[cantarell-fonts/respacing] Reorder points



commit 59e65601cb3e8938eaa30f1253eaa87d05bc7939
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Sat Oct 19 23:42:46 2019 +0100

    Reorder points

 src/Cantarell-Bold.ufo/glyphs/A_E_.glif            |  12 +--
 src/Cantarell-Bold.ufo/glyphs/E_-cy.glif           |  12 +--
 src/Cantarell-Bold.ufo/glyphs/E_.glif              |  20 +---
 src/Cantarell-Bold.ufo/glyphs/E_f-cy.glif          |  12 +--
 src/Cantarell-Bold.ufo/glyphs/E_ng.glif            |   8 +-
 src/Cantarell-Bold.ufo/glyphs/F_.glif              |  14 +--
 src/Cantarell-Bold.ufo/glyphs/H_.glif              |  16 ++-
 src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif   |  12 +--
 src/Cantarell-Bold.ufo/glyphs/L_je-cy.glif         |  40 ++++----
 src/Cantarell-Bold.ufo/glyphs/O_E_.glif            |  12 +--
 src/Cantarell-Bold.ufo/glyphs/P_.glif              |  24 ++---
 src/Cantarell-Bold.ufo/glyphs/Q_.glif              |  12 +--
 src/Cantarell-Bold.ufo/glyphs/R_.glif              |  24 ++---
 src/Cantarell-Bold.ufo/glyphs/S_chwa.glif          |  12 +--
 src/Cantarell-Bold.ufo/glyphs/T_.glif              |   8 +-
 src/Cantarell-Bold.ufo/glyphs/T_horn.glif          |  12 +--
 src/Cantarell-Bold.ufo/glyphs/Y_usbig-cy.glif      |  42 ++++----
 src/Cantarell-Bold.ufo/glyphs/Z_he-cy.glif         |  12 +--
 src/Cantarell-Bold.ufo/glyphs/ae.glif              |  80 +++++++--------
 src/Cantarell-Bold.ufo/glyphs/ampersand.glif       |  32 +++---
 src/Cantarell-Bold.ufo/glyphs/approxequal.glif     |  24 ++---
 src/Cantarell-Bold.ufo/glyphs/asciitilde.glif      |  12 +--
 src/Cantarell-Bold.ufo/glyphs/asterisk.glif        |  20 ++--
 src/Cantarell-Bold.ufo/glyphs/b.glif               |  14 +--
 .../glyphs/caroncomb.loclV_I_E_T_.glif             |   4 +-
 src/Cantarell-Bold.ufo/glyphs/cedi.glif            |  12 +--
 .../glyphs/cheverticalstroke-cy.glif               |  12 +--
 src/Cantarell-Bold.ufo/glyphs/circumflexcomb.glif  |   6 +-
 .../glyphs/circumflexcomb.loclV_I_E_T_.glif        |   6 +-
 src/Cantarell-Bold.ufo/glyphs/colonsign.glif       |  48 ++++-----
 .../glyphs/commaturnedabovecomb.glif               |   8 +-
 src/Cantarell-Bold.ufo/glyphs/copyright.glif       |  28 ++---
 src/Cantarell-Bold.ufo/glyphs/d.glif               |  14 +--
 src/Cantarell-Bold.ufo/glyphs/dblgravecomb.glif    |  12 +--
 .../glyphs/descender-cy.case.glif                  |   4 +-
 .../glyphs/dieresisbelowcomb.glif                  |  28 ++---
 src/Cantarell-Bold.ufo/glyphs/dieresiscomb.glif    |  28 ++---
 .../glyphs/dieresiscomb.loclV_I_E_T_.glif          |  28 ++---
 src/Cantarell-Bold.ufo/glyphs/divide.glif          |  32 +++---
 src/Cantarell-Bold.ufo/glyphs/dollar.glif          |  12 +--
 src/Cantarell-Bold.ufo/glyphs/dong.glif            |  26 ++---
 src/Cantarell-Bold.ufo/glyphs/ef-cy.glif           |  60 +++++------
 src/Cantarell-Bold.ufo/glyphs/emptyset.glif        |  12 +--
 src/Cantarell-Bold.ufo/glyphs/eng.glif             |  14 +--
 src/Cantarell-Bold.ufo/glyphs/euro.glif            |  24 ++---
 src/Cantarell-Bold.ufo/glyphs/florin.glif          |  12 +--
 src/Cantarell-Bold.ufo/glyphs/franc.glif           |  12 +--
 .../glyphs/ghemiddlehook-cy.glif                   |  34 +++---
 src/Cantarell-Bold.ufo/glyphs/guillemetleft.glif   |  18 ++--
 src/Cantarell-Bold.ufo/glyphs/h.glif               |  12 +--
 src/Cantarell-Bold.ufo/glyphs/hryvnia.glif         |  26 ++---
 .../glyphs/hungarumlautcomb.case.glif              |  12 +--
 .../glyphs/hungarumlautcomb.glif                   |  12 +--
 src/Cantarell-Bold.ufo/glyphs/k.glif               |  12 +--
 src/Cantarell-Bold.ufo/glyphs/kabashkir-cy.glif    |  12 +--
 src/Cantarell-Bold.ufo/glyphs/kgreenlandic.glif    |  12 +--
 src/Cantarell-Bold.ufo/glyphs/kip.glif             |  12 +--
 src/Cantarell-Bold.ufo/glyphs/lira.glif            |  12 +--
 src/Cantarell-Bold.ufo/glyphs/liraT_urkish.glif    |  12 +--
 src/Cantarell-Bold.ufo/glyphs/lje-cy.glif          |  40 ++++----
 src/Cantarell-Bold.ufo/glyphs/logicalnot.glif      |  12 +--
 src/Cantarell-Bold.ufo/glyphs/m.glif               |  36 +++----
 src/Cantarell-Bold.ufo/glyphs/micro.glif           |  12 +--
 src/Cantarell-Bold.ufo/glyphs/multiply.glif        |  14 +--
 src/Cantarell-Bold.ufo/glyphs/n.glif               |  14 +--
 src/Cantarell-Bold.ufo/glyphs/naira.glif           |  48 ++++-----
 src/Cantarell-Bold.ufo/glyphs/nine.dnom.glif       |  12 +--
 src/Cantarell-Bold.ufo/glyphs/nine.osf.glif        |  12 +--
 src/Cantarell-Bold.ufo/glyphs/nje-cy.glif          |  36 +++----
 src/Cantarell-Bold.ufo/glyphs/notequal.glif        |  12 +--
 src/Cantarell-Bold.ufo/glyphs/notidentical.glif    |  12 +--
 src/Cantarell-Bold.ufo/glyphs/oslash.glif          |  12 +--
 src/Cantarell-Bold.ufo/glyphs/p.glif               |  14 +--
 src/Cantarell-Bold.ufo/glyphs/peseta.glif          |  24 ++---
 src/Cantarell-Bold.ufo/glyphs/peso.glif            |  34 +++---
 src/Cantarell-Bold.ufo/glyphs/plusminus.glif       |  12 +--
 src/Cantarell-Bold.ufo/glyphs/q.glif               |  14 +--
 src/Cantarell-Bold.ufo/glyphs/registered.glif      |  24 ++---
 src/Cantarell-Bold.ufo/glyphs/ruble.glif           |  24 ++---
 src/Cantarell-Bold.ufo/glyphs/thorn.glif           |  12 +--
 src/Cantarell-Bold.ufo/glyphs/trademark.glif       |  24 ++---
 src/Cantarell-Bold.ufo/glyphs/tugrik.glif          |  16 +--
 src/Cantarell-Bold.ufo/glyphs/u.glif               |  24 ++---
 .../glyphs/verticallineabovecomb.glif              |   4 +-
 src/Cantarell-Bold.ufo/glyphs/won.glif             |  12 +--
 src/Cantarell-Bold.ufo/glyphs/yeru-cy.glif         |  12 +--
 src/Cantarell-Bold.ufo/glyphs/yusbig-cy.glif       |  42 ++++----
 src/Cantarell-Bold.ufo/glyphs/zhe-cy.glif          |  26 ++---
 src/Cantarell-Light.ufo/glyphs/A_E_.glif           |  12 +--
 src/Cantarell-Light.ufo/glyphs/E_-cy.glif          |  12 +--
 src/Cantarell-Light.ufo/glyphs/E_.glif             |  20 +---
 src/Cantarell-Light.ufo/glyphs/E_f-cy.glif         |  12 +--
 src/Cantarell-Light.ufo/glyphs/E_ng.glif           |   8 +-
 src/Cantarell-Light.ufo/glyphs/F_.glif             |  14 +--
 src/Cantarell-Light.ufo/glyphs/H_.glif             |  16 ++-
 src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif  |  12 +--
 src/Cantarell-Light.ufo/glyphs/L_je-cy.glif        |  40 ++++----
 src/Cantarell-Light.ufo/glyphs/O_E_.glif           |  12 +--
 src/Cantarell-Light.ufo/glyphs/P_.glif             |  24 ++---
 src/Cantarell-Light.ufo/glyphs/Q_.glif             |  12 +--
 src/Cantarell-Light.ufo/glyphs/R_.glif             |  24 ++---
 src/Cantarell-Light.ufo/glyphs/S_chwa.glif         |  12 +--
 src/Cantarell-Light.ufo/glyphs/T_.glif             |   8 +-
 src/Cantarell-Light.ufo/glyphs/T_horn.glif         |  12 +--
 src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif     |  42 ++++----
 src/Cantarell-Light.ufo/glyphs/Z_he-cy.glif        |  12 +--
 src/Cantarell-Light.ufo/glyphs/ae.glif             |  82 +++++++--------
 src/Cantarell-Light.ufo/glyphs/ampersand.glif      |  32 +++---
 src/Cantarell-Light.ufo/glyphs/approxequal.glif    |  24 ++---
 src/Cantarell-Light.ufo/glyphs/asciitilde.glif     |  12 +--
 src/Cantarell-Light.ufo/glyphs/asterisk.glif       |  20 ++--
 src/Cantarell-Light.ufo/glyphs/b.glif              |  68 ++++++------
 .../glyphs/caroncomb.loclV_I_E_T_.glif             |   4 +-
 src/Cantarell-Light.ufo/glyphs/cedi.glif           |  12 +--
 .../glyphs/cheverticalstroke-cy.glif               |  14 +--
 src/Cantarell-Light.ufo/glyphs/circumflexcomb.glif |   6 +-
 .../glyphs/circumflexcomb.loclV_I_E_T_.glif        |   6 +-
 src/Cantarell-Light.ufo/glyphs/colonsign.glif      |  48 ++++-----
 .../glyphs/commaturnedabovecomb.glif               |   8 +-
 src/Cantarell-Light.ufo/glyphs/copyright.glif      |  28 ++---
 src/Cantarell-Light.ufo/glyphs/d.glif              |  72 ++++++-------
 src/Cantarell-Light.ufo/glyphs/dblgravecomb.glif   |  12 +--
 .../glyphs/descender-cy.case.glif                  |   2 +-
 .../glyphs/dieresisbelowcomb.glif                  |  28 ++---
 src/Cantarell-Light.ufo/glyphs/dieresiscomb.glif   |  28 ++---
 .../glyphs/dieresiscomb.loclV_I_E_T_.glif          |  28 ++---
 src/Cantarell-Light.ufo/glyphs/divide.glif         |  32 +++---
 src/Cantarell-Light.ufo/glyphs/dollar.glif         |  12 +--
 src/Cantarell-Light.ufo/glyphs/dong.glif           |  26 ++---
 src/Cantarell-Light.ufo/glyphs/ef-cy.glif          | 114 ++++++++++-----------
 src/Cantarell-Light.ufo/glyphs/emptyset.glif       |  12 +--
 src/Cantarell-Light.ufo/glyphs/eng.glif            |  64 ++++++------
 src/Cantarell-Light.ufo/glyphs/euro.glif           |  24 ++---
 src/Cantarell-Light.ufo/glyphs/florin.glif         |  12 +--
 src/Cantarell-Light.ufo/glyphs/franc.glif          |  12 +--
 .../glyphs/ghemiddlehook-cy.glif                   |  54 +++++-----
 src/Cantarell-Light.ufo/glyphs/h.glif              |  48 ++++-----
 src/Cantarell-Light.ufo/glyphs/hryvnia.glif        |  26 ++---
 .../glyphs/hungarumlautcomb.case.glif              |  12 +--
 src/Cantarell-Light.ufo/glyphs/k.glif              |  28 ++---
 src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif   |  12 +--
 src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif   |  24 ++---
 src/Cantarell-Light.ufo/glyphs/kip.glif            |  12 +--
 src/Cantarell-Light.ufo/glyphs/lira.glif           |  12 +--
 src/Cantarell-Light.ufo/glyphs/liraT_urkish.glif   |  12 +--
 src/Cantarell-Light.ufo/glyphs/lje-cy.glif         |  40 ++++----
 src/Cantarell-Light.ufo/glyphs/logicalnot.glif     |  12 +--
 src/Cantarell-Light.ufo/glyphs/m.glif              |  80 +++++++--------
 src/Cantarell-Light.ufo/glyphs/micro.glif          |  48 ++++-----
 src/Cantarell-Light.ufo/glyphs/multiply.glif       |  14 +--
 src/Cantarell-Light.ufo/glyphs/n.glif              |  48 ++++-----
 src/Cantarell-Light.ufo/glyphs/naira.glif          |  48 ++++-----
 src/Cantarell-Light.ufo/glyphs/nine.dnom.glif      |  12 +--
 src/Cantarell-Light.ufo/glyphs/nine.osf.glif       |  12 +--
 src/Cantarell-Light.ufo/glyphs/nje-cy.glif         |  60 +++++------
 src/Cantarell-Light.ufo/glyphs/notequal.glif       |  12 +--
 src/Cantarell-Light.ufo/glyphs/notidentical.glif   |  12 +--
 src/Cantarell-Light.ufo/glyphs/oslash.glif         |  60 +++++------
 src/Cantarell-Light.ufo/glyphs/p.glif              |  68 ++++++------
 src/Cantarell-Light.ufo/glyphs/peseta.glif         |  24 ++---
 src/Cantarell-Light.ufo/glyphs/peso.glif           |  34 +++---
 src/Cantarell-Light.ufo/glyphs/plusminus.glif      |  12 +--
 src/Cantarell-Light.ufo/glyphs/q.glif              |  68 ++++++------
 src/Cantarell-Light.ufo/glyphs/r.glif              |  44 ++++----
 src/Cantarell-Light.ufo/glyphs/registered.glif     |  24 ++---
 src/Cantarell-Light.ufo/glyphs/ruble.glif          |  24 ++---
 src/Cantarell-Light.ufo/glyphs/thorn.glif          |  62 +++++------
 src/Cantarell-Light.ufo/glyphs/trademark.glif      |  24 ++---
 src/Cantarell-Light.ufo/glyphs/tugrik.glif         |  16 +--
 src/Cantarell-Light.ufo/glyphs/u.glif              |  52 +++++-----
 .../glyphs/verticallineabovecomb.glif              |   4 +-
 src/Cantarell-Light.ufo/glyphs/won.glif            |  12 +--
 src/Cantarell-Light.ufo/glyphs/yeru-cy.glif        |  52 +++++-----
 src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif      |  42 ++++----
 src/Cantarell-Light.ufo/glyphs/zhe-cy.glif         |  26 ++---
 src/Cantarell-Regular.ufo/glyphs/A_E_.glif         |  12 +--
 src/Cantarell-Regular.ufo/glyphs/E_-cy.glif        |  12 +--
 src/Cantarell-Regular.ufo/glyphs/E_.glif           |  20 +---
 src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif       |  12 +--
 src/Cantarell-Regular.ufo/glyphs/E_ng.glif         |   8 +-
 src/Cantarell-Regular.ufo/glyphs/F_.glif           |  14 +--
 src/Cantarell-Regular.ufo/glyphs/H_.glif           |  16 ++-
 .../glyphs/K_abashkir-cy.glif                      |  12 +--
 src/Cantarell-Regular.ufo/glyphs/L_je-cy.glif      |  40 ++++----
 src/Cantarell-Regular.ufo/glyphs/O_E_.glif         |  12 +--
 src/Cantarell-Regular.ufo/glyphs/P_.glif           |  24 ++---
 src/Cantarell-Regular.ufo/glyphs/Q_.glif           |  12 +--
 src/Cantarell-Regular.ufo/glyphs/R_.glif           |  24 ++---
 src/Cantarell-Regular.ufo/glyphs/S_chwa.glif       |  12 +--
 src/Cantarell-Regular.ufo/glyphs/T_.glif           |   8 +-
 src/Cantarell-Regular.ufo/glyphs/T_horn.glif       |  12 +--
 src/Cantarell-Regular.ufo/glyphs/Y_usbig-cy.glif   |  42 ++++----
 src/Cantarell-Regular.ufo/glyphs/Z_he-cy.glif      |  12 +--
 src/Cantarell-Regular.ufo/glyphs/ae.glif           |  80 +++++++--------
 src/Cantarell-Regular.ufo/glyphs/ampersand.glif    |  32 +++---
 src/Cantarell-Regular.ufo/glyphs/approxequal.glif  |  24 ++---
 src/Cantarell-Regular.ufo/glyphs/asciicircum.glif  |   6 +-
 src/Cantarell-Regular.ufo/glyphs/asciitilde.glif   |  12 +--
 src/Cantarell-Regular.ufo/glyphs/asterisk.glif     |  20 ++--
 src/Cantarell-Regular.ufo/glyphs/b.glif            |  14 +--
 .../glyphs/caroncomb.loclV_I_E_T_.glif             |   4 +-
 src/Cantarell-Regular.ufo/glyphs/cedi.glif         |  12 +--
 .../glyphs/cheverticalstroke-cy.glif               |  12 +--
 .../glyphs/circumflexcomb.glif                     |   2 +-
 .../glyphs/circumflexcomb.loclV_I_E_T_.glif        |   2 +-
 src/Cantarell-Regular.ufo/glyphs/colonsign.glif    |  48 ++++-----
 .../glyphs/commaturnedabovecomb.glif               |   8 +-
 src/Cantarell-Regular.ufo/glyphs/copyright.glif    |  28 ++---
 src/Cantarell-Regular.ufo/glyphs/d.glif            |  14 +--
 src/Cantarell-Regular.ufo/glyphs/dblgravecomb.glif |  12 +--
 .../glyphs/descender-cy.case.glif                  |   2 +-
 .../glyphs/dieresisbelowcomb.glif                  |  28 ++---
 src/Cantarell-Regular.ufo/glyphs/dieresiscomb.glif |  28 ++---
 .../glyphs/dieresiscomb.loclV_I_E_T_.glif          |  28 ++---
 src/Cantarell-Regular.ufo/glyphs/divide.glif       |  32 +++---
 src/Cantarell-Regular.ufo/glyphs/dollar.glif       |  12 +--
 src/Cantarell-Regular.ufo/glyphs/dong.glif         |  26 ++---
 src/Cantarell-Regular.ufo/glyphs/ef-cy.glif        |  60 +++++------
 src/Cantarell-Regular.ufo/glyphs/emptyset.glif     |  12 +--
 src/Cantarell-Regular.ufo/glyphs/eng.glif          |  14 +--
 src/Cantarell-Regular.ufo/glyphs/euro.glif         |  24 ++---
 src/Cantarell-Regular.ufo/glyphs/florin.glif       |  12 +--
 src/Cantarell-Regular.ufo/glyphs/franc.glif        |  12 +--
 .../glyphs/ghemiddlehook-cy.glif                   |  34 +++---
 .../glyphs/guillemetright.glif                     |  18 ++--
 src/Cantarell-Regular.ufo/glyphs/h.glif            |  12 +--
 src/Cantarell-Regular.ufo/glyphs/hryvnia.glif      |  26 ++---
 .../glyphs/hungarumlautcomb.case.glif              |  12 +--
 src/Cantarell-Regular.ufo/glyphs/k.glif            |  12 +--
 src/Cantarell-Regular.ufo/glyphs/kabashkir-cy.glif |  12 +--
 src/Cantarell-Regular.ufo/glyphs/kgreenlandic.glif |  12 +--
 src/Cantarell-Regular.ufo/glyphs/kip.glif          |  12 +--
 src/Cantarell-Regular.ufo/glyphs/lira.glif         |  12 +--
 src/Cantarell-Regular.ufo/glyphs/liraT_urkish.glif |  12 +--
 src/Cantarell-Regular.ufo/glyphs/lje-cy.glif       |  40 ++++----
 src/Cantarell-Regular.ufo/glyphs/logicalnot.glif   |  12 +--
 src/Cantarell-Regular.ufo/glyphs/m.glif            |  36 +++----
 src/Cantarell-Regular.ufo/glyphs/micro.glif        |  12 +--
 src/Cantarell-Regular.ufo/glyphs/multiply.glif     |  14 +--
 src/Cantarell-Regular.ufo/glyphs/n.glif            |  14 +--
 src/Cantarell-Regular.ufo/glyphs/naira.glif        |  48 ++++-----
 src/Cantarell-Regular.ufo/glyphs/nine.dnom.glif    |  12 +--
 src/Cantarell-Regular.ufo/glyphs/nine.osf.glif     |  12 +--
 src/Cantarell-Regular.ufo/glyphs/nje-cy.glif       |  36 +++----
 src/Cantarell-Regular.ufo/glyphs/notequal.glif     |  12 +--
 src/Cantarell-Regular.ufo/glyphs/notidentical.glif |  12 +--
 src/Cantarell-Regular.ufo/glyphs/oslash.glif       |  12 +--
 src/Cantarell-Regular.ufo/glyphs/p.glif            |  14 +--
 src/Cantarell-Regular.ufo/glyphs/peseta.glif       |  24 ++---
 src/Cantarell-Regular.ufo/glyphs/peso.glif         |  34 +++---
 src/Cantarell-Regular.ufo/glyphs/plusminus.glif    |  12 +--
 src/Cantarell-Regular.ufo/glyphs/q.glif            |  14 +--
 src/Cantarell-Regular.ufo/glyphs/registered.glif   |  24 ++---
 src/Cantarell-Regular.ufo/glyphs/ruble.glif        |  24 ++---
 src/Cantarell-Regular.ufo/glyphs/thorn.glif        |  12 +--
 src/Cantarell-Regular.ufo/glyphs/trademark.glif    |  24 ++---
 src/Cantarell-Regular.ufo/glyphs/tugrik.glif       |  16 +--
 src/Cantarell-Regular.ufo/glyphs/u.glif            |  24 ++---
 .../glyphs/verticallineabovecomb.glif              |   4 +-
 src/Cantarell-Regular.ufo/glyphs/won.glif          |  12 +--
 src/Cantarell-Regular.ufo/glyphs/yeru-cy.glif      |  12 +--
 src/Cantarell-Regular.ufo/glyphs/yusbig-cy.glif    |  42 ++++----
 src/Cantarell-Regular.ufo/glyphs/zhe-cy.glif       |  26 ++---
 263 files changed, 2867 insertions(+), 2957 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_E_.glif b/src/Cantarell-Bold.ufo/glyphs/A_E_.glif
index c5b2ebf4..5606f52b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_E_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_E_.glif
@@ -17,18 +17,18 @@
       <point x="514" y="305" type="line"/>
       <point x="196" y="305" type="line"/>
     </contour>
-    <contour>
-      <point x="474" y="0" type="line"/>
-      <point x="647" y="0" type="line"/>
-      <point x="647" y="694" type="line"/>
-      <point x="474" y="694" type="line"/>
-    </contour>
     <contour>
       <point x="554" y="0" type="line"/>
       <point x="972" y="0" type="line"/>
       <point x="972" y="152" type="line"/>
       <point x="554" y="152" type="line"/>
     </contour>
+    <contour>
+      <point x="474" y="0" type="line"/>
+      <point x="647" y="0" type="line"/>
+      <point x="647" y="694" type="line"/>
+      <point x="474" y="694" type="line"/>
+    </contour>
     <contour>
       <point x="554" y="278" type="line"/>
       <point x="944" y="278" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_-cy.glif
index 08213de0..4c9daf8e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_-cy.glif
@@ -3,12 +3,6 @@
   <advance width="652"/>
   <unicode hex="0404"/>
   <outline>
-    <contour>
-      <point x="170" y="275" type="line"/>
-      <point x="537" y="275" type="line"/>
-      <point x="537" y="415" type="line"/>
-      <point x="170" y="415" type="line"/>
-    </contour>
     <contour>
       <point x="404" y="-10" type="curve" smooth="yes"/>
       <point x="484" y="-10"/>
@@ -37,6 +31,12 @@
       <point x="37" y="131"/>
       <point x="187" y="-10"/>
     </contour>
+    <contour>
+      <point x="170" y="275" type="line"/>
+      <point x="537" y="275" type="line"/>
+      <point x="537" y="415" type="line"/>
+      <point x="170" y="415" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_.glif b/src/Cantarell-Bold.ufo/glyphs/E_.glif
index a3dd6533..dd828be0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_.glif
@@ -12,27 +12,17 @@ E
   <outline>
     <contour>
       <point x="71" y="0" type="line"/>
-      <point x="244" y="0" type="line"/>
-      <point x="244" y="694" type="line"/>
-      <point x="71" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="151" y="0" type="line"/>
       <point x="569" y="0" type="line"/>
       <point x="569" y="152" type="line"/>
-      <point x="151" y="152" type="line"/>
-    </contour>
-    <contour>
-      <point x="151" y="276" type="line"/>
+      <point x="244" y="152" type="line"/>
+      <point x="244" y="276" type="line"/>
       <point x="541" y="276" type="line"/>
       <point x="541" y="428" type="line"/>
-      <point x="151" y="428" type="line"/>
-    </contour>
-    <contour>
-      <point x="151" y="542" type="line"/>
+      <point x="244" y="428" type="line"/>
+      <point x="244" y="542" type="line"/>
       <point x="569" y="542" type="line"/>
       <point x="569" y="694" type="line"/>
-      <point x="151" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_f-cy.glif b/src/Cantarell-Bold.ufo/glyphs/E_f-cy.glif
index 174857c0..929f5738 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_f-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_f-cy.glif
@@ -3,6 +3,12 @@
   <advance width="822"/>
   <unicode hex="0424"/>
   <outline>
+    <contour>
+      <point x="326" y="-20" type="line"/>
+      <point x="496" y="-20" type="line"/>
+      <point x="496" y="714" type="line"/>
+      <point x="326" y="714" type="line"/>
+    </contour>
     <contour>
       <point x="407" y="48" type="curve" smooth="yes"/>
       <point x="653" y="48"/>
@@ -31,11 +37,5 @@
       <point x="628" y="249"/>
       <point x="550" y="193"/>
     </contour>
-    <contour>
-      <point x="326" y="-20" type="line"/>
-      <point x="496" y="-20" type="line"/>
-      <point x="496" y="714" type="line"/>
-      <point x="326" y="714" type="line"/>
-    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_ng.glif b/src/Cantarell-Bold.ufo/glyphs/E_ng.glif
index b5bc832d..68b5bcca 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_ng.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_ng.glif
@@ -4,10 +4,6 @@
   <unicode hex="014A"/>
   <outline>
     <contour>
-      <point x="71" y="0" type="line"/>
-      <point x="234" y="0" type="line"/>
-      <point x="234" y="470" type="line"/>
-      <point x="222" y="460" type="line"/>
       <point x="570" y="-37" type="line"/>
       <point x="722" y="0" type="line"/>
       <point x="722" y="694" type="line"/>
@@ -16,6 +12,10 @@
       <point x="578" y="219" type="line"/>
       <point x="263" y="694" type="line"/>
       <point x="71" y="694" type="line"/>
+      <point x="71" y="0" type="line"/>
+      <point x="234" y="0" type="line"/>
+      <point x="234" y="470" type="line"/>
+      <point x="222" y="460" type="line"/>
     </contour>
     <contour>
       <point x="559" y="-243" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/F_.glif b/src/Cantarell-Bold.ufo/glyphs/F_.glif
index cdda85cf..44c1b076 100644
--- a/src/Cantarell-Bold.ufo/glyphs/F_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/F_.glif
@@ -11,20 +11,14 @@ F
     <contour>
       <point x="71" y="0" type="line"/>
       <point x="247" y="0" type="line"/>
-      <point x="247" y="694" type="line"/>
-      <point x="71" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="151" y="257" type="line"/>
+      <point x="247" y="257" type="line"/>
       <point x="530" y="257" type="line"/>
       <point x="530" y="409" type="line"/>
-      <point x="151" y="409" type="line"/>
-    </contour>
-    <contour>
-      <point x="151" y="542" type="line"/>
+      <point x="247" y="409" type="line"/>
+      <point x="247" y="542" type="line"/>
       <point x="566" y="542" type="line"/>
       <point x="566" y="694" type="line"/>
-      <point x="151" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/H_.glif b/src/Cantarell-Bold.ufo/glyphs/H_.glif
index 1d9cc269..528297cf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/H_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/H_.glif
@@ -11,23 +11,19 @@ H
   <anchor x="11" y="694" name="topleft"/>
   <outline>
     <contour>
+      <point x="71" y="0" type="line"/>
+      <point x="247" y="0" type="line"/>
+      <point x="247" y="274" type="line"/>
+      <point x="516" y="274" type="line"/>
       <point x="516" y="0" type="line"/>
       <point x="692" y="0" type="line"/>
       <point x="692" y="694" type="line"/>
       <point x="516" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="71" y="0" type="line"/>
-      <point x="247" y="0" type="line"/>
+      <point x="516" y="430" type="line"/>
+      <point x="247" y="430" type="line"/>
       <point x="247" y="694" type="line"/>
       <point x="71" y="694" type="line"/>
     </contour>
-    <contour>
-      <point x="226" y="274" type="line"/>
-      <point x="536" y="274" type="line"/>
-      <point x="536" y="430" type="line"/>
-      <point x="226" y="430" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif
index f4fa42d4..73817cab 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_abashkir-cy.glif
@@ -3,12 +3,6 @@
   <advance width="807"/>
   <unicode hex="04A0"/>
   <outline>
-    <contour>
-      <point x="14" y="542" type="line"/>
-      <point x="352" y="542" type="line"/>
-      <point x="352" y="694" type="line"/>
-      <point x="14" y="694" type="line"/>
-    </contour>
     <contour>
       <point x="604" y="0" type="line"/>
       <point x="801" y="0" type="line"/>
@@ -30,6 +24,12 @@
       <point x="454" y="437" type="line"/>
       <point x="250" y="437" type="line"/>
     </contour>
+    <contour>
+      <point x="14" y="542" type="line"/>
+      <point x="352" y="542" type="line"/>
+      <point x="352" y="694" type="line"/>
+      <point x="14" y="694" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_je-cy.glif b/src/Cantarell-Bold.ufo/glyphs/L_je-cy.glif
index c9c72045..6a4837cd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_je-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_je-cy.glif
@@ -3,26 +3,6 @@
   <advance width="1123"/>
   <unicode hex="0409"/>
   <outline>
-    <contour>
-      <point x="648" y="0" type="line"/>
-      <point x="812" y="0" type="line" smooth="yes"/>
-      <point x="983" y="0"/>
-      <point x="1103" y="98"/>
-      <point x="1103" y="237" type="curve" smooth="yes"/>
-      <point x="1103" y="364"/>
-      <point x="1010" y="444"/>
-      <point x="863" y="444" type="curve" smooth="yes"/>
-      <point x="661" y="444" type="line"/>
-      <point x="661" y="312" type="line"/>
-      <point x="825" y="312" type="line" smooth="yes"/>
-      <point x="883" y="312"/>
-      <point x="923" y="274"/>
-      <point x="923" y="220" type="curve" smooth="yes"/>
-      <point x="923" y="168"/>
-      <point x="890" y="136"/>
-      <point x="835" y="136" type="curve" smooth="yes"/>
-      <point x="648" y="136" type="line"/>
-    </contour>
     <contour>
       <point x="137" y="-10" type="curve" smooth="yes"/>
       <point x="287" y="-10"/>
@@ -45,6 +25,26 @@
       <point x="37" y="4"/>
       <point x="79" y="-10"/>
     </contour>
+    <contour>
+      <point x="648" y="0" type="line"/>
+      <point x="812" y="0" type="line" smooth="yes"/>
+      <point x="983" y="0"/>
+      <point x="1103" y="98"/>
+      <point x="1103" y="237" type="curve" smooth="yes"/>
+      <point x="1103" y="364"/>
+      <point x="1010" y="444"/>
+      <point x="863" y="444" type="curve" smooth="yes"/>
+      <point x="661" y="444" type="line"/>
+      <point x="661" y="312" type="line"/>
+      <point x="825" y="312" type="line" smooth="yes"/>
+      <point x="883" y="312"/>
+      <point x="923" y="274"/>
+      <point x="923" y="220" type="curve" smooth="yes"/>
+      <point x="923" y="168"/>
+      <point x="890" y="136"/>
+      <point x="835" y="136" type="curve" smooth="yes"/>
+      <point x="648" y="136" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_E_.glif b/src/Cantarell-Bold.ufo/glyphs/O_E_.glif
index ca3cc3c1..c46af838 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_E_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_E_.glif
@@ -33,18 +33,18 @@
       <point x="37" y="130"/>
       <point x="187" y="-10"/>
     </contour>
-    <contour>
-      <point x="511" y="0" type="line"/>
-      <point x="684" y="0" type="line"/>
-      <point x="684" y="694" type="line"/>
-      <point x="511" y="694" type="line"/>
-    </contour>
     <contour>
       <point x="591" y="0" type="line"/>
       <point x="1009" y="0" type="line"/>
       <point x="1009" y="152" type="line"/>
       <point x="591" y="152" type="line"/>
     </contour>
+    <contour>
+      <point x="511" y="0" type="line"/>
+      <point x="684" y="0" type="line"/>
+      <point x="684" y="694" type="line"/>
+      <point x="511" y="694" type="line"/>
+    </contour>
     <contour>
       <point x="591" y="278" type="line"/>
       <point x="981" y="278" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/P_.glif b/src/Cantarell-Bold.ufo/glyphs/P_.glif
index abd46666..55d157eb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/P_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/P_.glif
@@ -11,20 +11,7 @@ P
     <contour>
       <point x="71" y="0" type="line"/>
       <point x="244" y="0" type="line"/>
-      <point x="244" y="694" type="line"/>
-      <point x="71" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="180" y="204" type="line"/>
-      <point x="301" y="204" type="line" smooth="yes"/>
-      <point x="489" y="204"/>
-      <point x="613" y="307"/>
-      <point x="613" y="463" type="curve" smooth="yes"/>
-      <point x="613" y="608"/>
-      <point x="507" y="694"/>
-      <point x="330" y="694" type="curve" smooth="yes"/>
-      <point x="180" y="694" type="line"/>
-      <point x="180" y="542" type="line"/>
+      <point x="244" y="542" type="line"/>
       <point x="316" y="542" type="line" smooth="yes"/>
       <point x="386" y="542"/>
       <point x="433" y="504"/>
@@ -33,6 +20,15 @@ P
       <point x="394" y="356"/>
       <point x="332" y="356" type="curve" smooth="yes"/>
       <point x="180" y="356" type="line"/>
+      <point x="180" y="204" type="line"/>
+      <point x="301" y="204" type="line" smooth="yes"/>
+      <point x="489" y="204"/>
+      <point x="613" y="307"/>
+      <point x="613" y="463" type="curve" smooth="yes"/>
+      <point x="613" y="608"/>
+      <point x="507" y="694"/>
+      <point x="330" y="694" type="curve" smooth="yes"/>
+      <point x="71" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Q_.glif b/src/Cantarell-Bold.ufo/glyphs/Q_.glif
index 0dc17202..6db5cca6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Q_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Q_.glif
@@ -22,6 +22,12 @@ Q
       <point x="37" y="130"/>
       <point x="176" y="-10"/>
     </contour>
+    <contour>
+      <point x="655" y="-63" type="line"/>
+      <point x="763" y="38" type="line"/>
+      <point x="438" y="348" type="line"/>
+      <point x="334" y="245" type="line"/>
+    </contour>
     <contour>
       <point x="395" y="140" type="curve" smooth="yes"/>
       <point x="282" y="140"/>
@@ -36,12 +42,6 @@ Q
       <point x="567" y="215"/>
       <point x="503" y="140"/>
     </contour>
-    <contour>
-      <point x="655" y="-63" type="line"/>
-      <point x="763" y="38" type="line"/>
-      <point x="438" y="348" type="line"/>
-      <point x="334" y="245" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_.glif b/src/Cantarell-Bold.ufo/glyphs/R_.glif
index 08b7b323..0fccc646 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_.glif
@@ -11,20 +11,7 @@ R
     <contour>
       <point x="71" y="0" type="line"/>
       <point x="244" y="0" type="line"/>
-      <point x="244" y="694" type="line"/>
-      <point x="71" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="192" y="237" type="line"/>
-      <point x="333" y="237" type="line" smooth="yes"/>
-      <point x="503" y="237"/>
-      <point x="616" y="338"/>
-      <point x="616" y="484" type="curve" smooth="yes"/>
-      <point x="616" y="618"/>
-      <point x="520" y="694"/>
-      <point x="357" y="694" type="curve" smooth="yes"/>
-      <point x="192" y="694" type="line"/>
-      <point x="192" y="543" type="line"/>
+      <point x="244" y="543" type="line"/>
       <point x="333" y="543" type="line" smooth="yes"/>
       <point x="398" y="543"/>
       <point x="436" y="512"/>
@@ -33,6 +20,15 @@ R
       <point x="408" y="384"/>
       <point x="357" y="384" type="curve" smooth="yes"/>
       <point x="192" y="384" type="line"/>
+      <point x="192" y="237" type="line"/>
+      <point x="333" y="237" type="line" smooth="yes"/>
+      <point x="503" y="237"/>
+      <point x="616" y="338"/>
+      <point x="616" y="484" type="curve" smooth="yes"/>
+      <point x="616" y="618"/>
+      <point x="520" y="694"/>
+      <point x="357" y="694" type="curve" smooth="yes"/>
+      <point x="71" y="694" type="line"/>
     </contour>
     <contour>
       <point x="456" y="0" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_chwa.glif b/src/Cantarell-Bold.ufo/glyphs/S_chwa.glif
index 482c2426..71d04b59 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_chwa.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_chwa.glif
@@ -6,6 +6,12 @@
   <anchor x="369" y="694" name="top"/>
   <outline>
     <contour>
+      <point x="343" y="-10" type="curve" smooth="yes"/>
+      <point x="553" y="-10"/>
+      <point x="696" y="133"/>
+      <point x="696" y="350" type="curve" smooth="yes"/>
+      <point x="696" y="571"/>
+      <point x="549" y="704"/>
       <point x="310" y="704" type="curve" smooth="yes"/>
       <point x="220" y="704"/>
       <point x="133" y="685"/>
@@ -31,12 +37,6 @@
       <point x="38" y="280" type="curve" smooth="yes"/>
       <point x="38" y="105"/>
       <point x="156" y="-10"/>
-      <point x="343" y="-10" type="curve" smooth="yes"/>
-      <point x="553" y="-10"/>
-      <point x="696" y="133"/>
-      <point x="696" y="350" type="curve" smooth="yes"/>
-      <point x="696" y="571"/>
-      <point x="549" y="704"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_.glif b/src/Cantarell-Bold.ufo/glyphs/T_.glif
index 2a366078..44fae23b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_.glif
@@ -12,14 +12,12 @@ T
     <contour>
       <point x="221" y="0" type="line"/>
       <point x="391" y="0" type="line"/>
-      <point x="391" y="660" type="line"/>
-      <point x="221" y="660" type="line"/>
-    </contour>
-    <contour>
-      <point x="7" y="542" type="line"/>
+      <point x="391" y="542" type="line"/>
       <point x="607" y="542" type="line"/>
       <point x="607" y="694" type="line"/>
       <point x="7" y="694" type="line"/>
+      <point x="7" y="542" type="line"/>
+      <point x="221" y="542" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_horn.glif b/src/Cantarell-Bold.ufo/glyphs/T_horn.glif
index 2e36809b..56fb2f2f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_horn.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_horn.glif
@@ -3,12 +3,6 @@
   <advance width="625"/>
   <unicode hex="00DE"/>
   <outline>
-    <contour>
-      <point x="71" y="0" type="line"/>
-      <point x="244" y="0" type="line"/>
-      <point x="244" y="694" type="line"/>
-      <point x="71" y="694" type="line"/>
-    </contour>
     <contour>
       <point x="180" y="116" type="line"/>
       <point x="316" y="116" type="line" smooth="yes"/>
@@ -29,6 +23,12 @@
       <point x="332" y="268" type="curve" smooth="yes"/>
       <point x="180" y="268" type="line"/>
     </contour>
+    <contour>
+      <point x="71" y="0" type="line"/>
+      <point x="244" y="0" type="line"/>
+      <point x="244" y="694" type="line"/>
+      <point x="71" y="694" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Y_usbig-cy.glif b/src/Cantarell-Bold.ufo/glyphs/Y_usbig-cy.glif
index 6663f1e4..2ab89461 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Y_usbig-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Y_usbig-cy.glif
@@ -4,26 +4,7 @@
   <unicode hex="046A"/>
   <outline>
     <contour>
-      <point x="241" y="378" type="line"/>
-      <point x="428" y="378" type="line"/>
-      <point x="245" y="615" type="line"/>
-      <point x="210" y="550" type="line"/>
-      <point x="587" y="550" type="line"/>
-      <point x="547" y="615" type="line"/>
-      <point x="379" y="398" type="line"/>
-      <point x="556" y="398" type="line"/>
-      <point x="709" y="546" type="line"/>
-      <point x="709" y="694" type="line"/>
-      <point x="87" y="694" type="line"/>
-      <point x="87" y="546" type="line"/>
-    </contour>
-    <contour>
-      <point x="485" y="304" type="line"/>
-      <point x="318" y="304" type="line"/>
-      <point x="318" y="0" type="line"/>
-      <point x="485" y="0" type="line"/>
-    </contour>
-    <contour>
+      <point x="19" y="0" type="curve"/>
       <point x="187" y="0" type="line"/>
       <point x="187" y="200"/>
       <point x="251" y="291"/>
@@ -37,7 +18,26 @@
       <point x="408" y="420" type="curve" smooth="yes"/>
       <point x="141" y="420"/>
       <point x="19" y="288"/>
-      <point x="19" y="0" type="curve"/>
+    </contour>
+    <contour>
+      <point x="318" y="0" type="line"/>
+      <point x="485" y="0" type="line"/>
+      <point x="485" y="304" type="line"/>
+      <point x="318" y="304" type="line"/>
+    </contour>
+    <contour>
+      <point x="241" y="378" type="line"/>
+      <point x="428" y="378" type="line"/>
+      <point x="245" y="615" type="line"/>
+      <point x="210" y="550" type="line"/>
+      <point x="587" y="550" type="line"/>
+      <point x="547" y="615" type="line"/>
+      <point x="379" y="398" type="line"/>
+      <point x="556" y="398" type="line"/>
+      <point x="709" y="546" type="line"/>
+      <point x="709" y="694" type="line"/>
+      <point x="87" y="694" type="line"/>
+      <point x="87" y="546" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_he-cy.glif b/src/Cantarell-Bold.ufo/glyphs/Z_he-cy.glif
index 65c9256a..80f14e8e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_he-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_he-cy.glif
@@ -23,17 +23,17 @@
       <point x="217" y="331" type="line"/>
       <point x="214" y="359" type="line"/>
     </contour>
-    <contour>
-      <point x="303" y="278" type="line"/>
-      <point x="752" y="278" type="line"/>
-      <point x="752" y="430" type="line"/>
-      <point x="303" y="430" type="line"/>
-    </contour>
     <contour>
       <point x="439" y="0" type="line"/>
       <point x="612" y="0" type="line"/>
       <point x="612" y="694" type="line"/>
       <point x="439" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="303" y="278" type="line"/>
+      <point x="752" y="278" type="line"/>
+      <point x="752" y="430" type="line"/>
+      <point x="303" y="430" type="line"/>
+    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ae.glif b/src/Cantarell-Bold.ufo/glyphs/ae.glif
index abc406d3..a79f9421 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ae.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ae.glif
@@ -5,46 +5,6 @@
   <anchor x="408" y="0" name="bottom"/>
   <anchor x="408" y="490" name="top"/>
   <outline>
-    <contour>
-      <point x="324" y="255" type="line"/>
-      <point x="457" y="255" type="line"/>
-      <point x="457" y="282" type="line" smooth="yes"/>
-      <point x="457" y="429"/>
-      <point x="394" y="500"/>
-      <point x="264" y="500" type="curve" smooth="yes"/>
-      <point x="186" y="500"/>
-      <point x="102" y="477"/>
-      <point x="38" y="438" type="curve"/>
-      <point x="76" y="321" type="line"/>
-      <point x="128" y="345"/>
-      <point x="184" y="359"/>
-      <point x="228" y="359" type="curve" smooth="yes"/>
-      <point x="289" y="359"/>
-      <point x="324" y="331"/>
-      <point x="324" y="282" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="197" y="-10" type="curve" smooth="yes"/>
-      <point x="293" y="-10"/>
-      <point x="365" y="43"/>
-      <point x="426" y="155" type="curve"/>
-      <point x="373" y="178" type="line"/>
-      <point x="340" y="140"/>
-      <point x="299" y="119"/>
-      <point x="260" y="119" type="curve" smooth="yes"/>
-      <point x="226" y="119"/>
-      <point x="207" y="133"/>
-      <point x="207" y="157" type="curve" smooth="yes"/>
-      <point x="207" y="192"/>
-      <point x="252" y="206"/>
-      <point x="361" y="205" type="curve"/>
-      <point x="361" y="299" type="line"/>
-      <point x="155" y="300"/>
-      <point x="33" y="236"/>
-      <point x="33" y="126" type="curve" smooth="yes"/>
-      <point x="33" y="44"/>
-      <point x="99" y="-10"/>
-    </contour>
     <contour>
       <point x="585" y="-10" type="curve" smooth="yes"/>
       <point x="645" y="-10"/>
@@ -78,6 +38,46 @@
       <point x="329" y="77"/>
       <point x="416" y="-10"/>
     </contour>
+    <contour>
+      <point x="197" y="-10" type="curve" smooth="yes"/>
+      <point x="293" y="-10"/>
+      <point x="365" y="43"/>
+      <point x="426" y="155" type="curve"/>
+      <point x="373" y="178" type="line"/>
+      <point x="340" y="140"/>
+      <point x="299" y="119"/>
+      <point x="260" y="119" type="curve" smooth="yes"/>
+      <point x="226" y="119"/>
+      <point x="207" y="133"/>
+      <point x="207" y="157" type="curve" smooth="yes"/>
+      <point x="207" y="192"/>
+      <point x="252" y="206"/>
+      <point x="361" y="205" type="curve"/>
+      <point x="361" y="299" type="line"/>
+      <point x="155" y="300"/>
+      <point x="33" y="236"/>
+      <point x="33" y="126" type="curve" smooth="yes"/>
+      <point x="33" y="44"/>
+      <point x="99" y="-10"/>
+    </contour>
+    <contour>
+      <point x="324" y="255" type="line"/>
+      <point x="457" y="255" type="line"/>
+      <point x="457" y="282" type="line" smooth="yes"/>
+      <point x="457" y="429"/>
+      <point x="394" y="500"/>
+      <point x="264" y="500" type="curve" smooth="yes"/>
+      <point x="186" y="500"/>
+      <point x="102" y="477"/>
+      <point x="38" y="438" type="curve"/>
+      <point x="76" y="321" type="line"/>
+      <point x="128" y="345"/>
+      <point x="184" y="359"/>
+      <point x="228" y="359" type="curve" smooth="yes"/>
+      <point x="289" y="359"/>
+      <point x="324" y="331"/>
+      <point x="324" y="282" type="curve" smooth="yes"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ampersand.glif b/src/Cantarell-Bold.ufo/glyphs/ampersand.glif
index 919e451e..d1ef6530 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ampersand.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ampersand.glif
@@ -4,22 +4,6 @@
   <unicode hex="0026"/>
   <outline>
     <contour>
-      <point x="594" y="-10" type="curve"/>
-      <point x="683" y="92" type="line"/>
-      <point x="388" y="314"/>
-      <point x="287" y="416"/>
-      <point x="287" y="511" type="curve" smooth="yes"/>
-      <point x="287" y="551"/>
-      <point x="307" y="572"/>
-      <point x="343" y="572" type="curve" smooth="yes"/>
-      <point x="376" y="572"/>
-      <point x="399" y="554"/>
-      <point x="399" y="528" type="curve" smooth="yes"/>
-      <point x="399" y="419"/>
-      <point x="39" y="443"/>
-      <point x="39" y="200" type="curve" smooth="yes"/>
-      <point x="39" y="75"/>
-      <point x="137" y="-10"/>
       <point x="283" y="-10" type="curve" smooth="yes"/>
       <point x="443" y="-10"/>
       <point x="579" y="94"/>
@@ -42,6 +26,22 @@
       <point x="132" y="517" type="curve" smooth="yes"/>
       <point x="132" y="397"/>
       <point x="230" y="284"/>
+      <point x="594" y="-10" type="curve"/>
+      <point x="683" y="92" type="line"/>
+      <point x="388" y="314"/>
+      <point x="287" y="416"/>
+      <point x="287" y="511" type="curve" smooth="yes"/>
+      <point x="287" y="551"/>
+      <point x="307" y="572"/>
+      <point x="343" y="572" type="curve" smooth="yes"/>
+      <point x="376" y="572"/>
+      <point x="399" y="554"/>
+      <point x="399" y="528" type="curve" smooth="yes"/>
+      <point x="399" y="419"/>
+      <point x="39" y="443"/>
+      <point x="39" y="200" type="curve" smooth="yes"/>
+      <point x="39" y="75"/>
+      <point x="137" y="-10"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/approxequal.glif b/src/Cantarell-Bold.ufo/glyphs/approxequal.glif
index 994f9a84..a1825b57 100644
--- a/src/Cantarell-Bold.ufo/glyphs/approxequal.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/approxequal.glif
@@ -4,12 +4,6 @@
   <unicode hex="2248"/>
   <outline>
     <contour>
-      <point x="147" y="327" type="line"/>
-      <point x="170" y="375"/>
-      <point x="187" y="389"/>
-      <point x="208" y="389" type="curve" smooth="yes"/>
-      <point x="254" y="389"/>
-      <point x="295" y="331"/>
       <point x="365" y="331" type="curve" smooth="yes"/>
       <point x="436" y="331"/>
       <point x="520" y="398"/>
@@ -24,14 +18,14 @@
       <point x="154" y="546"/>
       <point x="83" y="479"/>
       <point x="44" y="373" type="curve"/>
+      <point x="147" y="327" type="line"/>
+      <point x="170" y="375"/>
+      <point x="187" y="389"/>
+      <point x="208" y="389" type="curve" smooth="yes"/>
+      <point x="254" y="389"/>
+      <point x="295" y="331"/>
     </contour>
     <contour>
-      <point x="143" y="85" type="line"/>
-      <point x="164" y="129"/>
-      <point x="185" y="146"/>
-      <point x="208" y="146" type="curve" smooth="yes"/>
-      <point x="254" y="146"/>
-      <point x="295" y="88"/>
       <point x="365" y="88" type="curve" smooth="yes"/>
       <point x="436" y="88"/>
       <point x="520" y="155"/>
@@ -46,6 +40,12 @@
       <point x="156" y="303"/>
       <point x="85" y="240"/>
       <point x="44" y="130" type="curve"/>
+      <point x="143" y="85" type="line"/>
+      <point x="164" y="129"/>
+      <point x="185" y="146"/>
+      <point x="208" y="146" type="curve" smooth="yes"/>
+      <point x="254" y="146"/>
+      <point x="295" y="88"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/asciitilde.glif b/src/Cantarell-Bold.ufo/glyphs/asciitilde.glif
index 72583609..519c0219 100644
--- a/src/Cantarell-Bold.ufo/glyphs/asciitilde.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/asciitilde.glif
@@ -4,12 +4,6 @@
   <unicode hex="007E"/>
   <outline>
     <contour>
-      <point x="117" y="214" type="line"/>
-      <point x="134" y="248"/>
-      <point x="161" y="269"/>
-      <point x="192" y="269" type="curve" smooth="yes"/>
-      <point x="252" y="269"/>
-      <point x="291" y="203"/>
       <point x="371" y="203" type="curve" smooth="yes"/>
       <point x="453" y="203"/>
       <point x="539" y="274"/>
@@ -24,6 +18,12 @@
       <point x="130" y="431"/>
       <point x="58" y="359"/>
       <point x="24" y="256" type="curve"/>
+      <point x="117" y="214" type="line"/>
+      <point x="134" y="248"/>
+      <point x="161" y="269"/>
+      <point x="192" y="269" type="curve" smooth="yes"/>
+      <point x="252" y="269"/>
+      <point x="291" y="203"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/asterisk.glif b/src/Cantarell-Bold.ufo/glyphs/asterisk.glif
index 2a104fb6..8ca27499 100644
--- a/src/Cantarell-Bold.ufo/glyphs/asterisk.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/asterisk.glif
@@ -4,10 +4,10 @@
   <unicode hex="002A"/>
   <outline>
     <contour>
-      <point x="256" y="467" type="line"/>
-      <point x="472" y="521" type="line"/>
-      <point x="401" y="648" type="line"/>
-      <point x="232" y="511" type="line"/>
+      <point x="395" y="315" type="line"/>
+      <point x="467" y="442" type="line"/>
+      <point x="259" y="507" type="line"/>
+      <point x="232" y="463" type="line"/>
     </contour>
     <contour>
       <point x="93" y="318" type="line"/>
@@ -27,17 +27,17 @@
       <point x="95" y="656" type="line"/>
       <point x="24" y="530" type="line"/>
     </contour>
-    <contour>
-      <point x="395" y="315" type="line"/>
-      <point x="467" y="442" type="line"/>
-      <point x="259" y="507" type="line"/>
-      <point x="232" y="463" type="line"/>
-    </contour>
     <contour>
       <point x="221" y="488" type="line"/>
       <point x="271" y="488" type="line"/>
       <point x="325" y="704" type="line"/>
       <point x="164" y="704" type="line"/>
     </contour>
+    <contour>
+      <point x="256" y="467" type="line"/>
+      <point x="472" y="521" type="line"/>
+      <point x="401" y="648" type="line"/>
+      <point x="232" y="511" type="line"/>
+    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/b.glif b/src/Cantarell-Bold.ufo/glyphs/b.glif
index 10b8db1b..0c8bcbe3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/b.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/b.glif
@@ -8,13 +8,6 @@ b
   <anchor x="297" y="0" name="bottom"/>
   <anchor x="297" y="490" name="top"/>
   <outline>
-    <contour>
-      <point x="62" y="0" type="line"/>
-      <point x="168" y="0" type="line"/>
-      <point x="228" y="120" type="line"/>
-      <point x="228" y="739" type="line"/>
-      <point x="62" y="739" type="line"/>
-    </contour>
     <contour>
       <point x="336" y="-10" type="curve" smooth="yes"/>
       <point x="472" y="-10"/>
@@ -43,6 +36,13 @@ b
       <point x="199" y="27"/>
       <point x="255" y="-10"/>
     </contour>
+    <contour>
+      <point x="62" y="0" type="line"/>
+      <point x="168" y="0" type="line"/>
+      <point x="228" y="120" type="line"/>
+      <point x="228" y="739" type="line"/>
+      <point x="62" y="739" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/caroncomb.loclV_I_E_T_.glif 
b/src/Cantarell-Bold.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
index d879f688..83d1c6f2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
@@ -4,13 +4,13 @@
   <anchor x="208" y="685" name="top"/>
   <outline>
     <contour>
+      <point x="155" y="533" type="line"/>
+      <point x="255" y="533" type="line"/>
       <point x="399" y="687" type="line"/>
       <point x="338" y="740" type="line"/>
       <point x="224" y="660" type="line"/>
       <point x="108" y="739" type="line"/>
       <point x="11" y="646" type="line"/>
-      <point x="155" y="533" type="line"/>
-      <point x="255" y="533" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/cedi.glif b/src/Cantarell-Bold.ufo/glyphs/cedi.glif
index c10e2e4a..fd507ebf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/cedi.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/cedi.glif
@@ -31,18 +31,18 @@
       <point x="49" y="131"/>
       <point x="178" y="-10"/>
     </contour>
-    <contour>
-      <point x="273" y="655" type="line"/>
-      <point x="430" y="655" type="line"/>
-      <point x="430" y="821" type="line"/>
-      <point x="273" y="821" type="line"/>
-    </contour>
     <contour>
       <point x="274" y="-123" type="line"/>
       <point x="431" y="-123" type="line"/>
       <point x="431" y="31" type="line"/>
       <point x="274" y="31" type="line"/>
     </contour>
+    <contour>
+      <point x="273" y="655" type="line"/>
+      <point x="430" y="655" type="line"/>
+      <point x="430" y="821" type="line"/>
+      <point x="273" y="821" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/cheverticalstroke-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/cheverticalstroke-cy.glif
index 9652f818..c746d2a5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/cheverticalstroke-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/cheverticalstroke-cy.glif
@@ -21,18 +21,18 @@
       <point x="19" y="220"/>
       <point x="90" y="162"/>
     </contour>
-    <contour>
-      <point x="335" y="0" type="line"/>
-      <point x="503" y="0" type="line"/>
-      <point x="503" y="490" type="line"/>
-      <point x="335" y="490" type="line"/>
-    </contour>
     <contour>
       <point x="218" y="67" type="line"/>
       <point x="299" y="67" type="line"/>
       <point x="299" y="418" type="line"/>
       <point x="218" y="418" type="line"/>
     </contour>
+    <contour>
+      <point x="335" y="0" type="line"/>
+      <point x="503" y="0" type="line"/>
+      <point x="503" y="490" type="line"/>
+      <point x="335" y="490" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb.glif 
b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb.glif
index d90ad26f..09ce33bf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb.glif
@@ -6,13 +6,13 @@
   <anchor x="379" y="648" name="top_viet"/>
   <outline>
     <contour>
-      <point x="20" y="594" type="line"/>
-      <point x="89" y="535" type="line"/>
-      <point x="198" y="618" type="line"/>
       <point x="302" y="534" type="line"/>
       <point x="398" y="625" type="line"/>
       <point x="251" y="762" type="line"/>
       <point x="166" y="762" type="line"/>
+      <point x="20" y="594" type="line"/>
+      <point x="89" y="535" type="line"/>
+      <point x="198" y="618" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif 
b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
index c1fd0f42..12ed3e42 100644
--- a/src/Cantarell-Bold.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
@@ -5,13 +5,13 @@
   <anchor x="381" y="612" name="top_viet"/>
   <outline>
     <contour>
-      <point x="20" y="571" type="line"/>
-      <point x="89" y="512" type="line"/>
-      <point x="198" y="581" type="line"/>
       <point x="302" y="511" type="line"/>
       <point x="398" y="602" type="line"/>
       <point x="251" y="714" type="line"/>
       <point x="166" y="714" type="line"/>
+      <point x="20" y="571" type="line"/>
+      <point x="89" y="512" type="line"/>
+      <point x="198" y="581" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/colonsign.glif b/src/Cantarell-Bold.ufo/glyphs/colonsign.glif
index e8e2fc34..8f379373 100644
--- a/src/Cantarell-Bold.ufo/glyphs/colonsign.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/colonsign.glif
@@ -3,30 +3,6 @@
   <advance width="600"/>
   <unicode hex="20A1"/>
   <outline>
-    <contour>
-      <point x="372" y="625" type="line"/>
-      <point x="491" y="625" type="line"/>
-      <point x="529" y="821" type="line"/>
-      <point x="410" y="821" type="line"/>
-    </contour>
-    <contour>
-      <point x="130" y="-123" type="line"/>
-      <point x="249" y="-123" type="line"/>
-      <point x="284" y="80" type="line"/>
-      <point x="164" y="80" type="line"/>
-    </contour>
-    <contour>
-      <point x="204" y="625" type="line"/>
-      <point x="323" y="625" type="line"/>
-      <point x="361" y="821" type="line"/>
-      <point x="241" y="821" type="line"/>
-    </contour>
-    <contour>
-      <point x="299" y="-123" type="line"/>
-      <point x="418" y="-123" type="line"/>
-      <point x="453" y="80" type="line"/>
-      <point x="333" y="80" type="line"/>
-    </contour>
     <contour>
       <point x="359" y="-10" type="curve" smooth="yes"/>
       <point x="426" y="-10"/>
@@ -55,6 +31,30 @@
       <point x="46" y="131"/>
       <point x="175" y="-10"/>
     </contour>
+    <contour>
+      <point x="130" y="-123" type="line"/>
+      <point x="249" y="-123" type="line"/>
+      <point x="284" y="80" type="line"/>
+      <point x="164" y="80" type="line"/>
+    </contour>
+    <contour>
+      <point x="299" y="-123" type="line"/>
+      <point x="418" y="-123" type="line"/>
+      <point x="453" y="80" type="line"/>
+      <point x="333" y="80" type="line"/>
+    </contour>
+    <contour>
+      <point x="204" y="625" type="line"/>
+      <point x="323" y="625" type="line"/>
+      <point x="361" y="821" type="line"/>
+      <point x="241" y="821" type="line"/>
+    </contour>
+    <contour>
+      <point x="372" y="625" type="line"/>
+      <point x="491" y="625" type="line"/>
+      <point x="529" y="821" type="line"/>
+      <point x="410" y="821" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/commaturnedabovecomb.glif 
b/src/Cantarell-Bold.ufo/glyphs/commaturnedabovecomb.glif
index 4e32756c..93f79e0c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/commaturnedabovecomb.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/commaturnedabovecomb.glif
@@ -5,14 +5,14 @@
   <anchor x="146" y="739" name="top"/>
   <outline>
     <contour>
-      <point x="240" y="730" type="curve"/>
-      <point x="99" y="730" type="line"/>
-      <point x="64" y="692"/>
-      <point x="48" y="641"/>
       <point x="48" y="568" type="curve"/>
       <point x="215" y="568" type="line"/>
       <point x="215" y="637"/>
       <point x="226" y="697"/>
+      <point x="240" y="730" type="curve"/>
+      <point x="99" y="730" type="line"/>
+      <point x="64" y="692"/>
+      <point x="48" y="641"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/copyright.glif b/src/Cantarell-Bold.ufo/glyphs/copyright.glif
index 8af29b3f..d62ee135 100644
--- a/src/Cantarell-Bold.ufo/glyphs/copyright.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/copyright.glif
@@ -17,20 +17,6 @@
       <point x="50" y="130"/>
       <point x="195" y="-10"/>
     </contour>
-    <contour>
-      <point x="421" y="81" type="curve" smooth="yes"/>
-      <point x="254" y="81"/>
-      <point x="142" y="189"/>
-      <point x="142" y="350" type="curve" smooth="yes"/>
-      <point x="142" y="508"/>
-      <point x="250" y="613"/>
-      <point x="412" y="613" type="curve" smooth="yes"/>
-      <point x="579" y="613"/>
-      <point x="691" y="504"/>
-      <point x="691" y="341" type="curve" smooth="yes"/>
-      <point x="691" y="185"/>
-      <point x="583" y="81"/>
-    </contour>
     <contour>
       <point x="430" y="134" type="curve" smooth="yes"/>
       <point x="474" y="134"/>
@@ -59,6 +45,20 @@
       <point x="208" y="218"/>
       <point x="297" y="134"/>
     </contour>
+    <contour>
+      <point x="421" y="81" type="curve" smooth="yes"/>
+      <point x="254" y="81"/>
+      <point x="142" y="189"/>
+      <point x="142" y="350" type="curve" smooth="yes"/>
+      <point x="142" y="508"/>
+      <point x="250" y="613"/>
+      <point x="412" y="613" type="curve" smooth="yes"/>
+      <point x="579" y="613"/>
+      <point x="691" y="504"/>
+      <point x="691" y="341" type="curve" smooth="yes"/>
+      <point x="691" y="185"/>
+      <point x="583" y="81"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/d.glif b/src/Cantarell-Bold.ufo/glyphs/d.glif
index 91d5562e..ea796fa2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/d.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/d.glif
@@ -10,13 +10,6 @@ d
   <anchor x="300" y="490" name="top"/>
   <anchor x="640" y="490" name="topright"/>
   <outline>
-    <contour>
-      <point x="428" y="0" type="line"/>
-      <point x="534" y="0" type="line"/>
-      <point x="534" y="739" type="line"/>
-      <point x="368" y="739" type="line"/>
-      <point x="368" y="120" type="line"/>
-    </contour>
     <contour>
       <point x="240" y="-10" type="curve" smooth="yes"/>
       <point x="311" y="-10"/>
@@ -45,6 +38,13 @@ d
       <point x="33" y="89"/>
       <point x="120" y="-10"/>
     </contour>
+    <contour>
+      <point x="428" y="0" type="line"/>
+      <point x="534" y="0" type="line"/>
+      <point x="534" y="739" type="line"/>
+      <point x="368" y="739" type="line"/>
+      <point x="368" y="120" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dblgravecomb.glif b/src/Cantarell-Bold.ufo/glyphs/dblgravecomb.glif
index 5704cebf..7bb8d2e6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dblgravecomb.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dblgravecomb.glif
@@ -4,18 +4,18 @@
   <anchor x="301" y="490" name="_top"/>
   <anchor x="301" y="799" name="top"/>
   <outline>
-    <contour>
-      <point x="159" y="527" type="line"/>
-      <point x="250" y="579" type="line"/>
-      <point x="165" y="775" type="line"/>
-      <point x="24" y="697" type="line"/>
-    </contour>
     <contour>
       <point x="378" y="527" type="line"/>
       <point x="469" y="579" type="line"/>
       <point x="384" y="776" type="line"/>
       <point x="242" y="697" type="line"/>
     </contour>
+    <contour>
+      <point x="159" y="527" type="line"/>
+      <point x="250" y="579" type="line"/>
+      <point x="165" y="775" type="line"/>
+      <point x="24" y="697" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/descender-cy.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/descender-cy.case.glif
index c3c79a8c..66801964 100644
--- a/src/Cantarell-Bold.ufo/glyphs/descender-cy.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/descender-cy.case.glif
@@ -4,12 +4,12 @@
   <anchor x="96" y="0" name="_bottomright"/>
   <outline>
     <contour>
-      <point x="55" y="0" type="line"/>
-      <point x="98" y="0" type="line"/>
       <point x="98" y="-187" type="line"/>
       <point x="260" y="-187" type="line"/>
       <point x="260" y="151" type="line"/>
       <point x="55" y="151" type="line"/>
+      <point x="55" y="0" type="line"/>
+      <point x="98" y="0" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dieresisbelowcomb.glif 
b/src/Cantarell-Bold.ufo/glyphs/dieresisbelowcomb.glif
index c53126f4..be74326b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dieresisbelowcomb.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dieresisbelowcomb.glif
@@ -4,20 +4,6 @@
   <anchor x="275" y="0" name="_bottom"/>
   <anchor x="275" y="-203" name="bottom"/>
   <outline>
-    <contour>
-      <point x="150" y="-227" type="curve" smooth="yes"/>
-      <point x="209" y="-227"/>
-      <point x="249" y="-187"/>
-      <point x="249" y="-128" type="curve" smooth="yes"/>
-      <point x="249" y="-68"/>
-      <point x="209" y="-28"/>
-      <point x="150" y="-28" type="curve" smooth="yes"/>
-      <point x="91" y="-28"/>
-      <point x="51" y="-68"/>
-      <point x="51" y="-128" type="curve" smooth="yes"/>
-      <point x="51" y="-187"/>
-      <point x="91" y="-227"/>
-    </contour>
     <contour>
       <point x="400" y="-227" type="curve" smooth="yes"/>
       <point x="459" y="-227"/>
@@ -32,6 +18,20 @@
       <point x="301" y="-187"/>
       <point x="341" y="-227"/>
     </contour>
+    <contour>
+      <point x="150" y="-227" type="curve" smooth="yes"/>
+      <point x="209" y="-227"/>
+      <point x="249" y="-187"/>
+      <point x="249" y="-128" type="curve" smooth="yes"/>
+      <point x="249" y="-68"/>
+      <point x="209" y="-28"/>
+      <point x="150" y="-28" type="curve" smooth="yes"/>
+      <point x="91" y="-28"/>
+      <point x="51" y="-68"/>
+      <point x="51" y="-128" type="curve" smooth="yes"/>
+      <point x="51" y="-187"/>
+      <point x="91" y="-227"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dieresiscomb.glif b/src/Cantarell-Bold.ufo/glyphs/dieresiscomb.glif
index 7bac52bc..d212aabe 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dieresiscomb.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dieresiscomb.glif
@@ -4,20 +4,6 @@
   <anchor x="269" y="490" name="_top"/>
   <anchor x="269" y="726" name="top"/>
   <outline>
-    <contour>
-      <point x="144" y="557" type="curve" smooth="yes"/>
-      <point x="203" y="557"/>
-      <point x="243" y="597"/>
-      <point x="243" y="656" type="curve" smooth="yes"/>
-      <point x="243" y="716"/>
-      <point x="203" y="756"/>
-      <point x="144" y="756" type="curve" smooth="yes"/>
-      <point x="85" y="756"/>
-      <point x="45" y="716"/>
-      <point x="45" y="656" type="curve" smooth="yes"/>
-      <point x="45" y="597"/>
-      <point x="85" y="557"/>
-    </contour>
     <contour>
       <point x="394" y="557" type="curve" smooth="yes"/>
       <point x="453" y="557"/>
@@ -32,6 +18,20 @@
       <point x="295" y="597"/>
       <point x="335" y="557"/>
     </contour>
+    <contour>
+      <point x="144" y="557" type="curve" smooth="yes"/>
+      <point x="203" y="557"/>
+      <point x="243" y="597"/>
+      <point x="243" y="656" type="curve" smooth="yes"/>
+      <point x="243" y="716"/>
+      <point x="203" y="756"/>
+      <point x="144" y="756" type="curve" smooth="yes"/>
+      <point x="85" y="756"/>
+      <point x="45" y="716"/>
+      <point x="45" y="656" type="curve" smooth="yes"/>
+      <point x="45" y="597"/>
+      <point x="85" y="557"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif 
b/src/Cantarell-Bold.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
index 0317313c..8c03440e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
@@ -3,20 +3,6 @@
   <anchor x="256" y="490" name="_top"/>
   <anchor x="256" y="676" name="top"/>
   <outline>
-    <contour>
-      <point x="136" y="536" type="curve" smooth="yes"/>
-      <point x="190" y="536"/>
-      <point x="226" y="572"/>
-      <point x="226" y="626" type="curve" smooth="yes"/>
-      <point x="226" y="681"/>
-      <point x="190" y="717"/>
-      <point x="136" y="717" type="curve" smooth="yes"/>
-      <point x="82" y="717"/>
-      <point x="46" y="681"/>
-      <point x="46" y="626" type="curve" smooth="yes"/>
-      <point x="46" y="572"/>
-      <point x="82" y="536"/>
-    </contour>
     <contour>
       <point x="376" y="536" type="curve" smooth="yes"/>
       <point x="430" y="536"/>
@@ -31,6 +17,20 @@
       <point x="286" y="572"/>
       <point x="322" y="536"/>
     </contour>
+    <contour>
+      <point x="136" y="536" type="curve" smooth="yes"/>
+      <point x="190" y="536"/>
+      <point x="226" y="572"/>
+      <point x="226" y="626" type="curve" smooth="yes"/>
+      <point x="226" y="681"/>
+      <point x="190" y="717"/>
+      <point x="136" y="717" type="curve" smooth="yes"/>
+      <point x="82" y="717"/>
+      <point x="46" y="681"/>
+      <point x="46" y="626" type="curve" smooth="yes"/>
+      <point x="46" y="572"/>
+      <point x="82" y="536"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/divide.glif b/src/Cantarell-Bold.ufo/glyphs/divide.glif
index e98d33ef..f59a552e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/divide.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/divide.glif
@@ -4,18 +4,10 @@
   <unicode hex="00F7"/>
   <outline>
     <contour>
-      <point x="300" y="430" type="curve" smooth="yes"/>
-      <point x="363" y="430"/>
-      <point x="407" y="473"/>
-      <point x="407" y="534" type="curve" smooth="yes"/>
-      <point x="407" y="597"/>
-      <point x="363" y="640"/>
-      <point x="300" y="640" type="curve" smooth="yes"/>
-      <point x="237" y="640"/>
-      <point x="194" y="597"/>
-      <point x="194" y="534" type="curve" smooth="yes"/>
-      <point x="194" y="473"/>
-      <point x="237" y="430"/>
+      <point x="60" y="254" type="line"/>
+      <point x="540" y="254" type="line"/>
+      <point x="540" y="405" type="line"/>
+      <point x="60" y="405" type="line"/>
     </contour>
     <contour>
       <point x="300" y="19" type="curve" smooth="yes"/>
@@ -32,10 +24,18 @@
       <point x="237" y="19"/>
     </contour>
     <contour>
-      <point x="60" y="254" type="line"/>
-      <point x="540" y="254" type="line"/>
-      <point x="540" y="405" type="line"/>
-      <point x="60" y="405" type="line"/>
+      <point x="300" y="430" type="curve" smooth="yes"/>
+      <point x="363" y="430"/>
+      <point x="407" y="473"/>
+      <point x="407" y="534" type="curve" smooth="yes"/>
+      <point x="407" y="597"/>
+      <point x="363" y="640"/>
+      <point x="300" y="640" type="curve" smooth="yes"/>
+      <point x="237" y="640"/>
+      <point x="194" y="597"/>
+      <point x="194" y="534" type="curve" smooth="yes"/>
+      <point x="194" y="473"/>
+      <point x="237" y="430"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dollar.glif b/src/Cantarell-Bold.ufo/glyphs/dollar.glif
index 52f520ee..bc07aca2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dollar.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dollar.glif
@@ -37,18 +37,18 @@
       <point x="116" y="23"/>
       <point x="199" y="0"/>
     </contour>
-    <contour>
-      <point x="231" y="636" type="line"/>
-      <point x="388" y="636" type="line"/>
-      <point x="388" y="821" type="line"/>
-      <point x="231" y="821" type="line"/>
-    </contour>
     <contour>
       <point x="231" y="-123" type="line"/>
       <point x="388" y="-123" type="line"/>
       <point x="388" y="54" type="line"/>
       <point x="231" y="54" type="line"/>
     </contour>
+    <contour>
+      <point x="231" y="636" type="line"/>
+      <point x="388" y="636" type="line"/>
+      <point x="388" y="821" type="line"/>
+      <point x="231" y="821" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dong.glif b/src/Cantarell-Bold.ufo/glyphs/dong.glif
index d3de4149..40e8aef2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dong.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dong.glif
@@ -3,19 +3,6 @@
   <advance width="600"/>
   <unicode hex="20AB"/>
   <outline>
-    <contour>
-      <point x="73" y="-175" type="line"/>
-      <point x="577" y="-175" type="line"/>
-      <point x="577" y="-50" type="line"/>
-      <point x="73" y="-50" type="line"/>
-    </contour>
-    <contour>
-      <point x="414" y="0" type="line"/>
-      <point x="519" y="0" type="line"/>
-      <point x="519" y="739" type="line"/>
-      <point x="353" y="739" type="line"/>
-      <point x="353" y="120" type="line"/>
-    </contour>
     <contour>
       <point x="229" y="-10" type="curve" smooth="yes"/>
       <point x="297" y="-10"/>
@@ -44,6 +31,19 @@
       <point x="27" y="90"/>
       <point x="112" y="-10"/>
     </contour>
+    <contour>
+      <point x="73" y="-175" type="line"/>
+      <point x="577" y="-175" type="line"/>
+      <point x="577" y="-50" type="line"/>
+      <point x="73" y="-50" type="line"/>
+    </contour>
+    <contour>
+      <point x="414" y="0" type="line"/>
+      <point x="519" y="0" type="line"/>
+      <point x="519" y="739" type="line"/>
+      <point x="353" y="739" type="line"/>
+      <point x="353" y="120" type="line"/>
+    </contour>
     <contour>
       <point x="237" y="546" type="line"/>
       <point x="585" y="546" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ef-cy.glif b/src/Cantarell-Bold.ufo/glyphs/ef-cy.glif
index 8cd21175..671a54d8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ef-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ef-cy.glif
@@ -4,10 +4,32 @@
   <unicode hex="0444"/>
   <outline>
     <contour>
-      <point x="333" y="-217" type="line"/>
-      <point x="487" y="-217" type="line"/>
-      <point x="487" y="739" type="line"/>
-      <point x="333" y="739" type="line"/>
+      <point x="563" y="-5" type="curve" smooth="yes"/>
+      <point x="692" y="-5"/>
+      <point x="783" y="102"/>
+      <point x="783" y="254" type="curve" smooth="yes"/>
+      <point x="783" y="395"/>
+      <point x="700" y="495"/>
+      <point x="581" y="495" type="curve" smooth="yes"/>
+      <point x="500" y="495"/>
+      <point x="436" y="449"/>
+      <point x="404" y="366" type="curve"/>
+      <point x="450" y="313" type="line"/>
+      <point x="462" y="340"/>
+      <point x="489" y="355"/>
+      <point x="522" y="355" type="curve" smooth="yes"/>
+      <point x="578" y="355"/>
+      <point x="612" y="314"/>
+      <point x="612" y="247" type="curve" smooth="yes"/>
+      <point x="612" y="178"/>
+      <point x="581" y="135"/>
+      <point x="531" y="135" type="curve" smooth="yes"/>
+      <point x="496" y="135"/>
+      <point x="465" y="154"/>
+      <point x="450" y="186" type="curve"/>
+      <point x="402" y="104" type="line"/>
+      <point x="430" y="32"/>
+      <point x="485" y="-5"/>
     </contour>
     <contour>
       <point x="233" y="-5" type="curve" smooth="yes"/>
@@ -38,32 +60,10 @@
       <point x="117" y="-5"/>
     </contour>
     <contour>
-      <point x="563" y="-5" type="curve" smooth="yes"/>
-      <point x="692" y="-5"/>
-      <point x="783" y="102"/>
-      <point x="783" y="254" type="curve" smooth="yes"/>
-      <point x="783" y="395"/>
-      <point x="700" y="495"/>
-      <point x="581" y="495" type="curve" smooth="yes"/>
-      <point x="500" y="495"/>
-      <point x="436" y="449"/>
-      <point x="404" y="366" type="curve"/>
-      <point x="450" y="313" type="line"/>
-      <point x="462" y="340"/>
-      <point x="489" y="355"/>
-      <point x="522" y="355" type="curve" smooth="yes"/>
-      <point x="578" y="355"/>
-      <point x="612" y="314"/>
-      <point x="612" y="247" type="curve" smooth="yes"/>
-      <point x="612" y="178"/>
-      <point x="581" y="135"/>
-      <point x="531" y="135" type="curve" smooth="yes"/>
-      <point x="496" y="135"/>
-      <point x="465" y="154"/>
-      <point x="450" y="186" type="curve"/>
-      <point x="402" y="104" type="line"/>
-      <point x="430" y="32"/>
-      <point x="485" y="-5"/>
+      <point x="333" y="-217" type="line"/>
+      <point x="487" y="-217" type="line"/>
+      <point x="487" y="739" type="line"/>
+      <point x="333" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/emptyset.glif b/src/Cantarell-Bold.ufo/glyphs/emptyset.glif
index 3422a4bb..0626c1fb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/emptyset.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/emptyset.glif
@@ -3,6 +3,12 @@
   <advance width="725"/>
   <unicode hex="2205"/>
   <outline>
+    <contour>
+      <point x="185" y="-33" type="line"/>
+      <point x="644" y="651" type="line"/>
+      <point x="533" y="725" type="line"/>
+      <point x="74" y="41" type="line"/>
+    </contour>
     <contour>
       <point x="356" y="33" type="curve" smooth="yes"/>
       <point x="548" y="33"/>
@@ -31,11 +37,5 @@
       <point x="507" y="251"/>
       <point x="451" y="193"/>
     </contour>
-    <contour>
-      <point x="185" y="-33" type="line"/>
-      <point x="644" y="651" type="line"/>
-      <point x="533" y="725" type="line"/>
-      <point x="74" y="41" type="line"/>
-    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eng.glif b/src/Cantarell-Bold.ufo/glyphs/eng.glif
index f942321f..04de16fd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eng.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eng.glif
@@ -3,13 +3,6 @@
   <advance width="598"/>
   <unicode hex="014B"/>
   <outline>
-    <contour>
-      <point x="62" y="0" type="line"/>
-      <point x="235" y="0" type="line"/>
-      <point x="235" y="376" type="line"/>
-      <point x="187" y="490" type="line"/>
-      <point x="62" y="490" type="line"/>
-    </contour>
     <contour>
       <point x="374" y="0" type="line"/>
       <point x="547" y="0" type="line"/>
@@ -40,6 +33,13 @@
       <point x="352" y="-112"/>
       <point x="319" y="-131" type="curve"/>
     </contour>
+    <contour>
+      <point x="62" y="0" type="line"/>
+      <point x="235" y="0" type="line"/>
+      <point x="235" y="376" type="line"/>
+      <point x="187" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/euro.glif b/src/Cantarell-Bold.ufo/glyphs/euro.glif
index d7846b84..8058aca0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/euro.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/euro.glif
@@ -3,18 +3,6 @@
   <advance width="600"/>
   <unicode hex="20AC"/>
   <outline>
-    <contour>
-      <point x="21" y="385" type="line"/>
-      <point x="541" y="385" type="line"/>
-      <point x="541" y="490" type="line"/>
-      <point x="21" y="490" type="line"/>
-    </contour>
-    <contour>
-      <point x="21" y="209" type="line"/>
-      <point x="524" y="209" type="line"/>
-      <point x="524" y="315" type="line"/>
-      <point x="21" y="315" type="line"/>
-    </contour>
     <contour>
       <point x="399" y="-10" type="curve" smooth="yes"/>
       <point x="471" y="-10"/>
@@ -43,6 +31,18 @@
       <point x="85" y="127"/>
       <point x="221" y="-10"/>
     </contour>
+    <contour>
+      <point x="21" y="209" type="line"/>
+      <point x="524" y="209" type="line"/>
+      <point x="524" y="315" type="line"/>
+      <point x="21" y="315" type="line"/>
+    </contour>
+    <contour>
+      <point x="21" y="385" type="line"/>
+      <point x="541" y="385" type="line"/>
+      <point x="541" y="490" type="line"/>
+      <point x="21" y="490" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/florin.glif b/src/Cantarell-Bold.ufo/glyphs/florin.glif
index 26662a5a..ec867e89 100644
--- a/src/Cantarell-Bold.ufo/glyphs/florin.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/florin.glif
@@ -21,12 +21,6 @@
       <point x="172" y="662"/>
       <point x="172" y="518" type="curve" smooth="yes"/>
     </contour>
-    <contour>
-      <point x="93" y="355" type="line"/>
-      <point x="482" y="355" type="line"/>
-      <point x="482" y="490" type="line"/>
-      <point x="93" y="490" type="line"/>
-    </contour>
     <contour>
       <point x="172" y="-227" type="line"/>
       <point x="276" y="-197"/>
@@ -39,6 +33,12 @@
       <point x="150" y="-112"/>
       <point x="117" y="-131" type="curve"/>
     </contour>
+    <contour>
+      <point x="93" y="355" type="line"/>
+      <point x="482" y="355" type="line"/>
+      <point x="482" y="490" type="line"/>
+      <point x="93" y="490" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/franc.glif b/src/Cantarell-Bold.ufo/glyphs/franc.glif
index 66b7231e..555442af 100644
--- a/src/Cantarell-Bold.ufo/glyphs/franc.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/franc.glif
@@ -3,12 +3,6 @@
   <advance width="600"/>
   <unicode hex="20A3"/>
   <outline>
-    <contour>
-      <point x="35" y="67" type="line"/>
-      <point x="410" y="67" type="line"/>
-      <point x="410" y="187" type="line"/>
-      <point x="35" y="187" type="line"/>
-    </contour>
     <contour>
       <point x="105" y="0" type="line"/>
       <point x="281" y="0" type="line"/>
@@ -21,6 +15,12 @@
       <point x="557" y="694" type="line"/>
       <point x="105" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="35" y="67" type="line"/>
+      <point x="410" y="67" type="line"/>
+      <point x="410" y="187" type="line"/>
+      <point x="35" y="187" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ghemiddlehook-cy.glif 
b/src/Cantarell-Bold.ufo/glyphs/ghemiddlehook-cy.glif
index ad49fd2d..dd0ac8b9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ghemiddlehook-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ghemiddlehook-cy.glif
@@ -4,14 +4,15 @@
   <unicode hex="0495"/>
   <outline>
     <contour>
-      <point x="62" y="0" type="line"/>
-      <point x="222" y="0" type="line"/>
-      <point x="222" y="355" type="line"/>
-      <point x="431" y="355" type="line"/>
-      <point x="431" y="490" type="line"/>
-      <point x="62" y="490" type="line"/>
-    </contour>
-    <contour>
+      <point x="279" y="-240" type="line"/>
+      <point x="457" y="-208"/>
+      <point x="562" y="-97"/>
+      <point x="562" y="58" type="curve" smooth="yes"/>
+      <point x="562" y="197"/>
+      <point x="475" y="290"/>
+      <point x="345" y="290" type="curve" smooth="yes"/>
+      <point x="250" y="290"/>
+      <point x="167" y="239"/>
       <point x="130" y="159" type="curve"/>
       <point x="151" y="62" type="line"/>
       <point x="173" y="122"/>
@@ -23,15 +24,14 @@
       <point x="391" y="-58"/>
       <point x="342" y="-120"/>
       <point x="258" y="-140" type="curve"/>
-      <point x="279" y="-240" type="line"/>
-      <point x="457" y="-208"/>
-      <point x="562" y="-97"/>
-      <point x="562" y="58" type="curve" smooth="yes"/>
-      <point x="562" y="197"/>
-      <point x="475" y="290"/>
-      <point x="345" y="290" type="curve" smooth="yes"/>
-      <point x="250" y="290"/>
-      <point x="167" y="239"/>
+    </contour>
+    <contour>
+      <point x="62" y="0" type="line"/>
+      <point x="222" y="0" type="line"/>
+      <point x="222" y="355" type="line"/>
+      <point x="431" y="355" type="line"/>
+      <point x="431" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/guillemetleft.glif 
b/src/Cantarell-Bold.ufo/glyphs/guillemetleft.glif
index 763910ce..12133a27 100644
--- a/src/Cantarell-Bold.ufo/glyphs/guillemetleft.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/guillemetleft.glif
@@ -3,15 +3,6 @@
   <advance width="666"/>
   <unicode hex="00AB"/>
   <outline>
-    <contour>
-      <point x="179" y="26" type="line"/>
-      <point x="367" y="26" type="line"/>
-      <point x="200" y="269" type="line"/>
-      <point x="199" y="220" type="line"/>
-      <point x="359" y="453" type="line"/>
-      <point x="184" y="453" type="line"/>
-      <point x="27" y="241" type="line"/>
-    </contour>
     <contour>
       <point x="452" y="26" type="line"/>
       <point x="640" y="26" type="line"/>
@@ -21,5 +12,14 @@
       <point x="456" y="453" type="line"/>
       <point x="300" y="241" type="line"/>
     </contour>
+    <contour>
+      <point x="179" y="26" type="line"/>
+      <point x="367" y="26" type="line"/>
+      <point x="200" y="269" type="line"/>
+      <point x="199" y="220" type="line"/>
+      <point x="359" y="453" type="line"/>
+      <point x="184" y="453" type="line"/>
+      <point x="27" y="241" type="line"/>
+    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/h.glif b/src/Cantarell-Bold.ufo/glyphs/h.glif
index 6b1efb7b..d14fcaf6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/h.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/h.glif
@@ -9,12 +9,6 @@ h
   <anchor x="173" y="595" name="center"/>
   <anchor x="321" y="739" name="top"/>
   <outline>
-    <contour>
-      <point x="62" y="0" type="line"/>
-      <point x="232" y="0" type="line"/>
-      <point x="232" y="739" type="line"/>
-      <point x="62" y="739" type="line"/>
-    </contour>
     <contour>
       <point x="371" y="0" type="line"/>
       <point x="544" y="0" type="line"/>
@@ -33,6 +27,12 @@ h
       <point x="371" y="320"/>
       <point x="371" y="265" type="curve" smooth="yes"/>
     </contour>
+    <contour>
+      <point x="62" y="0" type="line"/>
+      <point x="232" y="0" type="line"/>
+      <point x="232" y="739" type="line"/>
+      <point x="62" y="739" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hryvnia.glif b/src/Cantarell-Bold.ufo/glyphs/hryvnia.glif
index 9adac525..f3471eec 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hryvnia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hryvnia.glif
@@ -4,13 +4,6 @@
   <unicode hex="20B4"/>
   <outline>
     <contour>
-      <point x="312" y="270" type="curve"/>
-      <point x="82" y="270" type="line"/>
-      <point x="75" y="248"/>
-      <point x="73" y="224"/>
-      <point x="73" y="203" type="curve" smooth="yes"/>
-      <point x="73" y="70"/>
-      <point x="170" y="-10"/>
       <point x="321" y="-10" type="curve" smooth="yes"/>
       <point x="401" y="-10"/>
       <point x="468" y="12"/>
@@ -24,12 +17,13 @@
       <point x="255" y="201" type="curve" smooth="yes"/>
       <point x="255" y="229"/>
       <point x="272" y="251"/>
-    </contour>
-    <contour>
-      <point x="20" y="385" type="line"/>
-      <point x="580" y="385" type="line"/>
-      <point x="580" y="490" type="line"/>
-      <point x="20" y="490" type="line"/>
+      <point x="312" y="270" type="curve"/>
+      <point x="82" y="270" type="line"/>
+      <point x="75" y="248"/>
+      <point x="73" y="224"/>
+      <point x="73" y="203" type="curve" smooth="yes"/>
+      <point x="73" y="70"/>
+      <point x="170" y="-10"/>
     </contour>
     <contour>
       <point x="20" y="209" type="line"/>
@@ -37,6 +31,12 @@
       <point x="580" y="315" type="line"/>
       <point x="20" y="315" type="line"/>
     </contour>
+    <contour>
+      <point x="20" y="385" type="line"/>
+      <point x="580" y="385" type="line"/>
+      <point x="580" y="490" type="line"/>
+      <point x="20" y="490" type="line"/>
+    </contour>
     <contour>
       <point x="313" y="458" type="curve"/>
       <point x="511" y="458" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hungarumlautcomb.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/hungarumlautcomb.case.glif
index 3b4eb516..3857dcb2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hungarumlautcomb.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hungarumlautcomb.case.glif
@@ -3,18 +3,18 @@
   <anchor x="238" y="694" name="_top"/>
   <anchor x="238" y="926" name="top"/>
   <outline>
-    <contour>
-      <point x="83" y="739" type="line"/>
-      <point x="259" y="871" type="line"/>
-      <point x="140" y="986" type="line"/>
-      <point x="7" y="812" type="line"/>
-    </contour>
     <contour>
       <point x="338" y="739" type="line"/>
       <point x="514" y="871" type="line"/>
       <point x="395" y="986" type="line"/>
       <point x="262" y="812" type="line"/>
     </contour>
+    <contour>
+      <point x="83" y="739" type="line"/>
+      <point x="259" y="871" type="line"/>
+      <point x="140" y="986" type="line"/>
+      <point x="7" y="812" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/hungarumlautcomb.glif 
b/src/Cantarell-Bold.ufo/glyphs/hungarumlautcomb.glif
index 0a8184b3..203ffda7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/hungarumlautcomb.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/hungarumlautcomb.glif
@@ -4,18 +4,18 @@
   <anchor x="215" y="490" name="_top"/>
   <anchor x="215" y="799" name="top"/>
   <outline>
-    <contour>
-      <point x="345" y="527" type="line"/>
-      <point x="480" y="697" type="line"/>
-      <point x="339" y="775" type="line"/>
-      <point x="254" y="579" type="line"/>
-    </contour>
     <contour>
       <point x="127" y="527" type="line"/>
       <point x="262" y="697" type="line"/>
       <point x="120" y="776" type="line"/>
       <point x="35" y="579" type="line"/>
     </contour>
+    <contour>
+      <point x="345" y="527" type="line"/>
+      <point x="480" y="697" type="line"/>
+      <point x="339" y="775" type="line"/>
+      <point x="254" y="579" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/k.glif b/src/Cantarell-Bold.ufo/glyphs/k.glif
index 05d9e465..ce1df8ba 100644
--- a/src/Cantarell-Bold.ufo/glyphs/k.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/k.glif
@@ -8,12 +8,6 @@ k
   <anchor x="312" y="0" name="bottom"/>
   <anchor x="272" y="739" name="top"/>
   <outline>
-    <contour>
-      <point x="62" y="0" type="line"/>
-      <point x="232" y="0" type="line"/>
-      <point x="232" y="739" type="line"/>
-      <point x="62" y="739" type="line"/>
-    </contour>
     <contour>
       <point x="371" y="0" type="line"/>
       <point x="591" y="0" type="line"/>
@@ -23,6 +17,12 @@ k
       <point x="376" y="490" type="line"/>
       <point x="223" y="257" type="line"/>
     </contour>
+    <contour>
+      <point x="62" y="0" type="line"/>
+      <point x="232" y="0" type="line"/>
+      <point x="232" y="739" type="line"/>
+      <point x="62" y="739" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/kabashkir-cy.glif b/src/Cantarell-Bold.ufo/glyphs/kabashkir-cy.glif
index f2f16eeb..0c447923 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kabashkir-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kabashkir-cy.glif
@@ -3,12 +3,6 @@
   <advance width="689"/>
   <unicode hex="04A1"/>
   <outline>
-    <contour>
-      <point x="10" y="357" type="line"/>
-      <point x="332" y="357" type="line"/>
-      <point x="332" y="490" type="line"/>
-      <point x="10" y="490" type="line"/>
-    </contour>
     <contour>
       <point x="501" y="0" type="line"/>
       <point x="686" y="0" type="line"/>
@@ -30,6 +24,12 @@
       <point x="409" y="313" type="line"/>
       <point x="247" y="313" type="line"/>
     </contour>
+    <contour>
+      <point x="10" y="357" type="line"/>
+      <point x="332" y="357" type="line"/>
+      <point x="332" y="490" type="line"/>
+      <point x="10" y="490" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/kgreenlandic.glif b/src/Cantarell-Bold.ufo/glyphs/kgreenlandic.glif
index 70390fc6..6972e830 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kgreenlandic.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kgreenlandic.glif
@@ -3,12 +3,6 @@
   <advance width="583"/>
   <unicode hex="0138"/>
   <outline>
-    <contour>
-      <point x="62" y="0" type="line"/>
-      <point x="235" y="0" type="line"/>
-      <point x="235" y="490" type="line"/>
-      <point x="62" y="490" type="line"/>
-    </contour>
     <contour>
       <point x="371" y="0" type="line"/>
       <point x="591" y="0" type="line"/>
@@ -18,6 +12,12 @@
       <point x="376" y="490" type="line"/>
       <point x="219" y="257" type="line"/>
     </contour>
+    <contour>
+      <point x="62" y="0" type="line"/>
+      <point x="235" y="0" type="line"/>
+      <point x="235" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/kip.glif b/src/Cantarell-Bold.ufo/glyphs/kip.glif
index 9a84e8cb..a992e094 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kip.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kip.glif
@@ -3,12 +3,6 @@
   <advance width="600"/>
   <unicode hex="20AD"/>
   <outline>
-    <contour>
-      <point x="7" y="297" type="line"/>
-      <point x="565" y="297" type="line"/>
-      <point x="565" y="419" type="line"/>
-      <point x="7" y="419" type="line"/>
-    </contour>
     <contour>
       <point x="402" y="0" type="line"/>
       <point x="607" y="0" type="line"/>
@@ -24,6 +18,12 @@
       <point x="229" y="694" type="line"/>
       <point x="62" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="7" y="297" type="line"/>
+      <point x="565" y="297" type="line"/>
+      <point x="565" y="419" type="line"/>
+      <point x="7" y="419" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lira.glif b/src/Cantarell-Bold.ufo/glyphs/lira.glif
index 2c3817f6..4b5c13e5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lira.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lira.glif
@@ -30,18 +30,18 @@
       <point x="96" y="171"/>
       <point x="48" y="156" type="curve"/>
     </contour>
-    <contour>
-      <point x="52" y="385" type="line"/>
-      <point x="486" y="385" type="line"/>
-      <point x="486" y="490" type="line"/>
-      <point x="52" y="490" type="line"/>
-    </contour>
     <contour>
       <point x="52" y="209" type="line"/>
       <point x="486" y="209" type="line"/>
       <point x="486" y="315" type="line"/>
       <point x="52" y="315" type="line"/>
     </contour>
+    <contour>
+      <point x="52" y="385" type="line"/>
+      <point x="486" y="385" type="line"/>
+      <point x="486" y="490" type="line"/>
+      <point x="52" y="490" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/liraT_urkish.glif b/src/Cantarell-Bold.ufo/glyphs/liraT_urkish.glif
index 8e946463..500d42ba 100644
--- a/src/Cantarell-Bold.ufo/glyphs/liraT_urkish.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/liraT_urkish.glif
@@ -16,18 +16,18 @@
       <point x="289" y="694" type="line"/>
       <point x="123" y="694" type="line"/>
     </contour>
-    <contour>
-      <point x="72" y="355" type="line"/>
-      <point x="407" y="544" type="line"/>
-      <point x="357" y="636" type="line"/>
-      <point x="22" y="447" type="line"/>
-    </contour>
     <contour>
       <point x="96" y="175" type="line"/>
       <point x="421" y="353" type="line"/>
       <point x="371" y="445" type="line"/>
       <point x="45" y="267" type="line"/>
     </contour>
+    <contour>
+      <point x="72" y="355" type="line"/>
+      <point x="407" y="544" type="line"/>
+      <point x="357" y="636" type="line"/>
+      <point x="22" y="447" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lje-cy.glif b/src/Cantarell-Bold.ufo/glyphs/lje-cy.glif
index 403bcf2a..15da41cf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lje-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lje-cy.glif
@@ -3,26 +3,6 @@
   <advance width="859"/>
   <unicode hex="0459"/>
   <outline>
-    <contour>
-      <point x="435" y="0" type="line"/>
-      <point x="605" y="0" type="line" smooth="yes"/>
-      <point x="755" y="0"/>
-      <point x="843" y="70"/>
-      <point x="843" y="187" type="curve" smooth="yes"/>
-      <point x="843" y="281"/>
-      <point x="765" y="344"/>
-      <point x="650" y="344" type="curve" smooth="yes"/>
-      <point x="435" y="344" type="line"/>
-      <point x="435" y="220" type="line"/>
-      <point x="614" y="220" type="line" smooth="yes"/>
-      <point x="648" y="220"/>
-      <point x="674" y="202"/>
-      <point x="674" y="173" type="curve" smooth="yes"/>
-      <point x="674" y="144"/>
-      <point x="655" y="126"/>
-      <point x="626" y="126" type="curve" smooth="yes"/>
-      <point x="435" y="126" type="line"/>
-    </contour>
     <contour>
       <point x="86" y="-17" type="curve" smooth="yes"/>
       <point x="197" y="-17"/>
@@ -45,6 +25,26 @@
       <point x="11" y="-5"/>
       <point x="47" y="-17"/>
     </contour>
+    <contour>
+      <point x="435" y="0" type="line"/>
+      <point x="605" y="0" type="line" smooth="yes"/>
+      <point x="755" y="0"/>
+      <point x="843" y="70"/>
+      <point x="843" y="187" type="curve" smooth="yes"/>
+      <point x="843" y="281"/>
+      <point x="765" y="344"/>
+      <point x="650" y="344" type="curve" smooth="yes"/>
+      <point x="435" y="344" type="line"/>
+      <point x="435" y="220" type="line"/>
+      <point x="614" y="220" type="line" smooth="yes"/>
+      <point x="648" y="220"/>
+      <point x="674" y="202"/>
+      <point x="674" y="173" type="curve" smooth="yes"/>
+      <point x="674" y="144"/>
+      <point x="655" y="126"/>
+      <point x="626" y="126" type="curve" smooth="yes"/>
+      <point x="435" y="126" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/logicalnot.glif b/src/Cantarell-Bold.ufo/glyphs/logicalnot.glif
index c9b69be5..c31ab0d6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/logicalnot.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/logicalnot.glif
@@ -3,18 +3,18 @@
   <advance width="600"/>
   <unicode hex="00AC"/>
   <outline>
-    <contour>
-      <point x="370" y="86" type="line"/>
-      <point x="540" y="86" type="line"/>
-      <point x="540" y="313" type="line"/>
-      <point x="370" y="313" type="line"/>
-    </contour>
     <contour>
       <point x="60" y="245" type="line"/>
       <point x="540" y="245" type="line"/>
       <point x="540" y="412" type="line"/>
       <point x="60" y="412" type="line"/>
     </contour>
+    <contour>
+      <point x="370" y="86" type="line"/>
+      <point x="540" y="86" type="line"/>
+      <point x="540" y="313" type="line"/>
+      <point x="370" y="313" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/m.glif b/src/Cantarell-Bold.ufo/glyphs/m.glif
index 2c3611c9..9ac2edf8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/m.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/m.glif
@@ -8,6 +8,24 @@ m
   <anchor x="470" y="0" name="bottom"/>
   <anchor x="470" y="490" name="top"/>
   <outline>
+    <contour>
+      <point x="686" y="0" type="line"/>
+      <point x="859" y="0" type="line"/>
+      <point x="859" y="284" type="line" smooth="yes"/>
+      <point x="859" y="418"/>
+      <point x="794" y="496"/>
+      <point x="683" y="496" type="curve" smooth="yes"/>
+      <point x="613" y="496"/>
+      <point x="552" y="465"/>
+      <point x="512" y="408" type="curve"/>
+      <point x="531" y="305" type="line"/>
+      <point x="556" y="332"/>
+      <point x="584" y="346"/>
+      <point x="618" y="346" type="curve" smooth="yes"/>
+      <point x="665" y="346"/>
+      <point x="686" y="320"/>
+      <point x="686" y="265" type="curve" smooth="yes"/>
+    </contour>
     <contour>
       <point x="62" y="0" type="line"/>
       <point x="235" y="0" type="line"/>
@@ -33,24 +51,6 @@ m
       <point x="374" y="320"/>
       <point x="374" y="265" type="curve" smooth="yes"/>
     </contour>
-    <contour>
-      <point x="686" y="0" type="line"/>
-      <point x="859" y="0" type="line"/>
-      <point x="859" y="284" type="line" smooth="yes"/>
-      <point x="859" y="418"/>
-      <point x="794" y="496"/>
-      <point x="683" y="496" type="curve" smooth="yes"/>
-      <point x="613" y="496"/>
-      <point x="552" y="465"/>
-      <point x="512" y="408" type="curve"/>
-      <point x="531" y="305" type="line"/>
-      <point x="556" y="332"/>
-      <point x="584" y="346"/>
-      <point x="618" y="346" type="curve" smooth="yes"/>
-      <point x="665" y="346"/>
-      <point x="686" y="320"/>
-      <point x="686" y="265" type="curve" smooth="yes"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/micro.glif b/src/Cantarell-Bold.ufo/glyphs/micro.glif
index bc5930b9..26feab13 100644
--- a/src/Cantarell-Bold.ufo/glyphs/micro.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/micro.glif
@@ -3,6 +3,12 @@
   <advance width="610"/>
   <unicode hex="00B5"/>
   <outline>
+    <contour>
+      <point x="62" y="-217" type="line"/>
+      <point x="228" y="-217" type="line"/>
+      <point x="228" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
+    </contour>
     <contour>
       <point x="298" y="-6" type="curve" smooth="yes"/>
       <point x="349" y="-6"/>
@@ -19,12 +25,6 @@
       <point x="189" y="24"/>
       <point x="246" y="-6"/>
     </contour>
-    <contour>
-      <point x="62" y="-217" type="line"/>
-      <point x="228" y="-217" type="line"/>
-      <point x="228" y="490" type="line"/>
-      <point x="62" y="490" type="line"/>
-    </contour>
     <contour>
       <point x="403" y="0" type="line"/>
       <point x="548" y="0" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/multiply.glif b/src/Cantarell-Bold.ufo/glyphs/multiply.glif
index 3114f828..89b71fb8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/multiply.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/multiply.glif
@@ -4,16 +4,16 @@
   <unicode hex="00D7"/>
   <outline>
     <contour>
-      <point x="71" y="439" type="line"/>
+      <point x="189" y="100" type="line"/>
+      <point x="71" y="218" type="line"/>
+      <point x="411" y="557" type="line"/>
+      <point x="529" y="439" type="line"/>
+    </contour>
+    <contour>
       <point x="411" y="100" type="line"/>
       <point x="529" y="218" type="line"/>
       <point x="189" y="557" type="line"/>
-    </contour>
-    <contour>
-      <point x="189" y="100" type="line"/>
-      <point x="529" y="439" type="line"/>
-      <point x="411" y="557" type="line"/>
-      <point x="71" y="218" type="line"/>
+      <point x="71" y="439" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/n.glif b/src/Cantarell-Bold.ufo/glyphs/n.glif
index 39ecdf94..a337fae1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/n.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/n.glif
@@ -8,13 +8,6 @@ n
   <anchor x="304" y="0" name="bottom"/>
   <anchor x="304" y="490" name="top"/>
   <outline>
-    <contour>
-      <point x="62" y="0" type="line"/>
-      <point x="235" y="0" type="line"/>
-      <point x="235" y="376" type="line"/>
-      <point x="187" y="490" type="line"/>
-      <point x="62" y="490" type="line"/>
-    </contour>
     <contour>
       <point x="374" y="0" type="line"/>
       <point x="547" y="0" type="line"/>
@@ -33,5 +26,12 @@ n
       <point x="374" y="320"/>
       <point x="374" y="265" type="curve" smooth="yes"/>
     </contour>
+    <contour>
+      <point x="62" y="0" type="line"/>
+      <point x="235" y="0" type="line"/>
+      <point x="235" y="376" type="line"/>
+      <point x="187" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
+    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/naira.glif b/src/Cantarell-Bold.ufo/glyphs/naira.glif
index 529e097a..cfe1de0e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/naira.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/naira.glif
@@ -3,30 +3,6 @@
   <advance width="600"/>
   <unicode hex="20A6"/>
   <outline>
-    <contour>
-      <point x="505" y="490" type="line"/>
-      <point x="505" y="384" type="line"/>
-      <point x="600" y="384" type="line"/>
-      <point x="600" y="490" type="line"/>
-    </contour>
-    <contour>
-      <point x="505" y="314" type="line"/>
-      <point x="505" y="208" type="line"/>
-      <point x="600" y="208" type="line"/>
-      <point x="600" y="314" type="line"/>
-    </contour>
-    <contour>
-      <point x="95" y="208" type="line"/>
-      <point x="95" y="314" type="line"/>
-      <point x="0" y="314" type="line"/>
-      <point x="0" y="208" type="line"/>
-    </contour>
-    <contour>
-      <point x="95" y="384" type="line"/>
-      <point x="95" y="490" type="line"/>
-      <point x="0" y="490" type="line"/>
-      <point x="0" y="384" type="line"/>
-    </contour>
     <contour>
       <point x="70" y="0" type="line"/>
       <point x="219" y="0" type="line"/>
@@ -41,6 +17,30 @@
       <point x="254" y="694" type="line"/>
       <point x="70" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="0" y="208" type="line"/>
+      <point x="95" y="208" type="line"/>
+      <point x="95" y="314" type="line"/>
+      <point x="0" y="314" type="line"/>
+    </contour>
+    <contour>
+      <point x="0" y="384" type="line"/>
+      <point x="95" y="384" type="line"/>
+      <point x="95" y="490" type="line"/>
+      <point x="0" y="490" type="line"/>
+    </contour>
+    <contour>
+      <point x="505" y="208" type="line"/>
+      <point x="600" y="208" type="line"/>
+      <point x="600" y="314" type="line"/>
+      <point x="505" y="314" type="line"/>
+    </contour>
+    <contour>
+      <point x="505" y="384" type="line"/>
+      <point x="600" y="384" type="line"/>
+      <point x="600" y="490" type="line"/>
+      <point x="505" y="490" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nine.dnom.glif b/src/Cantarell-Bold.ufo/glyphs/nine.dnom.glif
index 8b64cb05..f325d0cf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nine.dnom.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nine.dnom.glif
@@ -6,6 +6,12 @@ nine
 </note>
   <outline>
     <contour>
+      <point x="172" y="-6" type="curve" smooth="yes"/>
+      <point x="318" y="-6"/>
+      <point x="398" y="76"/>
+      <point x="398" y="216" type="curve" smooth="yes"/>
+      <point x="398" y="352"/>
+      <point x="331" y="422"/>
       <point x="214" y="422" type="curve" smooth="yes"/>
       <point x="106" y="422"/>
       <point x="35" y="362"/>
@@ -38,12 +44,6 @@ nine
       <point x="41" y="20" type="line"/>
       <point x="75" y="4"/>
       <point x="122" y="-6"/>
-      <point x="172" y="-6" type="curve" smooth="yes"/>
-      <point x="318" y="-6"/>
-      <point x="398" y="76"/>
-      <point x="398" y="216" type="curve" smooth="yes"/>
-      <point x="398" y="352"/>
-      <point x="331" y="422"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nine.osf.glif b/src/Cantarell-Bold.ufo/glyphs/nine.osf.glif
index d3282caa..7372ce1d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nine.osf.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nine.osf.glif
@@ -3,6 +3,12 @@
   <advance width="604"/>
   <outline>
     <contour>
+      <point x="234" y="-110" type="curve" smooth="yes"/>
+      <point x="452" y="-110"/>
+      <point x="569" y="26"/>
+      <point x="569" y="264" type="curve" smooth="yes"/>
+      <point x="569" y="487"/>
+      <point x="468" y="604"/>
       <point x="295" y="604" type="curve" smooth="yes"/>
       <point x="138" y="604"/>
       <point x="32" y="507"/>
@@ -35,12 +41,6 @@
       <point x="43" y="-69" type="line"/>
       <point x="95" y="-95"/>
       <point x="162" y="-110"/>
-      <point x="234" y="-110" type="curve" smooth="yes"/>
-      <point x="452" y="-110"/>
-      <point x="569" y="26"/>
-      <point x="569" y="264" type="curve" smooth="yes"/>
-      <point x="569" y="487"/>
-      <point x="468" y="604"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nje-cy.glif b/src/Cantarell-Bold.ufo/glyphs/nje-cy.glif
index 93cca4ae..2e1a26e9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nje-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nje-cy.glif
@@ -3,24 +3,6 @@
   <advance width="873"/>
   <unicode hex="045A"/>
   <outline>
-    <contour>
-      <point x="382" y="0" type="line"/>
-      <point x="550" y="0" type="line"/>
-      <point x="550" y="490" type="line"/>
-      <point x="382" y="490" type="line"/>
-    </contour>
-    <contour>
-      <point x="62" y="0" type="line"/>
-      <point x="230" y="0" type="line"/>
-      <point x="230" y="490" type="line"/>
-      <point x="62" y="490" type="line"/>
-    </contour>
-    <contour>
-      <point x="212" y="179" type="line"/>
-      <point x="400" y="179" type="line"/>
-      <point x="400" y="314" type="line"/>
-      <point x="212" y="314" type="line"/>
-    </contour>
     <contour>
       <point x="449" y="0" type="line"/>
       <point x="619" y="0" type="line" smooth="yes"/>
@@ -41,6 +23,24 @@
       <point x="640" y="126" type="curve" smooth="yes"/>
       <point x="449" y="126" type="line"/>
     </contour>
+    <contour>
+      <point x="62" y="0" type="line"/>
+      <point x="230" y="0" type="line"/>
+      <point x="230" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
+    </contour>
+    <contour>
+      <point x="212" y="179" type="line"/>
+      <point x="400" y="179" type="line"/>
+      <point x="400" y="314" type="line"/>
+      <point x="212" y="314" type="line"/>
+    </contour>
+    <contour>
+      <point x="382" y="0" type="line"/>
+      <point x="550" y="0" type="line"/>
+      <point x="550" y="490" type="line"/>
+      <point x="382" y="490" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/notequal.glif b/src/Cantarell-Bold.ufo/glyphs/notequal.glif
index 6f941fb7..5405914c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/notequal.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/notequal.glif
@@ -9,18 +9,18 @@
       <point x="378" y="654" type="line"/>
       <point x="93" y="25" type="line"/>
     </contour>
-    <contour>
-      <point x="60" y="359" type="line"/>
-      <point x="540" y="359" type="line"/>
-      <point x="540" y="526" type="line"/>
-      <point x="60" y="526" type="line"/>
-    </contour>
     <contour>
       <point x="60" y="116" type="line"/>
       <point x="540" y="116" type="line"/>
       <point x="540" y="283" type="line"/>
       <point x="60" y="283" type="line"/>
     </contour>
+    <contour>
+      <point x="60" y="359" type="line"/>
+      <point x="540" y="359" type="line"/>
+      <point x="540" y="526" type="line"/>
+      <point x="60" y="526" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/notidentical.glif b/src/Cantarell-Bold.ufo/glyphs/notidentical.glif
index 64d6b267..e5a99600 100644
--- a/src/Cantarell-Bold.ufo/glyphs/notidentical.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/notidentical.glif
@@ -9,12 +9,6 @@
       <point x="450" y="748" type="line"/>
       <point x="69" y="-39" type="line"/>
     </contour>
-    <contour>
-      <point x="60" y="462" type="line"/>
-      <point x="540" y="462" type="line"/>
-      <point x="540" y="597" type="line"/>
-      <point x="60" y="597" type="line"/>
-    </contour>
     <contour>
       <point x="60" y="82" type="line"/>
       <point x="540" y="82" type="line"/>
@@ -27,6 +21,12 @@
       <point x="540" y="407" type="line"/>
       <point x="60" y="407" type="line"/>
     </contour>
+    <contour>
+      <point x="60" y="462" type="line"/>
+      <point x="540" y="462" type="line"/>
+      <point x="540" y="597" type="line"/>
+      <point x="60" y="597" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oslash.glif b/src/Cantarell-Bold.ufo/glyphs/oslash.glif
index 39c88080..9011a4a3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oslash.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oslash.glif
@@ -4,6 +4,12 @@
   <unicode hex="00F8"/>
   <anchor x="299" y="490" name="top"/>
   <outline>
+    <contour>
+      <point x="142" y="-62" type="line"/>
+      <point x="527" y="509" type="line"/>
+      <point x="455" y="552" type="line"/>
+      <point x="72" y="-19" type="line"/>
+    </contour>
     <contour>
       <point x="290" y="-10" type="curve" smooth="yes"/>
       <point x="454" y="-10"/>
@@ -32,12 +38,6 @@
       <point x="391" y="173"/>
       <point x="358" y="134"/>
     </contour>
-    <contour>
-      <point x="142" y="-62" type="line"/>
-      <point x="527" y="509" type="line"/>
-      <point x="455" y="552" type="line"/>
-      <point x="72" y="-19" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/p.glif b/src/Cantarell-Bold.ufo/glyphs/p.glif
index cac97e43..3e59034f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/p.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/p.glif
@@ -8,13 +8,6 @@ p
   <anchor x="296" y="0" name="bottom"/>
   <anchor x="296" y="490" name="top"/>
   <outline>
-    <contour>
-      <point x="62" y="-217" type="line"/>
-      <point x="227" y="-217" type="line"/>
-      <point x="227" y="370" type="line"/>
-      <point x="177" y="490" type="line"/>
-      <point x="62" y="490" type="line"/>
-    </contour>
     <contour>
       <point x="336" y="-10" type="curve" smooth="yes"/>
       <point x="465" y="-10"/>
@@ -43,6 +36,13 @@ p
       <point x="208" y="26"/>
       <point x="264" y="-10"/>
     </contour>
+    <contour>
+      <point x="62" y="-217" type="line"/>
+      <point x="227" y="-217" type="line"/>
+      <point x="227" y="370" type="line"/>
+      <point x="177" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/peseta.glif b/src/Cantarell-Bold.ufo/glyphs/peseta.glif
index e9ba4ad0..22273cb4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/peseta.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/peseta.glif
@@ -3,18 +3,6 @@
   <advance width="600"/>
   <unicode hex="20A7"/>
   <outline>
-    <contour>
-      <point x="494" y="507" type="line"/>
-      <point x="494" y="372" type="line"/>
-      <point x="621" y="372" type="line"/>
-      <point x="621" y="507" type="line"/>
-    </contour>
-    <contour>
-      <point x="105" y="372" type="line"/>
-      <point x="105" y="507" type="line"/>
-      <point x="-11" y="507" type="line"/>
-      <point x="-11" y="372" type="line"/>
-    </contour>
     <contour>
       <point x="68" y="0" type="line"/>
       <point x="236" y="0" type="line"/>
@@ -28,6 +16,12 @@
       <point x="295" y="694" type="curve" smooth="yes"/>
       <point x="68" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="-11" y="372" type="line"/>
+      <point x="105" y="372" type="line"/>
+      <point x="105" y="507" type="line"/>
+      <point x="-11" y="507" type="line"/>
+    </contour>
     <contour>
       <point x="236" y="356" type="line"/>
       <point x="236" y="542" type="line"/>
@@ -39,6 +33,12 @@
       <point x="335" y="356"/>
       <point x="297" y="356" type="curve" smooth="yes"/>
     </contour>
+    <contour>
+      <point x="494" y="372" type="line"/>
+      <point x="621" y="372" type="line"/>
+      <point x="621" y="507" type="line"/>
+      <point x="494" y="507" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/peso.glif b/src/Cantarell-Bold.ufo/glyphs/peso.glif
index 5c76332c..fe375e14 100644
--- a/src/Cantarell-Bold.ufo/glyphs/peso.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/peso.glif
@@ -3,18 +3,6 @@
   <advance width="600"/>
   <unicode hex="20B1"/>
   <outline>
-    <contour>
-      <point x="474" y="590" type="line"/>
-      <point x="474" y="484" type="line"/>
-      <point x="605" y="484" type="line"/>
-      <point x="605" y="590" type="line"/>
-    </contour>
-    <contour>
-      <point x="105" y="484" type="line"/>
-      <point x="105" y="590" type="line"/>
-      <point x="-10" y="590" type="line"/>
-      <point x="-10" y="484" type="line"/>
-    </contour>
     <contour>
       <point x="68" y="0" type="line"/>
       <point x="236" y="0" type="line"/>
@@ -28,6 +16,18 @@
       <point x="295" y="694" type="curve" smooth="yes"/>
       <point x="68" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="-10" y="308" type="line"/>
+      <point x="105" y="308" type="line"/>
+      <point x="105" y="414" type="line"/>
+      <point x="-10" y="414" type="line"/>
+    </contour>
+    <contour>
+      <point x="-10" y="484" type="line"/>
+      <point x="105" y="484" type="line"/>
+      <point x="105" y="590" type="line"/>
+      <point x="-10" y="590" type="line"/>
+    </contour>
     <contour>
       <point x="236" y="356" type="line"/>
       <point x="236" y="542" type="line"/>
@@ -40,16 +40,16 @@
       <point x="297" y="356" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="474" y="414" type="line"/>
       <point x="474" y="308" type="line"/>
       <point x="605" y="308" type="line"/>
       <point x="605" y="414" type="line"/>
+      <point x="474" y="414" type="line"/>
     </contour>
     <contour>
-      <point x="105" y="308" type="line"/>
-      <point x="105" y="414" type="line"/>
-      <point x="-10" y="414" type="line"/>
-      <point x="-10" y="308" type="line"/>
+      <point x="474" y="484" type="line"/>
+      <point x="605" y="484" type="line"/>
+      <point x="605" y="590" type="line"/>
+      <point x="474" y="590" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/plusminus.glif b/src/Cantarell-Bold.ufo/glyphs/plusminus.glif
index 231ce2e4..92047dd4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/plusminus.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/plusminus.glif
@@ -3,6 +3,12 @@
   <advance width="600"/>
   <unicode hex="00B1"/>
   <outline>
+    <contour>
+      <point x="56" y="321" type="line"/>
+      <point x="545" y="321" type="line"/>
+      <point x="545" y="469" type="line"/>
+      <point x="56" y="469" type="line"/>
+    </contour>
     <contour>
       <point x="61" y="2" type="line"/>
       <point x="541" y="2" type="line"/>
@@ -15,12 +21,6 @@
       <point x="373" y="624" type="line"/>
       <point x="223" y="624" type="line"/>
     </contour>
-    <contour>
-      <point x="56" y="321" type="line"/>
-      <point x="545" y="321" type="line"/>
-      <point x="545" y="469" type="line"/>
-      <point x="56" y="469" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/q.glif b/src/Cantarell-Bold.ufo/glyphs/q.glif
index b2f7d443..ff80b1d1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/q.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/q.glif
@@ -8,13 +8,6 @@ q
   <anchor x="302" y="0" name="bottom"/>
   <anchor x="302" y="490" name="top"/>
   <outline>
-    <contour>
-      <point x="368" y="-217" type="line"/>
-      <point x="534" y="-217" type="line"/>
-      <point x="534" y="490" type="line"/>
-      <point x="419" y="490" type="line"/>
-      <point x="368" y="370" type="line"/>
-    </contour>
     <contour>
       <point x="241" y="-10" type="curve" smooth="yes"/>
       <point x="328" y="-10"/>
@@ -43,6 +36,13 @@ q
       <point x="33" y="91"/>
       <point x="117" y="-10"/>
     </contour>
+    <contour>
+      <point x="368" y="-217" type="line"/>
+      <point x="534" y="-217" type="line"/>
+      <point x="534" y="490" type="line"/>
+      <point x="419" y="490" type="line"/>
+      <point x="368" y="370" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/registered.glif b/src/Cantarell-Bold.ufo/glyphs/registered.glif
index a518a699..4a1d39aa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/registered.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/registered.glif
@@ -17,6 +17,18 @@
       <point x="56" y="363"/>
       <point x="157" y="266"/>
     </contour>
+    <contour>
+      <point x="202" y="380" type="line"/>
+      <point x="285" y="380" type="line"/>
+      <point x="285" y="658" type="line"/>
+      <point x="202" y="658" type="line"/>
+    </contour>
+    <contour>
+      <point x="353" y="380" type="line"/>
+      <point x="275" y="516" type="line"/>
+      <point x="369" y="516" type="line"/>
+      <point x="450" y="380" type="line"/>
+    </contour>
     <contour>
       <point x="314" y="336" type="curve" smooth="yes"/>
       <point x="203" y="336"/>
@@ -31,12 +43,6 @@
       <point x="494" y="405"/>
       <point x="421" y="336"/>
     </contour>
-    <contour>
-      <point x="202" y="380" type="line"/>
-      <point x="285" y="380" type="line"/>
-      <point x="285" y="658" type="line"/>
-      <point x="202" y="658" type="line"/>
-    </contour>
     <contour>
       <point x="257" y="471" type="line"/>
       <point x="318" y="471" type="line" smooth="yes"/>
@@ -57,12 +63,6 @@
       <point x="324" y="540" type="curve" smooth="yes"/>
       <point x="257" y="540" type="line"/>
     </contour>
-    <contour>
-      <point x="353" y="380" type="line"/>
-      <point x="450" y="380" type="line"/>
-      <point x="369" y="516" type="line"/>
-      <point x="275" y="516" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ruble.glif b/src/Cantarell-Bold.ufo/glyphs/ruble.glif
index 1cf1f929..72bb746a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ruble.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ruble.glif
@@ -3,18 +3,6 @@
   <advance width="600"/>
   <unicode hex="20BD"/>
   <outline>
-    <contour>
-      <point x="108" y="0" type="line"/>
-      <point x="281" y="0" type="line"/>
-      <point x="281" y="694" type="line"/>
-      <point x="108" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="30" y="80" type="line"/>
-      <point x="411" y="80" type="line"/>
-      <point x="411" y="180" type="line"/>
-      <point x="30" y="180" type="line"/>
-    </contour>
     <contour>
       <point x="30" y="250" type="line"/>
       <point x="302" y="250" type="line" smooth="yes"/>
@@ -35,6 +23,18 @@
       <point x="333" y="362" type="curve" smooth="yes"/>
       <point x="30" y="362" type="line"/>
     </contour>
+    <contour>
+      <point x="30" y="80" type="line"/>
+      <point x="411" y="80" type="line"/>
+      <point x="411" y="180" type="line"/>
+      <point x="30" y="180" type="line"/>
+    </contour>
+    <contour>
+      <point x="108" y="0" type="line"/>
+      <point x="281" y="0" type="line"/>
+      <point x="281" y="694" type="line"/>
+      <point x="108" y="694" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/thorn.glif b/src/Cantarell-Bold.ufo/glyphs/thorn.glif
index 16baa4d6..2137f21f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/thorn.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/thorn.glif
@@ -3,12 +3,6 @@
   <advance width="595"/>
   <unicode hex="00FE"/>
   <outline>
-    <contour>
-      <point x="62" y="-217" type="line"/>
-      <point x="227" y="-217" type="line"/>
-      <point x="227" y="739" type="line"/>
-      <point x="62" y="739" type="line"/>
-    </contour>
     <contour>
       <point x="336" y="-10" type="curve" smooth="yes"/>
       <point x="465" y="-10"/>
@@ -37,6 +31,12 @@
       <point x="208" y="26"/>
       <point x="264" y="-10"/>
     </contour>
+    <contour>
+      <point x="62" y="-217" type="line"/>
+      <point x="227" y="-217" type="line"/>
+      <point x="227" y="739" type="line"/>
+      <point x="62" y="739" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/trademark.glif b/src/Cantarell-Bold.ufo/glyphs/trademark.glif
index a7126af9..281e372d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/trademark.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/trademark.glif
@@ -3,18 +3,6 @@
   <advance width="767"/>
   <unicode hex="2122"/>
   <outline>
-    <contour>
-      <point x="134" y="382" type="line"/>
-      <point x="226" y="382" type="line"/>
-      <point x="226" y="658" type="line"/>
-      <point x="134" y="658" type="line"/>
-    </contour>
-    <contour>
-      <point x="43" y="613" type="line"/>
-      <point x="318" y="613" type="line"/>
-      <point x="318" y="694" type="line"/>
-      <point x="43" y="694" type="line"/>
-    </contour>
     <contour>
       <point x="337" y="382" type="line"/>
       <point x="414" y="382" type="line"/>
@@ -33,5 +21,17 @@
       <point x="420" y="694" type="line"/>
       <point x="337" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="134" y="382" type="line"/>
+      <point x="226" y="382" type="line"/>
+      <point x="226" y="658" type="line"/>
+      <point x="134" y="658" type="line"/>
+    </contour>
+    <contour>
+      <point x="43" y="613" type="line"/>
+      <point x="318" y="613" type="line"/>
+      <point x="318" y="694" type="line"/>
+      <point x="43" y="694" type="line"/>
+    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tugrik.glif b/src/Cantarell-Bold.ufo/glyphs/tugrik.glif
index 77a81825..212df2a6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tugrik.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tugrik.glif
@@ -4,20 +4,14 @@
   <unicode hex="20AE"/>
   <outline>
     <contour>
-      <point x="50" y="542" type="line"/>
-      <point x="219" y="542" type="line"/>
       <point x="219" y="0" type="line"/>
       <point x="379" y="0" type="line"/>
       <point x="379" y="542" type="line"/>
       <point x="550" y="542" type="line"/>
       <point x="550" y="694" type="line"/>
       <point x="50" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="133" y="238" type="line"/>
-      <point x="499" y="410" type="line"/>
-      <point x="458" y="503" type="line"/>
-      <point x="92" y="331" type="line"/>
+      <point x="50" y="542" type="line"/>
+      <point x="219" y="542" type="line"/>
     </contour>
     <contour>
       <point x="157" y="58" type="line"/>
@@ -25,6 +19,12 @@
       <point x="472" y="312" type="line"/>
       <point x="115" y="151" type="line"/>
     </contour>
+    <contour>
+      <point x="133" y="238" type="line"/>
+      <point x="499" y="410" type="line"/>
+      <point x="458" y="503" type="line"/>
+      <point x="92" y="331" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/u.glif b/src/Cantarell-Bold.ufo/glyphs/u.glif
index 6c52cced..33803d4d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/u.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/u.glif
@@ -11,18 +11,6 @@ u
   <anchor x="518" y="490" name="topright"/>
   <outline>
     <contour>
-      <point x="522" y="490" type="line"/>
-      <point x="349" y="490" type="line"/>
-      <point x="349" y="114" type="line"/>
-      <point x="397" y="0" type="line"/>
-      <point x="522" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="224" y="490" type="line"/>
-      <point x="51" y="490" type="line"/>
-      <point x="51" y="186" type="line" smooth="yes"/>
-      <point x="51" y="68"/>
-      <point x="119" y="-6"/>
       <point x="218" y="-6" type="curve" smooth="yes"/>
       <point x="285" y="-6"/>
       <point x="344" y="25"/>
@@ -34,6 +22,18 @@ u
       <point x="223" y="144"/>
       <point x="224" y="205"/>
       <point x="224" y="225" type="curve" smooth="yes"/>
+      <point x="224" y="490" type="line"/>
+      <point x="51" y="490" type="line"/>
+      <point x="51" y="186" type="line" smooth="yes"/>
+      <point x="51" y="68"/>
+      <point x="119" y="-6"/>
+    </contour>
+    <contour>
+      <point x="397" y="0" type="line"/>
+      <point x="522" y="0" type="line"/>
+      <point x="522" y="490" type="line"/>
+      <point x="349" y="490" type="line"/>
+      <point x="349" y="114" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/verticallineabovecomb.glif 
b/src/Cantarell-Bold.ufo/glyphs/verticallineabovecomb.glif
index 95b763eb..fc55ee69 100644
--- a/src/Cantarell-Bold.ufo/glyphs/verticallineabovecomb.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/verticallineabovecomb.glif
@@ -5,10 +5,10 @@
   <anchor x="113" y="760" name="top"/>
   <outline>
     <contour>
-      <point x="180" y="760" type="line"/>
-      <point x="45" y="760" type="line"/>
       <point x="54" y="556" type="line"/>
       <point x="170" y="556" type="line"/>
+      <point x="180" y="760" type="line"/>
+      <point x="45" y="760" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/won.glif b/src/Cantarell-Bold.ufo/glyphs/won.glif
index faa579c7..d1fc892d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/won.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/won.glif
@@ -21,18 +21,18 @@
       <point x="149" y="694" type="line"/>
       <point x="-1" y="694" type="line"/>
     </contour>
-    <contour>
-      <point x="0" y="385" type="line"/>
-      <point x="601" y="385" type="line"/>
-      <point x="601" y="490" type="line"/>
-      <point x="0" y="490" type="line"/>
-    </contour>
     <contour>
       <point x="-1" y="208" type="line"/>
       <point x="131" y="208" type="line"/>
       <point x="131" y="314" type="line"/>
       <point x="-1" y="314" type="line"/>
     </contour>
+    <contour>
+      <point x="0" y="385" type="line"/>
+      <point x="601" y="385" type="line"/>
+      <point x="601" y="490" type="line"/>
+      <point x="0" y="490" type="line"/>
+    </contour>
     <contour>
       <point x="468" y="208" type="line"/>
       <point x="600" y="208" type="line"/>
diff --git a/src/Cantarell-Bold.ufo/glyphs/yeru-cy.glif b/src/Cantarell-Bold.ufo/glyphs/yeru-cy.glif
index bfe17ba1..aca2cd4b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/yeru-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/yeru-cy.glif
@@ -4,12 +4,6 @@
   <unicode hex="044B"/>
   <anchor x="392" y="490" name="top"/>
   <outline>
-    <contour>
-      <point x="555" y="-3" type="line"/>
-      <point x="721" y="-3" type="line"/>
-      <point x="721" y="490" type="line"/>
-      <point x="555" y="490" type="line"/>
-    </contour>
     <contour>
       <point x="62" y="0" type="line"/>
       <point x="263" y="0" type="line" smooth="yes"/>
@@ -32,6 +26,12 @@
       <point x="222" y="490" type="line"/>
       <point x="62" y="490" type="line"/>
     </contour>
+    <contour>
+      <point x="555" y="-3" type="line"/>
+      <point x="721" y="-3" type="line"/>
+      <point x="721" y="490" type="line"/>
+      <point x="555" y="490" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Bold.ufo/glyphs/yusbig-cy.glif b/src/Cantarell-Bold.ufo/glyphs/yusbig-cy.glif
index bcc10c9d..3112b823 100644
--- a/src/Cantarell-Bold.ufo/glyphs/yusbig-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/yusbig-cy.glif
@@ -4,26 +4,7 @@
   <unicode hex="046B"/>
   <outline>
     <contour>
-      <point x="192" y="253" type="line"/>
-      <point x="349" y="253" type="line"/>
-      <point x="205" y="423" type="line"/>
-      <point x="176" y="369" type="line"/>
-      <point x="472" y="369" type="line"/>
-      <point x="439" y="423" type="line"/>
-      <point x="308" y="270" type="line"/>
-      <point x="457" y="270" type="line"/>
-      <point x="575" y="365" type="line"/>
-      <point x="575" y="489" type="line"/>
-      <point x="72" y="489" type="line"/>
-      <point x="72" y="365" type="line"/>
-    </contour>
-    <contour>
-      <point x="396" y="192" type="line"/>
-      <point x="256" y="192" type="line"/>
-      <point x="256" y="0" type="line"/>
-      <point x="396" y="0" type="line"/>
-    </contour>
-    <contour>
+      <point x="16" y="0" type="curve"/>
       <point x="166" y="0" type="line"/>
       <point x="166" y="123"/>
       <point x="214" y="179"/>
@@ -37,7 +18,26 @@
       <point x="331" y="294" type="curve" smooth="yes"/>
       <point x="115" y="294"/>
       <point x="16" y="198"/>
-      <point x="16" y="0" type="curve"/>
+    </contour>
+    <contour>
+      <point x="256" y="0" type="line"/>
+      <point x="396" y="0" type="line"/>
+      <point x="396" y="192" type="line"/>
+      <point x="256" y="192" type="line"/>
+    </contour>
+    <contour>
+      <point x="192" y="253" type="line"/>
+      <point x="349" y="253" type="line"/>
+      <point x="205" y="423" type="line"/>
+      <point x="176" y="369" type="line"/>
+      <point x="472" y="369" type="line"/>
+      <point x="439" y="423" type="line"/>
+      <point x="308" y="270" type="line"/>
+      <point x="457" y="270" type="line"/>
+      <point x="575" y="365" type="line"/>
+      <point x="575" y="489" type="line"/>
+      <point x="72" y="489" type="line"/>
+      <point x="72" y="365" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zhe-cy.glif b/src/Cantarell-Bold.ufo/glyphs/zhe-cy.glif
index c86ba9dd..79f4779d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zhe-cy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zhe-cy.glif
@@ -5,15 +5,6 @@
   <anchor x="694" y="0" name="bottomright"/>
   <anchor x="422" y="490" name="top"/>
   <outline>
-    <contour>
-      <point x="665" y="0" type="line"/>
-      <point x="841" y="0" type="line"/>
-      <point x="682" y="270" type="line"/>
-      <point x="685" y="247" type="line"/>
-      <point x="836" y="490" type="line"/>
-      <point x="654" y="490" type="line"/>
-      <point x="521" y="249" type="line"/>
-    </contour>
     <contour>
       <point x="0" y="0" type="line"/>
       <point x="174" y="0" type="line"/>
@@ -23,6 +14,12 @@
       <point x="166" y="220" type="line"/>
       <point x="164" y="243" type="line"/>
     </contour>
+    <contour>
+      <point x="347" y="0" type="line"/>
+      <point x="501" y="0" type="line"/>
+      <point x="501" y="490" type="line"/>
+      <point x="347" y="490" type="line"/>
+    </contour>
     <contour>
       <point x="281" y="180" type="line"/>
       <point x="566" y="180" type="line"/>
@@ -30,10 +27,13 @@
       <point x="281" y="313" type="line"/>
     </contour>
     <contour>
-      <point x="347" y="0" type="line"/>
-      <point x="501" y="0" type="line"/>
-      <point x="501" y="490" type="line"/>
-      <point x="347" y="490" type="line"/>
+      <point x="665" y="0" type="line"/>
+      <point x="841" y="0" type="line"/>
+      <point x="682" y="270" type="line"/>
+      <point x="685" y="247" type="line"/>
+      <point x="836" y="490" type="line"/>
+      <point x="654" y="490" type="line"/>
+      <point x="521" y="249" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_E_.glif b/src/Cantarell-Light.ufo/glyphs/A_E_.glif
index 5fd2c0eb..46bb4c4d 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_E_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_E_.glif
@@ -17,18 +17,18 @@
       <point x="438" y="262" type="line"/>
       <point x="168" y="262" type="line"/>
     </contour>
-    <contour>
-      <point x="427" y="0" type="line"/>
-      <point x="448" y="0" type="line"/>
-      <point x="448" y="694" type="line"/>
-      <point x="427" y="694" type="line"/>
-    </contour>
     <contour>
       <point x="436" y="0" type="line"/>
       <point x="814" y="0" type="line"/>
       <point x="814" y="18" type="line"/>
       <point x="436" y="18" type="line"/>
     </contour>
+    <contour>
+      <point x="427" y="0" type="line"/>
+      <point x="448" y="0" type="line"/>
+      <point x="448" y="694" type="line"/>
+      <point x="427" y="694" type="line"/>
+    </contour>
     <contour>
       <point x="436" y="351" type="line"/>
       <point x="789" y="351" type="line"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_-cy.glif
index c8d4ec2c..46d56160 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_-cy.glif
@@ -3,12 +3,6 @@
   <advance width="661"/>
   <unicode hex="0404"/>
   <outline>
-    <contour>
-      <point x="69" y="349" type="line"/>
-      <point x="540" y="349" type="line"/>
-      <point x="540" y="367" type="line"/>
-      <point x="69" y="367" type="line"/>
-    </contour>
     <contour>
       <point x="400" y="-10" type="curve" smooth="yes"/>
       <point x="468" y="-10"/>
@@ -37,6 +31,12 @@
       <point x="64" y="129"/>
       <point x="200" y="-10"/>
     </contour>
+    <contour>
+      <point x="69" y="349" type="line"/>
+      <point x="540" y="349" type="line"/>
+      <point x="540" y="367" type="line"/>
+      <point x="69" y="367" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_.glif b/src/Cantarell-Light.ufo/glyphs/E_.glif
index 07c3d0e8..90c7d30f 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_.glif
@@ -12,27 +12,17 @@ E
   <outline>
     <contour>
       <point x="104" y="0" type="line"/>
-      <point x="125" y="0" type="line"/>
-      <point x="125" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="113" y="0" type="line"/>
       <point x="498" y="0" type="line"/>
       <point x="498" y="18" type="line"/>
-      <point x="113" y="18" type="line"/>
-    </contour>
-    <contour>
-      <point x="113" y="355" type="line"/>
+      <point x="125" y="18" type="line"/>
+      <point x="125" y="355" type="line"/>
       <point x="471" y="355" type="line"/>
       <point x="471" y="373" type="line"/>
-      <point x="113" y="373" type="line"/>
-    </contour>
-    <contour>
-      <point x="113" y="676" type="line"/>
+      <point x="125" y="373" type="line"/>
+      <point x="125" y="676" type="line"/>
       <point x="498" y="676" type="line"/>
       <point x="498" y="694" type="line"/>
-      <point x="113" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_f-cy.glif b/src/Cantarell-Light.ufo/glyphs/E_f-cy.glif
index 20c51b4c..5dcae123 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_f-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_f-cy.glif
@@ -3,6 +3,12 @@
   <advance width="796"/>
   <unicode hex="0424"/>
   <outline>
+    <contour>
+      <point x="386" y="-20" type="line"/>
+      <point x="407" y="-20" type="line"/>
+      <point x="407" y="714" type="line"/>
+      <point x="386" y="714" type="line"/>
+    </contour>
     <contour>
       <point x="397" y="86" type="curve" smooth="yes"/>
       <point x="609" y="86"/>
@@ -31,11 +37,5 @@
       <point x="712" y="196"/>
       <point x="596" y="105"/>
     </contour>
-    <contour>
-      <point x="386" y="-20" type="line"/>
-      <point x="407" y="-20" type="line"/>
-      <point x="407" y="714" type="line"/>
-      <point x="386" y="714" type="line"/>
-    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_ng.glif b/src/Cantarell-Light.ufo/glyphs/E_ng.glif
index 6dba7418..88ad0a9b 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_ng.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_ng.glif
@@ -4,10 +4,6 @@
   <unicode hex="014A"/>
   <outline>
     <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="124" y="0" type="line"/>
-      <point x="124" y="674" type="line"/>
-      <point x="122" y="674" type="line"/>
       <point x="593" y="-10" type="line"/>
       <point x="613" y="0" type="line"/>
       <point x="613" y="694" type="line"/>
@@ -16,6 +12,10 @@
       <point x="597" y="20" type="line"/>
       <point x="133" y="694" type="line"/>
       <point x="104" y="694" type="line"/>
+      <point x="104" y="0" type="line"/>
+      <point x="124" y="0" type="line"/>
+      <point x="124" y="674" type="line"/>
+      <point x="122" y="674" type="line"/>
     </contour>
     <contour>
       <point x="507" y="-230" type="line"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/F_.glif b/src/Cantarell-Light.ufo/glyphs/F_.glif
index 79d7a764..a6017c22 100644
--- a/src/Cantarell-Light.ufo/glyphs/F_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/F_.glif
@@ -11,20 +11,14 @@ F
     <contour>
       <point x="104" y="0" type="line"/>
       <point x="126" y="0" type="line"/>
-      <point x="126" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="113" y="366" type="line"/>
+      <point x="126" y="366" type="line"/>
       <point x="467" y="366" type="line"/>
       <point x="467" y="384" type="line"/>
-      <point x="113" y="384" type="line"/>
-    </contour>
-    <contour>
-      <point x="113" y="676" type="line"/>
+      <point x="126" y="384" type="line"/>
+      <point x="126" y="676" type="line"/>
       <point x="491" y="676" type="line"/>
       <point x="491" y="694" type="line"/>
-      <point x="113" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/H_.glif b/src/Cantarell-Light.ufo/glyphs/H_.glif
index 14e09357..c5165f6b 100644
--- a/src/Cantarell-Light.ufo/glyphs/H_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/H_.glif
@@ -11,23 +11,19 @@ H
   <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <contour>
+      <point x="104" y="0" type="line"/>
+      <point x="126" y="0" type="line"/>
+      <point x="126" y="352" type="line"/>
+      <point x="564" y="352" type="line"/>
       <point x="564" y="0" type="line"/>
       <point x="586" y="0" type="line"/>
       <point x="586" y="694" type="line"/>
       <point x="564" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="126" y="0" type="line"/>
+      <point x="564" y="371" type="line"/>
+      <point x="126" y="371" type="line"/>
       <point x="126" y="694" type="line"/>
       <point x="104" y="694" type="line"/>
     </contour>
-    <contour>
-      <point x="119" y="352" type="line"/>
-      <point x="570" y="352" type="line"/>
-      <point x="570" y="371" type="line"/>
-      <point x="119" y="371" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif
index a905c552..c1640440 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_abashkir-cy.glif
@@ -3,12 +3,6 @@
   <advance width="714"/>
   <unicode hex="04A0"/>
   <outline>
-    <contour>
-      <point x="22" y="676" type="line"/>
-      <point x="236" y="676" type="line"/>
-      <point x="236" y="694" type="line"/>
-      <point x="22" y="694" type="line"/>
-    </contour>
     <contour>
       <point x="661" y="0" type="line"/>
       <point x="686" y="0" type="line"/>
@@ -30,6 +24,12 @@
       <point x="386" y="366" type="line"/>
       <point x="225" y="366" type="line"/>
     </contour>
+    <contour>
+      <point x="22" y="676" type="line"/>
+      <point x="236" y="676" type="line"/>
+      <point x="236" y="694" type="line"/>
+      <point x="22" y="694" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_je-cy.glif b/src/Cantarell-Light.ufo/glyphs/L_je-cy.glif
index 55de6f84..ae66d307 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_je-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_je-cy.glif
@@ -3,26 +3,6 @@
   <advance width="1050"/>
   <unicode hex="0409"/>
   <outline>
-    <contour>
-      <point x="567" y="0" type="line"/>
-      <point x="762" y="0" type="line" smooth="yes"/>
-      <point x="905" y="0"/>
-      <point x="990" y="73"/>
-      <point x="990" y="200" type="curve" smooth="yes"/>
-      <point x="990" y="322"/>
-      <point x="912" y="403"/>
-      <point x="796" y="403" type="curve" smooth="yes"/>
-      <point x="572" y="403" type="line"/>
-      <point x="572" y="386" type="line"/>
-      <point x="786" y="386" type="line" smooth="yes"/>
-      <point x="893" y="386"/>
-      <point x="968" y="312"/>
-      <point x="968" y="195" type="curve" smooth="yes"/>
-      <point x="968" y="82"/>
-      <point x="898" y="18"/>
-      <point x="773" y="18" type="curve" smooth="yes"/>
-      <point x="567" y="18" type="line"/>
-    </contour>
     <contour>
       <point x="110" y="-6" type="curve" smooth="yes"/>
       <point x="198" y="-6"/>
@@ -45,6 +25,26 @@
       <point x="57" y="2"/>
       <point x="85" y="-6"/>
     </contour>
+    <contour>
+      <point x="567" y="0" type="line"/>
+      <point x="762" y="0" type="line" smooth="yes"/>
+      <point x="905" y="0"/>
+      <point x="990" y="73"/>
+      <point x="990" y="200" type="curve" smooth="yes"/>
+      <point x="990" y="322"/>
+      <point x="912" y="403"/>
+      <point x="796" y="403" type="curve" smooth="yes"/>
+      <point x="572" y="403" type="line"/>
+      <point x="572" y="386" type="line"/>
+      <point x="786" y="386" type="line" smooth="yes"/>
+      <point x="893" y="386"/>
+      <point x="968" y="312"/>
+      <point x="968" y="195" type="curve" smooth="yes"/>
+      <point x="968" y="82"/>
+      <point x="898" y="18"/>
+      <point x="773" y="18" type="curve" smooth="yes"/>
+      <point x="567" y="18" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_E_.glif b/src/Cantarell-Light.ufo/glyphs/O_E_.glif
index c118527e..5fcc4da2 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_E_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_E_.glif
@@ -33,18 +33,18 @@
       <point x="64" y="131"/>
       <point x="207" y="-10"/>
     </contour>
-    <contour>
-      <point x="502" y="0" type="line"/>
-      <point x="523" y="0" type="line"/>
-      <point x="523" y="694" type="line"/>
-      <point x="502" y="694" type="line"/>
-    </contour>
     <contour>
       <point x="511" y="0" type="line"/>
       <point x="896" y="0" type="line"/>
       <point x="896" y="18" type="line"/>
       <point x="511" y="18" type="line"/>
     </contour>
+    <contour>
+      <point x="502" y="0" type="line"/>
+      <point x="523" y="0" type="line"/>
+      <point x="523" y="694" type="line"/>
+      <point x="502" y="694" type="line"/>
+    </contour>
     <contour>
       <point x="511" y="351" type="line"/>
       <point x="871" y="351" type="line"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/P_.glif b/src/Cantarell-Light.ufo/glyphs/P_.glif
index 2d3ab18c..5350ea99 100644
--- a/src/Cantarell-Light.ufo/glyphs/P_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/P_.glif
@@ -11,20 +11,7 @@ P
     <contour>
       <point x="104" y="0" type="line"/>
       <point x="125" y="0" type="line"/>
-      <point x="125" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="119" y="268" type="line"/>
-      <point x="280" y="268" type="line" smooth="yes"/>
-      <point x="416" y="268"/>
-      <point x="506" y="353"/>
-      <point x="506" y="480" type="curve" smooth="yes"/>
-      <point x="506" y="608"/>
-      <point x="418" y="694"/>
-      <point x="286" y="694" type="curve" smooth="yes"/>
-      <point x="119" y="694" type="line"/>
-      <point x="119" y="676" type="line"/>
+      <point x="125" y="676" type="line"/>
       <point x="280" y="676" type="line" smooth="yes"/>
       <point x="402" y="676"/>
       <point x="484" y="597"/>
@@ -33,6 +20,15 @@ P
       <point x="410" y="286"/>
       <point x="286" y="286" type="curve" smooth="yes"/>
       <point x="119" y="286" type="line"/>
+      <point x="119" y="268" type="line"/>
+      <point x="280" y="268" type="line" smooth="yes"/>
+      <point x="416" y="268"/>
+      <point x="506" y="353"/>
+      <point x="506" y="480" type="curve" smooth="yes"/>
+      <point x="506" y="608"/>
+      <point x="418" y="694"/>
+      <point x="286" y="694" type="curve" smooth="yes"/>
+      <point x="104" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/Q_.glif b/src/Cantarell-Light.ufo/glyphs/Q_.glif
index a2b5a838..7542c691 100644
--- a/src/Cantarell-Light.ufo/glyphs/Q_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Q_.glif
@@ -22,6 +22,12 @@ Q
       <point x="64" y="133"/>
       <point x="186" y="-10"/>
     </contour>
+    <contour>
+      <point x="684" y="-13" type="line"/>
+      <point x="697" y="1" type="line"/>
+      <point x="407" y="287" type="line"/>
+      <point x="396" y="274" type="line"/>
+    </contour>
     <contour>
       <point x="371" y="9" type="curve" smooth="yes"/>
       <point x="200" y="9"/>
@@ -36,12 +42,6 @@ Q
       <point x="653" y="143"/>
       <point x="541" y="9"/>
     </contour>
-    <contour>
-      <point x="684" y="-13" type="line"/>
-      <point x="697" y="1" type="line"/>
-      <point x="407" y="287" type="line"/>
-      <point x="396" y="274" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_.glif b/src/Cantarell-Light.ufo/glyphs/R_.glif
index 31ed8e81..027b1aff 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_.glif
@@ -11,20 +11,7 @@ R
     <contour>
       <point x="104" y="0" type="line"/>
       <point x="125" y="0" type="line"/>
-      <point x="125" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="115" y="311" type="line"/>
-      <point x="277" y="311" type="line" smooth="yes"/>
-      <point x="427" y="311"/>
-      <point x="509" y="381"/>
-      <point x="509" y="506" type="curve" smooth="yes"/>
-      <point x="509" y="628"/>
-      <point x="427" y="694"/>
-      <point x="282" y="694" type="curve" smooth="yes"/>
-      <point x="115" y="694" type="line"/>
-      <point x="115" y="676" type="line"/>
+      <point x="125" y="676" type="line"/>
       <point x="277" y="676" type="line" smooth="yes"/>
       <point x="413" y="676"/>
       <point x="487" y="616"/>
@@ -33,6 +20,15 @@ R
       <point x="417" y="329"/>
       <point x="284" y="329" type="curve" smooth="yes"/>
       <point x="115" y="329" type="line"/>
+      <point x="115" y="311" type="line"/>
+      <point x="277" y="311" type="line" smooth="yes"/>
+      <point x="427" y="311"/>
+      <point x="509" y="381"/>
+      <point x="509" y="506" type="curve" smooth="yes"/>
+      <point x="509" y="628"/>
+      <point x="427" y="694"/>
+      <point x="282" y="694" type="curve" smooth="yes"/>
+      <point x="104" y="694" type="line"/>
     </contour>
     <contour>
       <point x="525" y="0" type="line"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_chwa.glif b/src/Cantarell-Light.ufo/glyphs/S_chwa.glif
index de947854..c878e364 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_chwa.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_chwa.glif
@@ -6,6 +6,12 @@
   <anchor x="369" y="694" name="top"/>
   <outline>
     <contour>
+      <point x="364" y="-10" type="curve" smooth="yes"/>
+      <point x="540" y="-10"/>
+      <point x="665" y="130"/>
+      <point x="665" y="342" type="curve" smooth="yes"/>
+      <point x="665" y="562"/>
+      <point x="532" y="704"/>
       <point x="328" y="704" type="curve" smooth="yes"/>
       <point x="245" y="704"/>
       <point x="174" y="681"/>
@@ -31,12 +37,6 @@
       <point x="82" y="318" type="curve" smooth="yes"/>
       <point x="82" y="123"/>
       <point x="191" y="-10"/>
-      <point x="364" y="-10" type="curve" smooth="yes"/>
-      <point x="540" y="-10"/>
-      <point x="665" y="130"/>
-      <point x="665" y="342" type="curve" smooth="yes"/>
-      <point x="665" y="562"/>
-      <point x="532" y="704"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_.glif b/src/Cantarell-Light.ufo/glyphs/T_.glif
index d6862167..80accc50 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_.glif
@@ -12,14 +12,12 @@ T
     <contour>
       <point x="245" y="0" type="line"/>
       <point x="266" y="0" type="line"/>
-      <point x="266" y="694" type="line"/>
-      <point x="245" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="0" y="676" type="line"/>
+      <point x="266" y="676" type="line"/>
       <point x="511" y="676" type="line"/>
       <point x="511" y="694" type="line"/>
       <point x="0" y="694" type="line"/>
+      <point x="0" y="676" type="line"/>
+      <point x="245" y="676" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_horn.glif b/src/Cantarell-Light.ufo/glyphs/T_horn.glif
index 8c8f6262..88c381a9 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_horn.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_horn.glif
@@ -3,12 +3,6 @@
   <advance width="556"/>
   <unicode hex="00DE"/>
   <outline>
-    <contour>
-      <point x="104" y="0" type="line"/>
-      <point x="125" y="0" type="line"/>
-      <point x="125" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-    </contour>
     <contour>
       <point x="119" y="148" type="line"/>
       <point x="280" y="148" type="line" smooth="yes"/>
@@ -29,6 +23,12 @@
       <point x="286" y="166" type="curve" smooth="yes"/>
       <point x="119" y="166" type="line"/>
     </contour>
+    <contour>
+      <point x="104" y="0" type="line"/>
+      <point x="125" y="0" type="line"/>
+      <point x="125" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif b/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif
index e837ba77..de671061 100644
--- a/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Y_usbig-cy.glif
@@ -4,26 +4,7 @@
   <unicode hex="046A"/>
   <outline>
     <contour>
-      <point x="355" y="381" type="line"/>
-      <point x="375" y="381" type="line"/>
-      <point x="124" y="683" type="line"/>
-      <point x="122" y="677" type="line"/>
-      <point x="631" y="677" type="line"/>
-      <point x="629" y="683" type="line"/>
-      <point x="373" y="381" type="line"/>
-      <point x="393" y="381" type="line"/>
-      <point x="649" y="676" type="line"/>
-      <point x="649" y="694" type="line"/>
-      <point x="104" y="694" type="line"/>
-      <point x="104" y="676" type="line"/>
-    </contour>
-    <contour>
-      <point x="386" y="369" type="line"/>
-      <point x="366" y="369" type="line"/>
-      <point x="366" y="0" type="line"/>
-      <point x="386" y="0" type="line"/>
-    </contour>
-    <contour>
+      <point x="58" y="0" type="curve"/>
       <point x="77" y="0" type="line"/>
       <point x="77" y="250"/>
       <point x="170" y="364"/>
@@ -37,7 +18,26 @@
       <point x="380" y="382" type="curve" smooth="yes"/>
       <point x="159" y="382"/>
       <point x="58" y="262"/>
-      <point x="58" y="0" type="curve"/>
+    </contour>
+    <contour>
+      <point x="366" y="0" type="line"/>
+      <point x="386" y="0" type="line"/>
+      <point x="386" y="369" type="line"/>
+      <point x="366" y="369" type="line"/>
+    </contour>
+    <contour>
+      <point x="355" y="381" type="line"/>
+      <point x="375" y="381" type="line"/>
+      <point x="124" y="683" type="line"/>
+      <point x="122" y="677" type="line"/>
+      <point x="631" y="677" type="line"/>
+      <point x="629" y="683" type="line"/>
+      <point x="373" y="381" type="line"/>
+      <point x="393" y="381" type="line"/>
+      <point x="649" y="676" type="line"/>
+      <point x="649" y="694" type="line"/>
+      <point x="104" y="694" type="line"/>
+      <point x="104" y="676" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_he-cy.glif b/src/Cantarell-Light.ufo/glyphs/Z_he-cy.glif
index 69ffaeb0..cbcad008 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_he-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_he-cy.glif
@@ -23,17 +23,17 @@
       <point x="281" y="354" type="line"/>
       <point x="280" y="363" type="line"/>
     </contour>
-    <contour>
-      <point x="278" y="349" type="line"/>
-      <point x="598" y="349" type="line"/>
-      <point x="598" y="367" type="line"/>
-      <point x="278" y="367" type="line"/>
-    </contour>
     <contour>
       <point x="432" y="0" type="line"/>
       <point x="452" y="0" type="line"/>
       <point x="452" y="694" type="line"/>
       <point x="432" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="278" y="349" type="line"/>
+      <point x="598" y="349" type="line"/>
+      <point x="598" y="367" type="line"/>
+      <point x="278" y="367" type="line"/>
+    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ae.glif b/src/Cantarell-Light.ufo/glyphs/ae.glif
index d5b84e8f..8736326b 100644
--- a/src/Cantarell-Light.ufo/glyphs/ae.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ae.glif
@@ -1,50 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ae" format="2">
-  <advance width="822"/>
+  <advance width="831"/>
   <unicode hex="00E6"/>
   <anchor x="406" y="0" name="bottom"/>
   <anchor x="406" y="480" name="top"/>
   <outline>
-    <contour>
-      <point x="374" y="239" type="line"/>
-      <point x="389" y="239" type="line"/>
-      <point x="389" y="327" type="line" smooth="yes"/>
-      <point x="389" y="429"/>
-      <point x="332" y="486"/>
-      <point x="230" y="486" type="curve" smooth="yes"/>
-      <point x="164" y="486"/>
-      <point x="95" y="463"/>
-      <point x="49" y="426" type="curve"/>
-      <point x="54" y="412" type="line"/>
-      <point x="99" y="447"/>
-      <point x="162" y="468"/>
-      <point x="224" y="468" type="curve" smooth="yes"/>
-      <point x="321" y="468"/>
-      <point x="374" y="416"/>
-      <point x="374" y="322" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="193" y="-10" type="curve" smooth="yes"/>
-      <point x="296" y="-10"/>
-      <point x="380" y="55"/>
-      <point x="397" y="154" type="curve"/>
-      <point x="386" y="162" type="line"/>
-      <point x="372" y="73"/>
-      <point x="297" y="8"/>
-      <point x="197" y="8" type="curve" smooth="yes"/>
-      <point x="119" y="8"/>
-      <point x="67" y="48"/>
-      <point x="67" y="112" type="curve" smooth="yes"/>
-      <point x="67" y="202"/>
-      <point x="170" y="244"/>
-      <point x="382" y="244" type="curve"/>
-      <point x="382" y="262" type="line"/>
-      <point x="166" y="262"/>
-      <point x="46" y="210"/>
-      <point x="46" y="109" type="curve" smooth="yes"/>
-      <point x="46" y="37"/>
-      <point x="106" y="-10"/>
-    </contour>
     <contour>
       <point x="601" y="-10" type="curve" smooth="yes"/>
       <point x="656" y="-10"/>
@@ -78,6 +38,46 @@
       <point x="374" y="87"/>
       <point x="462" y="-10"/>
     </contour>
+    <contour>
+      <point x="193" y="-10" type="curve" smooth="yes"/>
+      <point x="296" y="-10"/>
+      <point x="380" y="55"/>
+      <point x="397" y="154" type="curve"/>
+      <point x="386" y="162" type="line"/>
+      <point x="372" y="73"/>
+      <point x="297" y="8"/>
+      <point x="197" y="8" type="curve" smooth="yes"/>
+      <point x="119" y="8"/>
+      <point x="67" y="48"/>
+      <point x="67" y="112" type="curve" smooth="yes"/>
+      <point x="67" y="202"/>
+      <point x="170" y="244"/>
+      <point x="382" y="244" type="curve"/>
+      <point x="382" y="262" type="line"/>
+      <point x="166" y="262"/>
+      <point x="46" y="210"/>
+      <point x="46" y="109" type="curve" smooth="yes"/>
+      <point x="46" y="37"/>
+      <point x="106" y="-10"/>
+    </contour>
+    <contour>
+      <point x="374" y="239" type="line"/>
+      <point x="389" y="239" type="line"/>
+      <point x="389" y="327" type="line" smooth="yes"/>
+      <point x="389" y="429"/>
+      <point x="332" y="486"/>
+      <point x="230" y="486" type="curve" smooth="yes"/>
+      <point x="164" y="486"/>
+      <point x="95" y="463"/>
+      <point x="49" y="426" type="curve"/>
+      <point x="54" y="412" type="line"/>
+      <point x="99" y="447"/>
+      <point x="162" y="468"/>
+      <point x="224" y="468" type="curve" smooth="yes"/>
+      <point x="321" y="468"/>
+      <point x="374" y="416"/>
+      <point x="374" y="322" type="curve" smooth="yes"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/ampersand.glif b/src/Cantarell-Light.ufo/glyphs/ampersand.glif
index 2769cdaf..a0c3b46f 100644
--- a/src/Cantarell-Light.ufo/glyphs/ampersand.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ampersand.glif
@@ -4,22 +4,6 @@
   <unicode hex="0026"/>
   <outline>
     <contour>
-      <point x="584" y="-5" type="curve"/>
-      <point x="597" y="10" type="line"/>
-      <point x="290" y="295"/>
-      <point x="193" y="418"/>
-      <point x="193" y="538" type="curve" smooth="yes"/>
-      <point x="193" y="628"/>
-      <point x="243" y="686"/>
-      <point x="320" y="686" type="curve" smooth="yes"/>
-      <point x="391" y="686"/>
-      <point x="441" y="636"/>
-      <point x="441" y="567" type="curve" smooth="yes"/>
-      <point x="441" y="382"/>
-      <point x="91" y="412"/>
-      <point x="91" y="184" type="curve" smooth="yes"/>
-      <point x="91" y="65"/>
-      <point x="186" y="-12"/>
       <point x="294" y="-12" type="curve" smooth="yes"/>
       <point x="421" y="-12"/>
       <point x="540" y="93"/>
@@ -42,6 +26,22 @@
       <point x="172" y="537" type="curve" smooth="yes"/>
       <point x="172" y="411"/>
       <point x="274" y="280"/>
+      <point x="584" y="-5" type="curve"/>
+      <point x="597" y="10" type="line"/>
+      <point x="290" y="295"/>
+      <point x="193" y="418"/>
+      <point x="193" y="538" type="curve" smooth="yes"/>
+      <point x="193" y="628"/>
+      <point x="243" y="686"/>
+      <point x="320" y="686" type="curve" smooth="yes"/>
+      <point x="391" y="686"/>
+      <point x="441" y="636"/>
+      <point x="441" y="567" type="curve" smooth="yes"/>
+      <point x="441" y="382"/>
+      <point x="91" y="412"/>
+      <point x="91" y="184" type="curve" smooth="yes"/>
+      <point x="91" y="65"/>
+      <point x="186" y="-12"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/approxequal.glif b/src/Cantarell-Light.ufo/glyphs/approxequal.glif
index fde32c89..8a041f5b 100644
--- a/src/Cantarell-Light.ufo/glyphs/approxequal.glif
+++ b/src/Cantarell-Light.ufo/glyphs/approxequal.glif
@@ -4,12 +4,6 @@
   <unicode hex="2248"/>
   <outline>
     <contour>
-      <point x="70" y="382" type="line"/>
-      <point x="87" y="425"/>
-      <point x="136" y="464"/>
-      <point x="192" y="464" type="curve" smooth="yes"/>
-      <point x="274" y="464"/>
-      <point x="303" y="378"/>
       <point x="392" y="378" type="curve" smooth="yes"/>
       <point x="457" y="378"/>
       <point x="507" y="424"/>
@@ -24,14 +18,14 @@
       <point x="134" y="483"/>
       <point x="73" y="443"/>
       <point x="58" y="387" type="curve"/>
+      <point x="70" y="382" type="line"/>
+      <point x="87" y="425"/>
+      <point x="136" y="464"/>
+      <point x="192" y="464" type="curve" smooth="yes"/>
+      <point x="274" y="464"/>
+      <point x="303" y="378"/>
     </contour>
     <contour>
-      <point x="70" y="152" type="line"/>
-      <point x="87" y="195"/>
-      <point x="136" y="234"/>
-      <point x="192" y="234" type="curve" smooth="yes"/>
-      <point x="274" y="234"/>
-      <point x="303" y="148"/>
       <point x="392" y="148" type="curve" smooth="yes"/>
       <point x="457" y="148"/>
       <point x="507" y="194"/>
@@ -46,6 +40,12 @@
       <point x="134" y="253"/>
       <point x="73" y="213"/>
       <point x="58" y="157" type="curve"/>
+      <point x="70" y="152" type="line"/>
+      <point x="87" y="195"/>
+      <point x="136" y="234"/>
+      <point x="192" y="234" type="curve" smooth="yes"/>
+      <point x="274" y="234"/>
+      <point x="303" y="148"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/asciitilde.glif b/src/Cantarell-Light.ufo/glyphs/asciitilde.glif
index eff8a45f..e11e3759 100644
--- a/src/Cantarell-Light.ufo/glyphs/asciitilde.glif
+++ b/src/Cantarell-Light.ufo/glyphs/asciitilde.glif
@@ -4,12 +4,6 @@
   <unicode hex="007E"/>
   <outline>
     <contour>
-      <point x="81" y="273" type="line"/>
-      <point x="100" y="321"/>
-      <point x="144" y="363"/>
-      <point x="193" y="363" type="curve" smooth="yes"/>
-      <point x="262" y="363"/>
-      <point x="305" y="268"/>
       <point x="388" y="268" type="curve" smooth="yes"/>
       <point x="443" y="268"/>
       <point x="496" y="311"/>
@@ -24,6 +18,12 @@
       <point x="138" y="382"/>
       <point x="82" y="331"/>
       <point x="67" y="278" type="curve"/>
+      <point x="81" y="273" type="line"/>
+      <point x="100" y="321"/>
+      <point x="144" y="363"/>
+      <point x="193" y="363" type="curve" smooth="yes"/>
+      <point x="262" y="363"/>
+      <point x="305" y="268"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/asterisk.glif b/src/Cantarell-Light.ufo/glyphs/asterisk.glif
index 4d527bf0..3f35d6fd 100644
--- a/src/Cantarell-Light.ufo/glyphs/asterisk.glif
+++ b/src/Cantarell-Light.ufo/glyphs/asterisk.glif
@@ -4,10 +4,10 @@
   <unicode hex="002A"/>
   <outline>
     <contour>
-      <point x="232" y="488" type="line"/>
-      <point x="409" y="585" type="line"/>
-      <point x="397" y="603" type="line"/>
-      <point x="226" y="497" type="line"/>
+      <point x="399" y="369" type="line"/>
+      <point x="411" y="387" type="line"/>
+      <point x="232" y="494" type="line"/>
+      <point x="225" y="484" type="line"/>
     </contour>
     <contour>
       <point x="62" y="372" type="line"/>
@@ -27,17 +27,17 @@
       <point x="63" y="608" type="line"/>
       <point x="51" y="590" type="line"/>
     </contour>
-    <contour>
-      <point x="399" y="369" type="line"/>
-      <point x="411" y="387" type="line"/>
-      <point x="232" y="494" type="line"/>
-      <point x="225" y="484" type="line"/>
-    </contour>
     <contour>
       <point x="220" y="487" type="line"/>
       <point x="234" y="487" type="line"/>
       <point x="237" y="694" type="line"/>
       <point x="216" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="232" y="488" type="line"/>
+      <point x="409" y="585" type="line"/>
+      <point x="397" y="603" type="line"/>
+      <point x="226" y="497" type="line"/>
+    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/b.glif b/src/Cantarell-Light.ufo/glyphs/b.glif
index e82dc2e0..fcccffa7 100644
--- a/src/Cantarell-Light.ufo/glyphs/b.glif
+++ b/src/Cantarell-Light.ufo/glyphs/b.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="b" format="2">
-  <advance width="534"/>
+  <advance width="555"/>
   <unicode hex="0062"/>
   <note>
 b
 </note>
-  <anchor x="260" y="0" name="bottom"/>
-  <anchor x="260" y="480" name="top"/>
+  <anchor x="272" y="0" name="bottom"/>
+  <anchor x="272" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="104" y="0" type="line"/>
-      <point x="107" y="64" type="line"/>
-      <point x="107" y="739" type="line"/>
-      <point x="88" y="739" type="line"/>
+      <point x="279" y="-10" type="curve" smooth="yes"/>
+      <point x="404" y="-10"/>
+      <point x="489" y="90"/>
+      <point x="489" y="240" type="curve" smooth="yes"/>
+      <point x="489" y="389"/>
+      <point x="405" y="486"/>
+      <point x="281" y="486" type="curve" smooth="yes"/>
+      <point x="198" y="486"/>
+      <point x="138" y="444"/>
+      <point x="105" y="375" type="curve"/>
+      <point x="109" y="355" type="line"/>
+      <point x="139" y="425"/>
+      <point x="197" y="468"/>
+      <point x="276" y="468" type="curve" smooth="yes"/>
+      <point x="392" y="468"/>
+      <point x="468" y="378"/>
+      <point x="468" y="237" type="curve" smooth="yes"/>
+      <point x="468" y="97"/>
+      <point x="393" y="8"/>
+      <point x="281" y="8" type="curve" smooth="yes"/>
+      <point x="201" y="8"/>
+      <point x="140" y="53"/>
+      <point x="110" y="126" type="curve"/>
+      <point x="107" y="96" type="line"/>
+      <point x="140" y="29"/>
+      <point x="199" y="-10"/>
     </contour>
     <contour>
-      <point x="267" y="-10" type="curve" smooth="yes"/>
-      <point x="392" y="-10"/>
-      <point x="477" y="90"/>
-      <point x="477" y="240" type="curve" smooth="yes"/>
-      <point x="477" y="389"/>
-      <point x="393" y="486"/>
-      <point x="269" y="486" type="curve" smooth="yes"/>
-      <point x="186" y="486"/>
-      <point x="126" y="444"/>
-      <point x="93" y="375" type="curve"/>
-      <point x="97" y="355" type="line"/>
-      <point x="127" y="425"/>
-      <point x="185" y="468"/>
-      <point x="264" y="468" type="curve" smooth="yes"/>
-      <point x="380" y="468"/>
-      <point x="456" y="378"/>
-      <point x="456" y="237" type="curve" smooth="yes"/>
-      <point x="456" y="97"/>
-      <point x="381" y="8"/>
-      <point x="269" y="8" type="curve" smooth="yes"/>
-      <point x="189" y="8"/>
-      <point x="128" y="53"/>
-      <point x="98" y="126" type="curve"/>
-      <point x="95" y="96" type="line"/>
-      <point x="128" y="29"/>
-      <point x="187" y="-10"/>
+      <point x="100" y="0" type="line"/>
+      <point x="116" y="0" type="line"/>
+      <point x="119" y="64" type="line"/>
+      <point x="119" y="739" type="line"/>
+      <point x="100" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/caroncomb.loclV_I_E_T_.glif 
b/src/Cantarell-Light.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
index 2827e809..b8c5fdd0 100644
--- a/src/Cantarell-Light.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
@@ -4,13 +4,13 @@
   <anchor x="185" y="579" name="top"/>
   <outline>
     <contour>
+      <point x="176" y="562" type="line"/>
+      <point x="191" y="562" type="line"/>
       <point x="306" y="665" type="line"/>
       <point x="300" y="671" type="line"/>
       <point x="184" y="580" type="line"/>
       <point x="69" y="667" type="line"/>
       <point x="58" y="656" type="line"/>
-      <point x="176" y="562" type="line"/>
-      <point x="191" y="562" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/cedi.glif b/src/Cantarell-Light.ufo/glyphs/cedi.glif
index 7c7ecda7..18e5ef0a 100644
--- a/src/Cantarell-Light.ufo/glyphs/cedi.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cedi.glif
@@ -31,18 +31,18 @@
       <point x="67" y="129"/>
       <point x="181" y="-10"/>
     </contour>
-    <contour>
-      <point x="350" y="693" type="line"/>
-      <point x="368" y="693" type="line"/>
-      <point x="368" y="813" type="line"/>
-      <point x="350" y="813" type="line"/>
-    </contour>
     <contour>
       <point x="341" y="-120" type="line"/>
       <point x="359" y="-120" type="line"/>
       <point x="359" y="0" type="line"/>
       <point x="341" y="0" type="line"/>
     </contour>
+    <contour>
+      <point x="350" y="693" type="line"/>
+      <point x="368" y="693" type="line"/>
+      <point x="368" y="813" type="line"/>
+      <point x="350" y="813" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif
index 661815b7..2ebff28c 100644
--- a/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/cheverticalstroke-cy.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="cheverticalstroke-cy" format="2">
-  <advance width="500"/>
+  <advance width="512"/>
   <unicode hex="04B9"/>
   <outline>
     <contour>
@@ -21,18 +21,18 @@
       <point x="53" y="225"/>
       <point x="117" y="181"/>
     </contour>
-    <contour>
-      <point x="392" y="0" type="line"/>
-      <point x="412" y="0" type="line"/>
-      <point x="412" y="480" type="line"/>
-      <point x="392" y="480" type="line"/>
-    </contour>
     <contour>
       <point x="218" y="51" type="line"/>
       <point x="237" y="51" type="line"/>
       <point x="237" y="351" type="line"/>
       <point x="218" y="351" type="line"/>
     </contour>
+    <contour>
+      <point x="392" y="0" type="line"/>
+      <point x="412" y="0" type="line"/>
+      <point x="412" y="480" type="line"/>
+      <point x="392" y="480" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/circumflexcomb.glif 
b/src/Cantarell-Light.ufo/glyphs/circumflexcomb.glif
index a6603d9b..8a1c8048 100644
--- a/src/Cantarell-Light.ufo/glyphs/circumflexcomb.glif
+++ b/src/Cantarell-Light.ufo/glyphs/circumflexcomb.glif
@@ -6,13 +6,13 @@
   <anchor x="299" y="622" name="top_viet"/>
   <outline>
     <contour>
-      <point x="55" y="584" type="line"/>
-      <point x="61" y="578" type="line"/>
-      <point x="171" y="691" type="line"/>
       <point x="284" y="577" type="line"/>
       <point x="296" y="588" type="line"/>
       <point x="181" y="708" type="line"/>
       <point x="165" y="708" type="line"/>
+      <point x="55" y="584" type="line"/>
+      <point x="61" y="578" type="line"/>
+      <point x="171" y="691" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif 
b/src/Cantarell-Light.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
index 853012cb..ff35891a 100644
--- a/src/Cantarell-Light.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
@@ -5,13 +5,13 @@
   <anchor x="284" y="554" name="top_viet"/>
   <outline>
     <contour>
-      <point x="55" y="561" type="line"/>
-      <point x="61" y="555" type="line"/>
-      <point x="171" y="643" type="line"/>
       <point x="284" y="554" type="line"/>
       <point x="296" y="565" type="line"/>
       <point x="181" y="660" type="line"/>
       <point x="165" y="660" type="line"/>
+      <point x="55" y="561" type="line"/>
+      <point x="61" y="555" type="line"/>
+      <point x="171" y="643" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/colonsign.glif b/src/Cantarell-Light.ufo/glyphs/colonsign.glif
index cd86ca65..5963a746 100644
--- a/src/Cantarell-Light.ufo/glyphs/colonsign.glif
+++ b/src/Cantarell-Light.ufo/glyphs/colonsign.glif
@@ -3,30 +3,6 @@
   <advance width="580"/>
   <unicode hex="20A1"/>
   <outline>
-    <contour>
-      <point x="422" y="694" type="line"/>
-      <point x="438" y="694" type="line"/>
-      <point x="456" y="813" type="line"/>
-      <point x="440" y="813" type="line"/>
-    </contour>
-    <contour>
-      <point x="255" y="-120" type="line"/>
-      <point x="270" y="-120" type="line"/>
-      <point x="289" y="11" type="line"/>
-      <point x="273" y="11" type="line"/>
-    </contour>
-    <contour>
-      <point x="341" y="694" type="line"/>
-      <point x="357" y="694" type="line"/>
-      <point x="375" y="813" type="line"/>
-      <point x="360" y="813" type="line"/>
-    </contour>
-    <contour>
-      <point x="335" y="-120" type="line"/>
-      <point x="350" y="-120" type="line"/>
-      <point x="367" y="3" type="line"/>
-      <point x="351" y="3" type="line"/>
-    </contour>
     <contour>
       <point x="352" y="-10" type="curve" smooth="yes"/>
       <point x="409" y="-10"/>
@@ -55,6 +31,30 @@
       <point x="70" y="129"/>
       <point x="184" y="-10"/>
     </contour>
+    <contour>
+      <point x="255" y="-120" type="line"/>
+      <point x="270" y="-120" type="line"/>
+      <point x="289" y="11" type="line"/>
+      <point x="273" y="11" type="line"/>
+    </contour>
+    <contour>
+      <point x="335" y="-120" type="line"/>
+      <point x="350" y="-120" type="line"/>
+      <point x="367" y="3" type="line"/>
+      <point x="351" y="3" type="line"/>
+    </contour>
+    <contour>
+      <point x="341" y="694" type="line"/>
+      <point x="357" y="694" type="line"/>
+      <point x="375" y="813" type="line"/>
+      <point x="360" y="813" type="line"/>
+    </contour>
+    <contour>
+      <point x="422" y="694" type="line"/>
+      <point x="438" y="694" type="line"/>
+      <point x="456" y="813" type="line"/>
+      <point x="440" y="813" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/commaturnedabovecomb.glif 
b/src/Cantarell-Light.ufo/glyphs/commaturnedabovecomb.glif
index 3b7a8633..698c42af 100644
--- a/src/Cantarell-Light.ufo/glyphs/commaturnedabovecomb.glif
+++ b/src/Cantarell-Light.ufo/glyphs/commaturnedabovecomb.glif
@@ -5,14 +5,14 @@
   <anchor x="104" y="739" name="top"/>
   <outline>
     <contour>
-      <point x="141" y="742" type="curve"/>
-      <point x="129" y="742" type="line"/>
-      <point x="107" y="712"/>
-      <point x="91" y="657"/>
       <point x="91" y="590" type="curve"/>
       <point x="110" y="590" type="line"/>
       <point x="110" y="653"/>
       <point x="122" y="708"/>
+      <point x="141" y="742" type="curve"/>
+      <point x="129" y="742" type="line"/>
+      <point x="107" y="712"/>
+      <point x="91" y="657"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/copyright.glif b/src/Cantarell-Light.ufo/glyphs/copyright.glif
index 4f7e193d..29364fd3 100644
--- a/src/Cantarell-Light.ufo/glyphs/copyright.glif
+++ b/src/Cantarell-Light.ufo/glyphs/copyright.glif
@@ -17,20 +17,6 @@
       <point x="104" y="136"/>
       <point x="239" y="-3"/>
     </contour>
-    <contour>
-      <point x="445" y="15" type="curve" smooth="yes"/>
-      <point x="253" y="15"/>
-      <point x="125" y="148"/>
-      <point x="125" y="347" type="curve" smooth="yes"/>
-      <point x="125" y="550"/>
-      <point x="251" y="686"/>
-      <point x="441" y="686" type="curve" smooth="yes"/>
-      <point x="634" y="686"/>
-      <point x="762" y="549"/>
-      <point x="762" y="344" type="curve" smooth="yes"/>
-      <point x="762" y="147"/>
-      <point x="635" y="15"/>
-    </contour>
     <contour>
       <point x="452" y="134" type="curve" smooth="yes"/>
       <point x="491" y="134"/>
@@ -59,6 +45,20 @@
       <point x="257" y="218"/>
       <point x="335" y="134"/>
     </contour>
+    <contour>
+      <point x="445" y="15" type="curve" smooth="yes"/>
+      <point x="253" y="15"/>
+      <point x="125" y="148"/>
+      <point x="125" y="347" type="curve" smooth="yes"/>
+      <point x="125" y="550"/>
+      <point x="251" y="686"/>
+      <point x="441" y="686" type="curve" smooth="yes"/>
+      <point x="634" y="686"/>
+      <point x="762" y="549"/>
+      <point x="762" y="344" type="curve" smooth="yes"/>
+      <point x="762" y="147"/>
+      <point x="635" y="15"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/d.glif b/src/Cantarell-Light.ufo/glyphs/d.glif
index 1cf2e86e..66a0b38b 100644
--- a/src/Cantarell-Light.ufo/glyphs/d.glif
+++ b/src/Cantarell-Light.ufo/glyphs/d.glif
@@ -1,49 +1,49 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="d" format="2">
-  <advance width="534"/>
+  <advance width="555"/>
   <unicode hex="0064"/>
   <note>
 d
 </note>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="391" y="592" name="center"/>
-  <anchor x="275" y="480" name="top"/>
-  <anchor x="548" y="480" name="topright"/>
+  <anchor x="284" y="0" name="bottom"/>
+  <anchor x="400" y="592" name="center"/>
+  <anchor x="284" y="480" name="top"/>
+  <anchor x="557" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="430" y="0" type="line"/>
-      <point x="446" y="0" type="line"/>
-      <point x="446" y="739" type="line"/>
-      <point x="427" y="739" type="line"/>
-      <point x="427" y="64" type="line"/>
+      <point x="277" y="-10" type="curve" smooth="yes"/>
+      <point x="348" y="-10"/>
+      <point x="405" y="23"/>
+      <point x="441" y="85" type="curve"/>
+      <point x="438" y="106" type="line"/>
+      <point x="406" y="44"/>
+      <point x="350" y="8"/>
+      <point x="279" y="8" type="curve" smooth="yes"/>
+      <point x="162" y="8"/>
+      <point x="87" y="101"/>
+      <point x="87" y="239" type="curve" smooth="yes"/>
+      <point x="87" y="374"/>
+      <point x="159" y="468"/>
+      <point x="274" y="468" type="curve" smooth="yes"/>
+      <point x="348" y="468"/>
+      <point x="406" y="431"/>
+      <point x="438" y="367" type="curve"/>
+      <point x="442" y="396" type="line"/>
+      <point x="408" y="454"/>
+      <point x="352" y="486"/>
+      <point x="279" y="486" type="curve" smooth="yes"/>
+      <point x="151" y="486"/>
+      <point x="66" y="386"/>
+      <point x="66" y="237" type="curve" smooth="yes"/>
+      <point x="66" y="89"/>
+      <point x="150" y="-10"/>
     </contour>
     <contour>
-      <point x="268" y="-10" type="curve" smooth="yes"/>
-      <point x="339" y="-10"/>
-      <point x="396" y="23"/>
-      <point x="432" y="85" type="curve"/>
-      <point x="429" y="106" type="line"/>
-      <point x="397" y="44"/>
-      <point x="341" y="8"/>
-      <point x="270" y="8" type="curve" smooth="yes"/>
-      <point x="153" y="8"/>
-      <point x="78" y="101"/>
-      <point x="78" y="239" type="curve" smooth="yes"/>
-      <point x="78" y="374"/>
-      <point x="150" y="468"/>
-      <point x="265" y="468" type="curve" smooth="yes"/>
-      <point x="339" y="468"/>
-      <point x="397" y="431"/>
-      <point x="429" y="367" type="curve"/>
-      <point x="433" y="396" type="line"/>
-      <point x="399" y="454"/>
-      <point x="343" y="486"/>
-      <point x="270" y="486" type="curve" smooth="yes"/>
-      <point x="142" y="486"/>
-      <point x="57" y="386"/>
-      <point x="57" y="237" type="curve" smooth="yes"/>
-      <point x="57" y="89"/>
-      <point x="141" y="-10"/>
+      <point x="439" y="0" type="line"/>
+      <point x="455" y="0" type="line"/>
+      <point x="455" y="739" type="line"/>
+      <point x="436" y="739" type="line"/>
+      <point x="436" y="64" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/dblgravecomb.glif 
b/src/Cantarell-Light.ufo/glyphs/dblgravecomb.glif
index 5a989b55..0ddc39d4 100644
--- a/src/Cantarell-Light.ufo/glyphs/dblgravecomb.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dblgravecomb.glif
@@ -4,18 +4,18 @@
   <anchor x="252" y="480" name="_top"/>
   <anchor x="252" y="708" name="top"/>
   <outline>
-    <contour>
-      <point x="188" y="570" type="line"/>
-      <point x="195" y="574" type="line"/>
-      <point x="127" y="727" type="line"/>
-      <point x="107" y="718" type="line"/>
-    </contour>
     <contour>
       <point x="326" y="570" type="line"/>
       <point x="333" y="574" type="line"/>
       <point x="265" y="727" type="line"/>
       <point x="245" y="718" type="line"/>
     </contour>
+    <contour>
+      <point x="188" y="570" type="line"/>
+      <point x="195" y="574" type="line"/>
+      <point x="127" y="727" type="line"/>
+      <point x="107" y="718" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/descender-cy.case.glif 
b/src/Cantarell-Light.ufo/glyphs/descender-cy.case.glif
index 18efdef5..b8d6b5e5 100644
--- a/src/Cantarell-Light.ufo/glyphs/descender-cy.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/descender-cy.case.glif
@@ -4,12 +4,12 @@
   <anchor x="96" y="0" name="_bottomright"/>
   <outline>
     <contour>
-      <point x="131" y="0" type="line"/>
       <point x="131" y="-175" type="line"/>
       <point x="152" y="-175" type="line"/>
       <point x="152" y="19" type="line"/>
       <point x="76" y="19" type="line"/>
       <point x="76" y="0" type="line"/>
+      <point x="131" y="0" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dieresisbelowcomb.glif 
b/src/Cantarell-Light.ufo/glyphs/dieresisbelowcomb.glif
index ac8d5e69..d2e0e93c 100644
--- a/src/Cantarell-Light.ufo/glyphs/dieresisbelowcomb.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dieresisbelowcomb.glif
@@ -4,20 +4,6 @@
   <anchor x="220" y="0" name="_bottom"/>
   <anchor x="220" y="-143" name="bottom"/>
   <outline>
-    <contour>
-      <point x="120" y="-143" type="curve" smooth="yes"/>
-      <point x="132" y="-143"/>
-      <point x="141" y="-134"/>
-      <point x="141" y="-122" type="curve" smooth="yes"/>
-      <point x="141" y="-110"/>
-      <point x="132" y="-101"/>
-      <point x="120" y="-101" type="curve" smooth="yes"/>
-      <point x="108" y="-101"/>
-      <point x="99" y="-110"/>
-      <point x="99" y="-122" type="curve" smooth="yes"/>
-      <point x="99" y="-134"/>
-      <point x="108" y="-143"/>
-    </contour>
     <contour>
       <point x="320" y="-143" type="curve" smooth="yes"/>
       <point x="332" y="-143"/>
@@ -32,6 +18,20 @@
       <point x="299" y="-134"/>
       <point x="308" y="-143"/>
     </contour>
+    <contour>
+      <point x="120" y="-143" type="curve" smooth="yes"/>
+      <point x="132" y="-143"/>
+      <point x="141" y="-134"/>
+      <point x="141" y="-122" type="curve" smooth="yes"/>
+      <point x="141" y="-110"/>
+      <point x="132" y="-101"/>
+      <point x="120" y="-101" type="curve" smooth="yes"/>
+      <point x="108" y="-101"/>
+      <point x="99" y="-110"/>
+      <point x="99" y="-122" type="curve" smooth="yes"/>
+      <point x="99" y="-134"/>
+      <point x="108" y="-143"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/dieresiscomb.glif 
b/src/Cantarell-Light.ufo/glyphs/dieresiscomb.glif
index a7a1e8d6..4b8b59bb 100644
--- a/src/Cantarell-Light.ufo/glyphs/dieresiscomb.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dieresiscomb.glif
@@ -4,20 +4,6 @@
   <anchor x="219" y="480" name="_top"/>
   <anchor x="219" y="639" name="top"/>
   <outline>
-    <contour>
-      <point x="134" y="627" type="curve" smooth="yes"/>
-      <point x="146" y="627"/>
-      <point x="155" y="636"/>
-      <point x="155" y="648" type="curve" smooth="yes"/>
-      <point x="155" y="660"/>
-      <point x="146" y="669"/>
-      <point x="134" y="669" type="curve" smooth="yes"/>
-      <point x="122" y="669"/>
-      <point x="113" y="660"/>
-      <point x="113" y="648" type="curve" smooth="yes"/>
-      <point x="113" y="636"/>
-      <point x="122" y="627"/>
-    </contour>
     <contour>
       <point x="304" y="627" type="curve" smooth="yes"/>
       <point x="316" y="627"/>
@@ -32,6 +18,20 @@
       <point x="283" y="636"/>
       <point x="292" y="627"/>
     </contour>
+    <contour>
+      <point x="134" y="627" type="curve" smooth="yes"/>
+      <point x="146" y="627"/>
+      <point x="155" y="636"/>
+      <point x="155" y="648" type="curve" smooth="yes"/>
+      <point x="155" y="660"/>
+      <point x="146" y="669"/>
+      <point x="134" y="669" type="curve" smooth="yes"/>
+      <point x="122" y="669"/>
+      <point x="113" y="660"/>
+      <point x="113" y="648" type="curve" smooth="yes"/>
+      <point x="113" y="636"/>
+      <point x="122" y="627"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif 
b/src/Cantarell-Light.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
index d1c4b8e7..164b19c1 100644
--- a/src/Cantarell-Light.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
@@ -3,20 +3,6 @@
   <anchor x="219" y="480" name="_top"/>
   <anchor x="219" y="559" name="top"/>
   <outline>
-    <contour>
-      <point x="139" y="567" type="curve" smooth="yes"/>
-      <point x="151" y="567"/>
-      <point x="160" y="576"/>
-      <point x="160" y="588" type="curve" smooth="yes"/>
-      <point x="160" y="600"/>
-      <point x="151" y="609"/>
-      <point x="139" y="609" type="curve" smooth="yes"/>
-      <point x="127" y="609"/>
-      <point x="118" y="600"/>
-      <point x="118" y="588" type="curve" smooth="yes"/>
-      <point x="118" y="576"/>
-      <point x="127" y="567"/>
-    </contour>
     <contour>
       <point x="299" y="567" type="curve" smooth="yes"/>
       <point x="311" y="567"/>
@@ -31,6 +17,20 @@
       <point x="278" y="576"/>
       <point x="287" y="567"/>
     </contour>
+    <contour>
+      <point x="139" y="567" type="curve" smooth="yes"/>
+      <point x="151" y="567"/>
+      <point x="160" y="576"/>
+      <point x="160" y="588" type="curve" smooth="yes"/>
+      <point x="160" y="600"/>
+      <point x="151" y="609"/>
+      <point x="139" y="609" type="curve" smooth="yes"/>
+      <point x="127" y="609"/>
+      <point x="118" y="600"/>
+      <point x="118" y="588" type="curve" smooth="yes"/>
+      <point x="118" y="576"/>
+      <point x="127" y="567"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/divide.glif b/src/Cantarell-Light.ufo/glyphs/divide.glif
index 3e523326..cd6d8c90 100644
--- a/src/Cantarell-Light.ufo/glyphs/divide.glif
+++ b/src/Cantarell-Light.ufo/glyphs/divide.glif
@@ -4,18 +4,10 @@
   <unicode hex="00F7"/>
   <outline>
     <contour>
-      <point x="281" y="502" type="curve" smooth="yes"/>
-      <point x="292" y="502"/>
-      <point x="302" y="511"/>
-      <point x="302" y="523" type="curve" smooth="yes"/>
-      <point x="302" y="535"/>
-      <point x="292" y="544"/>
-      <point x="281" y="544" type="curve" smooth="yes"/>
-      <point x="271" y="544"/>
-      <point x="261" y="535"/>
-      <point x="261" y="523" type="curve" smooth="yes"/>
-      <point x="261" y="511"/>
-      <point x="271" y="502"/>
+      <point x="60" y="322" type="line"/>
+      <point x="520" y="322" type="line"/>
+      <point x="520" y="339" type="line"/>
+      <point x="60" y="339" type="line"/>
     </contour>
     <contour>
       <point x="281" y="118" type="curve" smooth="yes"/>
@@ -32,10 +24,18 @@
       <point x="271" y="118"/>
     </contour>
     <contour>
-      <point x="60" y="322" type="line"/>
-      <point x="520" y="322" type="line"/>
-      <point x="520" y="339" type="line"/>
-      <point x="60" y="339" type="line"/>
+      <point x="281" y="502" type="curve" smooth="yes"/>
+      <point x="292" y="502"/>
+      <point x="302" y="511"/>
+      <point x="302" y="523" type="curve" smooth="yes"/>
+      <point x="302" y="535"/>
+      <point x="292" y="544"/>
+      <point x="281" y="544" type="curve" smooth="yes"/>
+      <point x="271" y="544"/>
+      <point x="261" y="535"/>
+      <point x="261" y="523" type="curve" smooth="yes"/>
+      <point x="261" y="511"/>
+      <point x="271" y="502"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/dollar.glif b/src/Cantarell-Light.ufo/glyphs/dollar.glif
index e3b1dd9e..9355ddf4 100644
--- a/src/Cantarell-Light.ufo/glyphs/dollar.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dollar.glif
@@ -37,18 +37,18 @@
       <point x="148" y="16"/>
       <point x="220" y="-1"/>
     </contour>
-    <contour>
-      <point x="292" y="677" type="line"/>
-      <point x="310" y="677" type="line"/>
-      <point x="310" y="813" type="line"/>
-      <point x="292" y="813" type="line"/>
-    </contour>
     <contour>
       <point x="292" y="-120" type="line"/>
       <point x="310" y="-120" type="line"/>
       <point x="310" y="9" type="line"/>
       <point x="292" y="9" type="line"/>
     </contour>
+    <contour>
+      <point x="292" y="677" type="line"/>
+      <point x="310" y="677" type="line"/>
+      <point x="310" y="813" type="line"/>
+      <point x="292" y="813" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/dong.glif b/src/Cantarell-Light.ufo/glyphs/dong.glif
index 7315937e..e98b9815 100644
--- a/src/Cantarell-Light.ufo/glyphs/dong.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dong.glif
@@ -3,19 +3,6 @@
   <advance width="580"/>
   <unicode hex="20AB"/>
   <outline>
-    <contour>
-      <point x="125" y="-117" type="line"/>
-      <point x="498" y="-117" type="line"/>
-      <point x="498" y="-100" type="line"/>
-      <point x="125" y="-100" type="line"/>
-    </contour>
-    <contour>
-      <point x="442" y="0" type="line"/>
-      <point x="458" y="0" type="line"/>
-      <point x="458" y="739" type="line"/>
-      <point x="439" y="739" type="line"/>
-      <point x="439" y="64" type="line"/>
-    </contour>
     <contour>
       <point x="284" y="-10" type="curve" smooth="yes"/>
       <point x="353" y="-10"/>
@@ -44,6 +31,19 @@
       <point x="78" y="90"/>
       <point x="160" y="-10"/>
     </contour>
+    <contour>
+      <point x="125" y="-117" type="line"/>
+      <point x="498" y="-117" type="line"/>
+      <point x="498" y="-100" type="line"/>
+      <point x="125" y="-100" type="line"/>
+    </contour>
+    <contour>
+      <point x="442" y="0" type="line"/>
+      <point x="458" y="0" type="line"/>
+      <point x="458" y="739" type="line"/>
+      <point x="439" y="739" type="line"/>
+      <point x="439" y="64" type="line"/>
+    </contour>
     <contour>
       <point x="293" y="584" type="line"/>
       <point x="515" y="584" type="line"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/ef-cy.glif b/src/Cantarell-Light.ufo/glyphs/ef-cy.glif
index 6c57b219..c233f8ed 100644
--- a/src/Cantarell-Light.ufo/glyphs/ef-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ef-cy.glif
@@ -1,69 +1,69 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ef-cy" format="2">
-  <advance width="759"/>
+  <advance width="777"/>
   <unicode hex="0444"/>
   <outline>
     <contour>
-      <point x="370" y="-217" type="line"/>
-      <point x="389" y="-217" type="line"/>
-      <point x="389" y="739" type="line"/>
-      <point x="370" y="739" type="line"/>
+      <point x="532" y="-5" type="curve" smooth="yes"/>
+      <point x="638" y="-5"/>
+      <point x="711" y="96"/>
+      <point x="711" y="242" type="curve" smooth="yes"/>
+      <point x="711" y="384"/>
+      <point x="639" y="482"/>
+      <point x="534" y="482" type="curve" smooth="yes"/>
+      <point x="467" y="482"/>
+      <point x="413" y="442"/>
+      <point x="385" y="371" type="curve"/>
+      <point x="389" y="351" type="line"/>
+      <point x="414" y="422"/>
+      <point x="466" y="464"/>
+      <point x="529" y="464" type="curve" smooth="yes"/>
+      <point x="625" y="464"/>
+      <point x="690" y="374"/>
+      <point x="690" y="239" type="curve" smooth="yes"/>
+      <point x="690" y="104"/>
+      <point x="627" y="13"/>
+      <point x="533" y="13" type="curve" smooth="yes"/>
+      <point x="469" y="13"/>
+      <point x="415" y="57"/>
+      <point x="390" y="131" type="curve"/>
+      <point x="386" y="101" type="line"/>
+      <point x="415" y="32"/>
+      <point x="467" y="-5"/>
     </contour>
     <contour>
-      <point x="236" y="-5" type="curve" smooth="yes"/>
-      <point x="295" y="-5"/>
-      <point x="346" y="29"/>
-      <point x="376" y="90" type="curve"/>
-      <point x="372" y="111" type="line"/>
-      <point x="345" y="49"/>
-      <point x="296" y="13"/>
-      <point x="239" y="13" type="curve" smooth="yes"/>
-      <point x="143" y="13"/>
-      <point x="78" y="106"/>
-      <point x="78" y="241" type="curve" smooth="yes"/>
-      <point x="78" y="374"/>
-      <point x="142" y="464"/>
-      <point x="235" y="464" type="curve" smooth="yes"/>
-      <point x="294" y="464"/>
-      <point x="345" y="427"/>
-      <point x="372" y="363" type="curve"/>
-      <point x="377" y="392" type="line"/>
-      <point x="347" y="451"/>
-      <point x="298" y="482"/>
-      <point x="238" y="482" type="curve" smooth="yes"/>
-      <point x="131" y="482"/>
-      <point x="57" y="382"/>
-      <point x="57" y="239" type="curve" smooth="yes"/>
-      <point x="57" y="95"/>
-      <point x="131" y="-5"/>
+      <point x="245" y="-5" type="curve" smooth="yes"/>
+      <point x="304" y="-5"/>
+      <point x="355" y="29"/>
+      <point x="385" y="90" type="curve"/>
+      <point x="381" y="111" type="line"/>
+      <point x="354" y="49"/>
+      <point x="305" y="13"/>
+      <point x="248" y="13" type="curve" smooth="yes"/>
+      <point x="152" y="13"/>
+      <point x="87" y="106"/>
+      <point x="87" y="241" type="curve" smooth="yes"/>
+      <point x="87" y="374"/>
+      <point x="151" y="464"/>
+      <point x="244" y="464" type="curve" smooth="yes"/>
+      <point x="303" y="464"/>
+      <point x="354" y="427"/>
+      <point x="381" y="363" type="curve"/>
+      <point x="386" y="392" type="line"/>
+      <point x="356" y="451"/>
+      <point x="307" y="482"/>
+      <point x="247" y="482" type="curve" smooth="yes"/>
+      <point x="140" y="482"/>
+      <point x="66" y="382"/>
+      <point x="66" y="239" type="curve" smooth="yes"/>
+      <point x="66" y="95"/>
+      <point x="140" y="-5"/>
     </contour>
     <contour>
-      <point x="523" y="-5" type="curve" smooth="yes"/>
-      <point x="629" y="-5"/>
-      <point x="702" y="96"/>
-      <point x="702" y="242" type="curve" smooth="yes"/>
-      <point x="702" y="384"/>
-      <point x="630" y="482"/>
-      <point x="525" y="482" type="curve" smooth="yes"/>
-      <point x="458" y="482"/>
-      <point x="404" y="442"/>
-      <point x="376" y="371" type="curve"/>
-      <point x="380" y="351" type="line"/>
-      <point x="405" y="422"/>
-      <point x="457" y="464"/>
-      <point x="520" y="464" type="curve" smooth="yes"/>
-      <point x="616" y="464"/>
-      <point x="681" y="374"/>
-      <point x="681" y="239" type="curve" smooth="yes"/>
-      <point x="681" y="104"/>
-      <point x="618" y="13"/>
-      <point x="524" y="13" type="curve" smooth="yes"/>
-      <point x="460" y="13"/>
-      <point x="406" y="57"/>
-      <point x="381" y="131" type="curve"/>
-      <point x="377" y="101" type="line"/>
-      <point x="406" y="32"/>
-      <point x="458" y="-5"/>
+      <point x="379" y="-217" type="line"/>
+      <point x="398" y="-217" type="line"/>
+      <point x="398" y="739" type="line"/>
+      <point x="379" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/emptyset.glif b/src/Cantarell-Light.ufo/glyphs/emptyset.glif
index 59fdb971..49c40a7c 100644
--- a/src/Cantarell-Light.ufo/glyphs/emptyset.glif
+++ b/src/Cantarell-Light.ufo/glyphs/emptyset.glif
@@ -3,6 +3,12 @@
   <advance width="744"/>
   <unicode hex="2205"/>
   <outline>
+    <contour>
+      <point x="177" y="48" type="line"/>
+      <point x="581" y="647" type="line"/>
+      <point x="567" y="657" type="line"/>
+      <point x="163" y="58" type="line"/>
+    </contour>
     <contour>
       <point x="371" y="74" type="curve" smooth="yes"/>
       <point x="533" y="74"/>
@@ -31,11 +37,5 @@
       <point x="621" y="191"/>
       <point x="522" y="92"/>
     </contour>
-    <contour>
-      <point x="177" y="48" type="line"/>
-      <point x="581" y="647" type="line"/>
-      <point x="567" y="657" type="line"/>
-      <point x="163" y="58" type="line"/>
-    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/eng.glif b/src/Cantarell-Light.ufo/glyphs/eng.glif
index 85285524..81071d52 100644
--- a/src/Cantarell-Light.ufo/glyphs/eng.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eng.glif
@@ -1,44 +1,44 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eng" format="2">
-  <advance width="525"/>
+  <advance width="550"/>
   <unicode hex="014B"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="109" y="0" type="line"/>
-      <point x="109" y="399" type="line"/>
-      <point x="105" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="437" y="0" type="line"/>
+      <point x="458" y="0" type="line"/>
+      <point x="458" y="314" type="line" smooth="yes"/>
+      <point x="458" y="421"/>
+      <point x="398" y="486"/>
+      <point x="292" y="486" type="curve" smooth="yes"/>
+      <point x="216" y="486"/>
+      <point x="146" y="454"/>
+      <point x="105" y="399" type="curve"/>
+      <point x="114" y="388" type="line"/>
+      <point x="148" y="436"/>
+      <point x="218" y="468"/>
+      <point x="289" y="468" type="curve" smooth="yes"/>
+      <point x="384" y="468"/>
+      <point x="437" y="411"/>
+      <point x="437" y="314" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="425" y="0" type="line"/>
-      <point x="446" y="0" type="line"/>
-      <point x="446" y="314" type="line" smooth="yes"/>
-      <point x="446" y="421"/>
-      <point x="386" y="486"/>
-      <point x="280" y="486" type="curve" smooth="yes"/>
-      <point x="204" y="486"/>
-      <point x="134" y="454"/>
-      <point x="93" y="399" type="curve"/>
-      <point x="102" y="388" type="line"/>
-      <point x="136" y="436"/>
-      <point x="206" y="468"/>
-      <point x="277" y="468" type="curve" smooth="yes"/>
-      <point x="372" y="468"/>
-      <point x="425" y="411"/>
-      <point x="425" y="314" type="curve" smooth="yes"/>
+      <point x="352" y="-217" type="line"/>
+      <point x="416" y="-187"/>
+      <point x="458" y="-110"/>
+      <point x="458" y="-23" type="curve" smooth="yes"/>
+      <point x="458" y="0" type="line"/>
+      <point x="437" y="0" type="line"/>
+      <point x="437" y="-35" type="line" smooth="yes"/>
+      <point x="437" y="-104"/>
+      <point x="401" y="-173"/>
+      <point x="347" y="-207" type="curve"/>
     </contour>
     <contour>
-      <point x="340" y="-217" type="line"/>
-      <point x="404" y="-187"/>
-      <point x="446" y="-110"/>
-      <point x="446" y="-23" type="curve" smooth="yes"/>
-      <point x="446" y="0" type="line"/>
-      <point x="425" y="0" type="line"/>
-      <point x="425" y="-35" type="line" smooth="yes"/>
-      <point x="425" y="-104"/>
-      <point x="389" y="-173"/>
-      <point x="335" y="-207" type="curve"/>
+      <point x="100" y="0" type="line"/>
+      <point x="121" y="0" type="line"/>
+      <point x="121" y="399" type="line"/>
+      <point x="117" y="480" type="line"/>
+      <point x="100" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/euro.glif b/src/Cantarell-Light.ufo/glyphs/euro.glif
index 807afb93..d30200b9 100644
--- a/src/Cantarell-Light.ufo/glyphs/euro.glif
+++ b/src/Cantarell-Light.ufo/glyphs/euro.glif
@@ -3,18 +3,6 @@
   <advance width="580"/>
   <unicode hex="20AC"/>
   <outline>
-    <contour>
-      <point x="25" y="418" type="line"/>
-      <point x="493" y="418" type="line"/>
-      <point x="493" y="435" type="line"/>
-      <point x="25" y="435" type="line"/>
-    </contour>
-    <contour>
-      <point x="25" y="261" type="line"/>
-      <point x="473" y="261" type="line"/>
-      <point x="473" y="278" type="line"/>
-      <point x="25" y="278" type="line"/>
-    </contour>
     <contour>
       <point x="382" y="-10" type="curve" smooth="yes"/>
       <point x="439" y="-10"/>
@@ -43,6 +31,18 @@
       <point x="100" y="129"/>
       <point x="214" y="-10"/>
     </contour>
+    <contour>
+      <point x="25" y="261" type="line"/>
+      <point x="473" y="261" type="line"/>
+      <point x="473" y="278" type="line"/>
+      <point x="25" y="278" type="line"/>
+    </contour>
+    <contour>
+      <point x="25" y="418" type="line"/>
+      <point x="493" y="418" type="line"/>
+      <point x="493" y="435" type="line"/>
+      <point x="25" y="435" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/florin.glif b/src/Cantarell-Light.ufo/glyphs/florin.glif
index 55d44d1e..3dd13bfb 100644
--- a/src/Cantarell-Light.ufo/glyphs/florin.glif
+++ b/src/Cantarell-Light.ufo/glyphs/florin.glif
@@ -21,12 +21,6 @@
       <point x="240" y="702"/>
       <point x="240" y="631" type="curve" smooth="yes"/>
     </contour>
-    <contour>
-      <point x="163" y="463" type="line"/>
-      <point x="414" y="463" type="line"/>
-      <point x="414" y="480" type="line"/>
-      <point x="163" y="480" type="line"/>
-    </contour>
     <contour>
       <point x="154" y="-217" type="line"/>
       <point x="218" y="-187"/>
@@ -39,6 +33,12 @@
       <point x="203" y="-173"/>
       <point x="149" y="-207" type="curve"/>
     </contour>
+    <contour>
+      <point x="163" y="463" type="line"/>
+      <point x="414" y="463" type="line"/>
+      <point x="414" y="480" type="line"/>
+      <point x="163" y="480" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/franc.glif b/src/Cantarell-Light.ufo/glyphs/franc.glif
index f61f4943..292a3042 100644
--- a/src/Cantarell-Light.ufo/glyphs/franc.glif
+++ b/src/Cantarell-Light.ufo/glyphs/franc.glif
@@ -3,12 +3,6 @@
   <advance width="580"/>
   <unicode hex="20A3"/>
   <outline>
-    <contour>
-      <point x="68" y="209" type="line"/>
-      <point x="314" y="209" type="line"/>
-      <point x="314" y="226" type="line"/>
-      <point x="68" y="226" type="line"/>
-    </contour>
     <contour>
       <point x="153" y="0" type="line"/>
       <point x="175" y="0" type="line"/>
@@ -21,6 +15,12 @@
       <point x="498" y="694" type="line"/>
       <point x="153" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="68" y="209" type="line"/>
+      <point x="314" y="209" type="line"/>
+      <point x="314" y="226" type="line"/>
+      <point x="68" y="226" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif
index f68c5f9c..4888aceb 100644
--- a/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ghemiddlehook-cy.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="ghemiddlehook-cy" format="2">
-  <advance width="506"/>
+  <advance width="518"/>
   <unicode hex="0495"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="109" y="0" type="line"/>
-      <point x="109" y="463" type="line"/>
-      <point x="387" y="463" type="line"/>
-      <point x="387" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="231" y="-217" type="line"/>
+      <point x="374" y="-210"/>
+      <point x="476" y="-98"/>
+      <point x="476" y="63" type="curve" smooth="yes"/>
+      <point x="476" y="198"/>
+      <point x="399" y="283"/>
+      <point x="275" y="283" type="curve" smooth="yes"/>
+      <point x="210" y="283"/>
+      <point x="146" y="259"/>
+      <point x="107" y="220" type="curve"/>
+      <point x="116" y="209" type="line"/>
+      <point x="149" y="242"/>
+      <point x="213" y="265"/>
+      <point x="273" y="265" type="curve" smooth="yes"/>
+      <point x="384" y="265"/>
+      <point x="455" y="186"/>
+      <point x="455" y="60" type="curve" smooth="yes"/>
+      <point x="455" y="-87"/>
+      <point x="360" y="-193"/>
+      <point x="228" y="-206" type="curve"/>
     </contour>
     <contour>
-      <point x="95" y="220" type="curve"/>
-      <point x="104" y="209" type="line"/>
-      <point x="137" y="242"/>
-      <point x="201" y="265"/>
-      <point x="261" y="265" type="curve" smooth="yes"/>
-      <point x="372" y="265"/>
-      <point x="443" y="186"/>
-      <point x="443" y="60" type="curve" smooth="yes"/>
-      <point x="443" y="-87"/>
-      <point x="348" y="-193"/>
-      <point x="216" y="-206" type="curve"/>
-      <point x="219" y="-217" type="line"/>
-      <point x="362" y="-210"/>
-      <point x="464" y="-98"/>
-      <point x="464" y="63" type="curve" smooth="yes"/>
-      <point x="464" y="198"/>
-      <point x="387" y="283"/>
-      <point x="263" y="283" type="curve" smooth="yes"/>
-      <point x="198" y="283"/>
-      <point x="134" y="259"/>
+      <point x="100" y="0" type="line"/>
+      <point x="121" y="0" type="line"/>
+      <point x="121" y="463" type="line"/>
+      <point x="399" y="463" type="line"/>
+      <point x="399" y="480" type="line"/>
+      <point x="100" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/h.glif b/src/Cantarell-Light.ufo/glyphs/h.glif
index 752ac4fd..e30f6c4a 100644
--- a/src/Cantarell-Light.ufo/glyphs/h.glif
+++ b/src/Cantarell-Light.ufo/glyphs/h.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="h" format="2">
-  <advance width="525"/>
+  <advance width="550"/>
   <unicode hex="0068"/>
   <note>
 h
 </note>
-  <anchor x="266" y="0" name="bottom"/>
-  <anchor x="143" y="592" name="center"/>
-  <anchor x="286" y="739" name="top"/>
+  <anchor x="278" y="0" name="bottom"/>
+  <anchor x="155" y="592" name="center"/>
+  <anchor x="298" y="739" name="top"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="108" y="0" type="line"/>
-      <point x="108" y="739" type="line"/>
-      <point x="88" y="739" type="line"/>
+      <point x="437" y="0" type="line"/>
+      <point x="458" y="0" type="line"/>
+      <point x="458" y="314" type="line" smooth="yes"/>
+      <point x="458" y="421"/>
+      <point x="397" y="486"/>
+      <point x="295" y="486" type="curve" smooth="yes"/>
+      <point x="222" y="486"/>
+      <point x="152" y="452"/>
+      <point x="105" y="394" type="curve"/>
+      <point x="114" y="383" type="line"/>
+      <point x="157" y="436"/>
+      <point x="223" y="468"/>
+      <point x="291" y="468" type="curve" smooth="yes"/>
+      <point x="383" y="468"/>
+      <point x="437" y="411"/>
+      <point x="437" y="314" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="425" y="0" type="line"/>
-      <point x="446" y="0" type="line"/>
-      <point x="446" y="314" type="line" smooth="yes"/>
-      <point x="446" y="421"/>
-      <point x="385" y="486"/>
-      <point x="283" y="486" type="curve" smooth="yes"/>
-      <point x="210" y="486"/>
-      <point x="140" y="452"/>
-      <point x="93" y="394" type="curve"/>
-      <point x="102" y="383" type="line"/>
-      <point x="145" y="436"/>
-      <point x="211" y="468"/>
-      <point x="279" y="468" type="curve" smooth="yes"/>
-      <point x="371" y="468"/>
-      <point x="425" y="411"/>
-      <point x="425" y="314" type="curve" smooth="yes"/>
+      <point x="100" y="0" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="120" y="739" type="line"/>
+      <point x="100" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/hryvnia.glif b/src/Cantarell-Light.ufo/glyphs/hryvnia.glif
index 7b8b5bec..bcfd5f24 100644
--- a/src/Cantarell-Light.ufo/glyphs/hryvnia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hryvnia.glif
@@ -4,13 +4,6 @@
   <unicode hex="20B4"/>
   <outline>
     <contour>
-      <point x="167" y="273" type="curve"/>
-      <point x="138" y="273" type="line"/>
-      <point x="117" y="246"/>
-      <point x="108" y="212"/>
-      <point x="108" y="173" type="curve" smooth="yes"/>
-      <point x="108" y="62"/>
-      <point x="187" y="-10"/>
       <point x="306" y="-10" type="curve" smooth="yes"/>
       <point x="367" y="-10"/>
       <point x="432" y="8"/>
@@ -24,12 +17,13 @@
       <point x="130" y="174" type="curve" smooth="yes"/>
       <point x="130" y="213"/>
       <point x="142" y="247"/>
-    </contour>
-    <contour>
-      <point x="25" y="418" type="line"/>
-      <point x="555" y="418" type="line"/>
-      <point x="555" y="435" type="line"/>
-      <point x="25" y="435" type="line"/>
+      <point x="167" y="273" type="curve"/>
+      <point x="138" y="273" type="line"/>
+      <point x="117" y="246"/>
+      <point x="108" y="212"/>
+      <point x="108" y="173" type="curve" smooth="yes"/>
+      <point x="108" y="62"/>
+      <point x="187" y="-10"/>
     </contour>
     <contour>
       <point x="25" y="261" type="line"/>
@@ -37,6 +31,12 @@
       <point x="555" y="278" type="line"/>
       <point x="25" y="278" type="line"/>
     </contour>
+    <contour>
+      <point x="25" y="418" type="line"/>
+      <point x="555" y="418" type="line"/>
+      <point x="555" y="435" type="line"/>
+      <point x="25" y="435" type="line"/>
+    </contour>
     <contour>
       <point x="407" y="428" type="curve"/>
       <point x="439" y="428" type="line"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/hungarumlautcomb.case.glif 
b/src/Cantarell-Light.ufo/glyphs/hungarumlautcomb.case.glif
index c34bde6a..7b2843be 100644
--- a/src/Cantarell-Light.ufo/glyphs/hungarumlautcomb.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/hungarumlautcomb.case.glif
@@ -3,18 +3,18 @@
   <anchor x="172" y="694" name="_top"/>
   <anchor x="172" y="926" name="top"/>
   <outline>
-    <contour>
-      <point x="59" y="772" type="line"/>
-      <point x="182" y="895" type="line"/>
-      <point x="166" y="911" type="line"/>
-      <point x="53" y="777" type="line"/>
-    </contour>
     <contour>
       <point x="239" y="772" type="line"/>
       <point x="362" y="895" type="line"/>
       <point x="346" y="911" type="line"/>
       <point x="233" y="777" type="line"/>
     </contour>
+    <contour>
+      <point x="59" y="772" type="line"/>
+      <point x="182" y="895" type="line"/>
+      <point x="166" y="911" type="line"/>
+      <point x="53" y="777" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/k.glif b/src/Cantarell-Light.ufo/glyphs/k.glif
index eab4a729..004ad29b 100644
--- a/src/Cantarell-Light.ufo/glyphs/k.glif
+++ b/src/Cantarell-Light.ufo/glyphs/k.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="k" format="2">
-  <advance width="432"/>
+  <advance width="444"/>
   <unicode hex="006B"/>
   <note>
 k
 </note>
-  <anchor x="205" y="0" name="bottom"/>
-  <anchor x="185" y="739" name="top"/>
+  <anchor x="217" y="0" name="bottom"/>
+  <anchor x="197" y="739" name="top"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="108" y="0" type="line"/>
-      <point x="108" y="739" type="line"/>
-      <point x="88" y="739" type="line"/>
+      <point x="408" y="0" type="line"/>
+      <point x="437" y="0" type="line"/>
+      <point x="141" y="267" type="line"/>
+      <point x="139" y="249" type="line"/>
+      <point x="415" y="480" type="line"/>
+      <point x="388" y="480" type="line"/>
+      <point x="122" y="257" type="line"/>
     </contour>
     <contour>
-      <point x="396" y="0" type="line"/>
-      <point x="425" y="0" type="line"/>
-      <point x="129" y="267" type="line"/>
-      <point x="127" y="249" type="line"/>
-      <point x="403" y="480" type="line"/>
-      <point x="376" y="480" type="line"/>
-      <point x="110" y="257" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="120" y="739" type="line"/>
+      <point x="100" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif 
b/src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif
index 87b3325b..fc6446b0 100644
--- a/src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kabashkir-cy.glif
@@ -3,12 +3,6 @@
   <advance width="554"/>
   <unicode hex="04A1"/>
   <outline>
-    <contour>
-      <point x="12" y="463" type="line"/>
-      <point x="220" y="463" type="line"/>
-      <point x="220" y="480" type="line"/>
-      <point x="12" y="480" type="line"/>
-    </contour>
     <contour>
       <point x="514" y="0" type="line"/>
       <point x="538" y="0" type="line"/>
@@ -30,6 +24,12 @@
       <point x="352" y="262" type="line"/>
       <point x="209" y="262" type="line"/>
     </contour>
+    <contour>
+      <point x="12" y="463" type="line"/>
+      <point x="220" y="463" type="line"/>
+      <point x="220" y="480" type="line"/>
+      <point x="12" y="480" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif 
b/src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif
index c6bf340e..90ae0687 100644
--- a/src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kgreenlandic.glif
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kgreenlandic" format="2">
-  <advance width="432"/>
+  <advance width="444"/>
   <unicode hex="0138"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="108" y="0" type="line"/>
-      <point x="108" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="408" y="0" type="line"/>
+      <point x="437" y="0" type="line"/>
+      <point x="141" y="267" type="line"/>
+      <point x="139" y="249" type="line"/>
+      <point x="415" y="480" type="line"/>
+      <point x="388" y="480" type="line"/>
+      <point x="122" y="257" type="line"/>
     </contour>
     <contour>
-      <point x="396" y="0" type="line"/>
-      <point x="425" y="0" type="line"/>
-      <point x="129" y="267" type="line"/>
-      <point x="127" y="249" type="line"/>
-      <point x="403" y="480" type="line"/>
-      <point x="376" y="480" type="line"/>
-      <point x="110" y="257" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="120" y="0" type="line"/>
+      <point x="120" y="480" type="line"/>
+      <point x="100" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/kip.glif b/src/Cantarell-Light.ufo/glyphs/kip.glif
index 77c12c95..0316c2eb 100644
--- a/src/Cantarell-Light.ufo/glyphs/kip.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kip.glif
@@ -3,12 +3,6 @@
   <advance width="580"/>
   <unicode hex="20AD"/>
   <outline>
-    <contour>
-      <point x="73" y="351" type="line"/>
-      <point x="482" y="351" type="line"/>
-      <point x="482" y="368" type="line"/>
-      <point x="73" y="368" type="line"/>
-    </contour>
     <contour>
       <point x="479" y="0" type="line"/>
       <point x="508" y="0" type="line"/>
@@ -24,6 +18,12 @@
       <point x="168" y="694" type="line"/>
       <point x="148" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="73" y="351" type="line"/>
+      <point x="482" y="351" type="line"/>
+      <point x="482" y="368" type="line"/>
+      <point x="73" y="368" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/lira.glif b/src/Cantarell-Light.ufo/glyphs/lira.glif
index 576cea3e..b05bc404 100644
--- a/src/Cantarell-Light.ufo/glyphs/lira.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lira.glif
@@ -30,18 +30,18 @@
       <point x="128" y="40"/>
       <point x="69" y="17" type="curve"/>
     </contour>
-    <contour>
-      <point x="81" y="418" type="line"/>
-      <point x="425" y="418" type="line"/>
-      <point x="425" y="435" type="line"/>
-      <point x="81" y="435" type="line"/>
-    </contour>
     <contour>
       <point x="81" y="261" type="line"/>
       <point x="425" y="261" type="line"/>
       <point x="425" y="278" type="line"/>
       <point x="81" y="278" type="line"/>
     </contour>
+    <contour>
+      <point x="81" y="418" type="line"/>
+      <point x="425" y="418" type="line"/>
+      <point x="425" y="435" type="line"/>
+      <point x="81" y="435" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/liraT_urkish.glif 
b/src/Cantarell-Light.ufo/glyphs/liraT_urkish.glif
index f14af80c..46913880 100644
--- a/src/Cantarell-Light.ufo/glyphs/liraT_urkish.glif
+++ b/src/Cantarell-Light.ufo/glyphs/liraT_urkish.glif
@@ -16,18 +16,18 @@
       <point x="174" y="694" type="line"/>
       <point x="154" y="694" type="line"/>
     </contour>
-    <contour>
-      <point x="87" y="428" type="line"/>
-      <point x="371" y="586" type="line"/>
-      <point x="362" y="602" type="line"/>
-      <point x="80" y="443" type="line"/>
-    </contour>
     <contour>
       <point x="103" y="270" type="line"/>
       <point x="366" y="418" type="line"/>
       <point x="356" y="433" type="line"/>
       <point x="95" y="284" type="line"/>
     </contour>
+    <contour>
+      <point x="87" y="428" type="line"/>
+      <point x="371" y="586" type="line"/>
+      <point x="362" y="602" type="line"/>
+      <point x="80" y="443" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/lje-cy.glif b/src/Cantarell-Light.ufo/glyphs/lje-cy.glif
index bc07cfd0..d6b811b8 100644
--- a/src/Cantarell-Light.ufo/glyphs/lje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lje-cy.glif
@@ -3,26 +3,6 @@
   <advance width="816"/>
   <unicode hex="0459"/>
   <outline>
-    <contour>
-      <point x="443" y="0" type="line"/>
-      <point x="595" y="0" type="line" smooth="yes"/>
-      <point x="706" y="0"/>
-      <point x="773" y="56"/>
-      <point x="773" y="150" type="curve" smooth="yes"/>
-      <point x="773" y="241"/>
-      <point x="712" y="301"/>
-      <point x="621" y="301" type="curve" smooth="yes"/>
-      <point x="446" y="301" type="line"/>
-      <point x="446" y="284" type="line"/>
-      <point x="614" y="284" type="line" smooth="yes"/>
-      <point x="695" y="284"/>
-      <point x="751" y="228"/>
-      <point x="751" y="145" type="curve" smooth="yes"/>
-      <point x="751" y="65"/>
-      <point x="696" y="17"/>
-      <point x="604" y="17" type="curve" smooth="yes"/>
-      <point x="443" y="17" type="line"/>
-    </contour>
     <contour>
       <point x="74" y="-7" type="curve" smooth="yes"/>
       <point x="140" y="-7"/>
@@ -45,6 +25,26 @@
       <point x="33" y="1"/>
       <point x="54" y="-7"/>
     </contour>
+    <contour>
+      <point x="443" y="0" type="line"/>
+      <point x="595" y="0" type="line" smooth="yes"/>
+      <point x="706" y="0"/>
+      <point x="773" y="56"/>
+      <point x="773" y="150" type="curve" smooth="yes"/>
+      <point x="773" y="241"/>
+      <point x="712" y="301"/>
+      <point x="621" y="301" type="curve" smooth="yes"/>
+      <point x="446" y="301" type="line"/>
+      <point x="446" y="284" type="line"/>
+      <point x="614" y="284" type="line" smooth="yes"/>
+      <point x="695" y="284"/>
+      <point x="751" y="228"/>
+      <point x="751" y="145" type="curve" smooth="yes"/>
+      <point x="751" y="65"/>
+      <point x="696" y="17"/>
+      <point x="604" y="17" type="curve" smooth="yes"/>
+      <point x="443" y="17" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/logicalnot.glif b/src/Cantarell-Light.ufo/glyphs/logicalnot.glif
index e4c2d0c6..07834db6 100644
--- a/src/Cantarell-Light.ufo/glyphs/logicalnot.glif
+++ b/src/Cantarell-Light.ufo/glyphs/logicalnot.glif
@@ -3,18 +3,18 @@
   <advance width="580"/>
   <unicode hex="00AC"/>
   <outline>
-    <contour>
-      <point x="502" y="101" type="line"/>
-      <point x="520" y="101" type="line"/>
-      <point x="520" y="333" type="line"/>
-      <point x="502" y="333" type="line"/>
-    </contour>
     <contour>
       <point x="60" y="322" type="line"/>
       <point x="520" y="322" type="line"/>
       <point x="520" y="339" type="line"/>
       <point x="60" y="339" type="line"/>
     </contour>
+    <contour>
+      <point x="502" y="101" type="line"/>
+      <point x="520" y="101" type="line"/>
+      <point x="520" y="333" type="line"/>
+      <point x="502" y="333" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/m.glif b/src/Cantarell-Light.ufo/glyphs/m.glif
index 968a394e..5d5e93bb 100644
--- a/src/Cantarell-Light.ufo/glyphs/m.glif
+++ b/src/Cantarell-Light.ufo/glyphs/m.glif
@@ -1,55 +1,55 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="m" format="2">
-  <advance width="842"/>
+  <advance width="867"/>
   <unicode hex="006D"/>
   <note>
 m
 </note>
-  <anchor x="433" y="0" name="bottom"/>
-  <anchor x="433" y="480" name="top"/>
+  <anchor x="445" y="0" name="bottom"/>
+  <anchor x="445" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="109" y="0" type="line"/>
-      <point x="109" y="404" type="line"/>
-      <point x="105" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="754" y="0" type="line"/>
+      <point x="775" y="0" type="line"/>
+      <point x="775" y="314" type="line" smooth="yes"/>
+      <point x="775" y="424"/>
+      <point x="714" y="486"/>
+      <point x="615" y="486" type="curve" smooth="yes"/>
+      <point x="545" y="486"/>
+      <point x="477" y="454"/>
+      <point x="429" y="399" type="curve"/>
+      <point x="435" y="386" type="line"/>
+      <point x="481" y="437"/>
+      <point x="546" y="468"/>
+      <point x="611" y="468" type="curve" smooth="yes"/>
+      <point x="700" y="468"/>
+      <point x="754" y="411"/>
+      <point x="754" y="314" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="415" y="0" type="line"/>
-      <point x="436" y="0" type="line"/>
-      <point x="436" y="314" type="line" smooth="yes"/>
-      <point x="436" y="424"/>
-      <point x="375" y="486"/>
-      <point x="277" y="486" type="curve" smooth="yes"/>
-      <point x="207" y="486"/>
-      <point x="139" y="456"/>
-      <point x="92" y="404" type="curve"/>
-      <point x="100" y="393" type="line"/>
-      <point x="145" y="440"/>
-      <point x="209" y="468"/>
-      <point x="273" y="468" type="curve" smooth="yes"/>
-      <point x="361" y="468"/>
-      <point x="415" y="411"/>
-      <point x="415" y="314" type="curve" smooth="yes"/>
+      <point x="100" y="0" type="line"/>
+      <point x="121" y="0" type="line"/>
+      <point x="121" y="404" type="line"/>
+      <point x="117" y="480" type="line"/>
+      <point x="100" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="742" y="0" type="line"/>
-      <point x="763" y="0" type="line"/>
-      <point x="763" y="314" type="line" smooth="yes"/>
-      <point x="763" y="424"/>
-      <point x="702" y="486"/>
-      <point x="603" y="486" type="curve" smooth="yes"/>
-      <point x="533" y="486"/>
-      <point x="465" y="454"/>
-      <point x="417" y="399" type="curve"/>
-      <point x="423" y="386" type="line"/>
-      <point x="469" y="437"/>
-      <point x="534" y="468"/>
-      <point x="599" y="468" type="curve" smooth="yes"/>
-      <point x="688" y="468"/>
-      <point x="742" y="411"/>
-      <point x="742" y="314" type="curve" smooth="yes"/>
+      <point x="427" y="0" type="line"/>
+      <point x="448" y="0" type="line"/>
+      <point x="448" y="314" type="line" smooth="yes"/>
+      <point x="448" y="424"/>
+      <point x="387" y="486"/>
+      <point x="289" y="486" type="curve" smooth="yes"/>
+      <point x="219" y="486"/>
+      <point x="151" y="456"/>
+      <point x="104" y="404" type="curve"/>
+      <point x="112" y="393" type="line"/>
+      <point x="157" y="440"/>
+      <point x="221" y="468"/>
+      <point x="285" y="468" type="curve" smooth="yes"/>
+      <point x="373" y="468"/>
+      <point x="427" y="411"/>
+      <point x="427" y="314" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/micro.glif b/src/Cantarell-Light.ufo/glyphs/micro.glif
index cd7b57a6..d2fccfef 100644
--- a/src/Cantarell-Light.ufo/glyphs/micro.glif
+++ b/src/Cantarell-Light.ufo/glyphs/micro.glif
@@ -1,36 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="micro" format="2">
-  <advance width="527"/>
+  <advance width="551"/>
   <unicode hex="00B5"/>
   <outline>
     <contour>
-      <point x="247" y="-6" type="curve" smooth="yes"/>
-      <point x="323" y="-6"/>
-      <point x="390" y="31"/>
-      <point x="434" y="96" type="curve"/>
-      <point x="427" y="107" type="line"/>
-      <point x="384" y="46"/>
-      <point x="321" y="12"/>
-      <point x="252" y="12" type="curve" smooth="yes"/>
-      <point x="161" y="12"/>
-      <point x="108" y="69"/>
-      <point x="108" y="166" type="curve"/>
-      <point x="88" y="184" type="line"/>
-      <point x="88" y="55"/>
-      <point x="151" y="-6"/>
+      <point x="100" y="-217" type="line"/>
+      <point x="120" y="-217" type="line"/>
+      <point x="120" y="482" type="line"/>
+      <point x="100" y="482" type="line"/>
     </contour>
     <contour>
-      <point x="88" y="-217" type="line"/>
-      <point x="108" y="-217" type="line"/>
-      <point x="108" y="482" type="line"/>
-      <point x="88" y="482" type="line"/>
+      <point x="259" y="-6" type="curve" smooth="yes"/>
+      <point x="335" y="-6"/>
+      <point x="402" y="31"/>
+      <point x="446" y="96" type="curve"/>
+      <point x="439" y="107" type="line"/>
+      <point x="396" y="46"/>
+      <point x="333" y="12"/>
+      <point x="264" y="12" type="curve" smooth="yes"/>
+      <point x="173" y="12"/>
+      <point x="120" y="69"/>
+      <point x="120" y="166" type="curve"/>
+      <point x="100" y="184" type="line"/>
+      <point x="100" y="55"/>
+      <point x="163" y="-6"/>
     </contour>
     <contour>
-      <point x="422" y="0" type="line"/>
-      <point x="439" y="0" type="line"/>
-      <point x="439" y="480" type="line"/>
-      <point x="418" y="480" type="line"/>
-      <point x="418" y="76" type="line"/>
+      <point x="434" y="0" type="line"/>
+      <point x="451" y="0" type="line"/>
+      <point x="451" y="480" type="line"/>
+      <point x="430" y="480" type="line"/>
+      <point x="430" y="76" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/multiply.glif b/src/Cantarell-Light.ufo/glyphs/multiply.glif
index 274d6882..b4858eb5 100644
--- a/src/Cantarell-Light.ufo/glyphs/multiply.glif
+++ b/src/Cantarell-Light.ufo/glyphs/multiply.glif
@@ -4,16 +4,16 @@
   <unicode hex="00D7"/>
   <outline>
     <contour>
-      <point x="121" y="487" type="line"/>
+      <point x="133" y="162" type="line"/>
+      <point x="121" y="174" type="line"/>
+      <point x="447" y="499" type="line"/>
+      <point x="459" y="487" type="line"/>
+    </contour>
+    <contour>
       <point x="447" y="162" type="line"/>
       <point x="459" y="174" type="line"/>
       <point x="133" y="499" type="line"/>
-    </contour>
-    <contour>
-      <point x="133" y="162" type="line"/>
-      <point x="459" y="487" type="line"/>
-      <point x="447" y="499" type="line"/>
-      <point x="121" y="174" type="line"/>
+      <point x="121" y="487" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/n.glif b/src/Cantarell-Light.ufo/glyphs/n.glif
index 8569e0f2..539693f4 100644
--- a/src/Cantarell-Light.ufo/glyphs/n.glif
+++ b/src/Cantarell-Light.ufo/glyphs/n.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="n" format="2">
-  <advance width="525"/>
+  <advance width="550"/>
   <unicode hex="006E"/>
   <note>
 n
 </note>
-  <anchor x="266" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
+  <anchor x="278" y="0" name="bottom"/>
+  <anchor x="274" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="109" y="0" type="line"/>
-      <point x="109" y="399" type="line"/>
-      <point x="105" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="437" y="0" type="line"/>
+      <point x="458" y="0" type="line"/>
+      <point x="458" y="314" type="line" smooth="yes"/>
+      <point x="458" y="421"/>
+      <point x="398" y="486"/>
+      <point x="292" y="486" type="curve" smooth="yes"/>
+      <point x="216" y="486"/>
+      <point x="146" y="454"/>
+      <point x="105" y="399" type="curve"/>
+      <point x="114" y="388" type="line"/>
+      <point x="148" y="436"/>
+      <point x="218" y="468"/>
+      <point x="289" y="468" type="curve" smooth="yes"/>
+      <point x="384" y="468"/>
+      <point x="437" y="411"/>
+      <point x="437" y="314" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="425" y="0" type="line"/>
-      <point x="446" y="0" type="line"/>
-      <point x="446" y="314" type="line" smooth="yes"/>
-      <point x="446" y="421"/>
-      <point x="386" y="486"/>
-      <point x="280" y="486" type="curve" smooth="yes"/>
-      <point x="204" y="486"/>
-      <point x="134" y="454"/>
-      <point x="93" y="399" type="curve"/>
-      <point x="102" y="388" type="line"/>
-      <point x="136" y="436"/>
-      <point x="206" y="468"/>
-      <point x="277" y="468" type="curve" smooth="yes"/>
-      <point x="372" y="468"/>
-      <point x="425" y="411"/>
-      <point x="425" y="314" type="curve" smooth="yes"/>
+      <point x="100" y="0" type="line"/>
+      <point x="121" y="0" type="line"/>
+      <point x="121" y="399" type="line"/>
+      <point x="117" y="480" type="line"/>
+      <point x="100" y="480" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/naira.glif b/src/Cantarell-Light.ufo/glyphs/naira.glif
index f37bc3a7..d6110a40 100644
--- a/src/Cantarell-Light.ufo/glyphs/naira.glif
+++ b/src/Cantarell-Light.ufo/glyphs/naira.glif
@@ -3,30 +3,6 @@
   <advance width="580"/>
   <unicode hex="20A6"/>
   <outline>
-    <contour>
-      <point x="455" y="435" type="line"/>
-      <point x="455" y="418" type="line"/>
-      <point x="549" y="418" type="line"/>
-      <point x="549" y="435" type="line"/>
-    </contour>
-    <contour>
-      <point x="455" y="278" type="line"/>
-      <point x="455" y="261" type="line"/>
-      <point x="549" y="261" type="line"/>
-      <point x="549" y="278" type="line"/>
-    </contour>
-    <contour>
-      <point x="127" y="261" type="line"/>
-      <point x="127" y="278" type="line"/>
-      <point x="33" y="278" type="line"/>
-      <point x="33" y="261" type="line"/>
-    </contour>
-    <contour>
-      <point x="127" y="418" type="line"/>
-      <point x="127" y="435" type="line"/>
-      <point x="33" y="435" type="line"/>
-      <point x="33" y="418" type="line"/>
-    </contour>
     <contour>
       <point x="118" y="0" type="line"/>
       <point x="137" y="0" type="line"/>
@@ -41,6 +17,30 @@
       <point x="144" y="694" type="line"/>
       <point x="118" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="33" y="261" type="line"/>
+      <point x="127" y="261" type="line"/>
+      <point x="127" y="278" type="line"/>
+      <point x="33" y="278" type="line"/>
+    </contour>
+    <contour>
+      <point x="33" y="418" type="line"/>
+      <point x="127" y="418" type="line"/>
+      <point x="127" y="435" type="line"/>
+      <point x="33" y="435" type="line"/>
+    </contour>
+    <contour>
+      <point x="455" y="261" type="line"/>
+      <point x="549" y="261" type="line"/>
+      <point x="549" y="278" type="line"/>
+      <point x="455" y="278" type="line"/>
+    </contour>
+    <contour>
+      <point x="455" y="418" type="line"/>
+      <point x="549" y="418" type="line"/>
+      <point x="549" y="435" type="line"/>
+      <point x="455" y="435" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/nine.dnom.glif b/src/Cantarell-Light.ufo/glyphs/nine.dnom.glif
index d12d5ef7..3242d91e 100644
--- a/src/Cantarell-Light.ufo/glyphs/nine.dnom.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nine.dnom.glif
@@ -6,6 +6,12 @@ nine
 </note>
   <outline>
     <contour>
+      <point x="155" y="-6" type="curve" smooth="yes"/>
+      <point x="270" y="-6"/>
+      <point x="333" y="76"/>
+      <point x="333" y="224" type="curve" smooth="yes"/>
+      <point x="333" y="348"/>
+      <point x="279" y="422"/>
       <point x="186" y="422" type="curve" smooth="yes"/>
       <point x="109" y="422"/>
       <point x="53" y="369"/>
@@ -38,12 +44,6 @@ nine
       <point x="62" y="17" type="line"/>
       <point x="94" y="1"/>
       <point x="121" y="-6"/>
-      <point x="155" y="-6" type="curve" smooth="yes"/>
-      <point x="270" y="-6"/>
-      <point x="333" y="76"/>
-      <point x="333" y="224" type="curve" smooth="yes"/>
-      <point x="333" y="348"/>
-      <point x="279" y="422"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/nine.osf.glif b/src/Cantarell-Light.ufo/glyphs/nine.osf.glif
index 78db8a4a..1a68817e 100644
--- a/src/Cantarell-Light.ufo/glyphs/nine.osf.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nine.osf.glif
@@ -3,6 +3,12 @@
   <advance width="546"/>
   <outline>
     <contour>
+      <point x="208" y="-110" type="curve" smooth="yes"/>
+      <point x="387" y="-110"/>
+      <point x="482" y="24"/>
+      <point x="482" y="275" type="curve" smooth="yes"/>
+      <point x="482" y="481"/>
+      <point x="398" y="604"/>
       <point x="254" y="604" type="curve" smooth="yes"/>
       <point x="134" y="604"/>
       <point x="52" y="517"/>
@@ -35,12 +41,6 @@
       <point x="64" y="-73" type="line"/>
       <point x="105" y="-97"/>
       <point x="154" y="-110"/>
-      <point x="208" y="-110" type="curve" smooth="yes"/>
-      <point x="387" y="-110"/>
-      <point x="482" y="24"/>
-      <point x="482" y="275" type="curve" smooth="yes"/>
-      <point x="482" y="481"/>
-      <point x="398" y="604"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/nje-cy.glif b/src/Cantarell-Light.ufo/glyphs/nje-cy.glif
index 3affec07..7923b07c 100644
--- a/src/Cantarell-Light.ufo/glyphs/nje-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nje-cy.glif
@@ -1,45 +1,45 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nje-cy" format="2">
-  <advance width="805"/>
+  <advance width="817"/>
   <unicode hex="045A"/>
   <outline>
     <contour>
-      <point x="420" y="0" type="line"/>
-      <point x="441" y="0" type="line"/>
-      <point x="441" y="480" type="line"/>
-      <point x="420" y="480" type="line"/>
+      <point x="444" y="0" type="line"/>
+      <point x="596" y="0" type="line" smooth="yes"/>
+      <point x="707" y="0"/>
+      <point x="774" y="56"/>
+      <point x="774" y="150" type="curve" smooth="yes"/>
+      <point x="774" y="241"/>
+      <point x="713" y="301"/>
+      <point x="622" y="301" type="curve" smooth="yes"/>
+      <point x="447" y="301" type="line"/>
+      <point x="447" y="284" type="line"/>
+      <point x="615" y="284" type="line" smooth="yes"/>
+      <point x="696" y="284"/>
+      <point x="752" y="228"/>
+      <point x="752" y="145" type="curve" smooth="yes"/>
+      <point x="752" y="65"/>
+      <point x="697" y="17"/>
+      <point x="605" y="17" type="curve" smooth="yes"/>
+      <point x="444" y="17" type="line"/>
     </contour>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="109" y="0" type="line"/>
-      <point x="109" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="121" y="0" type="line"/>
+      <point x="121" y="480" type="line"/>
+      <point x="100" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="100" y="245" type="line"/>
-      <point x="428" y="245" type="line"/>
-      <point x="428" y="262" type="line"/>
-      <point x="100" y="262" type="line"/>
+      <point x="112" y="245" type="line"/>
+      <point x="440" y="245" type="line"/>
+      <point x="440" y="262" type="line"/>
+      <point x="112" y="262" type="line"/>
     </contour>
     <contour>
       <point x="432" y="0" type="line"/>
-      <point x="584" y="0" type="line" smooth="yes"/>
-      <point x="695" y="0"/>
-      <point x="762" y="56"/>
-      <point x="762" y="150" type="curve" smooth="yes"/>
-      <point x="762" y="241"/>
-      <point x="701" y="301"/>
-      <point x="610" y="301" type="curve" smooth="yes"/>
-      <point x="435" y="301" type="line"/>
-      <point x="435" y="284" type="line"/>
-      <point x="603" y="284" type="line" smooth="yes"/>
-      <point x="684" y="284"/>
-      <point x="740" y="228"/>
-      <point x="740" y="145" type="curve" smooth="yes"/>
-      <point x="740" y="65"/>
-      <point x="685" y="17"/>
-      <point x="593" y="17" type="curve" smooth="yes"/>
-      <point x="432" y="17" type="line"/>
+      <point x="453" y="0" type="line"/>
+      <point x="453" y="480" type="line"/>
+      <point x="432" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/notequal.glif b/src/Cantarell-Light.ufo/glyphs/notequal.glif
index c09e0f2d..199adc38 100644
--- a/src/Cantarell-Light.ufo/glyphs/notequal.glif
+++ b/src/Cantarell-Light.ufo/glyphs/notequal.glif
@@ -9,18 +9,18 @@
       <point x="406" y="568" type="line"/>
       <point x="169" y="85" type="line"/>
     </contour>
-    <contour>
-      <point x="60" y="436" type="line"/>
-      <point x="520" y="436" type="line"/>
-      <point x="520" y="453" type="line"/>
-      <point x="60" y="453" type="line"/>
-    </contour>
     <contour>
       <point x="60" y="193" type="line"/>
       <point x="520" y="193" type="line"/>
       <point x="520" y="210" type="line"/>
       <point x="60" y="210" type="line"/>
     </contour>
+    <contour>
+      <point x="60" y="436" type="line"/>
+      <point x="520" y="436" type="line"/>
+      <point x="520" y="453" type="line"/>
+      <point x="60" y="453" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/notidentical.glif 
b/src/Cantarell-Light.ufo/glyphs/notidentical.glif
index 43eabb95..da6ac24d 100644
--- a/src/Cantarell-Light.ufo/glyphs/notidentical.glif
+++ b/src/Cantarell-Light.ufo/glyphs/notidentical.glif
@@ -9,12 +9,6 @@
       <point x="429" y="616" type="line"/>
       <point x="146" y="72" type="line"/>
     </contour>
-    <contour>
-      <point x="60" y="502" type="line"/>
-      <point x="520" y="502" type="line"/>
-      <point x="520" y="519" type="line"/>
-      <point x="60" y="519" type="line"/>
-    </contour>
     <contour>
       <point x="60" y="158" type="line"/>
       <point x="520" y="158" type="line"/>
@@ -27,6 +21,12 @@
       <point x="520" y="347" type="line"/>
       <point x="60" y="347" type="line"/>
     </contour>
+    <contour>
+      <point x="60" y="502" type="line"/>
+      <point x="520" y="502" type="line"/>
+      <point x="520" y="519" type="line"/>
+      <point x="60" y="519" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/oslash.glif b/src/Cantarell-Light.ufo/glyphs/oslash.glif
index b4670491..41634aa2 100644
--- a/src/Cantarell-Light.ufo/glyphs/oslash.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oslash.glif
@@ -1,42 +1,42 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="oslash" format="2">
-  <advance width="535"/>
+  <advance width="553"/>
   <unicode hex="00F8"/>
-  <anchor x="268" y="480" name="top"/>
+  <anchor x="277" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="268" y="-10" type="curve" smooth="yes"/>
-      <point x="393" y="-10"/>
-      <point x="478" y="90"/>
-      <point x="478" y="240" type="curve" smooth="yes"/>
-      <point x="478" y="389"/>
-      <point x="394" y="486"/>
-      <point x="270" y="486" type="curve" smooth="yes"/>
-      <point x="142" y="486"/>
-      <point x="57" y="386"/>
-      <point x="57" y="237" type="curve" smooth="yes"/>
-      <point x="57" y="89"/>
-      <point x="141" y="-10"/>
+      <point x="98" y="-42" type="line"/>
+      <point x="465" y="505" type="line"/>
+      <point x="454" y="513" type="line"/>
+      <point x="87" y="-34" type="line"/>
     </contour>
     <contour>
-      <point x="270" y="8" type="curve" smooth="yes"/>
-      <point x="153" y="8"/>
-      <point x="78" y="101"/>
-      <point x="78" y="239" type="curve" smooth="yes"/>
-      <point x="78" y="374"/>
-      <point x="150" y="468"/>
-      <point x="265" y="468" type="curve" smooth="yes"/>
-      <point x="381" y="468"/>
-      <point x="457" y="378"/>
-      <point x="457" y="237" type="curve" smooth="yes"/>
-      <point x="457" y="97"/>
-      <point x="382" y="8"/>
+      <point x="277" y="-10" type="curve" smooth="yes"/>
+      <point x="402" y="-10"/>
+      <point x="487" y="90"/>
+      <point x="487" y="240" type="curve" smooth="yes"/>
+      <point x="487" y="389"/>
+      <point x="403" y="486"/>
+      <point x="279" y="486" type="curve" smooth="yes"/>
+      <point x="151" y="486"/>
+      <point x="66" y="386"/>
+      <point x="66" y="237" type="curve" smooth="yes"/>
+      <point x="66" y="89"/>
+      <point x="150" y="-10"/>
     </contour>
     <contour>
-      <point x="89" y="-42" type="line"/>
-      <point x="456" y="505" type="line"/>
-      <point x="445" y="513" type="line"/>
-      <point x="78" y="-34" type="line"/>
+      <point x="279" y="8" type="curve" smooth="yes"/>
+      <point x="162" y="8"/>
+      <point x="87" y="101"/>
+      <point x="87" y="239" type="curve" smooth="yes"/>
+      <point x="87" y="374"/>
+      <point x="159" y="468"/>
+      <point x="274" y="468" type="curve" smooth="yes"/>
+      <point x="390" y="468"/>
+      <point x="466" y="378"/>
+      <point x="466" y="237" type="curve" smooth="yes"/>
+      <point x="466" y="97"/>
+      <point x="391" y="8"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/p.glif b/src/Cantarell-Light.ufo/glyphs/p.glif
index 8acb4158..526b7680 100644
--- a/src/Cantarell-Light.ufo/glyphs/p.glif
+++ b/src/Cantarell-Light.ufo/glyphs/p.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="p" format="2">
-  <advance width="535"/>
+  <advance width="556"/>
   <unicode hex="0070"/>
   <note>
 p
 </note>
-  <anchor x="259" y="0" name="bottom"/>
-  <anchor x="259" y="480" name="top"/>
+  <anchor x="271" y="0" name="bottom"/>
+  <anchor x="271" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="88" y="-217" type="line"/>
-      <point x="108" y="-217" type="line"/>
-      <point x="108" y="406" type="line"/>
-      <point x="103" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="280" y="-10" type="curve" smooth="yes"/>
+      <point x="405" y="-10"/>
+      <point x="490" y="90"/>
+      <point x="490" y="240" type="curve" smooth="yes"/>
+      <point x="490" y="389"/>
+      <point x="406" y="486"/>
+      <point x="282" y="486" type="curve" smooth="yes"/>
+      <point x="199" y="486"/>
+      <point x="139" y="444"/>
+      <point x="106" y="375" type="curve"/>
+      <point x="110" y="355" type="line"/>
+      <point x="140" y="425"/>
+      <point x="198" y="468"/>
+      <point x="277" y="468" type="curve" smooth="yes"/>
+      <point x="393" y="468"/>
+      <point x="469" y="378"/>
+      <point x="469" y="237" type="curve" smooth="yes"/>
+      <point x="469" y="97"/>
+      <point x="394" y="8"/>
+      <point x="282" y="8" type="curve" smooth="yes"/>
+      <point x="202" y="8"/>
+      <point x="141" y="53"/>
+      <point x="111" y="126" type="curve"/>
+      <point x="108" y="96" type="line"/>
+      <point x="141" y="29"/>
+      <point x="200" y="-10"/>
     </contour>
     <contour>
-      <point x="268" y="-10" type="curve" smooth="yes"/>
-      <point x="393" y="-10"/>
-      <point x="478" y="90"/>
-      <point x="478" y="240" type="curve" smooth="yes"/>
-      <point x="478" y="389"/>
-      <point x="394" y="486"/>
-      <point x="270" y="486" type="curve" smooth="yes"/>
-      <point x="187" y="486"/>
-      <point x="127" y="444"/>
-      <point x="94" y="375" type="curve"/>
-      <point x="98" y="355" type="line"/>
-      <point x="128" y="425"/>
-      <point x="186" y="468"/>
-      <point x="265" y="468" type="curve" smooth="yes"/>
-      <point x="381" y="468"/>
-      <point x="457" y="378"/>
-      <point x="457" y="237" type="curve" smooth="yes"/>
-      <point x="457" y="97"/>
-      <point x="382" y="8"/>
-      <point x="270" y="8" type="curve" smooth="yes"/>
-      <point x="190" y="8"/>
-      <point x="129" y="53"/>
-      <point x="99" y="126" type="curve"/>
-      <point x="96" y="96" type="line"/>
-      <point x="129" y="29"/>
-      <point x="188" y="-10"/>
+      <point x="100" y="-217" type="line"/>
+      <point x="120" y="-217" type="line"/>
+      <point x="120" y="406" type="line"/>
+      <point x="115" y="480" type="line"/>
+      <point x="100" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/peseta.glif b/src/Cantarell-Light.ufo/glyphs/peseta.glif
index d3d8484b..9cc267e3 100644
--- a/src/Cantarell-Light.ufo/glyphs/peseta.glif
+++ b/src/Cantarell-Light.ufo/glyphs/peseta.glif
@@ -3,18 +3,6 @@
   <advance width="580"/>
   <unicode hex="20A7"/>
   <outline>
-    <contour>
-      <point x="449" y="473" type="line"/>
-      <point x="449" y="456" type="line"/>
-      <point x="543" y="456" type="line"/>
-      <point x="543" y="473" type="line"/>
-    </contour>
-    <contour>
-      <point x="141" y="456" type="line"/>
-      <point x="141" y="473" type="line"/>
-      <point x="45" y="473" type="line"/>
-      <point x="45" y="456" type="line"/>
-    </contour>
     <contour>
       <point x="130" y="0" type="line"/>
       <point x="151" y="0" type="line"/>
@@ -28,6 +16,12 @@
       <point x="280" y="694" type="curve" smooth="yes"/>
       <point x="130" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="45" y="456" type="line"/>
+      <point x="141" y="456" type="line"/>
+      <point x="141" y="473" type="line"/>
+      <point x="45" y="473" type="line"/>
+    </contour>
     <contour>
       <point x="151" y="286" type="line"/>
       <point x="151" y="676" type="line"/>
@@ -39,6 +33,12 @@
       <point x="380" y="286"/>
       <point x="280" y="286" type="curve" smooth="yes"/>
     </contour>
+    <contour>
+      <point x="449" y="456" type="line"/>
+      <point x="543" y="456" type="line"/>
+      <point x="543" y="473" type="line"/>
+      <point x="449" y="473" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/peso.glif b/src/Cantarell-Light.ufo/glyphs/peso.glif
index 13d153c1..19a3033b 100644
--- a/src/Cantarell-Light.ufo/glyphs/peso.glif
+++ b/src/Cantarell-Light.ufo/glyphs/peso.glif
@@ -3,18 +3,6 @@
   <advance width="580"/>
   <unicode hex="20B1"/>
   <outline>
-    <contour>
-      <point x="449" y="565" type="line"/>
-      <point x="449" y="548" type="line"/>
-      <point x="533" y="548" type="line"/>
-      <point x="533" y="565" type="line"/>
-    </contour>
-    <contour>
-      <point x="141" y="548" type="line"/>
-      <point x="141" y="565" type="line"/>
-      <point x="45" y="565" type="line"/>
-      <point x="45" y="548" type="line"/>
-    </contour>
     <contour>
       <point x="130" y="0" type="line"/>
       <point x="151" y="0" type="line"/>
@@ -28,6 +16,18 @@
       <point x="280" y="694" type="curve" smooth="yes"/>
       <point x="130" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="45" y="391" type="line"/>
+      <point x="141" y="391" type="line"/>
+      <point x="141" y="408" type="line"/>
+      <point x="45" y="408" type="line"/>
+    </contour>
+    <contour>
+      <point x="45" y="548" type="line"/>
+      <point x="141" y="548" type="line"/>
+      <point x="141" y="565" type="line"/>
+      <point x="45" y="565" type="line"/>
+    </contour>
     <contour>
       <point x="151" y="286" type="line"/>
       <point x="151" y="676" type="line"/>
@@ -40,16 +40,16 @@
       <point x="280" y="286" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="439" y="408" type="line"/>
       <point x="439" y="391" type="line"/>
       <point x="533" y="391" type="line"/>
       <point x="533" y="408" type="line"/>
+      <point x="439" y="408" type="line"/>
     </contour>
     <contour>
-      <point x="141" y="391" type="line"/>
-      <point x="141" y="408" type="line"/>
-      <point x="45" y="408" type="line"/>
-      <point x="45" y="391" type="line"/>
+      <point x="449" y="548" type="line"/>
+      <point x="533" y="548" type="line"/>
+      <point x="533" y="565" type="line"/>
+      <point x="449" y="565" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/plusminus.glif b/src/Cantarell-Light.ufo/glyphs/plusminus.glif
index 508dba39..eaca35e6 100644
--- a/src/Cantarell-Light.ufo/glyphs/plusminus.glif
+++ b/src/Cantarell-Light.ufo/glyphs/plusminus.glif
@@ -3,18 +3,18 @@
   <advance width="580"/>
   <unicode hex="00B1"/>
   <outline>
-    <contour>
-      <point x="60" y="63" type="line"/>
-      <point x="520" y="63" type="line"/>
-      <point x="520" y="80" type="line"/>
-      <point x="60" y="80" type="line"/>
-    </contour>
     <contour>
       <point x="282" y="163" type="line"/>
       <point x="300" y="163" type="line"/>
       <point x="300" y="623" type="line"/>
       <point x="282" y="623" type="line"/>
     </contour>
+    <contour>
+      <point x="60" y="63" type="line"/>
+      <point x="520" y="63" type="line"/>
+      <point x="520" y="80" type="line"/>
+      <point x="60" y="80" type="line"/>
+    </contour>
     <contour>
       <point x="60" y="384" type="line"/>
       <point x="520" y="384" type="line"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/q.glif b/src/Cantarell-Light.ufo/glyphs/q.glif
index 805444ba..40739dd1 100644
--- a/src/Cantarell-Light.ufo/glyphs/q.glif
+++ b/src/Cantarell-Light.ufo/glyphs/q.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="q" format="2">
-  <advance width="536"/>
+  <advance width="557"/>
   <unicode hex="0071"/>
   <note>
 q
 </note>
-  <anchor x="278" y="0" name="bottom"/>
-  <anchor x="278" y="480" name="top"/>
+  <anchor x="287" y="0" name="bottom"/>
+  <anchor x="287" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="428" y="-217" type="line"/>
-      <point x="448" y="-217" type="line"/>
-      <point x="448" y="480" type="line"/>
-      <point x="433" y="480" type="line"/>
-      <point x="428" y="406" type="line"/>
+      <point x="277" y="-10" type="curve" smooth="yes"/>
+      <point x="348" y="-10"/>
+      <point x="405" y="23"/>
+      <point x="441" y="85" type="curve"/>
+      <point x="438" y="106" type="line"/>
+      <point x="406" y="44"/>
+      <point x="350" y="8"/>
+      <point x="279" y="8" type="curve" smooth="yes"/>
+      <point x="162" y="8"/>
+      <point x="87" y="101"/>
+      <point x="87" y="239" type="curve" smooth="yes"/>
+      <point x="87" y="374"/>
+      <point x="159" y="468"/>
+      <point x="274" y="468" type="curve" smooth="yes"/>
+      <point x="348" y="468"/>
+      <point x="406" y="431"/>
+      <point x="438" y="367" type="curve"/>
+      <point x="442" y="396" type="line"/>
+      <point x="408" y="454"/>
+      <point x="352" y="486"/>
+      <point x="279" y="486" type="curve" smooth="yes"/>
+      <point x="151" y="486"/>
+      <point x="66" y="386"/>
+      <point x="66" y="237" type="curve" smooth="yes"/>
+      <point x="66" y="89"/>
+      <point x="150" y="-10"/>
     </contour>
     <contour>
-      <point x="268" y="-10" type="curve" smooth="yes"/>
-      <point x="339" y="-10"/>
-      <point x="396" y="23"/>
-      <point x="432" y="85" type="curve"/>
-      <point x="429" y="106" type="line"/>
-      <point x="397" y="44"/>
-      <point x="341" y="8"/>
-      <point x="270" y="8" type="curve" smooth="yes"/>
-      <point x="153" y="8"/>
-      <point x="78" y="101"/>
-      <point x="78" y="239" type="curve" smooth="yes"/>
-      <point x="78" y="374"/>
-      <point x="150" y="468"/>
-      <point x="265" y="468" type="curve" smooth="yes"/>
-      <point x="339" y="468"/>
-      <point x="397" y="431"/>
-      <point x="429" y="367" type="curve"/>
-      <point x="433" y="396" type="line"/>
-      <point x="399" y="454"/>
-      <point x="343" y="486"/>
-      <point x="270" y="486" type="curve" smooth="yes"/>
-      <point x="142" y="486"/>
-      <point x="57" y="386"/>
-      <point x="57" y="237" type="curve" smooth="yes"/>
-      <point x="57" y="89"/>
-      <point x="141" y="-10"/>
+      <point x="437" y="-217" type="line"/>
+      <point x="457" y="-217" type="line"/>
+      <point x="457" y="480" type="line"/>
+      <point x="442" y="480" type="line"/>
+      <point x="437" y="406" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/r.glif b/src/Cantarell-Light.ufo/glyphs/r.glif
index 28bd7020..e822477e 100644
--- a/src/Cantarell-Light.ufo/glyphs/r.glif
+++ b/src/Cantarell-Light.ufo/glyphs/r.glif
@@ -1,35 +1,35 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="r" format="2">
-  <advance width="321"/>
+  <advance width="333"/>
   <unicode hex="0072"/>
   <note>
 r
 </note>
-  <anchor x="97" y="0" name="bottom"/>
-  <anchor x="189" y="480" name="top"/>
+  <anchor x="109" y="0" name="bottom"/>
+  <anchor x="201" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="109" y="0" type="line"/>
-      <point x="109" y="378" type="line"/>
-      <point x="105" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="121" y="0" type="line"/>
+      <point x="121" y="378" type="line"/>
+      <point x="117" y="480" type="line"/>
+      <point x="100" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="101" y="365" type="line"/>
-      <point x="134" y="426"/>
-      <point x="190" y="462"/>
-      <point x="250" y="462" type="curve" smooth="yes"/>
-      <point x="267" y="462"/>
-      <point x="286" y="459"/>
-      <point x="302" y="453" type="curve"/>
-      <point x="308" y="469" type="line"/>
-      <point x="293" y="476"/>
-      <point x="273" y="480"/>
-      <point x="252" y="480" type="curve" smooth="yes"/>
-      <point x="187" y="480"/>
-      <point x="131" y="446"/>
-      <point x="101" y="388" type="curve"/>
+      <point x="113" y="365" type="line"/>
+      <point x="146" y="426"/>
+      <point x="202" y="462"/>
+      <point x="262" y="462" type="curve" smooth="yes"/>
+      <point x="279" y="462"/>
+      <point x="298" y="459"/>
+      <point x="314" y="453" type="curve"/>
+      <point x="320" y="469" type="line"/>
+      <point x="305" y="476"/>
+      <point x="285" y="480"/>
+      <point x="264" y="480" type="curve" smooth="yes"/>
+      <point x="199" y="480"/>
+      <point x="143" y="446"/>
+      <point x="113" y="388" type="curve"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/registered.glif b/src/Cantarell-Light.ufo/glyphs/registered.glif
index 9c0d919b..43049683 100644
--- a/src/Cantarell-Light.ufo/glyphs/registered.glif
+++ b/src/Cantarell-Light.ufo/glyphs/registered.glif
@@ -17,6 +17,18 @@
       <point x="110" y="372"/>
       <point x="200" y="279"/>
     </contour>
+    <contour>
+      <point x="258" y="380" type="line"/>
+      <point x="279" y="380" type="line"/>
+      <point x="279" y="658" type="line"/>
+      <point x="258" y="658" type="line"/>
+    </contour>
+    <contour>
+      <point x="422" y="380" type="line"/>
+      <point x="447" y="380" type="line"/>
+      <point x="372" y="509" type="line"/>
+      <point x="348" y="509" type="line"/>
+    </contour>
     <contour>
       <point x="339" y="297" type="curve" smooth="yes"/>
       <point x="214" y="297"/>
@@ -31,12 +43,6 @@
       <point x="544" y="383"/>
       <point x="462" y="297"/>
     </contour>
-    <contour>
-      <point x="258" y="380" type="line"/>
-      <point x="279" y="380" type="line"/>
-      <point x="279" y="658" type="line"/>
-      <point x="258" y="658" type="line"/>
-    </contour>
     <contour>
       <point x="271" y="497" type="line"/>
       <point x="337" y="497" type="line" smooth="yes"/>
@@ -57,12 +63,6 @@
       <point x="340" y="514" type="curve" smooth="yes"/>
       <point x="271" y="514" type="line"/>
     </contour>
-    <contour>
-      <point x="422" y="380" type="line"/>
-      <point x="447" y="380" type="line"/>
-      <point x="372" y="509" type="line"/>
-      <point x="348" y="509" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/ruble.glif b/src/Cantarell-Light.ufo/glyphs/ruble.glif
index e6265028..6cdbc9e1 100644
--- a/src/Cantarell-Light.ufo/glyphs/ruble.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ruble.glif
@@ -3,18 +3,6 @@
   <advance width="580"/>
   <unicode hex="20BD"/>
   <outline>
-    <contour>
-      <point x="148" y="0" type="line"/>
-      <point x="169" y="0" type="line"/>
-      <point x="169" y="694" type="line"/>
-      <point x="148" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="65" y="122" type="line"/>
-      <point x="324" y="122" type="line"/>
-      <point x="324" y="139" type="line"/>
-      <point x="65" y="139" type="line"/>
-    </contour>
     <contour>
       <point x="65" y="279" type="line"/>
       <point x="315" y="279" type="line" smooth="yes"/>
@@ -35,6 +23,18 @@
       <point x="320" y="297" type="curve" smooth="yes"/>
       <point x="65" y="297" type="line"/>
     </contour>
+    <contour>
+      <point x="65" y="122" type="line"/>
+      <point x="324" y="122" type="line"/>
+      <point x="324" y="139" type="line"/>
+      <point x="65" y="139" type="line"/>
+    </contour>
+    <contour>
+      <point x="148" y="0" type="line"/>
+      <point x="169" y="0" type="line"/>
+      <point x="169" y="694" type="line"/>
+      <point x="148" y="694" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/thorn.glif b/src/Cantarell-Light.ufo/glyphs/thorn.glif
index 5f84bdcc..0c73f860 100644
--- a/src/Cantarell-Light.ufo/glyphs/thorn.glif
+++ b/src/Cantarell-Light.ufo/glyphs/thorn.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="thorn" format="2">
-  <advance width="535"/>
+  <advance width="556"/>
   <unicode hex="00FE"/>
   <outline>
     <contour>
-      <point x="88" y="-217" type="line"/>
-      <point x="107" y="-217" type="line"/>
-      <point x="107" y="739" type="line"/>
-      <point x="88" y="739" type="line"/>
+      <point x="280" y="-10" type="curve" smooth="yes"/>
+      <point x="405" y="-10"/>
+      <point x="490" y="90"/>
+      <point x="490" y="240" type="curve" smooth="yes"/>
+      <point x="490" y="389"/>
+      <point x="406" y="486"/>
+      <point x="282" y="486" type="curve" smooth="yes"/>
+      <point x="199" y="486"/>
+      <point x="139" y="444"/>
+      <point x="106" y="375" type="curve"/>
+      <point x="110" y="355" type="line"/>
+      <point x="140" y="425"/>
+      <point x="198" y="468"/>
+      <point x="277" y="468" type="curve" smooth="yes"/>
+      <point x="393" y="468"/>
+      <point x="469" y="378"/>
+      <point x="469" y="237" type="curve" smooth="yes"/>
+      <point x="469" y="97"/>
+      <point x="394" y="8"/>
+      <point x="282" y="8" type="curve" smooth="yes"/>
+      <point x="202" y="8"/>
+      <point x="141" y="53"/>
+      <point x="111" y="126" type="curve"/>
+      <point x="108" y="96" type="line"/>
+      <point x="141" y="29"/>
+      <point x="200" y="-10"/>
     </contour>
     <contour>
-      <point x="268" y="-10" type="curve" smooth="yes"/>
-      <point x="393" y="-10"/>
-      <point x="478" y="90"/>
-      <point x="478" y="240" type="curve" smooth="yes"/>
-      <point x="478" y="389"/>
-      <point x="394" y="486"/>
-      <point x="270" y="486" type="curve" smooth="yes"/>
-      <point x="187" y="486"/>
-      <point x="127" y="444"/>
-      <point x="94" y="375" type="curve"/>
-      <point x="98" y="355" type="line"/>
-      <point x="128" y="425"/>
-      <point x="186" y="468"/>
-      <point x="265" y="468" type="curve" smooth="yes"/>
-      <point x="381" y="468"/>
-      <point x="457" y="378"/>
-      <point x="457" y="237" type="curve" smooth="yes"/>
-      <point x="457" y="97"/>
-      <point x="382" y="8"/>
-      <point x="270" y="8" type="curve" smooth="yes"/>
-      <point x="190" y="8"/>
-      <point x="129" y="53"/>
-      <point x="99" y="126" type="curve"/>
-      <point x="96" y="96" type="line"/>
-      <point x="129" y="29"/>
-      <point x="188" y="-10"/>
+      <point x="100" y="-217" type="line"/>
+      <point x="119" y="-217" type="line"/>
+      <point x="119" y="739" type="line"/>
+      <point x="100" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/trademark.glif b/src/Cantarell-Light.ufo/glyphs/trademark.glif
index b1409404..db90b5d2 100644
--- a/src/Cantarell-Light.ufo/glyphs/trademark.glif
+++ b/src/Cantarell-Light.ufo/glyphs/trademark.glif
@@ -3,18 +3,6 @@
   <advance width="793"/>
   <unicode hex="2122"/>
   <outline>
-    <contour>
-      <point x="189" y="382" type="line"/>
-      <point x="207" y="382" type="line"/>
-      <point x="207" y="690" type="line"/>
-      <point x="189" y="690" type="line"/>
-    </contour>
-    <contour>
-      <point x="80" y="679" type="line"/>
-      <point x="316" y="679" type="line"/>
-      <point x="316" y="694" type="line"/>
-      <point x="80" y="694" type="line"/>
-    </contour>
     <contour>
       <point x="359" y="382" type="line"/>
       <point x="376" y="382" type="line"/>
@@ -33,5 +21,17 @@
       <point x="380" y="694" type="line"/>
       <point x="359" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="189" y="382" type="line"/>
+      <point x="207" y="382" type="line"/>
+      <point x="207" y="690" type="line"/>
+      <point x="189" y="690" type="line"/>
+    </contour>
+    <contour>
+      <point x="80" y="679" type="line"/>
+      <point x="316" y="679" type="line"/>
+      <point x="316" y="694" type="line"/>
+      <point x="80" y="694" type="line"/>
+    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tugrik.glif b/src/Cantarell-Light.ufo/glyphs/tugrik.glif
index 9ddd4c27..5ee6808a 100644
--- a/src/Cantarell-Light.ufo/glyphs/tugrik.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tugrik.glif
@@ -4,20 +4,14 @@
   <unicode hex="20AE"/>
   <outline>
     <contour>
-      <point x="85" y="676" type="line"/>
-      <point x="280" y="676" type="line"/>
       <point x="280" y="0" type="line"/>
       <point x="301" y="0" type="line"/>
       <point x="301" y="676" type="line"/>
       <point x="496" y="676" type="line"/>
       <point x="496" y="694" type="line"/>
       <point x="85" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="143" y="339" type="line"/>
-      <point x="442" y="476" type="line"/>
-      <point x="434" y="492" type="line"/>
-      <point x="135" y="354" type="line"/>
+      <point x="85" y="676" type="line"/>
+      <point x="280" y="676" type="line"/>
     </contour>
     <contour>
       <point x="157" y="190" type="line"/>
@@ -25,6 +19,12 @@
       <point x="428" y="333" type="line"/>
       <point x="149" y="205" type="line"/>
     </contour>
+    <contour>
+      <point x="143" y="339" type="line"/>
+      <point x="442" y="476" type="line"/>
+      <point x="434" y="492" type="line"/>
+      <point x="135" y="354" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Light.ufo/glyphs/u.glif b/src/Cantarell-Light.ufo/glyphs/u.glif
index c1e56c65..30f4a351 100644
--- a/src/Cantarell-Light.ufo/glyphs/u.glif
+++ b/src/Cantarell-Light.ufo/glyphs/u.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="u" format="2">
-  <advance width="517"/>
+  <advance width="542"/>
   <unicode hex="0075"/>
   <note>
 u
 </note>
-  <anchor x="248" y="0" name="bottom"/>
-  <anchor x="423" y="10" name="ogonek"/>
-  <anchor x="248" y="480" name="top"/>
-  <anchor x="489" y="480" name="topright"/>
+  <anchor x="261" y="0" name="bottom"/>
+  <anchor x="436" y="10" name="ogonek"/>
+  <anchor x="261" y="480" name="top"/>
+  <anchor x="502" y="480" name="topright"/>
   <outline>
     <contour>
-      <point x="429" y="480" type="line"/>
-      <point x="408" y="480" type="line"/>
-      <point x="408" y="76" type="line"/>
-      <point x="412" y="0" type="line"/>
-      <point x="429" y="0" type="line"/>
+      <point x="253" y="-6" type="curve" smooth="yes"/>
+      <point x="320" y="-6"/>
+      <point x="390" y="25"/>
+      <point x="439" y="76" type="curve"/>
+      <point x="430" y="87" type="line"/>
+      <point x="384" y="40"/>
+      <point x="318" y="12"/>
+      <point x="257" y="12" type="curve" smooth="yes"/>
+      <point x="168" y="12"/>
+      <point x="113" y="69"/>
+      <point x="113" y="166" type="curve" smooth="yes"/>
+      <point x="113" y="480" type="line"/>
+      <point x="92" y="480" type="line"/>
+      <point x="92" y="166" type="line" smooth="yes"/>
+      <point x="92" y="57"/>
+      <point x="155" y="-6"/>
     </contour>
     <contour>
-      <point x="100" y="480" type="line"/>
-      <point x="79" y="480" type="line"/>
-      <point x="79" y="166" type="line" smooth="yes"/>
-      <point x="79" y="57"/>
-      <point x="142" y="-6"/>
-      <point x="240" y="-6" type="curve" smooth="yes"/>
-      <point x="307" y="-6"/>
-      <point x="377" y="25"/>
-      <point x="426" y="76" type="curve"/>
-      <point x="417" y="87" type="line"/>
-      <point x="371" y="40"/>
-      <point x="305" y="12"/>
-      <point x="244" y="12" type="curve" smooth="yes"/>
-      <point x="155" y="12"/>
-      <point x="100" y="69"/>
-      <point x="100" y="166" type="curve" smooth="yes"/>
+      <point x="425" y="0" type="line"/>
+      <point x="442" y="0" type="line"/>
+      <point x="442" y="480" type="line"/>
+      <point x="421" y="480" type="line"/>
+      <point x="421" y="76" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/verticallineabovecomb.glif 
b/src/Cantarell-Light.ufo/glyphs/verticallineabovecomb.glif
index 2693f009..19df39fd 100644
--- a/src/Cantarell-Light.ufo/glyphs/verticallineabovecomb.glif
+++ b/src/Cantarell-Light.ufo/glyphs/verticallineabovecomb.glif
@@ -5,10 +5,10 @@
   <anchor x="110" y="750" name="top"/>
   <outline>
     <contour>
-      <point x="119" y="745" type="line"/>
-      <point x="101" y="745" type="line"/>
       <point x="103" y="561" type="line"/>
       <point x="117" y="561" type="line"/>
+      <point x="119" y="745" type="line"/>
+      <point x="101" y="745" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/won.glif b/src/Cantarell-Light.ufo/glyphs/won.glif
index 8bd6476d..3e565506 100644
--- a/src/Cantarell-Light.ufo/glyphs/won.glif
+++ b/src/Cantarell-Light.ufo/glyphs/won.glif
@@ -21,18 +21,18 @@
       <point x="49" y="694" type="line"/>
       <point x="29" y="694" type="line"/>
     </contour>
-    <contour>
-      <point x="5" y="418" type="line"/>
-      <point x="575" y="418" type="line"/>
-      <point x="575" y="433" type="line"/>
-      <point x="5" y="433" type="line"/>
-    </contour>
     <contour>
       <point x="5" y="261" type="line"/>
       <point x="112" y="261" type="line"/>
       <point x="112" y="278" type="line"/>
       <point x="5" y="278" type="line"/>
     </contour>
+    <contour>
+      <point x="5" y="418" type="line"/>
+      <point x="575" y="418" type="line"/>
+      <point x="575" y="433" type="line"/>
+      <point x="5" y="433" type="line"/>
+    </contour>
     <contour>
       <point x="468" y="261" type="line"/>
       <point x="575" y="261" type="line"/>
diff --git a/src/Cantarell-Light.ufo/glyphs/yeru-cy.glif b/src/Cantarell-Light.ufo/glyphs/yeru-cy.glif
index 7898d812..47df1000 100644
--- a/src/Cantarell-Light.ufo/glyphs/yeru-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yeru-cy.glif
@@ -1,36 +1,36 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="yeru-cy" format="2">
-  <advance width="633"/>
+  <advance width="657"/>
   <unicode hex="044B"/>
-  <anchor x="317" y="480" name="top"/>
+  <anchor x="329" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="524" y="0" type="line"/>
-      <point x="545" y="0" type="line"/>
-      <point x="545" y="480" type="line"/>
-      <point x="524" y="480" type="line"/>
+      <point x="100" y="0" type="line"/>
+      <point x="261" y="0" type="line" smooth="yes"/>
+      <point x="373" y="0"/>
+      <point x="440" y="56"/>
+      <point x="440" y="150" type="curve" smooth="yes"/>
+      <point x="440" y="241"/>
+      <point x="379" y="301"/>
+      <point x="288" y="301" type="curve" smooth="yes"/>
+      <point x="113" y="301" type="line"/>
+      <point x="113" y="284" type="line"/>
+      <point x="280" y="284" type="line" smooth="yes"/>
+      <point x="362" y="284"/>
+      <point x="418" y="228"/>
+      <point x="418" y="145" type="curve" smooth="yes"/>
+      <point x="418" y="65"/>
+      <point x="363" y="17"/>
+      <point x="270" y="17" type="curve" smooth="yes"/>
+      <point x="121" y="17" type="line"/>
+      <point x="121" y="480" type="line"/>
+      <point x="100" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="88" y="0" type="line"/>
-      <point x="249" y="0" type="line" smooth="yes"/>
-      <point x="361" y="0"/>
-      <point x="428" y="56"/>
-      <point x="428" y="150" type="curve" smooth="yes"/>
-      <point x="428" y="241"/>
-      <point x="367" y="301"/>
-      <point x="276" y="301" type="curve" smooth="yes"/>
-      <point x="101" y="301" type="line"/>
-      <point x="101" y="284" type="line"/>
-      <point x="268" y="284" type="line" smooth="yes"/>
-      <point x="350" y="284"/>
-      <point x="406" y="228"/>
-      <point x="406" y="145" type="curve" smooth="yes"/>
-      <point x="406" y="65"/>
-      <point x="351" y="17"/>
-      <point x="258" y="17" type="curve" smooth="yes"/>
-      <point x="109" y="17" type="line"/>
-      <point x="109" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="536" y="0" type="line"/>
+      <point x="557" y="0" type="line"/>
+      <point x="557" y="480" type="line"/>
+      <point x="536" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif b/src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif
index 20150a86..b80c21bc 100644
--- a/src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/yusbig-cy.glif
@@ -4,26 +4,7 @@
   <unicode hex="046B"/>
   <outline>
     <contour>
-      <point x="270" y="269" type="line"/>
-      <point x="292" y="269" type="line"/>
-      <point x="96" y="469" type="line"/>
-      <point x="94" y="464" type="line"/>
-      <point x="489" y="464" type="line"/>
-      <point x="487" y="469" type="line"/>
-      <point x="289" y="270" type="line"/>
-      <point x="310" y="270" type="line"/>
-      <point x="506" y="462" type="line"/>
-      <point x="506" y="480" type="line"/>
-      <point x="77" y="480" type="line"/>
-      <point x="77" y="462" type="line"/>
-    </contour>
-    <contour>
-      <point x="301" y="259" type="line"/>
-      <point x="281" y="259" type="line"/>
-      <point x="281" y="0" type="line"/>
-      <point x="301" y="0" type="line"/>
-    </contour>
-    <contour>
+      <point x="40" y="0" type="curve"/>
       <point x="59" y="0" type="line"/>
       <point x="59" y="174"/>
       <point x="131" y="254"/>
@@ -37,7 +18,26 @@
       <point x="294" y="272" type="curve" smooth="yes"/>
       <point x="120" y="272"/>
       <point x="40" y="187"/>
-      <point x="40" y="0" type="curve"/>
+    </contour>
+    <contour>
+      <point x="281" y="0" type="line"/>
+      <point x="301" y="0" type="line"/>
+      <point x="301" y="259" type="line"/>
+      <point x="281" y="259" type="line"/>
+    </contour>
+    <contour>
+      <point x="270" y="269" type="line"/>
+      <point x="292" y="269" type="line"/>
+      <point x="96" y="469" type="line"/>
+      <point x="94" y="464" type="line"/>
+      <point x="489" y="464" type="line"/>
+      <point x="487" y="469" type="line"/>
+      <point x="289" y="270" type="line"/>
+      <point x="310" y="270" type="line"/>
+      <point x="506" y="462" type="line"/>
+      <point x="506" y="480" type="line"/>
+      <point x="77" y="480" type="line"/>
+      <point x="77" y="462" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/zhe-cy.glif b/src/Cantarell-Light.ufo/glyphs/zhe-cy.glif
index 832aeb1f..cce563d1 100644
--- a/src/Cantarell-Light.ufo/glyphs/zhe-cy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zhe-cy.glif
@@ -5,15 +5,6 @@
   <anchor x="681" y="0" name="bottomright"/>
   <anchor x="345" y="480" name="top"/>
   <outline>
-    <contour>
-      <point x="642" y="0" type="line"/>
-      <point x="668" y="0" type="line"/>
-      <point x="492" y="259" type="line"/>
-      <point x="492" y="251" type="line"/>
-      <point x="658" y="480" type="line"/>
-      <point x="632" y="480" type="line"/>
-      <point x="472" y="254" type="line"/>
-    </contour>
     <contour>
       <point x="21" y="0" type="line"/>
       <point x="46" y="0" type="line"/>
@@ -23,6 +14,12 @@
       <point x="197" y="251" type="line"/>
       <point x="196" y="258" type="line"/>
     </contour>
+    <contour>
+      <point x="334" y="0" type="line"/>
+      <point x="355" y="0" type="line"/>
+      <point x="355" y="480" type="line"/>
+      <point x="334" y="480" type="line"/>
+    </contour>
     <contour>
       <point x="196" y="246" type="line"/>
       <point x="486" y="246" type="line"/>
@@ -30,10 +27,13 @@
       <point x="196" y="263" type="line"/>
     </contour>
     <contour>
-      <point x="334" y="0" type="line"/>
-      <point x="355" y="0" type="line"/>
-      <point x="355" y="480" type="line"/>
-      <point x="334" y="480" type="line"/>
+      <point x="642" y="0" type="line"/>
+      <point x="668" y="0" type="line"/>
+      <point x="492" y="259" type="line"/>
+      <point x="492" y="251" type="line"/>
+      <point x="658" y="480" type="line"/>
+      <point x="632" y="480" type="line"/>
+      <point x="472" y="254" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_E_.glif b/src/Cantarell-Regular.ufo/glyphs/A_E_.glif
index eef80cdd..0c4c61f0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_E_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_E_.glif
@@ -17,18 +17,18 @@
       <point x="476" y="282" type="line"/>
       <point x="200" y="282" type="line"/>
     </contour>
-    <contour>
-      <point x="427" y="0" type="line"/>
-      <point x="510" y="0" type="line"/>
-      <point x="510" y="694" type="line"/>
-      <point x="427" y="694" type="line"/>
-    </contour>
     <contour>
       <point x="467" y="0" type="line"/>
       <point x="863" y="0" type="line"/>
       <point x="863" y="72" type="line"/>
       <point x="467" y="72" type="line"/>
     </contour>
+    <contour>
+      <point x="427" y="0" type="line"/>
+      <point x="510" y="0" type="line"/>
+      <point x="510" y="694" type="line"/>
+      <point x="427" y="694" type="line"/>
+    </contour>
     <contour>
       <point x="467" y="323" type="line"/>
       <point x="836" y="323" type="line"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_-cy.glif
index f01fb0d4..891a85b0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_-cy.glif
@@ -3,12 +3,6 @@
   <advance width="661"/>
   <unicode hex="0404"/>
   <outline>
-    <contour>
-      <point x="75" y="320" type="line"/>
-      <point x="539" y="320" type="line"/>
-      <point x="539" y="388" type="line"/>
-      <point x="75" y="388" type="line"/>
-    </contour>
     <contour>
       <point x="406" y="-10" type="curve" smooth="yes"/>
       <point x="475" y="-10"/>
@@ -37,6 +31,12 @@
       <point x="54" y="130"/>
       <point x="196" y="-10"/>
     </contour>
+    <contour>
+      <point x="75" y="320" type="line"/>
+      <point x="539" y="320" type="line"/>
+      <point x="539" y="388" type="line"/>
+      <point x="75" y="388" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_.glif b/src/Cantarell-Regular.ufo/glyphs/E_.glif
index 9a31af34..2e18ea2e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_.glif
@@ -12,27 +12,17 @@ E
   <outline>
     <contour>
       <point x="92" y="0" type="line"/>
-      <point x="175" y="0" type="line"/>
-      <point x="175" y="694" type="line"/>
-      <point x="92" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="132" y="0" type="line"/>
       <point x="528" y="0" type="line"/>
       <point x="528" y="72" type="line"/>
-      <point x="132" y="72" type="line"/>
-    </contour>
-    <contour>
-      <point x="132" y="323" type="line"/>
+      <point x="175" y="72" type="line"/>
+      <point x="175" y="323" type="line"/>
       <point x="501" y="323" type="line"/>
       <point x="501" y="395" type="line"/>
-      <point x="132" y="395" type="line"/>
-    </contour>
-    <contour>
-      <point x="132" y="622" type="line"/>
+      <point x="175" y="395" type="line"/>
+      <point x="175" y="622" type="line"/>
       <point x="528" y="622" type="line"/>
       <point x="528" y="694" type="line"/>
-      <point x="132" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif b/src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif
index 847788c5..758e7639 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_f-cy.glif
@@ -3,6 +3,12 @@
   <advance width="798"/>
   <unicode hex="0424"/>
   <outline>
+    <contour>
+      <point x="358" y="-20" type="line"/>
+      <point x="439" y="-20" type="line"/>
+      <point x="439" y="714" type="line"/>
+      <point x="358" y="714" type="line"/>
+    </contour>
     <contour>
       <point x="393" y="68" type="curve" smooth="yes"/>
       <point x="621" y="68"/>
@@ -31,11 +37,5 @@
       <point x="670" y="216"/>
       <point x="570" y="141"/>
     </contour>
-    <contour>
-      <point x="358" y="-20" type="line"/>
-      <point x="439" y="-20" type="line"/>
-      <point x="439" y="714" type="line"/>
-      <point x="358" y="714" type="line"/>
-    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_ng.glif b/src/Cantarell-Regular.ufo/glyphs/E_ng.glif
index 278c9323..0db655ae 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_ng.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_ng.glif
@@ -4,10 +4,6 @@
   <unicode hex="014A"/>
   <outline>
     <contour>
-      <point x="92" y="0" type="line"/>
-      <point x="170" y="0" type="line"/>
-      <point x="170" y="605" type="line"/>
-      <point x="153" y="605" type="line"/>
       <point x="587" y="-25" type="line"/>
       <point x="658" y="0" type="line"/>
       <point x="658" y="694" type="line"/>
@@ -16,6 +12,10 @@
       <point x="598" y="87" type="line"/>
       <point x="187" y="694" type="line"/>
       <point x="92" y="694" type="line"/>
+      <point x="92" y="0" type="line"/>
+      <point x="170" y="0" type="line"/>
+      <point x="170" y="605" type="line"/>
+      <point x="153" y="605" type="line"/>
     </contour>
     <contour>
       <point x="535" y="-234" type="line"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/F_.glif b/src/Cantarell-Regular.ufo/glyphs/F_.glif
index b8ca156f..1ad508b5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/F_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/F_.glif
@@ -11,20 +11,14 @@ F
     <contour>
       <point x="92" y="0" type="line"/>
       <point x="175" y="0" type="line"/>
-      <point x="175" y="694" type="line"/>
-      <point x="92" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="124" y="322" type="line"/>
+      <point x="175" y="322" type="line"/>
       <point x="494" y="322" type="line"/>
       <point x="494" y="394" type="line"/>
-      <point x="124" y="394" type="line"/>
-    </contour>
-    <contour>
-      <point x="124" y="622" type="line"/>
+      <point x="175" y="394" type="line"/>
+      <point x="175" y="622" type="line"/>
       <point x="523" y="622" type="line"/>
       <point x="523" y="694" type="line"/>
-      <point x="124" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/H_.glif b/src/Cantarell-Regular.ufo/glyphs/H_.glif
index 8b96614b..83658ebc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/H_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/H_.glif
@@ -11,23 +11,19 @@ H
   <anchor x="3" y="694" name="topleft"/>
   <outline>
     <contour>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="323" type="line"/>
+      <point x="546" y="323" type="line"/>
       <point x="546" y="0" type="line"/>
       <point x="629" y="0" type="line"/>
       <point x="629" y="694" type="line"/>
       <point x="546" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="92" y="0" type="line"/>
-      <point x="175" y="0" type="line"/>
+      <point x="546" y="395" type="line"/>
+      <point x="175" y="395" type="line"/>
       <point x="175" y="694" type="line"/>
       <point x="92" y="694" type="line"/>
     </contour>
-    <contour>
-      <point x="124" y="323" type="line"/>
-      <point x="594" y="323" type="line"/>
-      <point x="594" y="395" type="line"/>
-      <point x="124" y="395" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_abashkir-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/K_abashkir-cy.glif
index 124bc4d3..2ebf4bf5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_abashkir-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_abashkir-cy.glif
@@ -3,12 +3,6 @@
   <advance width="749"/>
   <unicode hex="04A0"/>
   <outline>
-    <contour>
-      <point x="29" y="622" type="line"/>
-      <point x="287" y="622" type="line"/>
-      <point x="287" y="694" type="line"/>
-      <point x="29" y="694" type="line"/>
-    </contour>
     <contour>
       <point x="640" y="0" type="line"/>
       <point x="735" y="0" type="line"/>
@@ -30,6 +24,12 @@
       <point x="443" y="395" type="line"/>
       <point x="238" y="395" type="line"/>
     </contour>
+    <contour>
+      <point x="29" y="622" type="line"/>
+      <point x="287" y="622" type="line"/>
+      <point x="287" y="694" type="line"/>
+      <point x="29" y="694" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_je-cy.glif b/src/Cantarell-Regular.ufo/glyphs/L_je-cy.glif
index b3a7a04f..a388e04a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_je-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_je-cy.glif
@@ -3,26 +3,6 @@
   <advance width="1069"/>
   <unicode hex="0409"/>
   <outline>
-    <contour>
-      <point x="587" y="0" type="line"/>
-      <point x="772" y="0" type="line" smooth="yes"/>
-      <point x="926" y="0"/>
-      <point x="1026" y="85"/>
-      <point x="1026" y="217" type="curve" smooth="yes"/>
-      <point x="1026" y="339"/>
-      <point x="933" y="427"/>
-      <point x="805" y="427" type="curve" smooth="yes"/>
-      <point x="589" y="427" type="line"/>
-      <point x="589" y="355" type="line"/>
-      <point x="796" y="355" type="line" smooth="yes"/>
-      <point x="880" y="355"/>
-      <point x="941" y="290"/>
-      <point x="941" y="200" type="curve" smooth="yes"/>
-      <point x="941" y="115"/>
-      <point x="887" y="72"/>
-      <point x="782" y="72" type="curve" smooth="yes"/>
-      <point x="587" y="72" type="line"/>
-    </contour>
     <contour>
       <point x="117" y="-10" type="curve" smooth="yes"/>
       <point x="219" y="-10"/>
@@ -45,6 +25,26 @@
       <point x="40" y="1"/>
       <point x="80" y="-10"/>
     </contour>
+    <contour>
+      <point x="587" y="0" type="line"/>
+      <point x="772" y="0" type="line" smooth="yes"/>
+      <point x="926" y="0"/>
+      <point x="1026" y="85"/>
+      <point x="1026" y="217" type="curve" smooth="yes"/>
+      <point x="1026" y="339"/>
+      <point x="933" y="427"/>
+      <point x="805" y="427" type="curve" smooth="yes"/>
+      <point x="589" y="427" type="line"/>
+      <point x="589" y="355" type="line"/>
+      <point x="796" y="355" type="line" smooth="yes"/>
+      <point x="880" y="355"/>
+      <point x="941" y="290"/>
+      <point x="941" y="200" type="curve" smooth="yes"/>
+      <point x="941" y="115"/>
+      <point x="887" y="72"/>
+      <point x="782" y="72" type="curve" smooth="yes"/>
+      <point x="587" y="72" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_E_.glif b/src/Cantarell-Regular.ufo/glyphs/O_E_.glif
index 1fc2e4d3..8bda27ce 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_E_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_E_.glif
@@ -33,18 +33,18 @@
       <point x="54" y="127"/>
       <point x="181" y="-7"/>
     </contour>
-    <contour>
-      <point x="505" y="0" type="line"/>
-      <point x="588" y="0" type="line"/>
-      <point x="588" y="694" type="line"/>
-      <point x="505" y="694" type="line"/>
-    </contour>
     <contour>
       <point x="545" y="0" type="line"/>
       <point x="941" y="0" type="line"/>
       <point x="941" y="72" type="line"/>
       <point x="545" y="72" type="line"/>
     </contour>
+    <contour>
+      <point x="505" y="0" type="line"/>
+      <point x="588" y="0" type="line"/>
+      <point x="588" y="694" type="line"/>
+      <point x="505" y="694" type="line"/>
+    </contour>
     <contour>
       <point x="545" y="323" type="line"/>
       <point x="914" y="323" type="line"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/P_.glif b/src/Cantarell-Regular.ufo/glyphs/P_.glif
index 502e1910..181a3579 100644
--- a/src/Cantarell-Regular.ufo/glyphs/P_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/P_.glif
@@ -11,20 +11,7 @@ P
     <contour>
       <point x="92" y="0" type="line"/>
       <point x="175" y="0" type="line"/>
-      <point x="175" y="694" type="line"/>
-      <point x="92" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="145" y="242" type="line"/>
-      <point x="293" y="242" type="line" smooth="yes"/>
-      <point x="448" y="242"/>
-      <point x="552" y="334"/>
-      <point x="552" y="473" type="curve" smooth="yes"/>
-      <point x="552" y="606"/>
-      <point x="454" y="694"/>
-      <point x="308" y="694" type="curve" smooth="yes"/>
-      <point x="145" y="694" type="line"/>
-      <point x="145" y="622" type="line"/>
+      <point x="175" y="622" type="line"/>
       <point x="298" y="622" type="line" smooth="yes"/>
       <point x="399" y="622"/>
       <point x="467" y="556"/>
@@ -33,6 +20,15 @@ P
       <point x="411" y="314"/>
       <point x="308" y="314" type="curve" smooth="yes"/>
       <point x="145" y="314" type="line"/>
+      <point x="145" y="242" type="line"/>
+      <point x="293" y="242" type="line" smooth="yes"/>
+      <point x="448" y="242"/>
+      <point x="552" y="334"/>
+      <point x="552" y="473" type="curve" smooth="yes"/>
+      <point x="552" y="606"/>
+      <point x="454" y="694"/>
+      <point x="308" y="694" type="curve" smooth="yes"/>
+      <point x="92" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Q_.glif b/src/Cantarell-Regular.ufo/glyphs/Q_.glif
index 4ab24a41..598363b9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Q_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Q_.glif
@@ -22,6 +22,12 @@ Q
       <point x="54" y="133"/>
       <point x="181" y="-7"/>
     </contour>
+    <contour>
+      <point x="676" y="-32" type="line"/>
+      <point x="725" y="19" type="line"/>
+      <point x="416" y="309" type="line"/>
+      <point x="371" y="259" type="line"/>
+    </contour>
     <contour>
       <point x="382" y="65" type="curve" smooth="yes"/>
       <point x="236" y="65"/>
@@ -36,12 +42,6 @@ Q
       <point x="621" y="177"/>
       <point x="525" y="65"/>
     </contour>
-    <contour>
-      <point x="676" y="-32" type="line"/>
-      <point x="725" y="19" type="line"/>
-      <point x="416" y="309" type="line"/>
-      <point x="371" y="259" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_.glif b/src/Cantarell-Regular.ufo/glyphs/R_.glif
index a9d6b455..5d08c46e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_.glif
@@ -11,20 +11,7 @@ R
     <contour>
       <point x="92" y="0" type="line"/>
       <point x="175" y="0" type="line"/>
-      <point x="175" y="694" type="line"/>
-      <point x="92" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="145" y="281" type="line"/>
-      <point x="312" y="281" type="line" smooth="yes"/>
-      <point x="456" y="281"/>
-      <point x="554" y="372"/>
-      <point x="554" y="500" type="curve" smooth="yes"/>
-      <point x="554" y="622"/>
-      <point x="464" y="694"/>
-      <point x="322" y="694" type="curve" smooth="yes"/>
-      <point x="145" y="694" type="line"/>
-      <point x="145" y="622" type="line"/>
+      <point x="175" y="622" type="line"/>
       <point x="312" y="622" type="line" smooth="yes"/>
       <point x="411" y="622"/>
       <point x="469" y="571"/>
@@ -33,6 +20,15 @@ R
       <point x="417" y="351"/>
       <point x="322" y="351" type="curve" smooth="yes"/>
       <point x="145" y="351" type="line"/>
+      <point x="145" y="281" type="line"/>
+      <point x="312" y="281" type="line" smooth="yes"/>
+      <point x="456" y="281"/>
+      <point x="554" y="372"/>
+      <point x="554" y="500" type="curve" smooth="yes"/>
+      <point x="554" y="622"/>
+      <point x="464" y="694"/>
+      <point x="322" y="694" type="curve" smooth="yes"/>
+      <point x="92" y="694" type="line"/>
     </contour>
     <contour>
       <point x="495" y="0" type="line"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_chwa.glif b/src/Cantarell-Regular.ufo/glyphs/S_chwa.glif
index 2617aefa..aa19dbe5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_chwa.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_chwa.glif
@@ -6,6 +6,12 @@
   <anchor x="359" y="694" name="top"/>
   <outline>
     <contour>
+      <point x="345" y="-10" type="curve" smooth="yes"/>
+      <point x="536" y="-10"/>
+      <point x="669" y="132"/>
+      <point x="669" y="347" type="curve" smooth="yes"/>
+      <point x="669" y="566"/>
+      <point x="531" y="700"/>
       <point x="312" y="700" type="curve" smooth="yes"/>
       <point x="225" y="700"/>
       <point x="147" y="680"/>
@@ -31,12 +37,6 @@
       <point x="53" y="291" type="curve" smooth="yes"/>
       <point x="53" y="111"/>
       <point x="169" y="-10"/>
-      <point x="345" y="-10" type="curve" smooth="yes"/>
-      <point x="536" y="-10"/>
-      <point x="669" y="132"/>
-      <point x="669" y="347" type="curve" smooth="yes"/>
-      <point x="669" y="566"/>
-      <point x="531" y="700"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_.glif b/src/Cantarell-Regular.ufo/glyphs/T_.glif
index 029db1d9..a4dc830f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_.glif
@@ -12,14 +12,12 @@ T
     <contour>
       <point x="241" y="0" type="line"/>
       <point x="324" y="0" type="line"/>
-      <point x="324" y="660" type="line"/>
-      <point x="241" y="660" type="line"/>
-    </contour>
-    <contour>
-      <point x="10" y="622" type="line"/>
+      <point x="324" y="622" type="line"/>
       <point x="556" y="622" type="line"/>
       <point x="556" y="694" type="line"/>
       <point x="10" y="694" type="line"/>
+      <point x="10" y="622" type="line"/>
+      <point x="241" y="622" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_horn.glif b/src/Cantarell-Regular.ufo/glyphs/T_horn.glif
index 45dcd272..76daca9a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_horn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_horn.glif
@@ -3,12 +3,6 @@
   <advance width="590"/>
   <unicode hex="00DE"/>
   <outline>
-    <contour>
-      <point x="92" y="0" type="line"/>
-      <point x="175" y="0" type="line"/>
-      <point x="175" y="694" type="line"/>
-      <point x="92" y="694" type="line"/>
-    </contour>
     <contour>
       <point x="145" y="139" type="line"/>
       <point x="298" y="139" type="line" smooth="yes"/>
@@ -29,6 +23,12 @@
       <point x="308" y="211" type="curve" smooth="yes"/>
       <point x="145" y="211" type="line"/>
     </contour>
+    <contour>
+      <point x="92" y="0" type="line"/>
+      <point x="175" y="0" type="line"/>
+      <point x="175" y="694" type="line"/>
+      <point x="92" y="694" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Y_usbig-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/Y_usbig-cy.glif
index e130534b..d11c820e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Y_usbig-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Y_usbig-cy.glif
@@ -4,26 +4,7 @@
   <unicode hex="046A"/>
   <outline>
     <contour>
-      <point x="307" y="380" type="line"/>
-      <point x="404" y="380" type="line"/>
-      <point x="177" y="650" type="line"/>
-      <point x="170" y="624" type="line"/>
-      <point x="610" y="624" type="line"/>
-      <point x="600" y="650" type="line"/>
-      <point x="382" y="391" type="line"/>
-      <point x="476" y="391" type="line"/>
-      <point x="674" y="622" type="line"/>
-      <point x="674" y="694" type="line"/>
-      <point x="102" y="694" type="line"/>
-      <point x="102" y="622" type="line"/>
-    </contour>
-    <contour>
-      <point x="430" y="346" type="line"/>
-      <point x="347" y="346" type="line"/>
-      <point x="347" y="0" type="line"/>
-      <point x="430" y="0" type="line"/>
-    </contour>
-    <contour>
+      <point x="43" y="0" type="curve"/>
       <point x="124" y="0" type="line"/>
       <point x="124" y="226"/>
       <point x="206" y="330"/>
@@ -37,7 +18,26 @@
       <point x="392" y="400" type="curve" smooth="yes"/>
       <point x="153" y="400"/>
       <point x="43" y="274"/>
-      <point x="43" y="0" type="curve"/>
+    </contour>
+    <contour>
+      <point x="347" y="0" type="line"/>
+      <point x="430" y="0" type="line"/>
+      <point x="430" y="346" type="line"/>
+      <point x="347" y="346" type="line"/>
+    </contour>
+    <contour>
+      <point x="307" y="380" type="line"/>
+      <point x="404" y="380" type="line"/>
+      <point x="177" y="650" type="line"/>
+      <point x="170" y="624" type="line"/>
+      <point x="610" y="624" type="line"/>
+      <point x="600" y="650" type="line"/>
+      <point x="382" y="391" type="line"/>
+      <point x="476" y="391" type="line"/>
+      <point x="674" y="622" type="line"/>
+      <point x="674" y="694" type="line"/>
+      <point x="102" y="694" type="line"/>
+      <point x="102" y="622" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_he-cy.glif b/src/Cantarell-Regular.ufo/glyphs/Z_he-cy.glif
index c787459a..973c2396 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_he-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_he-cy.glif
@@ -23,17 +23,17 @@
       <point x="253" y="349" type="line"/>
       <point x="251" y="368" type="line"/>
     </contour>
-    <contour>
-      <point x="273" y="323" type="line"/>
-      <point x="653" y="323" type="line"/>
-      <point x="653" y="395" type="line"/>
-      <point x="273" y="395" type="line"/>
-    </contour>
     <contour>
       <point x="430" y="0" type="line"/>
       <point x="513" y="0" type="line"/>
       <point x="513" y="694" type="line"/>
       <point x="430" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="273" y="323" type="line"/>
+      <point x="653" y="323" type="line"/>
+      <point x="653" y="395" type="line"/>
+      <point x="273" y="395" type="line"/>
+    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ae.glif b/src/Cantarell-Regular.ufo/glyphs/ae.glif
index e1e59e83..c3f1657b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ae.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ae.glif
@@ -5,46 +5,6 @@
   <anchor x="418" y="0" name="bottom"/>
   <anchor x="418" y="482" name="top"/>
   <outline>
-    <contour>
-      <point x="362" y="224" type="line"/>
-      <point x="424" y="224" type="line"/>
-      <point x="424" y="326" type="line" smooth="yes"/>
-      <point x="424" y="434"/>
-      <point x="362" y="492"/>
-      <point x="247" y="492" type="curve" smooth="yes"/>
-      <point x="183" y="492"/>
-      <point x="123" y="474"/>
-      <point x="59" y="436" type="curve"/>
-      <point x="77" y="378" type="line"/>
-      <point x="134" y="407"/>
-      <point x="180" y="420"/>
-      <point x="230" y="420" type="curve" smooth="yes"/>
-      <point x="314" y="420"/>
-      <point x="362" y="384"/>
-      <point x="362" y="313" type="curve" smooth="yes"/>
-    </contour>
-    <contour>
-      <point x="208" y="-10" type="curve" smooth="yes"/>
-      <point x="322" y="-10"/>
-      <point x="410" y="62"/>
-      <point x="426" y="169" type="curve"/>
-      <point x="397" y="183" type="line"/>
-      <point x="381" y="108"/>
-      <point x="316" y="60"/>
-      <point x="232" y="60" type="curve" smooth="yes"/>
-      <point x="168" y="60"/>
-      <point x="127" y="89"/>
-      <point x="127" y="134" type="curve" smooth="yes"/>
-      <point x="127" y="196"/>
-      <point x="201" y="219"/>
-      <point x="369" y="219" type="curve"/>
-      <point x="369" y="279" type="line"/>
-      <point x="162" y="279"/>
-      <point x="47" y="225"/>
-      <point x="47" y="120" type="curve" smooth="yes"/>
-      <point x="47" y="42"/>
-      <point x="111" y="-10"/>
-    </contour>
     <contour>
       <point x="607" y="-10" type="curve" smooth="yes"/>
       <point x="661" y="-10"/>
@@ -78,6 +38,46 @@
       <point x="358" y="82"/>
       <point x="451" y="-10"/>
     </contour>
+    <contour>
+      <point x="208" y="-10" type="curve" smooth="yes"/>
+      <point x="322" y="-10"/>
+      <point x="410" y="62"/>
+      <point x="426" y="169" type="curve"/>
+      <point x="397" y="183" type="line"/>
+      <point x="381" y="108"/>
+      <point x="316" y="60"/>
+      <point x="232" y="60" type="curve" smooth="yes"/>
+      <point x="168" y="60"/>
+      <point x="127" y="89"/>
+      <point x="127" y="134" type="curve" smooth="yes"/>
+      <point x="127" y="196"/>
+      <point x="201" y="219"/>
+      <point x="369" y="219" type="curve"/>
+      <point x="369" y="279" type="line"/>
+      <point x="162" y="279"/>
+      <point x="47" y="225"/>
+      <point x="47" y="120" type="curve" smooth="yes"/>
+      <point x="47" y="42"/>
+      <point x="111" y="-10"/>
+    </contour>
+    <contour>
+      <point x="362" y="224" type="line"/>
+      <point x="424" y="224" type="line"/>
+      <point x="424" y="326" type="line" smooth="yes"/>
+      <point x="424" y="434"/>
+      <point x="362" y="492"/>
+      <point x="247" y="492" type="curve" smooth="yes"/>
+      <point x="183" y="492"/>
+      <point x="123" y="474"/>
+      <point x="59" y="436" type="curve"/>
+      <point x="77" y="378" type="line"/>
+      <point x="134" y="407"/>
+      <point x="180" y="420"/>
+      <point x="230" y="420" type="curve" smooth="yes"/>
+      <point x="314" y="420"/>
+      <point x="362" y="384"/>
+      <point x="362" y="313" type="curve" smooth="yes"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ampersand.glif b/src/Cantarell-Regular.ufo/glyphs/ampersand.glif
index 734be7c3..7fb8e54c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ampersand.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ampersand.glif
@@ -4,22 +4,6 @@
   <unicode hex="0026"/>
   <outline>
     <contour>
-      <point x="583" y="-10" type="curve"/>
-      <point x="634" y="50" type="line"/>
-      <point x="299" y="326"/>
-      <point x="222" y="415"/>
-      <point x="222" y="524" type="curve" smooth="yes"/>
-      <point x="222" y="598"/>
-      <point x="257" y="638"/>
-      <point x="319" y="638" type="curve" smooth="yes"/>
-      <point x="377" y="638"/>
-      <point x="419" y="602"/>
-      <point x="419" y="553" type="curve" smooth="yes"/>
-      <point x="419" y="401"/>
-      <point x="69" y="426"/>
-      <point x="69" y="187" type="curve" smooth="yes"/>
-      <point x="69" y="69"/>
-      <point x="156" y="-12"/>
       <point x="280" y="-12" type="curve" smooth="yes"/>
       <point x="421" y="-12"/>
       <point x="557" y="95"/>
@@ -42,6 +26,22 @@
       <point x="146" y="517" type="curve" smooth="yes"/>
       <point x="146" y="386"/>
       <point x="242" y="274"/>
+      <point x="583" y="-10" type="curve"/>
+      <point x="634" y="50" type="line"/>
+      <point x="299" y="326"/>
+      <point x="222" y="415"/>
+      <point x="222" y="524" type="curve" smooth="yes"/>
+      <point x="222" y="598"/>
+      <point x="257" y="638"/>
+      <point x="319" y="638" type="curve" smooth="yes"/>
+      <point x="377" y="638"/>
+      <point x="419" y="602"/>
+      <point x="419" y="553" type="curve" smooth="yes"/>
+      <point x="419" y="401"/>
+      <point x="69" y="426"/>
+      <point x="69" y="187" type="curve" smooth="yes"/>
+      <point x="69" y="69"/>
+      <point x="156" y="-12"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/approxequal.glif 
b/src/Cantarell-Regular.ufo/glyphs/approxequal.glif
index a221da27..9a0c6859 100644
--- a/src/Cantarell-Regular.ufo/glyphs/approxequal.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/approxequal.glif
@@ -4,12 +4,6 @@
   <unicode hex="2248"/>
   <outline>
     <contour>
-      <point x="101" y="365" type="line"/>
-      <point x="115" y="409"/>
-      <point x="155" y="436"/>
-      <point x="192" y="436" type="curve" smooth="yes"/>
-      <point x="256" y="436"/>
-      <point x="289" y="361"/>
       <point x="377" y="361" type="curve" smooth="yes"/>
       <point x="445" y="361"/>
       <point x="510" y="407"/>
@@ -24,14 +18,14 @@
       <point x="136" y="511"/>
       <point x="71" y="466"/>
       <point x="49" y="389" type="curve"/>
+      <point x="101" y="365" type="line"/>
+      <point x="115" y="409"/>
+      <point x="155" y="436"/>
+      <point x="192" y="436" type="curve" smooth="yes"/>
+      <point x="256" y="436"/>
+      <point x="289" y="361"/>
     </contour>
     <contour>
-      <point x="101" y="130" type="line"/>
-      <point x="115" y="176"/>
-      <point x="157" y="200"/>
-      <point x="192" y="200" type="curve" smooth="yes"/>
-      <point x="256" y="200"/>
-      <point x="289" y="126"/>
       <point x="377" y="126" type="curve" smooth="yes"/>
       <point x="445" y="126"/>
       <point x="510" y="171"/>
@@ -46,6 +40,12 @@
       <point x="135" y="275"/>
       <point x="70" y="227"/>
       <point x="49" y="153" type="curve"/>
+      <point x="101" y="130" type="line"/>
+      <point x="115" y="176"/>
+      <point x="157" y="200"/>
+      <point x="192" y="200" type="curve" smooth="yes"/>
+      <point x="256" y="200"/>
+      <point x="289" y="126"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/asciicircum.glif 
b/src/Cantarell-Regular.ufo/glyphs/asciicircum.glif
index 16ca61d0..f4afa04e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/asciicircum.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/asciicircum.glif
@@ -4,14 +4,14 @@
   <unicode hex="005E"/>
   <outline>
     <contour>
-      <point x="106" y="272" type="line"/>
-      <point x="303" y="619" type="line"/>
-      <point x="282" y="620" type="line"/>
       <point x="457" y="269" type="line"/>
       <point x="533" y="305" type="line"/>
       <point x="328" y="699" type="line"/>
       <point x="259" y="699" type="line"/>
       <point x="46" y="300" type="line"/>
+      <point x="106" y="272" type="line"/>
+      <point x="303" y="619" type="line"/>
+      <point x="282" y="620" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/asciitilde.glif 
b/src/Cantarell-Regular.ufo/glyphs/asciitilde.glif
index 3a5971fd..f9c273d1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/asciitilde.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/asciitilde.glif
@@ -4,12 +4,6 @@
   <unicode hex="007E"/>
   <outline>
     <contour>
-      <point x="99" y="247" type="line"/>
-      <point x="111" y="291"/>
-      <point x="150" y="325"/>
-      <point x="190" y="325" type="curve" smooth="yes"/>
-      <point x="252" y="325"/>
-      <point x="287" y="242"/>
       <point x="377" y="242" type="curve" smooth="yes"/>
       <point x="447" y="242"/>
       <point x="513" y="292"/>
@@ -24,6 +18,12 @@
       <point x="129" y="400"/>
       <point x="67" y="347"/>
       <point x="46" y="270" type="curve"/>
+      <point x="99" y="247" type="line"/>
+      <point x="111" y="291"/>
+      <point x="150" y="325"/>
+      <point x="190" y="325" type="curve" smooth="yes"/>
+      <point x="252" y="325"/>
+      <point x="287" y="242"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/asterisk.glif b/src/Cantarell-Regular.ufo/glyphs/asterisk.glif
index afbfb9f5..63ff8d4b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/asterisk.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/asterisk.glif
@@ -4,10 +4,10 @@
   <unicode hex="002A"/>
   <outline>
     <contour>
-      <point x="242" y="475" type="line"/>
-      <point x="431" y="561" type="line"/>
-      <point x="390" y="629" type="line"/>
-      <point x="226" y="503" type="line"/>
+      <point x="390" y="343" type="line"/>
+      <point x="430" y="409" type="line"/>
+      <point x="243" y="500" type="line"/>
+      <point x="226" y="472" type="line"/>
     </contour>
     <contour>
       <point x="79" y="345" type="line"/>
@@ -27,17 +27,17 @@
       <point x="81" y="630" type="line"/>
       <point x="40" y="565" type="line"/>
     </contour>
-    <contour>
-      <point x="390" y="343" type="line"/>
-      <point x="430" y="409" type="line"/>
-      <point x="243" y="500" type="line"/>
-      <point x="226" y="472" type="line"/>
-    </contour>
     <contour>
       <point x="219" y="488" type="line"/>
       <point x="251" y="488" type="line"/>
       <point x="274" y="695" type="line"/>
       <point x="194" y="695" type="line"/>
     </contour>
+    <contour>
+      <point x="242" y="475" type="line"/>
+      <point x="431" y="561" type="line"/>
+      <point x="390" y="629" type="line"/>
+      <point x="226" y="503" type="line"/>
+    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/b.glif b/src/Cantarell-Regular.ufo/glyphs/b.glif
index c4cb2e38..32a4daef 100644
--- a/src/Cantarell-Regular.ufo/glyphs/b.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/b.glif
@@ -8,13 +8,6 @@ b
   <anchor x="283" y="0" name="bottom"/>
   <anchor x="283" y="482" name="top"/>
   <outline>
-    <contour>
-      <point x="83" y="0" type="line"/>
-      <point x="139" y="0" type="line"/>
-      <point x="163" y="56" type="line"/>
-      <point x="163" y="739" type="line"/>
-      <point x="83" y="739" type="line"/>
-    </contour>
     <contour>
       <point x="288" y="-10" type="curve" smooth="yes"/>
       <point x="426" y="-10"/>
@@ -43,6 +36,13 @@ b
       <point x="137" y="33"/>
       <point x="200" y="-10"/>
     </contour>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="139" y="0" type="line"/>
+      <point x="163" y="56" type="line"/>
+      <point x="163" y="739" type="line"/>
+      <point x="83" y="739" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/caroncomb.loclV_I_E_T_.glif 
b/src/Cantarell-Regular.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
index 219e7e0e..c5cd6214 100644
--- a/src/Cantarell-Regular.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/caroncomb.loclV_I_E_T_.glif
@@ -4,13 +4,13 @@
   <anchor x="184" y="627" name="top"/>
   <outline>
     <contour>
+      <point x="165" y="541" type="line"/>
+      <point x="208" y="541" type="line"/>
       <point x="334" y="660" type="line"/>
       <point x="303" y="688" type="line"/>
       <point x="191" y="609" type="line"/>
       <point x="84" y="686" type="line"/>
       <point x="39" y="641" type="line"/>
-      <point x="165" y="541" type="line"/>
-      <point x="208" y="541" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/cedi.glif b/src/Cantarell-Regular.ufo/glyphs/cedi.glif
index 2aa45bd9..92a04fc2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/cedi.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/cedi.glif
@@ -31,18 +31,18 @@
       <point x="54" y="130"/>
       <point x="174" y="-10"/>
     </contour>
-    <contour>
-      <point x="312" y="658" type="line"/>
-      <point x="383" y="658" type="line"/>
-      <point x="383" y="818" type="line"/>
-      <point x="312" y="818" type="line"/>
-    </contour>
     <contour>
       <point x="312" y="-120" type="line"/>
       <point x="383" y="-120" type="line"/>
       <point x="383" y="28" type="line"/>
       <point x="312" y="28" type="line"/>
     </contour>
+    <contour>
+      <point x="312" y="658" type="line"/>
+      <point x="383" y="658" type="line"/>
+      <point x="383" y="818" type="line"/>
+      <point x="312" y="818" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/cheverticalstroke-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/cheverticalstroke-cy.glif
index 98cf3270..7949b3f4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/cheverticalstroke-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/cheverticalstroke-cy.glif
@@ -21,18 +21,18 @@
       <point x="48" y="222"/>
       <point x="118" y="171"/>
     </contour>
-    <contour>
-      <point x="378" y="0" type="line"/>
-      <point x="459" y="0" type="line"/>
-      <point x="459" y="482" type="line"/>
-      <point x="378" y="482" type="line"/>
-    </contour>
     <contour>
       <point x="223" y="53" type="line"/>
       <point x="286" y="53" type="line"/>
       <point x="286" y="378" type="line"/>
       <point x="223" y="378" type="line"/>
     </contour>
+    <contour>
+      <point x="378" y="0" type="line"/>
+      <point x="459" y="0" type="line"/>
+      <point x="459" y="482" type="line"/>
+      <point x="378" y="482" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb.glif 
b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb.glif
index f253e866..76374fe5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb.glif
@@ -6,13 +6,13 @@
   <anchor x="355" y="602" name="top_viet"/>
   <outline>
     <contour>
-      <point x="45" y="587" type="line"/>
       <point x="80" y="559" type="line"/>
       <point x="190" y="657" type="line"/>
       <point x="299" y="559" type="line"/>
       <point x="343" y="601" type="line"/>
       <point x="216" y="728" type="line"/>
       <point x="173" y="728" type="line"/>
+      <point x="45" y="587" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif 
b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
index 5932f3ee..95cb1492 100644
--- a/src/Cantarell-Regular.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/circumflexcomb.loclV_I_E_T_.glif
@@ -5,13 +5,13 @@
   <anchor x="321" y="563" name="top_viet"/>
   <outline>
     <contour>
-      <point x="45" y="564" type="line"/>
       <point x="80" y="536" type="line"/>
       <point x="190" y="610" type="line"/>
       <point x="299" y="536" type="line"/>
       <point x="343" y="578" type="line"/>
       <point x="216" y="680" type="line"/>
       <point x="173" y="680" type="line"/>
+      <point x="45" y="564" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/colonsign.glif b/src/Cantarell-Regular.ufo/glyphs/colonsign.glif
index c957a94b..ed7c9afb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/colonsign.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/colonsign.glif
@@ -3,30 +3,6 @@
   <advance width="580"/>
   <unicode hex="20A1"/>
   <outline>
-    <contour>
-      <point x="402" y="684" type="line"/>
-      <point x="461" y="684" type="line"/>
-      <point x="482" y="818" type="line"/>
-      <point x="423" y="818" type="line"/>
-    </contour>
-    <contour>
-      <point x="210" y="-120" type="line"/>
-      <point x="269" y="-120" type="line"/>
-      <point x="294" y="26" type="line"/>
-      <point x="235" y="26" type="line"/>
-    </contour>
-    <contour>
-      <point x="299" y="684" type="line"/>
-      <point x="358" y="684" type="line"/>
-      <point x="379" y="818" type="line"/>
-      <point x="320" y="818" type="line"/>
-    </contour>
-    <contour>
-      <point x="314" y="-120" type="line"/>
-      <point x="373" y="-120" type="line"/>
-      <point x="398" y="26" type="line"/>
-      <point x="339" y="26" type="line"/>
-    </contour>
     <contour>
       <point x="353" y="-10" type="curve" smooth="yes"/>
       <point x="413" y="-10"/>
@@ -55,6 +31,30 @@
       <point x="55" y="130"/>
       <point x="175" y="-10"/>
     </contour>
+    <contour>
+      <point x="210" y="-120" type="line"/>
+      <point x="269" y="-120" type="line"/>
+      <point x="294" y="26" type="line"/>
+      <point x="235" y="26" type="line"/>
+    </contour>
+    <contour>
+      <point x="314" y="-120" type="line"/>
+      <point x="373" y="-120" type="line"/>
+      <point x="398" y="26" type="line"/>
+      <point x="339" y="26" type="line"/>
+    </contour>
+    <contour>
+      <point x="299" y="684" type="line"/>
+      <point x="358" y="684" type="line"/>
+      <point x="379" y="818" type="line"/>
+      <point x="320" y="818" type="line"/>
+    </contour>
+    <contour>
+      <point x="402" y="684" type="line"/>
+      <point x="461" y="684" type="line"/>
+      <point x="482" y="818" type="line"/>
+      <point x="423" y="818" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/commaturnedabovecomb.glif 
b/src/Cantarell-Regular.ufo/glyphs/commaturnedabovecomb.glif
index c77997a0..80909872 100644
--- a/src/Cantarell-Regular.ufo/glyphs/commaturnedabovecomb.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/commaturnedabovecomb.glif
@@ -5,14 +5,14 @@
   <anchor x="151" y="749" name="top"/>
   <outline>
     <contour>
-      <point x="205" y="732" type="curve"/>
-      <point x="146" y="732" type="line"/>
-      <point x="114" y="688"/>
-      <point x="99" y="637"/>
       <point x="99" y="570" type="curve"/>
       <point x="174" y="570" type="line"/>
       <point x="174" y="632"/>
       <point x="186" y="697"/>
+      <point x="205" y="732" type="curve"/>
+      <point x="146" y="732" type="line"/>
+      <point x="114" y="688"/>
+      <point x="99" y="637"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/copyright.glif b/src/Cantarell-Regular.ufo/glyphs/copyright.glif
index b906f82b..00285301 100644
--- a/src/Cantarell-Regular.ufo/glyphs/copyright.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/copyright.glif
@@ -17,20 +17,6 @@
       <point x="81" y="136"/>
       <point x="223" y="-3"/>
     </contour>
-    <contour>
-      <point x="446" y="59" type="curve" smooth="yes"/>
-      <point x="264" y="59"/>
-      <point x="143" y="177"/>
-      <point x="143" y="354" type="curve" smooth="yes"/>
-      <point x="143" y="527"/>
-      <point x="260" y="642"/>
-      <point x="436" y="642" type="curve" smooth="yes"/>
-      <point x="617" y="642"/>
-      <point x="738" y="523"/>
-      <point x="738" y="344" type="curve" smooth="yes"/>
-      <point x="738" y="173"/>
-      <point x="621" y="59"/>
-    </contour>
     <contour>
       <point x="451" y="134" type="curve" smooth="yes"/>
       <point x="494" y="134"/>
@@ -59,6 +45,20 @@
       <point x="239" y="217"/>
       <point x="323" y="134"/>
     </contour>
+    <contour>
+      <point x="446" y="59" type="curve" smooth="yes"/>
+      <point x="264" y="59"/>
+      <point x="143" y="177"/>
+      <point x="143" y="354" type="curve" smooth="yes"/>
+      <point x="143" y="527"/>
+      <point x="260" y="642"/>
+      <point x="436" y="642" type="curve" smooth="yes"/>
+      <point x="617" y="642"/>
+      <point x="738" y="523"/>
+      <point x="738" y="344" type="curve" smooth="yes"/>
+      <point x="738" y="173"/>
+      <point x="621" y="59"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/d.glif b/src/Cantarell-Regular.ufo/glyphs/d.glif
index 72f36c88..146acdc7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/d.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/d.glif
@@ -10,13 +10,6 @@ d
   <anchor x="287" y="482" name="top"/>
   <anchor x="591" y="482" name="topright"/>
   <outline>
-    <contour>
-      <point x="431" y="0" type="line"/>
-      <point x="487" y="0" type="line"/>
-      <point x="487" y="739" type="line"/>
-      <point x="407" y="739" type="line"/>
-      <point x="407" y="56" type="line"/>
-    </contour>
     <contour>
       <point x="267" y="-10" type="curve" smooth="yes"/>
       <point x="348" y="-10"/>
@@ -45,6 +38,13 @@ d
       <point x="52" y="89"/>
       <point x="138" y="-10"/>
     </contour>
+    <contour>
+      <point x="431" y="0" type="line"/>
+      <point x="487" y="0" type="line"/>
+      <point x="487" y="739" type="line"/>
+      <point x="407" y="739" type="line"/>
+      <point x="407" y="56" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dblgravecomb.glif 
b/src/Cantarell-Regular.ufo/glyphs/dblgravecomb.glif
index cd8e396e..f54b5a6a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dblgravecomb.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dblgravecomb.glif
@@ -4,18 +4,18 @@
   <anchor x="254" y="482" name="_top"/>
   <anchor x="254" y="704" name="top"/>
   <outline>
-    <contour>
-      <point x="159" y="553" type="line"/>
-      <point x="201" y="575" type="line"/>
-      <point x="125" y="747" type="line"/>
-      <point x="54" y="708" type="line"/>
-    </contour>
     <contour>
       <point x="329" y="553" type="line"/>
       <point x="371" y="575" type="line"/>
       <point x="295" y="747" type="line"/>
       <point x="224" y="708" type="line"/>
     </contour>
+    <contour>
+      <point x="159" y="553" type="line"/>
+      <point x="201" y="575" type="line"/>
+      <point x="125" y="747" type="line"/>
+      <point x="54" y="708" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/descender-cy.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/descender-cy.case.glif
index c26fe85d..fb7cfc15 100644
--- a/src/Cantarell-Regular.ufo/glyphs/descender-cy.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/descender-cy.case.glif
@@ -4,12 +4,12 @@
   <anchor x="107" y="0" name="_bottomright"/>
   <outline>
     <contour>
-      <point x="107" y="0" type="line"/>
       <point x="107" y="-178" type="line"/>
       <point x="182" y="-178" type="line"/>
       <point x="182" y="72" type="line"/>
       <point x="75" y="72" type="line"/>
       <point x="75" y="0" type="line"/>
+      <point x="107" y="0" type="line"/>
     </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dieresisbelowcomb.glif 
b/src/Cantarell-Regular.ufo/glyphs/dieresisbelowcomb.glif
index 233c585e..09fc519b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dieresisbelowcomb.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dieresisbelowcomb.glif
@@ -4,20 +4,6 @@
   <anchor x="236" y="0" name="_bottom"/>
   <anchor x="236" y="-195" name="bottom"/>
   <outline>
-    <contour>
-      <point x="136" y="-195" type="curve" smooth="yes"/>
-      <point x="172" y="-195"/>
-      <point x="193" y="-174"/>
-      <point x="193" y="-138" type="curve" smooth="yes"/>
-      <point x="193" y="-102"/>
-      <point x="172" y="-81"/>
-      <point x="136" y="-81" type="curve" smooth="yes"/>
-      <point x="100" y="-81"/>
-      <point x="79" y="-102"/>
-      <point x="79" y="-138" type="curve" smooth="yes"/>
-      <point x="79" y="-174"/>
-      <point x="100" y="-195"/>
-    </contour>
     <contour>
       <point x="336" y="-195" type="curve" smooth="yes"/>
       <point x="372" y="-195"/>
@@ -32,6 +18,20 @@
       <point x="279" y="-174"/>
       <point x="300" y="-195"/>
     </contour>
+    <contour>
+      <point x="136" y="-195" type="curve" smooth="yes"/>
+      <point x="172" y="-195"/>
+      <point x="193" y="-174"/>
+      <point x="193" y="-138" type="curve" smooth="yes"/>
+      <point x="193" y="-102"/>
+      <point x="172" y="-81"/>
+      <point x="136" y="-81" type="curve" smooth="yes"/>
+      <point x="100" y="-81"/>
+      <point x="79" y="-102"/>
+      <point x="79" y="-138" type="curve" smooth="yes"/>
+      <point x="79" y="-174"/>
+      <point x="100" y="-195"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dieresiscomb.glif 
b/src/Cantarell-Regular.ufo/glyphs/dieresiscomb.glif
index e4a3801a..2ab58b0a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dieresiscomb.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dieresiscomb.glif
@@ -4,20 +4,6 @@
   <anchor x="233" y="482" name="_top"/>
   <anchor x="233" y="674" name="top"/>
   <outline>
-    <contour>
-      <point x="133" y="595" type="curve" smooth="yes"/>
-      <point x="169" y="595"/>
-      <point x="190" y="616"/>
-      <point x="190" y="652" type="curve" smooth="yes"/>
-      <point x="190" y="688"/>
-      <point x="169" y="709"/>
-      <point x="133" y="709" type="curve" smooth="yes"/>
-      <point x="97" y="709"/>
-      <point x="76" y="688"/>
-      <point x="76" y="652" type="curve" smooth="yes"/>
-      <point x="76" y="616"/>
-      <point x="97" y="595"/>
-    </contour>
     <contour>
       <point x="333" y="595" type="curve" smooth="yes"/>
       <point x="369" y="595"/>
@@ -32,6 +18,20 @@
       <point x="276" y="616"/>
       <point x="297" y="595"/>
     </contour>
+    <contour>
+      <point x="133" y="595" type="curve" smooth="yes"/>
+      <point x="169" y="595"/>
+      <point x="190" y="616"/>
+      <point x="190" y="652" type="curve" smooth="yes"/>
+      <point x="190" y="688"/>
+      <point x="169" y="709"/>
+      <point x="133" y="709" type="curve" smooth="yes"/>
+      <point x="97" y="709"/>
+      <point x="76" y="688"/>
+      <point x="76" y="652" type="curve" smooth="yes"/>
+      <point x="76" y="616"/>
+      <point x="97" y="595"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif 
b/src/Cantarell-Regular.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
index da99f581..8722e5b9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dieresiscomb.loclV_I_E_T_.glif
@@ -3,20 +3,6 @@
   <anchor x="224" y="482" name="_top"/>
   <anchor x="224" y="604" name="top"/>
   <outline>
-    <contour>
-      <point x="129" y="550" type="curve" smooth="yes"/>
-      <point x="162" y="550"/>
-      <point x="181" y="569"/>
-      <point x="181" y="602" type="curve" smooth="yes"/>
-      <point x="181" y="635"/>
-      <point x="162" y="654"/>
-      <point x="129" y="654" type="curve" smooth="yes"/>
-      <point x="96" y="654"/>
-      <point x="77" y="635"/>
-      <point x="77" y="602" type="curve" smooth="yes"/>
-      <point x="77" y="569"/>
-      <point x="96" y="550"/>
-    </contour>
     <contour>
       <point x="319" y="550" type="curve" smooth="yes"/>
       <point x="352" y="550"/>
@@ -31,6 +17,20 @@
       <point x="267" y="569"/>
       <point x="286" y="550"/>
     </contour>
+    <contour>
+      <point x="129" y="550" type="curve" smooth="yes"/>
+      <point x="162" y="550"/>
+      <point x="181" y="569"/>
+      <point x="181" y="602" type="curve" smooth="yes"/>
+      <point x="181" y="635"/>
+      <point x="162" y="654"/>
+      <point x="129" y="654" type="curve" smooth="yes"/>
+      <point x="96" y="654"/>
+      <point x="77" y="635"/>
+      <point x="77" y="602" type="curve" smooth="yes"/>
+      <point x="77" y="569"/>
+      <point x="96" y="550"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/divide.glif b/src/Cantarell-Regular.ufo/glyphs/divide.glif
index c280f38e..3b7f3402 100644
--- a/src/Cantarell-Regular.ufo/glyphs/divide.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/divide.glif
@@ -4,18 +4,10 @@
   <unicode hex="00F7"/>
   <outline>
     <contour>
-      <point x="287" y="467" type="curve" smooth="yes"/>
-      <point x="323" y="467"/>
-      <point x="346" y="490"/>
-      <point x="346" y="527" type="curve" smooth="yes"/>
-      <point x="346" y="563"/>
-      <point x="323" y="587"/>
-      <point x="287" y="587" type="curve" smooth="yes"/>
-      <point x="252" y="587"/>
-      <point x="229" y="564"/>
-      <point x="229" y="527" type="curve" smooth="yes"/>
-      <point x="229" y="490"/>
-      <point x="252" y="467"/>
+      <point x="55" y="297" type="line"/>
+      <point x="525" y="297" type="line"/>
+      <point x="525" y="371" type="line"/>
+      <point x="55" y="371" type="line"/>
     </contour>
     <contour>
       <point x="287" y="82" type="curve" smooth="yes"/>
@@ -32,10 +24,18 @@
       <point x="252" y="82"/>
     </contour>
     <contour>
-      <point x="55" y="297" type="line"/>
-      <point x="525" y="297" type="line"/>
-      <point x="525" y="371" type="line"/>
-      <point x="55" y="371" type="line"/>
+      <point x="287" y="467" type="curve" smooth="yes"/>
+      <point x="323" y="467"/>
+      <point x="346" y="490"/>
+      <point x="346" y="527" type="curve" smooth="yes"/>
+      <point x="346" y="563"/>
+      <point x="323" y="587"/>
+      <point x="287" y="587" type="curve" smooth="yes"/>
+      <point x="252" y="587"/>
+      <point x="229" y="564"/>
+      <point x="229" y="527" type="curve" smooth="yes"/>
+      <point x="229" y="490"/>
+      <point x="252" y="467"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dollar.glif b/src/Cantarell-Regular.ufo/glyphs/dollar.glif
index d6d99ae2..119263c8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dollar.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dollar.glif
@@ -37,18 +37,18 @@
       <point x="134" y="19"/>
       <point x="208" y="0"/>
     </contour>
-    <contour>
-      <point x="265" y="648" type="line"/>
-      <point x="336" y="648" type="line"/>
-      <point x="336" y="818" type="line"/>
-      <point x="265" y="818" type="line"/>
-    </contour>
     <contour>
       <point x="265" y="-120" type="line"/>
       <point x="336" y="-120" type="line"/>
       <point x="336" y="50" type="line"/>
       <point x="265" y="50" type="line"/>
     </contour>
+    <contour>
+      <point x="265" y="648" type="line"/>
+      <point x="336" y="648" type="line"/>
+      <point x="336" y="818" type="line"/>
+      <point x="265" y="818" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dong.glif b/src/Cantarell-Regular.ufo/glyphs/dong.glif
index e2e23d5a..081695df 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dong.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dong.glif
@@ -3,19 +3,6 @@
   <advance width="580"/>
   <unicode hex="20AB"/>
   <outline>
-    <contour>
-      <point x="86" y="-140" type="line"/>
-      <point x="500" y="-140" type="line"/>
-      <point x="500" y="-80" type="line"/>
-      <point x="86" y="-80" type="line"/>
-    </contour>
-    <contour>
-      <point x="426" y="0" type="line"/>
-      <point x="481" y="0" type="line"/>
-      <point x="481" y="739" type="line"/>
-      <point x="401" y="739" type="line"/>
-      <point x="401" y="56" type="line"/>
-    </contour>
     <contour>
       <point x="264" y="-10" type="curve" smooth="yes"/>
       <point x="344" y="-10"/>
@@ -44,6 +31,19 @@
       <point x="55" y="90"/>
       <point x="139" y="-10"/>
     </contour>
+    <contour>
+      <point x="86" y="-140" type="line"/>
+      <point x="500" y="-140" type="line"/>
+      <point x="500" y="-80" type="line"/>
+      <point x="86" y="-80" type="line"/>
+    </contour>
+    <contour>
+      <point x="426" y="0" type="line"/>
+      <point x="481" y="0" type="line"/>
+      <point x="481" y="739" type="line"/>
+      <point x="401" y="739" type="line"/>
+      <point x="401" y="56" type="line"/>
+    </contour>
     <contour>
       <point x="271" y="569" type="line"/>
       <point x="543" y="569" type="line"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ef-cy.glif b/src/Cantarell-Regular.ufo/glyphs/ef-cy.glif
index 2bea86a4..b2df46ec 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ef-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ef-cy.glif
@@ -4,10 +4,32 @@
   <unicode hex="0444"/>
   <outline>
     <contour>
-      <point x="356" y="-217" type="line"/>
-      <point x="433" y="-217" type="line"/>
-      <point x="433" y="739" type="line"/>
-      <point x="356" y="739" type="line"/>
+      <point x="537" y="-5" type="curve" smooth="yes"/>
+      <point x="656" y="-5"/>
+      <point x="738" y="100"/>
+      <point x="738" y="250" type="curve" smooth="yes"/>
+      <point x="738" y="389"/>
+      <point x="660" y="485"/>
+      <point x="547" y="485" type="curve" smooth="yes"/>
+      <point x="469" y="485"/>
+      <point x="409" y="439"/>
+      <point x="381" y="357" type="curve"/>
+      <point x="409" y="313" type="line"/>
+      <point x="428" y="377"/>
+      <point x="471" y="415"/>
+      <point x="525" y="415" type="curve" smooth="yes"/>
+      <point x="603" y="415"/>
+      <point x="657" y="342"/>
+      <point x="657" y="238" type="curve" smooth="yes"/>
+      <point x="657" y="134"/>
+      <point x="607" y="65"/>
+      <point x="533" y="65" type="curve" smooth="yes"/>
+      <point x="480" y="65"/>
+      <point x="435" y="100"/>
+      <point x="413" y="160" type="curve"/>
+      <point x="380" y="116" type="line"/>
+      <point x="408" y="36"/>
+      <point x="462" y="-5"/>
     </contour>
     <contour>
       <point x="239" y="-5" type="curve" smooth="yes"/>
@@ -38,32 +60,10 @@
       <point x="129" y="-5"/>
     </contour>
     <contour>
-      <point x="537" y="-5" type="curve" smooth="yes"/>
-      <point x="656" y="-5"/>
-      <point x="738" y="100"/>
-      <point x="738" y="250" type="curve" smooth="yes"/>
-      <point x="738" y="389"/>
-      <point x="660" y="485"/>
-      <point x="547" y="485" type="curve" smooth="yes"/>
-      <point x="469" y="485"/>
-      <point x="409" y="439"/>
-      <point x="381" y="357" type="curve"/>
-      <point x="409" y="313" type="line"/>
-      <point x="428" y="377"/>
-      <point x="471" y="415"/>
-      <point x="525" y="415" type="curve" smooth="yes"/>
-      <point x="603" y="415"/>
-      <point x="657" y="342"/>
-      <point x="657" y="238" type="curve" smooth="yes"/>
-      <point x="657" y="134"/>
-      <point x="607" y="65"/>
-      <point x="533" y="65" type="curve" smooth="yes"/>
-      <point x="480" y="65"/>
-      <point x="435" y="100"/>
-      <point x="413" y="160" type="curve"/>
-      <point x="380" y="116" type="line"/>
-      <point x="408" y="36"/>
-      <point x="462" y="-5"/>
+      <point x="356" y="-217" type="line"/>
+      <point x="433" y="-217" type="line"/>
+      <point x="433" y="739" type="line"/>
+      <point x="356" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/emptyset.glif b/src/Cantarell-Regular.ufo/glyphs/emptyset.glif
index 7b256023..e52f00a4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/emptyset.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/emptyset.glif
@@ -3,6 +3,12 @@
   <advance width="719"/>
   <unicode hex="2205"/>
   <outline>
+    <contour>
+      <point x="183" y="32" type="line"/>
+      <point x="588" y="630" type="line"/>
+      <point x="532" y="667" type="line"/>
+      <point x="127" y="69" type="line"/>
+    </contour>
     <contour>
       <point x="354" y="68" type="curve" smooth="yes"/>
       <point x="524" y="68"/>
@@ -31,11 +37,5 @@
       <point x="558" y="217"/>
       <point x="480" y="138"/>
     </contour>
-    <contour>
-      <point x="183" y="32" type="line"/>
-      <point x="588" y="630" type="line"/>
-      <point x="532" y="667" type="line"/>
-      <point x="127" y="69" type="line"/>
-    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eng.glif b/src/Cantarell-Regular.ufo/glyphs/eng.glif
index a57fb234..b55276b4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eng.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/eng.glif
@@ -3,13 +3,6 @@
   <advance width="567"/>
   <unicode hex="014B"/>
   <outline>
-    <contour>
-      <point x="83" y="0" type="line"/>
-      <point x="163" y="0" type="line"/>
-      <point x="163" y="426" type="line"/>
-      <point x="139" y="482" type="line"/>
-      <point x="83" y="482" type="line"/>
-    </contour>
     <contour>
       <point x="412" y="0" type="line"/>
       <point x="492" y="0" type="line"/>
@@ -40,6 +33,13 @@
       <point x="384" y="-155"/>
       <point x="342" y="-179" type="curve"/>
     </contour>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="163" y="0" type="line"/>
+      <point x="163" y="426" type="line"/>
+      <point x="139" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/euro.glif b/src/Cantarell-Regular.ufo/glyphs/euro.glif
index 9b1e5685..e354cd5f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/euro.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/euro.glif
@@ -3,18 +3,6 @@
   <advance width="580"/>
   <unicode hex="20AC"/>
   <outline>
-    <contour>
-      <point x="16" y="404" type="line"/>
-      <point x="505" y="404" type="line"/>
-      <point x="505" y="471" type="line"/>
-      <point x="16" y="471" type="line"/>
-    </contour>
-    <contour>
-      <point x="16" y="227" type="line"/>
-      <point x="486" y="227" type="line"/>
-      <point x="486" y="294" type="line"/>
-      <point x="16" y="294" type="line"/>
-    </contour>
     <contour>
       <point x="382" y="-10" type="curve" smooth="yes"/>
       <point x="442" y="-10"/>
@@ -43,6 +31,18 @@
       <point x="83" y="131"/>
       <point x="205" y="-10"/>
     </contour>
+    <contour>
+      <point x="16" y="227" type="line"/>
+      <point x="486" y="227" type="line"/>
+      <point x="486" y="294" type="line"/>
+      <point x="16" y="294" type="line"/>
+    </contour>
+    <contour>
+      <point x="16" y="404" type="line"/>
+      <point x="505" y="404" type="line"/>
+      <point x="505" y="471" type="line"/>
+      <point x="16" y="471" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/florin.glif b/src/Cantarell-Regular.ufo/glyphs/florin.glif
index 87be3ab6..6603d9c8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/florin.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/florin.glif
@@ -21,12 +21,6 @@
       <point x="197" y="680"/>
       <point x="197" y="577" type="curve" smooth="yes"/>
     </contour>
-    <contour>
-      <point x="125" y="415" type="line"/>
-      <point x="427" y="415" type="line"/>
-      <point x="427" y="482" type="line"/>
-      <point x="125" y="482" type="line"/>
-    </contour>
     <contour>
       <point x="154" y="-227" type="line"/>
       <point x="228" y="-194"/>
@@ -39,6 +33,12 @@
       <point x="169" y="-155"/>
       <point x="127" y="-179" type="curve"/>
     </contour>
+    <contour>
+      <point x="125" y="415" type="line"/>
+      <point x="427" y="415" type="line"/>
+      <point x="427" y="482" type="line"/>
+      <point x="125" y="482" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/franc.glif b/src/Cantarell-Regular.ufo/glyphs/franc.glif
index 3fef7d89..461ba3fb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/franc.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/franc.glif
@@ -3,12 +3,6 @@
   <advance width="580"/>
   <unicode hex="20A3"/>
   <outline>
-    <contour>
-      <point x="53" y="147" type="line"/>
-      <point x="348" y="147" type="line"/>
-      <point x="348" y="212" type="line"/>
-      <point x="53" y="212" type="line"/>
-    </contour>
     <contour>
       <point x="131" y="0" type="line"/>
       <point x="214" y="0" type="line"/>
@@ -21,6 +15,12 @@
       <point x="518" y="694" type="line"/>
       <point x="131" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="53" y="147" type="line"/>
+      <point x="348" y="147" type="line"/>
+      <point x="348" y="212" type="line"/>
+      <point x="53" y="212" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ghemiddlehook-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/ghemiddlehook-cy.glif
index b13918c3..16b55879 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ghemiddlehook-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ghemiddlehook-cy.glif
@@ -4,14 +4,15 @@
   <unicode hex="0495"/>
   <outline>
     <contour>
-      <point x="83" y="0" type="line"/>
-      <point x="165" y="0" type="line"/>
-      <point x="165" y="415" type="line"/>
-      <point x="414" y="415" type="line"/>
-      <point x="414" y="482" type="line"/>
-      <point x="83" y="482" type="line"/>
-    </contour>
-    <contour>
+      <point x="249" y="-228" type="line"/>
+      <point x="416" y="-197"/>
+      <point x="511" y="-93"/>
+      <point x="511" y="61" type="curve" smooth="yes"/>
+      <point x="511" y="203"/>
+      <point x="431" y="294"/>
+      <point x="308" y="294" type="curve" smooth="yes"/>
+      <point x="233" y="294"/>
+      <point x="162" y="261"/>
       <point x="117" y="205" type="curve"/>
       <point x="133" y="155" type="line"/>
       <point x="166" y="196"/>
@@ -23,15 +24,14 @@
       <point x="430" y="-75"/>
       <point x="359" y="-158"/>
       <point x="238" y="-178" type="curve"/>
-      <point x="249" y="-228" type="line"/>
-      <point x="416" y="-197"/>
-      <point x="511" y="-93"/>
-      <point x="511" y="61" type="curve" smooth="yes"/>
-      <point x="511" y="203"/>
-      <point x="431" y="294"/>
-      <point x="308" y="294" type="curve" smooth="yes"/>
-      <point x="233" y="294"/>
-      <point x="162" y="261"/>
+    </contour>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="165" y="0" type="line"/>
+      <point x="165" y="415" type="line"/>
+      <point x="414" y="415" type="line"/>
+      <point x="414" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/guillemetright.glif 
b/src/Cantarell-Regular.ufo/glyphs/guillemetright.glif
index fea81119..3dd05899 100644
--- a/src/Cantarell-Regular.ufo/glyphs/guillemetright.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/guillemetright.glif
@@ -3,15 +3,6 @@
   <advance width="545"/>
   <unicode hex="00BB"/>
   <outline>
-    <contour>
-      <point x="265" y="30" type="line"/>
-      <point x="350" y="30" type="line"/>
-      <point x="501" y="241" type="line"/>
-      <point x="349" y="452" type="line"/>
-      <point x="257" y="452" type="line"/>
-      <point x="425" y="215" type="line"/>
-      <point x="425" y="262" type="line"/>
-    </contour>
     <contour>
       <point x="50" y="30" type="line"/>
       <point x="135" y="30" type="line"/>
@@ -21,6 +12,15 @@
       <point x="210" y="215" type="line"/>
       <point x="210" y="262" type="line"/>
     </contour>
+    <contour>
+      <point x="265" y="30" type="line"/>
+      <point x="350" y="30" type="line"/>
+      <point x="501" y="241" type="line"/>
+      <point x="349" y="452" type="line"/>
+      <point x="257" y="452" type="line"/>
+      <point x="425" y="215" type="line"/>
+      <point x="425" y="262" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/h.glif b/src/Cantarell-Regular.ufo/glyphs/h.glif
index 42813226..a41728c7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/h.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/h.glif
@@ -9,12 +9,6 @@ h
   <anchor x="161" y="593" name="center"/>
   <anchor x="289" y="739" name="top"/>
   <outline>
-    <contour>
-      <point x="83" y="0" type="line"/>
-      <point x="163" y="0" type="line"/>
-      <point x="163" y="739" type="line"/>
-      <point x="83" y="739" type="line"/>
-    </contour>
     <contour>
       <point x="412" y="0" type="line"/>
       <point x="492" y="0" type="line"/>
@@ -33,6 +27,12 @@ h
       <point x="412" y="378"/>
       <point x="412" y="300" type="curve" smooth="yes"/>
     </contour>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="163" y="0" type="line"/>
+      <point x="163" y="739" type="line"/>
+      <point x="83" y="739" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/hryvnia.glif b/src/Cantarell-Regular.ufo/glyphs/hryvnia.glif
index 901f1483..dcd7b6c1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/hryvnia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/hryvnia.glif
@@ -4,13 +4,6 @@
   <unicode hex="20B4"/>
   <outline>
     <contour>
-      <point x="212" y="264" type="curve"/>
-      <point x="106" y="264" type="line"/>
-      <point x="95" y="243"/>
-      <point x="91" y="214"/>
-      <point x="91" y="187" type="curve" smooth="yes"/>
-      <point x="91" y="66"/>
-      <point x="177" y="-10"/>
       <point x="313" y="-10" type="curve" smooth="yes"/>
       <point x="377" y="-10"/>
       <point x="439" y="9"/>
@@ -24,12 +17,13 @@
       <point x="177" y="187" type="curve" smooth="yes"/>
       <point x="177" y="216"/>
       <point x="188" y="243"/>
-    </contour>
-    <contour>
-      <point x="20" y="404" type="line"/>
-      <point x="560" y="404" type="line"/>
-      <point x="560" y="471" type="line"/>
-      <point x="20" y="471" type="line"/>
+      <point x="212" y="264" type="curve"/>
+      <point x="106" y="264" type="line"/>
+      <point x="95" y="243"/>
+      <point x="91" y="214"/>
+      <point x="91" y="187" type="curve" smooth="yes"/>
+      <point x="91" y="66"/>
+      <point x="177" y="-10"/>
     </contour>
     <contour>
       <point x="20" y="227" type="line"/>
@@ -37,6 +31,12 @@
       <point x="560" y="294" type="line"/>
       <point x="20" y="294" type="line"/>
     </contour>
+    <contour>
+      <point x="20" y="404" type="line"/>
+      <point x="560" y="404" type="line"/>
+      <point x="560" y="471" type="line"/>
+      <point x="20" y="471" type="line"/>
+    </contour>
     <contour>
       <point x="384" y="443" type="curve"/>
       <point x="480" y="443" type="line"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/hungarumlautcomb.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/hungarumlautcomb.case.glif
index 322b1b18..12dfeff2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/hungarumlautcomb.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/hungarumlautcomb.case.glif
@@ -3,18 +3,18 @@
   <anchor x="210" y="694" name="_top"/>
   <anchor x="210" y="926" name="top"/>
   <outline>
-    <contour>
-      <point x="75" y="764" type="line"/>
-      <point x="205" y="885" type="line"/>
-      <point x="145" y="939" type="line"/>
-      <point x="36" y="800" type="line"/>
-    </contour>
     <contour>
       <point x="265" y="764" type="line"/>
       <point x="395" y="885" type="line"/>
       <point x="335" y="939" type="line"/>
       <point x="226" y="800" type="line"/>
     </contour>
+    <contour>
+      <point x="75" y="764" type="line"/>
+      <point x="205" y="885" type="line"/>
+      <point x="145" y="939" type="line"/>
+      <point x="36" y="800" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/k.glif b/src/Cantarell-Regular.ufo/glyphs/k.glif
index 35332d4c..70d01060 100644
--- a/src/Cantarell-Regular.ufo/glyphs/k.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/k.glif
@@ -8,12 +8,6 @@ k
   <anchor x="251" y="0" name="bottom"/>
   <anchor x="231" y="739" name="top"/>
   <outline>
-    <contour>
-      <point x="83" y="0" type="line"/>
-      <point x="163" y="0" type="line"/>
-      <point x="163" y="739" type="line"/>
-      <point x="83" y="739" type="line"/>
-    </contour>
     <contour>
       <point x="388" y="0" type="line"/>
       <point x="494" y="0" type="line"/>
@@ -23,6 +17,12 @@ k
       <point x="377" y="482" type="line"/>
       <point x="161" y="257" type="line"/>
     </contour>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="163" y="0" type="line"/>
+      <point x="163" y="739" type="line"/>
+      <point x="83" y="739" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/kabashkir-cy.glif 
b/src/Cantarell-Regular.ufo/glyphs/kabashkir-cy.glif
index 0e4ee344..52d7f6f7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/kabashkir-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/kabashkir-cy.glif
@@ -3,12 +3,6 @@
   <advance width="622"/>
   <unicode hex="04A1"/>
   <outline>
-    <contour>
-      <point x="21" y="415" type="line"/>
-      <point x="275" y="415" type="line"/>
-      <point x="275" y="482" type="line"/>
-      <point x="21" y="482" type="line"/>
-    </contour>
     <contour>
       <point x="512" y="0" type="line"/>
       <point x="606" y="0" type="line"/>
@@ -30,6 +24,12 @@
       <point x="392" y="284" type="line"/>
       <point x="229" y="284" type="line"/>
     </contour>
+    <contour>
+      <point x="21" y="415" type="line"/>
+      <point x="275" y="415" type="line"/>
+      <point x="275" y="482" type="line"/>
+      <point x="21" y="482" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/kgreenlandic.glif 
b/src/Cantarell-Regular.ufo/glyphs/kgreenlandic.glif
index 95118c67..9faacdcc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/kgreenlandic.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/kgreenlandic.glif
@@ -3,12 +3,6 @@
   <advance width="498"/>
   <unicode hex="0138"/>
   <outline>
-    <contour>
-      <point x="83" y="0" type="line"/>
-      <point x="163" y="0" type="line"/>
-      <point x="163" y="482" type="line"/>
-      <point x="83" y="482" type="line"/>
-    </contour>
     <contour>
       <point x="388" y="-3" type="line"/>
       <point x="494" y="-3" type="line"/>
@@ -18,6 +12,12 @@
       <point x="377" y="479" type="line"/>
       <point x="161" y="257" type="line"/>
     </contour>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="163" y="0" type="line"/>
+      <point x="163" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/kip.glif b/src/Cantarell-Regular.ufo/glyphs/kip.glif
index 31d85cb4..c4436470 100644
--- a/src/Cantarell-Regular.ufo/glyphs/kip.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/kip.glif
@@ -3,12 +3,6 @@
   <advance width="580"/>
   <unicode hex="20AD"/>
   <outline>
-    <contour>
-      <point x="43" y="329" type="line"/>
-      <point x="512" y="329" type="line"/>
-      <point x="512" y="389" type="line"/>
-      <point x="43" y="389" type="line"/>
-    </contour>
     <contour>
       <point x="441" y="0" type="line"/>
       <point x="543" y="0" type="line"/>
@@ -24,6 +18,12 @@
       <point x="189" y="694" type="line"/>
       <point x="106" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="43" y="329" type="line"/>
+      <point x="512" y="329" type="line"/>
+      <point x="512" y="389" type="line"/>
+      <point x="43" y="389" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lira.glif b/src/Cantarell-Regular.ufo/glyphs/lira.glif
index e1bd2810..924a6cb8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lira.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lira.glif
@@ -30,18 +30,18 @@
       <point x="109" y="89"/>
       <point x="58" y="72" type="curve"/>
     </contour>
-    <contour>
-      <point x="65" y="404" type="line"/>
-      <point x="445" y="404" type="line"/>
-      <point x="445" y="471" type="line"/>
-      <point x="65" y="471" type="line"/>
-    </contour>
     <contour>
       <point x="65" y="227" type="line"/>
       <point x="445" y="227" type="line"/>
       <point x="445" y="294" type="line"/>
       <point x="65" y="294" type="line"/>
     </contour>
+    <contour>
+      <point x="65" y="404" type="line"/>
+      <point x="445" y="404" type="line"/>
+      <point x="445" y="471" type="line"/>
+      <point x="65" y="471" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/liraT_urkish.glif 
b/src/Cantarell-Regular.ufo/glyphs/liraT_urkish.glif
index 67cc35ae..af653fa8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/liraT_urkish.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/liraT_urkish.glif
@@ -16,18 +16,18 @@
       <point x="220" y="694" type="line"/>
       <point x="143" y="694" type="line"/>
     </contour>
-    <contour>
-      <point x="87" y="392" type="line"/>
-      <point x="390" y="561" type="line"/>
-      <point x="361" y="615" type="line"/>
-      <point x="58" y="446" type="line"/>
-    </contour>
     <contour>
       <point x="102" y="220" type="line"/>
       <point x="392" y="382" type="line"/>
       <point x="363" y="436" type="line"/>
       <point x="73" y="274" type="line"/>
     </contour>
+    <contour>
+      <point x="87" y="392" type="line"/>
+      <point x="390" y="561" type="line"/>
+      <point x="361" y="615" type="line"/>
+      <point x="58" y="446" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lje-cy.glif b/src/Cantarell-Regular.ufo/glyphs/lje-cy.glif
index 35793f71..13b94b57 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lje-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lje-cy.glif
@@ -3,26 +3,6 @@
   <advance width="842"/>
   <unicode hex="0459"/>
   <outline>
-    <contour>
-      <point x="458" y="0" type="line"/>
-      <point x="603" y="0" type="line" smooth="yes"/>
-      <point x="729" y="0"/>
-      <point x="806" y="62"/>
-      <point x="806" y="164" type="curve" smooth="yes"/>
-      <point x="806" y="259"/>
-      <point x="736" y="320"/>
-      <point x="633" y="320" type="curve" smooth="yes"/>
-      <point x="458" y="320" type="line"/>
-      <point x="458" y="255" type="line"/>
-      <point x="620" y="255" type="line" smooth="yes"/>
-      <point x="682" y="255"/>
-      <point x="726" y="214"/>
-      <point x="726" y="156" type="curve" smooth="yes"/>
-      <point x="726" y="100"/>
-      <point x="684" y="67"/>
-      <point x="614" y="67" type="curve" smooth="yes"/>
-      <point x="458" y="67" type="line"/>
-    </contour>
     <contour>
       <point x="89" y="-11" type="curve" smooth="yes"/>
       <point x="174" y="-11"/>
@@ -45,6 +25,26 @@
       <point x="35" y="-3"/>
       <point x="62" y="-11"/>
     </contour>
+    <contour>
+      <point x="458" y="0" type="line"/>
+      <point x="603" y="0" type="line" smooth="yes"/>
+      <point x="729" y="0"/>
+      <point x="806" y="62"/>
+      <point x="806" y="164" type="curve" smooth="yes"/>
+      <point x="806" y="259"/>
+      <point x="736" y="320"/>
+      <point x="633" y="320" type="curve" smooth="yes"/>
+      <point x="458" y="320" type="line"/>
+      <point x="458" y="255" type="line"/>
+      <point x="620" y="255" type="line" smooth="yes"/>
+      <point x="682" y="255"/>
+      <point x="726" y="214"/>
+      <point x="726" y="156" type="curve" smooth="yes"/>
+      <point x="726" y="100"/>
+      <point x="684" y="67"/>
+      <point x="614" y="67" type="curve" smooth="yes"/>
+      <point x="458" y="67" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/logicalnot.glif 
b/src/Cantarell-Regular.ufo/glyphs/logicalnot.glif
index 2e5a7e24..c362cebb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/logicalnot.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/logicalnot.glif
@@ -3,18 +3,18 @@
   <advance width="580"/>
   <unicode hex="00AC"/>
   <outline>
-    <contour>
-      <point x="449" y="99" type="line"/>
-      <point x="525" y="99" type="line"/>
-      <point x="525" y="323" type="line"/>
-      <point x="449" y="323" type="line"/>
-    </contour>
     <contour>
       <point x="55" y="297" type="line"/>
       <point x="525" y="297" type="line"/>
       <point x="525" y="371" type="line"/>
       <point x="55" y="371" type="line"/>
     </contour>
+    <contour>
+      <point x="449" y="99" type="line"/>
+      <point x="525" y="99" type="line"/>
+      <point x="525" y="323" type="line"/>
+      <point x="449" y="323" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/m.glif b/src/Cantarell-Regular.ufo/glyphs/m.glif
index 59f0c74f..d0d9d7d4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/m.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/m.glif
@@ -8,6 +8,24 @@ m
   <anchor x="443" y="0" name="bottom"/>
   <anchor x="443" y="482" name="top"/>
   <outline>
+    <contour>
+      <point x="731" y="0" type="line"/>
+      <point x="811" y="0" type="line"/>
+      <point x="811" y="316" type="line" smooth="yes"/>
+      <point x="811" y="423"/>
+      <point x="741" y="492"/>
+      <point x="634" y="492" type="curve" smooth="yes"/>
+      <point x="565" y="492"/>
+      <point x="497" y="462"/>
+      <point x="447" y="409" type="curve"/>
+      <point x="466" y="358" type="line"/>
+      <point x="505" y="399"/>
+      <point x="557" y="422"/>
+      <point x="612" y="422" type="curve" smooth="yes"/>
+      <point x="689" y="422"/>
+      <point x="731" y="378"/>
+      <point x="731" y="300" type="curve" smooth="yes"/>
+    </contour>
     <contour>
       <point x="83" y="0" type="line"/>
       <point x="163" y="0" type="line"/>
@@ -33,24 +51,6 @@ m
       <point x="407" y="378"/>
       <point x="407" y="300" type="curve" smooth="yes"/>
     </contour>
-    <contour>
-      <point x="731" y="0" type="line"/>
-      <point x="811" y="0" type="line"/>
-      <point x="811" y="316" type="line" smooth="yes"/>
-      <point x="811" y="423"/>
-      <point x="741" y="492"/>
-      <point x="634" y="492" type="curve" smooth="yes"/>
-      <point x="565" y="492"/>
-      <point x="497" y="462"/>
-      <point x="447" y="409" type="curve"/>
-      <point x="466" y="358" type="line"/>
-      <point x="505" y="399"/>
-      <point x="557" y="422"/>
-      <point x="612" y="422" type="curve" smooth="yes"/>
-      <point x="689" y="422"/>
-      <point x="731" y="378"/>
-      <point x="731" y="300" type="curve" smooth="yes"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/micro.glif b/src/Cantarell-Regular.ufo/glyphs/micro.glif
index 0297804f..00045890 100644
--- a/src/Cantarell-Regular.ufo/glyphs/micro.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/micro.glif
@@ -3,6 +3,12 @@
   <advance width="575"/>
   <unicode hex="00B5"/>
   <outline>
+    <contour>
+      <point x="83" y="-217" type="line"/>
+      <point x="158" y="-217" type="line"/>
+      <point x="158" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
+    </contour>
     <contour>
       <point x="281" y="-10" type="curve" smooth="yes"/>
       <point x="338" y="-10"/>
@@ -19,12 +25,6 @@
       <point x="118" y="60"/>
       <point x="183" y="-10"/>
     </contour>
-    <contour>
-      <point x="83" y="-217" type="line"/>
-      <point x="158" y="-217" type="line"/>
-      <point x="158" y="482" type="line"/>
-      <point x="83" y="482" type="line"/>
-    </contour>
     <contour>
       <point x="436" y="0" type="line"/>
       <point x="492" y="0" type="line"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/multiply.glif b/src/Cantarell-Regular.ufo/glyphs/multiply.glif
index 86d6f8c4..30b040db 100644
--- a/src/Cantarell-Regular.ufo/glyphs/multiply.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/multiply.glif
@@ -4,16 +4,16 @@
   <unicode hex="00D7"/>
   <outline>
     <contour>
-      <point x="98" y="474" type="line"/>
+      <point x="150" y="142" type="line"/>
+      <point x="98" y="194" type="line"/>
+      <point x="430" y="526" type="line"/>
+      <point x="482" y="474" type="line"/>
+    </contour>
+    <contour>
       <point x="430" y="142" type="line"/>
       <point x="482" y="194" type="line"/>
       <point x="150" y="526" type="line"/>
-    </contour>
-    <contour>
-      <point x="150" y="142" type="line"/>
-      <point x="482" y="474" type="line"/>
-      <point x="430" y="526" type="line"/>
-      <point x="98" y="194" type="line"/>
+      <point x="98" y="474" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/n.glif b/src/Cantarell-Regular.ufo/glyphs/n.glif
index e84316c6..d792d7ca 100644
--- a/src/Cantarell-Regular.ufo/glyphs/n.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/n.glif
@@ -8,13 +8,6 @@ n
   <anchor x="286" y="0" name="bottom"/>
   <anchor x="286" y="482" name="top"/>
   <outline>
-    <contour>
-      <point x="83" y="0" type="line"/>
-      <point x="163" y="0" type="line"/>
-      <point x="163" y="426" type="line"/>
-      <point x="139" y="482" type="line"/>
-      <point x="83" y="482" type="line"/>
-    </contour>
     <contour>
       <point x="412" y="0" type="line"/>
       <point x="492" y="0" type="line"/>
@@ -33,5 +26,12 @@ n
       <point x="412" y="378"/>
       <point x="412" y="300" type="curve" smooth="yes"/>
     </contour>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="163" y="0" type="line"/>
+      <point x="163" y="426" type="line"/>
+      <point x="139" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
+    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/naira.glif b/src/Cantarell-Regular.ufo/glyphs/naira.glif
index ab646b73..614cf24d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/naira.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/naira.glif
@@ -3,30 +3,6 @@
   <advance width="580"/>
   <unicode hex="20A6"/>
   <outline>
-    <contour>
-      <point x="459" y="471" type="line"/>
-      <point x="459" y="404" type="line"/>
-      <point x="564" y="404" type="line"/>
-      <point x="564" y="471" type="line"/>
-    </contour>
-    <contour>
-      <point x="459" y="294" type="line"/>
-      <point x="459" y="227" type="line"/>
-      <point x="564" y="227" type="line"/>
-      <point x="564" y="294" type="line"/>
-    </contour>
-    <contour>
-      <point x="123" y="227" type="line"/>
-      <point x="123" y="294" type="line"/>
-      <point x="17" y="294" type="line"/>
-      <point x="17" y="227" type="line"/>
-    </contour>
-    <contour>
-      <point x="123" y="404" type="line"/>
-      <point x="123" y="471" type="line"/>
-      <point x="17" y="471" type="line"/>
-      <point x="17" y="404" type="line"/>
-    </contour>
     <contour>
       <point x="95" y="0" type="line"/>
       <point x="170" y="0" type="line"/>
@@ -41,6 +17,30 @@
       <point x="186" y="694" type="line"/>
       <point x="95" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="17" y="227" type="line"/>
+      <point x="123" y="227" type="line"/>
+      <point x="123" y="294" type="line"/>
+      <point x="17" y="294" type="line"/>
+    </contour>
+    <contour>
+      <point x="17" y="404" type="line"/>
+      <point x="123" y="404" type="line"/>
+      <point x="123" y="471" type="line"/>
+      <point x="17" y="471" type="line"/>
+    </contour>
+    <contour>
+      <point x="459" y="227" type="line"/>
+      <point x="564" y="227" type="line"/>
+      <point x="564" y="294" type="line"/>
+      <point x="459" y="294" type="line"/>
+    </contour>
+    <contour>
+      <point x="459" y="404" type="line"/>
+      <point x="564" y="404" type="line"/>
+      <point x="564" y="471" type="line"/>
+      <point x="459" y="471" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nine.dnom.glif b/src/Cantarell-Regular.ufo/glyphs/nine.dnom.glif
index 343378a3..d33e28c4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nine.dnom.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nine.dnom.glif
@@ -6,6 +6,12 @@ nine
 </note>
   <outline>
     <contour>
+      <point x="172" y="-6" type="curve" smooth="yes"/>
+      <point x="301" y="-6"/>
+      <point x="371" y="77"/>
+      <point x="371" y="220" type="curve" smooth="yes"/>
+      <point x="371" y="350"/>
+      <point x="311" y="422"/>
       <point x="208" y="422" type="curve" smooth="yes"/>
       <point x="117" y="422"/>
       <point x="54" y="366"/>
@@ -38,12 +44,6 @@ nine
       <point x="61" y="18" type="line"/>
       <point x="93" y="3"/>
       <point x="129" y="-6"/>
-      <point x="172" y="-6" type="curve" smooth="yes"/>
-      <point x="301" y="-6"/>
-      <point x="371" y="77"/>
-      <point x="371" y="220" type="curve" smooth="yes"/>
-      <point x="371" y="350"/>
-      <point x="311" y="422"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nine.osf.glif b/src/Cantarell-Regular.ufo/glyphs/nine.osf.glif
index 68b32c31..24e9f44d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nine.osf.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nine.osf.glif
@@ -3,6 +3,12 @@
   <advance width="579"/>
   <outline>
     <contour>
+      <point x="219" y="-110" type="curve" smooth="yes"/>
+      <point x="407" y="-110"/>
+      <point x="522" y="27"/>
+      <point x="522" y="266" type="curve" smooth="yes"/>
+      <point x="522" y="484"/>
+      <point x="425" y="604"/>
       <point x="275" y="604" type="curve" smooth="yes"/>
       <point x="144" y="604"/>
       <point x="51" y="514"/>
@@ -35,12 +41,6 @@
       <point x="61" y="-66" type="line"/>
       <point x="96" y="-93"/>
       <point x="154" y="-110"/>
-      <point x="219" y="-110" type="curve" smooth="yes"/>
-      <point x="407" y="-110"/>
-      <point x="522" y="27"/>
-      <point x="522" y="266" type="curve" smooth="yes"/>
-      <point x="522" y="484"/>
-      <point x="425" y="604"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nje-cy.glif b/src/Cantarell-Regular.ufo/glyphs/nje-cy.glif
index 8563ba20..454d297f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nje-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nje-cy.glif
@@ -3,24 +3,6 @@
   <advance width="835"/>
   <unicode hex="045A"/>
   <outline>
-    <contour>
-      <point x="411" y="0" type="line"/>
-      <point x="491" y="0" type="line"/>
-      <point x="491" y="486" type="line"/>
-      <point x="411" y="486" type="line"/>
-    </contour>
-    <contour>
-      <point x="83" y="0" type="line"/>
-      <point x="163" y="0" type="line"/>
-      <point x="163" y="486" type="line"/>
-      <point x="83" y="486" type="line"/>
-    </contour>
-    <contour>
-      <point x="136" y="218" type="line"/>
-      <point x="438" y="218" type="line"/>
-      <point x="438" y="285" type="line"/>
-      <point x="136" y="285" type="line"/>
-    </contour>
     <contour>
       <point x="451" y="0" type="line"/>
       <point x="596" y="0" type="line" smooth="yes"/>
@@ -41,6 +23,24 @@
       <point x="607" y="67" type="curve" smooth="yes"/>
       <point x="451" y="67" type="line"/>
     </contour>
+    <contour>
+      <point x="83" y="0" type="line"/>
+      <point x="163" y="0" type="line"/>
+      <point x="163" y="486" type="line"/>
+      <point x="83" y="486" type="line"/>
+    </contour>
+    <contour>
+      <point x="136" y="218" type="line"/>
+      <point x="438" y="218" type="line"/>
+      <point x="438" y="285" type="line"/>
+      <point x="136" y="285" type="line"/>
+    </contour>
+    <contour>
+      <point x="411" y="0" type="line"/>
+      <point x="491" y="0" type="line"/>
+      <point x="491" y="486" type="line"/>
+      <point x="411" y="486" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/notequal.glif b/src/Cantarell-Regular.ufo/glyphs/notequal.glif
index 1c8a76df..afd74629 100644
--- a/src/Cantarell-Regular.ufo/glyphs/notequal.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/notequal.glif
@@ -9,18 +9,18 @@
       <point x="393" y="601" type="line"/>
       <point x="132" y="65" type="line"/>
     </contour>
-    <contour>
-      <point x="55" y="411" type="line"/>
-      <point x="525" y="411" type="line"/>
-      <point x="525" y="485" type="line"/>
-      <point x="55" y="485" type="line"/>
-    </contour>
     <contour>
       <point x="55" y="168" type="line"/>
       <point x="525" y="168" type="line"/>
       <point x="525" y="242" type="line"/>
       <point x="55" y="242" type="line"/>
     </contour>
+    <contour>
+      <point x="55" y="411" type="line"/>
+      <point x="525" y="411" type="line"/>
+      <point x="525" y="485" type="line"/>
+      <point x="55" y="485" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/notidentical.glif 
b/src/Cantarell-Regular.ufo/glyphs/notidentical.glif
index 1232a4c2..a5a002e2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/notidentical.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/notidentical.glif
@@ -9,12 +9,6 @@
       <point x="415" y="635" type="line"/>
       <point x="122" y="50" type="line"/>
     </contour>
-    <contour>
-      <point x="55" y="466" type="line"/>
-      <point x="525" y="466" type="line"/>
-      <point x="525" y="535" type="line"/>
-      <point x="55" y="535" type="line"/>
-    </contour>
     <contour>
       <point x="55" y="122" type="line"/>
       <point x="525" y="122" type="line"/>
@@ -27,6 +21,12 @@
       <point x="525" y="363" type="line"/>
       <point x="55" y="363" type="line"/>
     </contour>
+    <contour>
+      <point x="55" y="466" type="line"/>
+      <point x="525" y="466" type="line"/>
+      <point x="525" y="535" type="line"/>
+      <point x="55" y="535" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oslash.glif b/src/Cantarell-Regular.ufo/glyphs/oslash.glif
index 176215e8..5f0a6f06 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oslash.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oslash.glif
@@ -4,6 +4,12 @@
   <unicode hex="00F8"/>
   <anchor x="284" y="482" name="top"/>
   <outline>
+    <contour>
+      <point x="109" y="-58" type="line"/>
+      <point x="495" y="513" type="line"/>
+      <point x="448" y="542" type="line"/>
+      <point x="66" y="-29" type="line"/>
+    </contour>
     <contour>
       <point x="277" y="-10" type="curve" smooth="yes"/>
       <point x="419" y="-10"/>
@@ -32,12 +38,6 @@
       <point x="435" y="130"/>
       <point x="377" y="60"/>
     </contour>
-    <contour>
-      <point x="109" y="-58" type="line"/>
-      <point x="495" y="513" type="line"/>
-      <point x="448" y="542" type="line"/>
-      <point x="66" y="-29" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/p.glif b/src/Cantarell-Regular.ufo/glyphs/p.glif
index 4b732c23..85fbee2a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/p.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/p.glif
@@ -8,13 +8,6 @@ p
   <anchor x="284" y="0" name="bottom"/>
   <anchor x="284" y="482" name="top"/>
   <outline>
-    <contour>
-      <point x="83" y="-217" type="line"/>
-      <point x="163" y="-217" type="line"/>
-      <point x="163" y="426" type="line"/>
-      <point x="139" y="482" type="line"/>
-      <point x="83" y="482" type="line"/>
-    </contour>
     <contour>
       <point x="295" y="-10" type="curve" smooth="yes"/>
       <point x="429" y="-10"/>
@@ -43,6 +36,13 @@ p
       <point x="139" y="39"/>
       <point x="208" y="-10"/>
     </contour>
+    <contour>
+      <point x="83" y="-217" type="line"/>
+      <point x="163" y="-217" type="line"/>
+      <point x="163" y="426" type="line"/>
+      <point x="139" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/peseta.glif b/src/Cantarell-Regular.ufo/glyphs/peseta.glif
index 1e2e9a9c..3eb6889a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/peseta.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/peseta.glif
@@ -3,18 +3,6 @@
   <advance width="580"/>
   <unicode hex="20A7"/>
   <outline>
-    <contour>
-      <point x="452" y="488" type="line"/>
-      <point x="452" y="421" type="line"/>
-      <point x="569" y="421" type="line"/>
-      <point x="569" y="488" type="line"/>
-    </contour>
-    <contour>
-      <point x="128" y="421" type="line"/>
-      <point x="128" y="488" type="line"/>
-      <point x="21" y="488" type="line"/>
-      <point x="21" y="421" type="line"/>
-    </contour>
     <contour>
       <point x="99" y="0" type="line"/>
       <point x="181" y="0" type="line"/>
@@ -28,6 +16,12 @@
       <point x="283" y="694" type="curve" smooth="yes"/>
       <point x="99" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="21" y="421" type="line"/>
+      <point x="128" y="421" type="line"/>
+      <point x="128" y="488" type="line"/>
+      <point x="21" y="488" type="line"/>
+    </contour>
     <contour>
       <point x="181" y="314" type="line"/>
       <point x="181" y="622" type="line"/>
@@ -39,6 +33,12 @@
       <point x="361" y="314"/>
       <point x="283" y="314" type="curve" smooth="yes"/>
     </contour>
+    <contour>
+      <point x="452" y="421" type="line"/>
+      <point x="569" y="421" type="line"/>
+      <point x="569" y="488" type="line"/>
+      <point x="452" y="488" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/peso.glif b/src/Cantarell-Regular.ufo/glyphs/peso.glif
index c8813f72..6a9c95a2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/peso.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/peso.glif
@@ -3,18 +3,6 @@
   <advance width="580"/>
   <unicode hex="20B1"/>
   <outline>
-    <contour>
-      <point x="452" y="588" type="line"/>
-      <point x="452" y="521" type="line"/>
-      <point x="559" y="521" type="line"/>
-      <point x="559" y="588" type="line"/>
-    </contour>
-    <contour>
-      <point x="128" y="521" type="line"/>
-      <point x="128" y="588" type="line"/>
-      <point x="21" y="588" type="line"/>
-      <point x="21" y="521" type="line"/>
-    </contour>
     <contour>
       <point x="99" y="0" type="line"/>
       <point x="181" y="0" type="line"/>
@@ -28,6 +16,18 @@
       <point x="283" y="694" type="curve" smooth="yes"/>
       <point x="99" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="21" y="344" type="line"/>
+      <point x="128" y="344" type="line"/>
+      <point x="128" y="411" type="line"/>
+      <point x="21" y="411" type="line"/>
+    </contour>
+    <contour>
+      <point x="21" y="521" type="line"/>
+      <point x="128" y="521" type="line"/>
+      <point x="128" y="588" type="line"/>
+      <point x="21" y="588" type="line"/>
+    </contour>
     <contour>
       <point x="181" y="314" type="line"/>
       <point x="181" y="622" type="line"/>
@@ -40,16 +40,16 @@
       <point x="283" y="314" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="452" y="411" type="line"/>
       <point x="452" y="344" type="line"/>
       <point x="559" y="344" type="line"/>
       <point x="559" y="411" type="line"/>
+      <point x="452" y="411" type="line"/>
     </contour>
     <contour>
-      <point x="128" y="344" type="line"/>
-      <point x="128" y="411" type="line"/>
-      <point x="21" y="411" type="line"/>
-      <point x="21" y="344" type="line"/>
+      <point x="452" y="521" type="line"/>
+      <point x="559" y="521" type="line"/>
+      <point x="559" y="588" type="line"/>
+      <point x="452" y="588" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/plusminus.glif b/src/Cantarell-Regular.ufo/glyphs/plusminus.glif
index fcea4023..99e4d358 100644
--- a/src/Cantarell-Regular.ufo/glyphs/plusminus.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/plusminus.glif
@@ -3,18 +3,18 @@
   <advance width="580"/>
   <unicode hex="00B1"/>
   <outline>
-    <contour>
-      <point x="56" y="35" type="line"/>
-      <point x="526" y="35" type="line"/>
-      <point x="526" y="109" type="line"/>
-      <point x="56" y="109" type="line"/>
-    </contour>
     <contour>
       <point x="251" y="153" type="line"/>
       <point x="327" y="153" type="line"/>
       <point x="327" y="623" type="line"/>
       <point x="251" y="623" type="line"/>
     </contour>
+    <contour>
+      <point x="56" y="35" type="line"/>
+      <point x="526" y="35" type="line"/>
+      <point x="526" y="109" type="line"/>
+      <point x="56" y="109" type="line"/>
+    </contour>
     <contour>
       <point x="54" y="351" type="line"/>
       <point x="524" y="351" type="line"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/q.glif b/src/Cantarell-Regular.ufo/glyphs/q.glif
index b7dbf553..3801a818 100644
--- a/src/Cantarell-Regular.ufo/glyphs/q.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/q.glif
@@ -8,13 +8,6 @@ q
   <anchor x="287" y="0" name="bottom"/>
   <anchor x="287" y="482" name="top"/>
   <outline>
-    <contour>
-      <point x="407" y="-217" type="line"/>
-      <point x="487" y="-217" type="line"/>
-      <point x="487" y="482" type="line"/>
-      <point x="431" y="482" type="line"/>
-      <point x="407" y="426" type="line"/>
-    </contour>
     <contour>
       <point x="267" y="-10" type="curve" smooth="yes"/>
       <point x="348" y="-10"/>
@@ -43,6 +36,13 @@ q
       <point x="52" y="89"/>
       <point x="138" y="-10"/>
     </contour>
+    <contour>
+      <point x="407" y="-217" type="line"/>
+      <point x="487" y="-217" type="line"/>
+      <point x="487" y="482" type="line"/>
+      <point x="431" y="482" type="line"/>
+      <point x="407" y="426" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/registered.glif 
b/src/Cantarell-Regular.ufo/glyphs/registered.glif
index 3280644d..efb448c9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/registered.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/registered.glif
@@ -17,6 +17,18 @@
       <point x="87" y="374"/>
       <point x="185" y="279"/>
     </contour>
+    <contour>
+      <point x="235" y="380" type="line"/>
+      <point x="296" y="380" type="line"/>
+      <point x="296" y="658" type="line"/>
+      <point x="235" y="658" type="line"/>
+    </contour>
+    <contour>
+      <point x="393" y="380" type="line"/>
+      <point x="458" y="380" type="line"/>
+      <point x="397" y="501" type="line"/>
+      <point x="338" y="501" type="line"/>
+    </contour>
     <contour>
       <point x="331" y="325" type="curve" smooth="yes"/>
       <point x="216" y="325"/>
@@ -31,12 +43,6 @@
       <point x="521" y="401"/>
       <point x="443" y="325"/>
     </contour>
-    <contour>
-      <point x="235" y="380" type="line"/>
-      <point x="296" y="380" type="line"/>
-      <point x="296" y="658" type="line"/>
-      <point x="235" y="658" type="line"/>
-    </contour>
     <contour>
       <point x="278" y="476" type="line"/>
       <point x="326" y="476" type="line" smooth="yes"/>
@@ -57,12 +63,6 @@
       <point x="329" y="528" type="curve" smooth="yes"/>
       <point x="278" y="528" type="line"/>
     </contour>
-    <contour>
-      <point x="393" y="380" type="line"/>
-      <point x="458" y="380" type="line"/>
-      <point x="397" y="501" type="line"/>
-      <point x="338" y="501" type="line"/>
-    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ruble.glif b/src/Cantarell-Regular.ufo/glyphs/ruble.glif
index df6c31d7..0cb3959b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ruble.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ruble.glif
@@ -3,18 +3,6 @@
   <advance width="580"/>
   <unicode hex="20BD"/>
   <outline>
-    <contour>
-      <point x="129" y="0" type="line"/>
-      <point x="212" y="0" type="line"/>
-      <point x="212" y="694" type="line"/>
-      <point x="129" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="48" y="88" type="line"/>
-      <point x="356" y="88" type="line"/>
-      <point x="356" y="155" type="line"/>
-      <point x="48" y="155" type="line"/>
-    </contour>
     <contour>
       <point x="48" y="265" type="line"/>
       <point x="308" y="265" type="line" smooth="yes"/>
@@ -35,6 +23,18 @@
       <point x="323" y="337" type="curve" smooth="yes"/>
       <point x="48" y="337" type="line"/>
     </contour>
+    <contour>
+      <point x="48" y="88" type="line"/>
+      <point x="356" y="88" type="line"/>
+      <point x="356" y="155" type="line"/>
+      <point x="48" y="155" type="line"/>
+    </contour>
+    <contour>
+      <point x="129" y="0" type="line"/>
+      <point x="212" y="0" type="line"/>
+      <point x="212" y="694" type="line"/>
+      <point x="129" y="694" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/thorn.glif b/src/Cantarell-Regular.ufo/glyphs/thorn.glif
index 9cd2af3c..ef40ed15 100644
--- a/src/Cantarell-Regular.ufo/glyphs/thorn.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/thorn.glif
@@ -3,12 +3,6 @@
   <advance width="568"/>
   <unicode hex="00FE"/>
   <outline>
-    <contour>
-      <point x="83" y="-217" type="line"/>
-      <point x="161" y="-217" type="line"/>
-      <point x="161" y="739" type="line"/>
-      <point x="83" y="739" type="line"/>
-    </contour>
     <contour>
       <point x="286" y="-10" type="curve" smooth="yes"/>
       <point x="424" y="-10"/>
@@ -37,6 +31,12 @@
       <point x="135" y="33"/>
       <point x="198" y="-10"/>
     </contour>
+    <contour>
+      <point x="83" y="-217" type="line"/>
+      <point x="161" y="-217" type="line"/>
+      <point x="161" y="739" type="line"/>
+      <point x="83" y="739" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/trademark.glif b/src/Cantarell-Regular.ufo/glyphs/trademark.glif
index 765e09df..21d7cea5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/trademark.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/trademark.glif
@@ -3,18 +3,6 @@
   <advance width="806"/>
   <unicode hex="2122"/>
   <outline>
-    <contour>
-      <point x="170" y="382" type="line"/>
-      <point x="225" y="382" type="line"/>
-      <point x="225" y="693" type="line"/>
-      <point x="170" y="693" type="line"/>
-    </contour>
-    <contour>
-      <point x="66" y="645" type="line"/>
-      <point x="329" y="645" type="line"/>
-      <point x="329" y="694" type="line"/>
-      <point x="66" y="694" type="line"/>
-    </contour>
     <contour>
       <point x="356" y="382" type="line"/>
       <point x="406" y="382" type="line"/>
@@ -33,5 +21,17 @@
       <point x="415" y="694" type="line"/>
       <point x="356" y="694" type="line"/>
     </contour>
+    <contour>
+      <point x="170" y="382" type="line"/>
+      <point x="225" y="382" type="line"/>
+      <point x="225" y="693" type="line"/>
+      <point x="170" y="693" type="line"/>
+    </contour>
+    <contour>
+      <point x="66" y="645" type="line"/>
+      <point x="329" y="645" type="line"/>
+      <point x="329" y="694" type="line"/>
+      <point x="66" y="694" type="line"/>
+    </contour>
   </outline>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tugrik.glif b/src/Cantarell-Regular.ufo/glyphs/tugrik.glif
index d21c3478..564dc5ee 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tugrik.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tugrik.glif
@@ -4,20 +4,14 @@
   <unicode hex="20AE"/>
   <outline>
     <contour>
-      <point x="67" y="622" type="line"/>
-      <point x="248" y="622" type="line"/>
       <point x="248" y="0" type="line"/>
       <point x="331" y="0" type="line"/>
       <point x="331" y="622" type="line"/>
       <point x="513" y="622" type="line"/>
       <point x="513" y="694" type="line"/>
       <point x="67" y="694" type="line"/>
-    </contour>
-    <contour>
-      <point x="139" y="291" type="line"/>
-      <point x="465" y="440" type="line"/>
-      <point x="437" y="495" type="line"/>
-      <point x="114" y="346" type="line"/>
+      <point x="67" y="622" type="line"/>
+      <point x="248" y="622" type="line"/>
     </contour>
     <contour>
       <point x="154" y="129" type="line"/>
@@ -25,6 +19,12 @@
       <point x="437" y="325" type="line"/>
       <point x="129" y="184" type="line"/>
     </contour>
+    <contour>
+      <point x="139" y="291" type="line"/>
+      <point x="465" y="440" type="line"/>
+      <point x="437" y="495" type="line"/>
+      <point x="114" y="346" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/u.glif b/src/Cantarell-Regular.ufo/glyphs/u.glif
index 94d43ac0..ab4ed634 100644
--- a/src/Cantarell-Regular.ufo/glyphs/u.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/u.glif
@@ -11,18 +11,6 @@ u
   <anchor x="532" y="482" name="topright"/>
   <outline>
     <contour>
-      <point x="475" y="482" type="line"/>
-      <point x="395" y="482" type="line"/>
-      <point x="395" y="56" type="line"/>
-      <point x="419" y="0" type="line"/>
-      <point x="475" y="0" type="line"/>
-    </contour>
-    <contour>
-      <point x="155" y="482" type="line"/>
-      <point x="75" y="482" type="line"/>
-      <point x="75" y="166" type="line" smooth="yes"/>
-      <point x="75" y="59"/>
-      <point x="146" y="-10"/>
       <point x="249" y="-10" type="curve" smooth="yes"/>
       <point x="317" y="-10"/>
       <point x="386" y="20"/>
@@ -34,6 +22,18 @@ u
       <point x="198" y="60"/>
       <point x="155" y="104"/>
       <point x="155" y="182" type="curve" smooth="yes"/>
+      <point x="155" y="482" type="line"/>
+      <point x="75" y="482" type="line"/>
+      <point x="75" y="166" type="line" smooth="yes"/>
+      <point x="75" y="59"/>
+      <point x="146" y="-10"/>
+    </contour>
+    <contour>
+      <point x="419" y="0" type="line"/>
+      <point x="475" y="0" type="line"/>
+      <point x="475" y="482" type="line"/>
+      <point x="395" y="482" type="line"/>
+      <point x="395" y="56" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/verticallineabovecomb.glif 
b/src/Cantarell-Regular.ufo/glyphs/verticallineabovecomb.glif
index f65f7cd2..a85969b4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/verticallineabovecomb.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/verticallineabovecomb.glif
@@ -5,10 +5,10 @@
   <anchor x="125" y="750" name="top"/>
   <outline>
     <contour>
-      <point x="160" y="750" type="line"/>
-      <point x="90" y="750" type="line"/>
       <point x="96" y="566" type="line"/>
       <point x="154" y="566" type="line"/>
+      <point x="160" y="750" type="line"/>
+      <point x="90" y="750" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/won.glif b/src/Cantarell-Regular.ufo/glyphs/won.glif
index 4f54bf75..ae7ecb36 100644
--- a/src/Cantarell-Regular.ufo/glyphs/won.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/won.glif
@@ -21,18 +21,18 @@
       <point x="93" y="694" type="line"/>
       <point x="14" y="694" type="line"/>
     </contour>
-    <contour>
-      <point x="0" y="404" type="line"/>
-      <point x="580" y="404" type="line"/>
-      <point x="580" y="468" type="line"/>
-      <point x="0" y="468" type="line"/>
-    </contour>
     <contour>
       <point x="0" y="227" type="line"/>
       <point x="112" y="227" type="line"/>
       <point x="112" y="294" type="line"/>
       <point x="0" y="294" type="line"/>
     </contour>
+    <contour>
+      <point x="0" y="404" type="line"/>
+      <point x="580" y="404" type="line"/>
+      <point x="580" y="468" type="line"/>
+      <point x="0" y="468" type="line"/>
+    </contour>
     <contour>
       <point x="468" y="227" type="line"/>
       <point x="580" y="227" type="line"/>
diff --git a/src/Cantarell-Regular.ufo/glyphs/yeru-cy.glif b/src/Cantarell-Regular.ufo/glyphs/yeru-cy.glif
index c912742a..7c2d1b0d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yeru-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yeru-cy.glif
@@ -4,12 +4,6 @@
   <unicode hex="044B"/>
   <anchor x="355" y="482" name="top"/>
   <outline>
-    <contour>
-      <point x="546" y="-1" type="line"/>
-      <point x="626" y="-1" type="line"/>
-      <point x="626" y="482" type="line"/>
-      <point x="546" y="482" type="line"/>
-    </contour>
     <contour>
       <point x="83" y="0" type="line"/>
       <point x="255" y="0" type="line" smooth="yes"/>
@@ -32,6 +26,12 @@
       <point x="163" y="482" type="line"/>
       <point x="83" y="482" type="line"/>
     </contour>
+    <contour>
+      <point x="546" y="-1" type="line"/>
+      <point x="626" y="-1" type="line"/>
+      <point x="626" y="482" type="line"/>
+      <point x="546" y="482" type="line"/>
+    </contour>
   </outline>
   <lib>
     <dict>
diff --git a/src/Cantarell-Regular.ufo/glyphs/yusbig-cy.glif b/src/Cantarell-Regular.ufo/glyphs/yusbig-cy.glif
index 9e4d2bc2..39f7fc0b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/yusbig-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/yusbig-cy.glif
@@ -4,26 +4,7 @@
   <unicode hex="046B"/>
   <outline>
     <contour>
-      <point x="245" y="267" type="line"/>
-      <point x="332" y="267" type="line"/>
-      <point x="155" y="444" type="line"/>
-      <point x="145" y="416" type="line"/>
-      <point x="483" y="416" type="line"/>
-      <point x="470" y="444" type="line"/>
-      <point x="300" y="276" type="line"/>
-      <point x="384" y="276" type="line"/>
-      <point x="541" y="415" type="line"/>
-      <point x="541" y="482" type="line"/>
-      <point x="85" y="482" type="line"/>
-      <point x="85" y="415" type="line"/>
-    </contour>
-    <contour>
-      <point x="352" y="235" type="line"/>
-      <point x="275" y="235" type="line"/>
-      <point x="275" y="0" type="line"/>
-      <point x="352" y="0" type="line"/>
-    </contour>
-    <contour>
+      <point x="38" y="0" type="curve"/>
       <point x="113" y="0" type="line"/>
       <point x="113" y="154"/>
       <point x="175" y="224"/>
@@ -37,7 +18,26 @@
       <point x="317" y="286" type="curve" smooth="yes"/>
       <point x="126" y="286"/>
       <point x="38" y="196"/>
-      <point x="38" y="0" type="curve"/>
+    </contour>
+    <contour>
+      <point x="275" y="0" type="line"/>
+      <point x="352" y="0" type="line"/>
+      <point x="352" y="235" type="line"/>
+      <point x="275" y="235" type="line"/>
+    </contour>
+    <contour>
+      <point x="245" y="267" type="line"/>
+      <point x="332" y="267" type="line"/>
+      <point x="155" y="444" type="line"/>
+      <point x="145" y="416" type="line"/>
+      <point x="483" y="416" type="line"/>
+      <point x="470" y="444" type="line"/>
+      <point x="300" y="276" type="line"/>
+      <point x="384" y="276" type="line"/>
+      <point x="541" y="415" type="line"/>
+      <point x="541" y="482" type="line"/>
+      <point x="85" y="482" type="line"/>
+      <point x="85" y="415" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zhe-cy.glif b/src/Cantarell-Regular.ufo/glyphs/zhe-cy.glif
index 35084f14..b73f6c09 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zhe-cy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zhe-cy.glif
@@ -5,15 +5,6 @@
   <anchor x="692" y="0" name="bottomright"/>
   <anchor x="385" y="482" name="top"/>
   <outline>
-    <contour>
-      <point x="655" y="0" type="line"/>
-      <point x="748" y="0" type="line"/>
-      <point x="574" y="266" type="line"/>
-      <point x="575" y="250" type="line"/>
-      <point x="739" y="482" type="line"/>
-      <point x="648" y="482" type="line"/>
-      <point x="489" y="253" type="line"/>
-    </contour>
     <contour>
       <point x="20" y="0" type="line"/>
       <point x="110" y="0" type="line"/>
@@ -23,6 +14,12 @@
       <point x="197" y="240" type="line"/>
       <point x="195" y="255" type="line"/>
     </contour>
+    <contour>
+      <point x="345" y="0" type="line"/>
+      <point x="425" y="0" type="line"/>
+      <point x="425" y="482" type="line"/>
+      <point x="345" y="482" type="line"/>
+    </contour>
     <contour>
       <point x="235" y="219" type="line"/>
       <point x="524" y="219" type="line"/>
@@ -30,10 +27,13 @@
       <point x="235" y="286" type="line"/>
     </contour>
     <contour>
-      <point x="345" y="0" type="line"/>
-      <point x="425" y="0" type="line"/>
-      <point x="425" y="482" type="line"/>
-      <point x="345" y="482" type="line"/>
+      <point x="655" y="0" type="line"/>
+      <point x="748" y="0" type="line"/>
+      <point x="574" y="266" type="line"/>
+      <point x="575" y="250" type="line"/>
+      <point x="739" y="482" type="line"/>
+      <point x="648" y="482" type="line"/>
+      <point x="489" y="253" type="line"/>
     </contour>
   </outline>
   <lib>


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