[cantarell-fonts/import-greek-gsoc] Broadly update Greek spacing



commit efaeaa11b222cae43641fabbe072b34d7b3d3918
Author: Nikolaus Waxweiler <madigens gmail com>
Date:   Mon Dec 21 18:26:34 2020 +0000

    Broadly update Greek spacing

 src/Cantarell-Bold.ufo/glyphs/A_lpha.glif          |   9 +-
 src/Cantarell-Bold.ufo/glyphs/A_lphadasia.glif     |  12 +--
 src/Cantarell-Bold.ufo/glyphs/A_lphadasiaoxia.glif |  12 +--
 .../glyphs/A_lphadasiaoxiaprosgegrammeni.glif      |  12 +--
 .../glyphs/A_lphadasiaperispomeni.glif             |  12 +--
 .../A_lphadasiaperispomeniprosgegrammeni.glif      |  12 +--
 .../glyphs/A_lphadasiaprosgegrammeni.glif          |  12 +--
 .../glyphs/A_lphadasiavaria.glif                   |  12 +--
 .../glyphs/A_lphadasiavariaprosgegrammeni.glif     |  12 +--
 src/Cantarell-Bold.ufo/glyphs/A_lphamacron.glif    |  14 +--
 src/Cantarell-Bold.ufo/glyphs/A_lphaoxia.glif      |  12 +--
 .../glyphs/A_lphaprosgegrammeni.glif               |  12 +--
 src/Cantarell-Bold.ufo/glyphs/A_lphapsili.glif     |  12 +--
 src/Cantarell-Bold.ufo/glyphs/A_lphapsilioxia.glif |  12 +--
 .../glyphs/A_lphapsilioxiaprosgegrammeni.glif      |  12 +--
 .../glyphs/A_lphapsiliperispomeni.glif             |  12 +--
 .../A_lphapsiliperispomeniprosgegrammeni.glif      |  12 +--
 .../glyphs/A_lphapsiliprosgegrammeni.glif          |  12 +--
 .../glyphs/A_lphapsilivaria.glif                   |  12 +--
 .../glyphs/A_lphapsilivariaprosgegrammeni.glif     |  12 +--
 src/Cantarell-Bold.ufo/glyphs/A_lphatonos.glif     |  12 +--
 src/Cantarell-Bold.ufo/glyphs/A_lphavaria.glif     |  12 +--
 src/Cantarell-Bold.ufo/glyphs/A_lphavrachy.glif    |  12 +--
 src/Cantarell-Bold.ufo/glyphs/B_eta.glif           |  10 +--
 src/Cantarell-Bold.ufo/glyphs/C_hi.glif            |  10 +--
 src/Cantarell-Bold.ufo/glyphs/D_elta.glif          |  36 ++++----
 src/Cantarell-Bold.ufo/glyphs/E_psilon.glif        |   9 +-
 src/Cantarell-Bold.ufo/glyphs/E_psilondasia.glif   |  12 +--
 .../glyphs/E_psilondasiaoxia.glif                  |  12 +--
 .../glyphs/E_psilondasiavaria.glif                 |  12 +--
 src/Cantarell-Bold.ufo/glyphs/E_psilonoxia.glif    |  12 +--
 src/Cantarell-Bold.ufo/glyphs/E_psilonpsili.glif   |  12 +--
 .../glyphs/E_psilonpsilioxia.glif                  |  12 +--
 .../glyphs/E_psilonpsilivaria.glif                 |  12 +--
 src/Cantarell-Bold.ufo/glyphs/E_psilontonos.glif   |  12 +--
 src/Cantarell-Bold.ufo/glyphs/E_psilonvaria.glif   |  12 +--
 src/Cantarell-Bold.ufo/glyphs/E_ta.glif            |   9 +-
 src/Cantarell-Bold.ufo/glyphs/E_tadasia.glif       |  12 +--
 src/Cantarell-Bold.ufo/glyphs/E_tadasiaoxia.glif   |  12 +--
 .../glyphs/E_tadasiaoxiaprosgegrammeni.glif        |  12 +--
 .../glyphs/E_tadasiaperispomeni.glif               |  12 +--
 .../glyphs/E_tadasiaperispomeniprosgegrammeni.glif |  12 +--
 .../glyphs/E_tadasiaprosgegrammeni.glif            |  12 +--
 src/Cantarell-Bold.ufo/glyphs/E_tadasiavaria.glif  |  12 +--
 .../glyphs/E_tadasiavariaprosgegrammeni.glif       |  12 +--
 src/Cantarell-Bold.ufo/glyphs/E_taoxia.glif        |  12 +--
 .../glyphs/E_taprosgegrammeni.glif                 |  12 +--
 src/Cantarell-Bold.ufo/glyphs/E_tapsili.glif       |  12 +--
 src/Cantarell-Bold.ufo/glyphs/E_tapsilioxia.glif   |  12 +--
 .../glyphs/E_tapsilioxiaprosgegrammeni.glif        |  12 +--
 .../glyphs/E_tapsiliperispomeni.glif               |  12 +--
 .../glyphs/E_tapsiliperispomeniprosgegrammeni.glif |  12 +--
 .../glyphs/E_tapsiliprosgegrammeni.glif            |  12 +--
 src/Cantarell-Bold.ufo/glyphs/E_tapsilivaria.glif  |  12 +--
 .../glyphs/E_tapsilivariaprosgegrammeni.glif       |  12 +--
 src/Cantarell-Bold.ufo/glyphs/E_tatonos.glif       |  12 +--
 src/Cantarell-Bold.ufo/glyphs/E_tavaria.glif       |  12 +--
 src/Cantarell-Bold.ufo/glyphs/G_amma.glif          |  10 +--
 src/Cantarell-Bold.ufo/glyphs/I_ota.glif           |   9 +-
 src/Cantarell-Bold.ufo/glyphs/I_otadasia.glif      |  12 +--
 src/Cantarell-Bold.ufo/glyphs/I_otadasiaoxia.glif  |  12 +--
 .../glyphs/I_otadasiaperispomeni.glif              |  12 +--
 src/Cantarell-Bold.ufo/glyphs/I_otadasiavaria.glif |  12 +--
 src/Cantarell-Bold.ufo/glyphs/I_otadieresis.glif   |  12 +--
 src/Cantarell-Bold.ufo/glyphs/I_otamacron.glif     |  14 +--
 src/Cantarell-Bold.ufo/glyphs/I_otaoxia.glif       |  12 +--
 src/Cantarell-Bold.ufo/glyphs/I_otapsili.glif      |  12 +--
 src/Cantarell-Bold.ufo/glyphs/I_otapsilioxia.glif  |  12 +--
 .../glyphs/I_otapsiliperispomeni.glif              |  12 +--
 src/Cantarell-Bold.ufo/glyphs/I_otapsilivaria.glif |  12 +--
 src/Cantarell-Bold.ufo/glyphs/I_otatonos.glif      |  12 +--
 src/Cantarell-Bold.ufo/glyphs/I_otavaria.glif      |  12 +--
 src/Cantarell-Bold.ufo/glyphs/I_otavrachy.glif     |  12 +--
 src/Cantarell-Bold.ufo/glyphs/K_appa.glif          |  10 +--
 src/Cantarell-Bold.ufo/glyphs/L_ambda.glif         |  24 +++--
 src/Cantarell-Bold.ufo/glyphs/M_u.glif             |  10 +--
 src/Cantarell-Bold.ufo/glyphs/N_u.glif             |  10 +--
 src/Cantarell-Bold.ufo/glyphs/O_mega.glif          |  78 ++++++++--------
 src/Cantarell-Bold.ufo/glyphs/O_megadasia.glif     |  13 +--
 src/Cantarell-Bold.ufo/glyphs/O_megadasiaoxia.glif |  13 +--
 .../glyphs/O_megadasiaoxiaprosgegrammeni.glif      |  15 +---
 .../glyphs/O_megadasiaperispomeni.glif             |  13 +--
 .../O_megadasiaperispomeniprosgegrammeni.glif      |  15 +---
 .../glyphs/O_megadasiaprosgegrammeni.glif          |  15 +---
 .../glyphs/O_megadasiavaria.glif                   |  13 +--
 .../glyphs/O_megadasiavariaprosgegrammeni.glif     |  15 +---
 src/Cantarell-Bold.ufo/glyphs/O_megaoxia.glif      |  13 +--
 .../glyphs/O_megaprosgegrammeni.glif               |  13 +--
 src/Cantarell-Bold.ufo/glyphs/O_megapsili.glif     |  13 +--
 src/Cantarell-Bold.ufo/glyphs/O_megapsilioxia.glif |  13 +--
 .../glyphs/O_megapsilioxiaprosgegrammeni.glif      |  15 +---
 .../glyphs/O_megapsiliperispomeni.glif             |  13 +--
 .../O_megapsiliperispomeniprosgegrammeni.glif      |  15 +---
 .../glyphs/O_megapsiliprosgegrammeni.glif          |  15 +---
 .../glyphs/O_megapsilivaria.glif                   |  13 +--
 .../glyphs/O_megapsilivariaprosgegrammeni.glif     |  15 +---
 src/Cantarell-Bold.ufo/glyphs/O_megatonos.glif     |  13 +--
 src/Cantarell-Bold.ufo/glyphs/O_megavaria.glif     |  13 +--
 src/Cantarell-Bold.ufo/glyphs/O_micron.glif        |  12 +--
 src/Cantarell-Bold.ufo/glyphs/O_microndasia.glif   |  15 +---
 .../glyphs/O_microndasiaoxia.glif                  |  15 +---
 .../glyphs/O_microndasiavaria.glif                 |  15 +---
 src/Cantarell-Bold.ufo/glyphs/O_micronoxia.glif    |  15 +---
 src/Cantarell-Bold.ufo/glyphs/O_micronpsili.glif   |  15 +---
 .../glyphs/O_micronpsilioxia.glif                  |  15 +---
 .../glyphs/O_micronpsilivaria.glif                 |  15 +---
 src/Cantarell-Bold.ufo/glyphs/O_microntonos.glif   |  15 +---
 src/Cantarell-Bold.ufo/glyphs/O_micronvaria.glif   |  15 +---
 src/Cantarell-Bold.ufo/glyphs/P_hi.glif            |  60 ++++++-------
 src/Cantarell-Bold.ufo/glyphs/P_i.glif             |   9 +-
 src/Cantarell-Bold.ufo/glyphs/P_si.glif            |  56 ++++++------
 src/Cantarell-Bold.ufo/glyphs/R_ho.glif            |   9 +-
 src/Cantarell-Bold.ufo/glyphs/R_hodasia.glif       |  10 +--
 src/Cantarell-Bold.ufo/glyphs/S_igma.glif          |  34 ++++---
 src/Cantarell-Bold.ufo/glyphs/T_au.glif            |  11 +--
 src/Cantarell-Bold.ufo/glyphs/T_heta.glif          |   9 +-
 src/Cantarell-Bold.ufo/glyphs/U_psilon.glif        |   8 +-
 src/Cantarell-Bold.ufo/glyphs/U_psilondasia.glif   |  11 +--
 .../glyphs/U_psilondasiaoxia.glif                  |  11 +--
 .../glyphs/U_psilondasiaperispomeni.glif           |  11 +--
 .../glyphs/U_psilondasiavaria.glif                 |  11 +--
 .../glyphs/U_psilondieresis.glif                   |  11 +--
 src/Cantarell-Bold.ufo/glyphs/U_psilonmacron.glif  |  13 +--
 src/Cantarell-Bold.ufo/glyphs/U_psilonoxia.glif    |  11 +--
 src/Cantarell-Bold.ufo/glyphs/U_psilontonos.glif   |  11 +--
 src/Cantarell-Bold.ufo/glyphs/U_psilonvaria.glif   |  11 +--
 src/Cantarell-Bold.ufo/glyphs/U_psilonvrachy.glif  |  11 +--
 src/Cantarell-Bold.ufo/glyphs/X_i.glif             |   4 +-
 src/Cantarell-Bold.ufo/glyphs/Z_eta.glif           |  10 +--
 src/Cantarell-Bold.ufo/glyphs/alpha.glif           |  98 ++++++++++----------
 src/Cantarell-Bold.ufo/glyphs/alphadasia.glif      |  12 +--
 src/Cantarell-Bold.ufo/glyphs/alphadasiaoxia.glif  |  12 +--
 .../glyphs/alphadasiaoxiaypogegrammeni.glif        |  14 +--
 .../glyphs/alphadasiaperispomeni.glif              |  12 +--
 .../glyphs/alphadasiaperispomeniypogegrammeni.glif |  14 +--
 src/Cantarell-Bold.ufo/glyphs/alphadasiavaria.glif |  12 +--
 .../glyphs/alphadasiavariaypogegrammeni.glif       |  14 +--
 .../glyphs/alphadasiaypogegrammeni.glif            |  14 +--
 src/Cantarell-Bold.ufo/glyphs/alphamacron.glif     |  12 +--
 src/Cantarell-Bold.ufo/glyphs/alphaoxia.glif       |  12 +--
 .../glyphs/alphaoxiaypogegrammeni.glif             |  14 +--
 .../glyphs/alphaperispomeni.glif                   |  12 +--
 .../glyphs/alphaperispomeniypogegrammeni.glif      |  14 +--
 src/Cantarell-Bold.ufo/glyphs/alphapsili.glif      |  12 +--
 src/Cantarell-Bold.ufo/glyphs/alphapsilioxia.glif  |  12 +--
 .../glyphs/alphapsilioxiaypogegrammeni.glif        |  14 +--
 .../glyphs/alphapsiliperispomeni.glif              |  12 +--
 .../glyphs/alphapsiliperispomeniypogegrammeni.glif |  14 +--
 src/Cantarell-Bold.ufo/glyphs/alphapsilivaria.glif |  12 +--
 .../glyphs/alphapsilivariaypogegrammeni.glif       |  14 +--
 .../glyphs/alphapsiliypogegrammeni.glif            |  14 +--
 src/Cantarell-Bold.ufo/glyphs/alphatonos.glif      |  12 +--
 src/Cantarell-Bold.ufo/glyphs/alphavaria.glif      |  12 +--
 .../glyphs/alphavariaypogegrammeni.glif            |  14 +--
 src/Cantarell-Bold.ufo/glyphs/alphavrachy.glif     |  12 +--
 .../glyphs/alphaypogegrammeni.glif                 |  12 +--
 src/Cantarell-Bold.ufo/glyphs/beta.glif            |   2 -
 src/Cantarell-Bold.ufo/glyphs/chi.glif             |   4 +-
 src/Cantarell-Bold.ufo/glyphs/dasia.case.glif      |   2 -
 src/Cantarell-Bold.ufo/glyphs/dasia.glif           |   6 --
 src/Cantarell-Bold.ufo/glyphs/dasiaoxia.case.glif  |   2 -
 src/Cantarell-Bold.ufo/glyphs/dasiaoxia.glif       |   2 -
 .../glyphs/dasiaperispomeni.case.glif              |   4 +-
 src/Cantarell-Bold.ufo/glyphs/dasiavaria.case.glif |   2 -
 src/Cantarell-Bold.ufo/glyphs/dasiavaria.glif      |   2 -
 .../glyphs/daspsiliiaperispomeni.glif              |   6 +-
 src/Cantarell-Bold.ufo/glyphs/delta.glif           |  92 ++++++++++---------
 src/Cantarell-Bold.ufo/glyphs/dialytikaoxia.glif   |   8 +-
 .../glyphs/dialytikaperispomeni.glif               |  10 +--
 src/Cantarell-Bold.ufo/glyphs/dialytikavaria.glif  |   8 +-
 src/Cantarell-Bold.ufo/glyphs/dieresistonos.glif   |   2 -
 src/Cantarell-Bold.ufo/glyphs/epsilon.glif         |  92 ++++++++++---------
 src/Cantarell-Bold.ufo/glyphs/epsilondasia.glif    |  12 +--
 .../glyphs/epsilondasiaoxia.glif                   |  12 +--
 .../glyphs/epsilondasiavaria.glif                  |  12 +--
 src/Cantarell-Bold.ufo/glyphs/epsilonoxia.glif     |  12 +--
 src/Cantarell-Bold.ufo/glyphs/epsilonpsili.glif    |  12 +--
 .../glyphs/epsilonpsilioxia.glif                   |  12 +--
 .../glyphs/epsilonpsilivaria.glif                  |  12 +--
 src/Cantarell-Bold.ufo/glyphs/epsilontonos.glif    |  12 +--
 src/Cantarell-Bold.ufo/glyphs/epsilonvaria.glif    |  12 +--
 src/Cantarell-Bold.ufo/glyphs/eta.glif             |  50 +++++------
 src/Cantarell-Bold.ufo/glyphs/etadasia.glif        |  12 +--
 src/Cantarell-Bold.ufo/glyphs/etadasiaoxia.glif    |  12 +--
 .../glyphs/etadasiaoxiaypogegrammeni.glif          |  14 +--
 .../glyphs/etadasiaperispomeni.glif                |  12 +--
 .../glyphs/etadasiaperispomeniypogegrammeni.glif   |  14 +--
 src/Cantarell-Bold.ufo/glyphs/etadasiavaria.glif   |  12 +--
 .../glyphs/etadasiavariaypogegrammeni.glif         |  14 +--
 .../glyphs/etadasiaypogegrammeni.glif              |  14 +--
 src/Cantarell-Bold.ufo/glyphs/etaoxia.glif         |  12 +--
 .../glyphs/etaoxiaypogegrammeni.glif               |  14 +--
 src/Cantarell-Bold.ufo/glyphs/etaperispomeni.glif  |  12 +--
 .../glyphs/etaperispomeniypogegrammeni.glif        |  14 +--
 src/Cantarell-Bold.ufo/glyphs/etapsili.glif        |  12 +--
 src/Cantarell-Bold.ufo/glyphs/etapsilioxia.glif    |  12 +--
 .../glyphs/etapsilioxiaypogegrammeni.glif          |  14 +--
 .../glyphs/etapsiliperispomeni.glif                |  12 +--
 .../glyphs/etapsiliperispomeniypogegrammeni.glif   |  14 +--
 src/Cantarell-Bold.ufo/glyphs/etapsilivaria.glif   |  12 +--
 .../glyphs/etapsilivariaypogegrammeni.glif         |  14 +--
 .../glyphs/etapsiliypogegrammeni.glif              |  14 +--
 src/Cantarell-Bold.ufo/glyphs/etatonos.glif        |  12 +--
 src/Cantarell-Bold.ufo/glyphs/etavaria.glif        |  12 +--
 .../glyphs/etavariaypogegrammeni.glif              |  14 +--
 .../glyphs/etaypogegrammeni.glif                   |  12 +--
 src/Cantarell-Bold.ufo/glyphs/gamma.glif           |  40 ++++-----
 src/Cantarell-Bold.ufo/glyphs/iota.glif            |  40 ++++-----
 src/Cantarell-Bold.ufo/glyphs/iotadasia.glif       |  12 +--
 src/Cantarell-Bold.ufo/glyphs/iotadasiaoxia.glif   |  12 +--
 .../glyphs/iotadasiaperispomeni.glif               |  10 +--
 src/Cantarell-Bold.ufo/glyphs/iotadasiavaria.glif  |  12 +--
 .../glyphs/iotadialytikaoxia.glif                  |  12 +--
 .../glyphs/iotadialytikaperispomeni.glif           |  12 +--
 .../glyphs/iotadialytikavaria.glif                 |  12 +--
 src/Cantarell-Bold.ufo/glyphs/iotadieresis.glif    |  12 +--
 .../glyphs/iotadieresistonos.glif                  |  12 +--
 src/Cantarell-Bold.ufo/glyphs/iotamacron.glif      |  12 +--
 src/Cantarell-Bold.ufo/glyphs/iotaoxia.glif        |  12 +--
 src/Cantarell-Bold.ufo/glyphs/iotaperispomeni.glif |  10 +--
 src/Cantarell-Bold.ufo/glyphs/iotapsili.glif       |  12 +--
 src/Cantarell-Bold.ufo/glyphs/iotapsilioxia.glif   |  12 +--
 .../glyphs/iotapsiliperispomeni.glif               |  10 +--
 src/Cantarell-Bold.ufo/glyphs/iotapsilivaria.glif  |  12 +--
 src/Cantarell-Bold.ufo/glyphs/iotatonos.glif       |  12 +--
 src/Cantarell-Bold.ufo/glyphs/iotavaria.glif       |  12 +--
 src/Cantarell-Bold.ufo/glyphs/iotavrachy.glif      |  12 +--
 src/Cantarell-Bold.ufo/glyphs/kaiS_ymbol.glif      |  84 +++++++++--------
 src/Cantarell-Bold.ufo/glyphs/kappa.glif           |  52 ++++++-----
 src/Cantarell-Bold.ufo/glyphs/koronis.case.glif    |   2 -
 src/Cantarell-Bold.ufo/glyphs/koronis.glif         |   2 -
 src/Cantarell-Bold.ufo/glyphs/lambda.glif          |   6 --
 .../glyphs/lowernumeral-greek.glif                 |   6 +-
 src/Cantarell-Bold.ufo/glyphs/mu.glif              |  78 ++++++++--------
 src/Cantarell-Bold.ufo/glyphs/nu.glif              |  36 ++++----
 src/Cantarell-Bold.ufo/glyphs/omega.glif           |  92 ++++++++++---------
 src/Cantarell-Bold.ufo/glyphs/omegadasia.glif      |  12 +--
 src/Cantarell-Bold.ufo/glyphs/omegadasiaoxia.glif  |  12 +--
 .../glyphs/omegadasiaoxiaypogegrammeni.glif        |  14 +--
 .../glyphs/omegadasiaperispomeni.glif              |  12 +--
 .../glyphs/omegadasiaperispomeniypogegrammeni.glif |  14 +--
 src/Cantarell-Bold.ufo/glyphs/omegadasiavaria.glif |  12 +--
 .../glyphs/omegadasiavariaypogegrammeni.glif       |  14 +--
 .../glyphs/omegadasiaypogegrammeni.glif            |  14 +--
 src/Cantarell-Bold.ufo/glyphs/omegaoxia.glif       |  12 +--
 .../glyphs/omegaoxiaypogegrammeni.glif             |  14 +--
 .../glyphs/omegaperispomeni.glif                   |  12 +--
 .../glyphs/omegaperispomeniypogegrammeni.glif      |  14 +--
 src/Cantarell-Bold.ufo/glyphs/omegapsili.glif      |  12 +--
 src/Cantarell-Bold.ufo/glyphs/omegapsilioxia.glif  |  12 +--
 .../glyphs/omegapsilioxiaypogegrammeni.glif        |  14 +--
 .../glyphs/omegapsiliperispomeni.glif              |  12 +--
 .../glyphs/omegapsiliperispomeniypogegrammeni.glif |  14 +--
 src/Cantarell-Bold.ufo/glyphs/omegapsilivaria.glif |  12 +--
 .../glyphs/omegapsilivariaypogegrammeni.glif       |  14 +--
 .../glyphs/omegapsiliypogegrammeni.glif            |  14 +--
 src/Cantarell-Bold.ufo/glyphs/omegatonos.glif      |  12 +--
 src/Cantarell-Bold.ufo/glyphs/omegavaria.glif      |  12 +--
 .../glyphs/omegavariaypogegrammeni.glif            |  14 +--
 .../glyphs/omegaypogegrammeni.glif                 |  12 +--
 src/Cantarell-Bold.ufo/glyphs/omicron.glif         |  56 ++++++------
 src/Cantarell-Bold.ufo/glyphs/omicrondasia.glif    |  12 +--
 .../glyphs/omicrondasiaoxia.glif                   |  12 +--
 .../glyphs/omicrondasiavaria.glif                  |  12 +--
 src/Cantarell-Bold.ufo/glyphs/omicronoxia.glif     |  12 +--
 src/Cantarell-Bold.ufo/glyphs/omicronpsili.glif    |  12 +--
 .../glyphs/omicronpsilioxia.glif                   |  12 +--
 .../glyphs/omicronpsilivaria.glif                  |  12 +--
 src/Cantarell-Bold.ufo/glyphs/omicrontonos.glif    |  12 +--
 src/Cantarell-Bold.ufo/glyphs/omicronvaria.glif    |  12 +--
 src/Cantarell-Bold.ufo/glyphs/oxia.case.glif       |   2 -
 src/Cantarell-Bold.ufo/glyphs/oxia.glif            |   2 -
 src/Cantarell-Bold.ufo/glyphs/perispomeni.glif     |  10 +--
 src/Cantarell-Bold.ufo/glyphs/phi.glif             |  76 ++++++++--------
 src/Cantarell-Bold.ufo/glyphs/pi.glif              |  52 ++++++-----
 src/Cantarell-Bold.ufo/glyphs/prosgegrammeni.glif  |   6 --
 src/Cantarell-Bold.ufo/glyphs/psi.glif             |  60 ++++++-------
 src/Cantarell-Bold.ufo/glyphs/psili.case.glif      |   2 -
 src/Cantarell-Bold.ufo/glyphs/psili.glif           |   6 --
 src/Cantarell-Bold.ufo/glyphs/psilioxia.case.glif  |   2 -
 src/Cantarell-Bold.ufo/glyphs/psilioxia.glif       |   2 -
 .../glyphs/psiliperispomeni.case.glif              |   4 +-
 .../glyphs/psiliperispomeni.glif                   |   8 +-
 src/Cantarell-Bold.ufo/glyphs/psilivaria.case.glif |   2 -
 src/Cantarell-Bold.ufo/glyphs/psilivaria.glif      |   2 -
 src/Cantarell-Bold.ufo/glyphs/rho.glif             |  68 +++++++-------
 src/Cantarell-Bold.ufo/glyphs/rhodasia.glif        |  12 +--
 src/Cantarell-Bold.ufo/glyphs/rhopsili.glif        |  12 +--
 src/Cantarell-Bold.ufo/glyphs/sigma.glif           |  60 ++++++-------
 src/Cantarell-Bold.ufo/glyphs/sigmafinal.glif      |  68 +++++++-------
 src/Cantarell-Bold.ufo/glyphs/tau.glif             |  44 +++++----
 src/Cantarell-Bold.ufo/glyphs/theta.glif           |  60 ++++++-------
 src/Cantarell-Bold.ufo/glyphs/tonos.case.glif      |   2 -
 src/Cantarell-Bold.ufo/glyphs/tonos.glif           |   6 --
 src/Cantarell-Bold.ufo/glyphs/upsilon.glif         |  52 ++++++-----
 src/Cantarell-Bold.ufo/glyphs/upsilondasia.glif    |  12 +--
 .../glyphs/upsilondasiaoxia.glif                   |  12 +--
 .../glyphs/upsilondasiaperispomeni.glif            |  12 +--
 .../glyphs/upsilondasiavaria.glif                  |  12 +--
 .../glyphs/upsilondialytikaoxia.glif               |  12 +--
 .../glyphs/upsilondialytikaperispomeni.glif        |  12 +--
 .../glyphs/upsilondialytikavaria.glif              |  12 +--
 src/Cantarell-Bold.ufo/glyphs/upsilondieresis.glif |  12 +--
 .../glyphs/upsilondieresistonos.glif               |  12 +--
 src/Cantarell-Bold.ufo/glyphs/upsilonmacron.glif   |  12 +--
 src/Cantarell-Bold.ufo/glyphs/upsilonoxia.glif     |  12 +--
 .../glyphs/upsilonperispomeni.glif                 |  12 +--
 src/Cantarell-Bold.ufo/glyphs/upsilonpsili.glif    |  12 +--
 .../glyphs/upsilonpsilioxia.glif                   |  12 +--
 .../glyphs/upsilonpsiliperispomeni.glif            |  12 +--
 .../glyphs/upsilonpsilivaria.glif                  |  12 +--
 src/Cantarell-Bold.ufo/glyphs/upsilontonos.glif    |   8 +-
 src/Cantarell-Bold.ufo/glyphs/upsilonvaria.glif    |  12 +--
 src/Cantarell-Bold.ufo/glyphs/upsilonvrachy.glif   |  12 +--
 src/Cantarell-Bold.ufo/glyphs/varia.case.glif      |   2 -
 src/Cantarell-Bold.ufo/glyphs/varia.glif           |   6 --
 src/Cantarell-Bold.ufo/glyphs/vrachy.case.glif     |   2 -
 src/Cantarell-Bold.ufo/glyphs/vrachy.glif          |   2 -
 src/Cantarell-Bold.ufo/glyphs/xi.glif              | 100 ++++++++++-----------
 src/Cantarell-Bold.ufo/glyphs/ypogegrammeni.glif   |   6 --
 src/Cantarell-Bold.ufo/glyphs/zeta.glif            |  68 +++++++-------
 src/Cantarell-Light.ufo/glyphs/A_lpha.glif         |   9 +-
 src/Cantarell-Light.ufo/glyphs/A_lphadasia.glif    |  12 +--
 .../glyphs/A_lphadasiaoxia.glif                    |  12 +--
 .../glyphs/A_lphadasiaoxiaprosgegrammeni.glif      |  12 +--
 .../glyphs/A_lphadasiaperispomeni.glif             |  12 +--
 .../A_lphadasiaperispomeniprosgegrammeni.glif      |  12 +--
 .../glyphs/A_lphadasiaprosgegrammeni.glif          |  12 +--
 .../glyphs/A_lphadasiavaria.glif                   |  12 +--
 .../glyphs/A_lphadasiavariaprosgegrammeni.glif     |  12 +--
 src/Cantarell-Light.ufo/glyphs/A_lphamacron.glif   |  14 +--
 src/Cantarell-Light.ufo/glyphs/A_lphaoxia.glif     |  12 +--
 .../glyphs/A_lphaprosgegrammeni.glif               |  12 +--
 src/Cantarell-Light.ufo/glyphs/A_lphapsili.glif    |  12 +--
 .../glyphs/A_lphapsilioxia.glif                    |  12 +--
 .../glyphs/A_lphapsilioxiaprosgegrammeni.glif      |  12 +--
 .../glyphs/A_lphapsiliperispomeni.glif             |  12 +--
 .../A_lphapsiliperispomeniprosgegrammeni.glif      |  12 +--
 .../glyphs/A_lphapsiliprosgegrammeni.glif          |  12 +--
 .../glyphs/A_lphapsilivaria.glif                   |  12 +--
 .../glyphs/A_lphapsilivariaprosgegrammeni.glif     |  12 +--
 src/Cantarell-Light.ufo/glyphs/A_lphatonos.glif    |  12 +--
 src/Cantarell-Light.ufo/glyphs/A_lphavaria.glif    |  12 +--
 src/Cantarell-Light.ufo/glyphs/A_lphavrachy.glif   |  14 +--
 src/Cantarell-Light.ufo/glyphs/B_eta.glif          |  10 +--
 src/Cantarell-Light.ufo/glyphs/C_hi.glif           |  10 +--
 src/Cantarell-Light.ufo/glyphs/D_elta.glif         |  36 ++++----
 src/Cantarell-Light.ufo/glyphs/E_psilon.glif       |   9 +-
 src/Cantarell-Light.ufo/glyphs/E_psilondasia.glif  |  12 +--
 .../glyphs/E_psilondasiaoxia.glif                  |  12 +--
 .../glyphs/E_psilondasiavaria.glif                 |  12 +--
 src/Cantarell-Light.ufo/glyphs/E_psilonoxia.glif   |  12 +--
 src/Cantarell-Light.ufo/glyphs/E_psilonpsili.glif  |  12 +--
 .../glyphs/E_psilonpsilioxia.glif                  |  12 +--
 .../glyphs/E_psilonpsilivaria.glif                 |  12 +--
 src/Cantarell-Light.ufo/glyphs/E_psilontonos.glif  |  12 +--
 src/Cantarell-Light.ufo/glyphs/E_psilonvaria.glif  |  12 +--
 src/Cantarell-Light.ufo/glyphs/E_ta.glif           |   9 +-
 src/Cantarell-Light.ufo/glyphs/E_tadasia.glif      |  12 +--
 src/Cantarell-Light.ufo/glyphs/E_tadasiaoxia.glif  |  12 +--
 .../glyphs/E_tadasiaoxiaprosgegrammeni.glif        |  12 +--
 .../glyphs/E_tadasiaperispomeni.glif               |  12 +--
 .../glyphs/E_tadasiaperispomeniprosgegrammeni.glif |  12 +--
 .../glyphs/E_tadasiaprosgegrammeni.glif            |  12 +--
 src/Cantarell-Light.ufo/glyphs/E_tadasiavaria.glif |  12 +--
 .../glyphs/E_tadasiavariaprosgegrammeni.glif       |  12 +--
 src/Cantarell-Light.ufo/glyphs/E_taoxia.glif       |  12 +--
 .../glyphs/E_taprosgegrammeni.glif                 |  12 +--
 src/Cantarell-Light.ufo/glyphs/E_tapsili.glif      |  12 +--
 src/Cantarell-Light.ufo/glyphs/E_tapsilioxia.glif  |  12 +--
 .../glyphs/E_tapsilioxiaprosgegrammeni.glif        |  12 +--
 .../glyphs/E_tapsiliperispomeni.glif               |  12 +--
 .../glyphs/E_tapsiliperispomeniprosgegrammeni.glif |  12 +--
 .../glyphs/E_tapsiliprosgegrammeni.glif            |  12 +--
 src/Cantarell-Light.ufo/glyphs/E_tapsilivaria.glif |  12 +--
 .../glyphs/E_tapsilivariaprosgegrammeni.glif       |  12 +--
 src/Cantarell-Light.ufo/glyphs/E_tatonos.glif      |  12 +--
 src/Cantarell-Light.ufo/glyphs/E_tavaria.glif      |  12 +--
 src/Cantarell-Light.ufo/glyphs/G_amma.glif         |  10 +--
 src/Cantarell-Light.ufo/glyphs/I_ota.glif          |   9 +-
 src/Cantarell-Light.ufo/glyphs/I_otadasia.glif     |  12 +--
 src/Cantarell-Light.ufo/glyphs/I_otadasiaoxia.glif |  12 +--
 .../glyphs/I_otadasiaperispomeni.glif              |  12 +--
 .../glyphs/I_otadasiavaria.glif                    |  12 +--
 src/Cantarell-Light.ufo/glyphs/I_otadieresis.glif  |  12 +--
 src/Cantarell-Light.ufo/glyphs/I_otamacron.glif    |  14 +--
 src/Cantarell-Light.ufo/glyphs/I_otaoxia.glif      |  12 +--
 src/Cantarell-Light.ufo/glyphs/I_otapsili.glif     |  12 +--
 src/Cantarell-Light.ufo/glyphs/I_otapsilioxia.glif |  12 +--
 .../glyphs/I_otapsiliperispomeni.glif              |  12 +--
 .../glyphs/I_otapsilivaria.glif                    |  12 +--
 src/Cantarell-Light.ufo/glyphs/I_otatonos.glif     |  12 +--
 src/Cantarell-Light.ufo/glyphs/I_otavaria.glif     |  12 +--
 src/Cantarell-Light.ufo/glyphs/I_otavrachy.glif    |  14 +--
 src/Cantarell-Light.ufo/glyphs/K_appa.glif         |  10 +--
 src/Cantarell-Light.ufo/glyphs/L_ambda.glif        |  24 +++--
 src/Cantarell-Light.ufo/glyphs/M_u.glif            |  10 +--
 src/Cantarell-Light.ufo/glyphs/N_u.glif            |  10 +--
 src/Cantarell-Light.ufo/glyphs/O_mega.glif         |  78 ++++++++--------
 src/Cantarell-Light.ufo/glyphs/O_megadasia.glif    |  13 +--
 .../glyphs/O_megadasiaoxia.glif                    |  13 +--
 .../glyphs/O_megadasiaoxiaprosgegrammeni.glif      |  15 +---
 .../glyphs/O_megadasiaperispomeni.glif             |  13 +--
 .../O_megadasiaperispomeniprosgegrammeni.glif      |  15 +---
 .../glyphs/O_megadasiaprosgegrammeni.glif          |  15 +---
 .../glyphs/O_megadasiavaria.glif                   |  13 +--
 .../glyphs/O_megadasiavariaprosgegrammeni.glif     |  15 +---
 src/Cantarell-Light.ufo/glyphs/O_megaoxia.glif     |  13 +--
 .../glyphs/O_megaprosgegrammeni.glif               |  13 +--
 src/Cantarell-Light.ufo/glyphs/O_megapsili.glif    |  13 +--
 .../glyphs/O_megapsilioxia.glif                    |  13 +--
 .../glyphs/O_megapsilioxiaprosgegrammeni.glif      |  15 +---
 .../glyphs/O_megapsiliperispomeni.glif             |  13 +--
 .../O_megapsiliperispomeniprosgegrammeni.glif      |  15 +---
 .../glyphs/O_megapsiliprosgegrammeni.glif          |  15 +---
 .../glyphs/O_megapsilivaria.glif                   |  13 +--
 .../glyphs/O_megapsilivariaprosgegrammeni.glif     |  15 +---
 src/Cantarell-Light.ufo/glyphs/O_megatonos.glif    |  13 +--
 src/Cantarell-Light.ufo/glyphs/O_megavaria.glif    |  13 +--
 src/Cantarell-Light.ufo/glyphs/O_micron.glif       |  12 +--
 src/Cantarell-Light.ufo/glyphs/O_microndasia.glif  |  15 +---
 .../glyphs/O_microndasiaoxia.glif                  |  15 +---
 .../glyphs/O_microndasiavaria.glif                 |  15 +---
 src/Cantarell-Light.ufo/glyphs/O_micronoxia.glif   |  15 +---
 src/Cantarell-Light.ufo/glyphs/O_micronpsili.glif  |  15 +---
 .../glyphs/O_micronpsilioxia.glif                  |  15 +---
 .../glyphs/O_micronpsilivaria.glif                 |  15 +---
 src/Cantarell-Light.ufo/glyphs/O_microntonos.glif  |  15 +---
 src/Cantarell-Light.ufo/glyphs/O_micronvaria.glif  |  15 +---
 src/Cantarell-Light.ufo/glyphs/P_hi.glif           |  60 ++++++-------
 src/Cantarell-Light.ufo/glyphs/P_i.glif            |   9 +-
 src/Cantarell-Light.ufo/glyphs/P_si.glif           |  56 ++++++------
 src/Cantarell-Light.ufo/glyphs/R_ho.glif           |   9 +-
 src/Cantarell-Light.ufo/glyphs/R_hodasia.glif      |  10 +--
 src/Cantarell-Light.ufo/glyphs/S_igma.glif         |   2 -
 src/Cantarell-Light.ufo/glyphs/T_au.glif           |  11 +--
 src/Cantarell-Light.ufo/glyphs/T_heta.glif         |   9 +-
 src/Cantarell-Light.ufo/glyphs/U_psilon.glif       |   8 +-
 src/Cantarell-Light.ufo/glyphs/U_psilondasia.glif  |  11 +--
 .../glyphs/U_psilondasiaoxia.glif                  |  11 +--
 .../glyphs/U_psilondasiaperispomeni.glif           |  11 +--
 .../glyphs/U_psilondasiavaria.glif                 |  11 +--
 .../glyphs/U_psilondieresis.glif                   |  11 +--
 src/Cantarell-Light.ufo/glyphs/U_psilonmacron.glif |  13 +--
 src/Cantarell-Light.ufo/glyphs/U_psilonoxia.glif   |  11 +--
 src/Cantarell-Light.ufo/glyphs/U_psilontonos.glif  |  11 +--
 src/Cantarell-Light.ufo/glyphs/U_psilonvaria.glif  |  11 +--
 src/Cantarell-Light.ufo/glyphs/U_psilonvrachy.glif |  13 +--
 src/Cantarell-Light.ufo/glyphs/X_i.glif            |   4 +-
 src/Cantarell-Light.ufo/glyphs/Z_eta.glif          |   8 --
 src/Cantarell-Light.ufo/glyphs/alpha.glif          | 100 ++++++++++-----------
 src/Cantarell-Light.ufo/glyphs/alphadasia.glif     |  12 +--
 src/Cantarell-Light.ufo/glyphs/alphadasiaoxia.glif |  12 +--
 .../glyphs/alphadasiaoxiaypogegrammeni.glif        |  14 +--
 .../glyphs/alphadasiaperispomeni.glif              |  12 +--
 .../glyphs/alphadasiaperispomeniypogegrammeni.glif |  14 +--
 .../glyphs/alphadasiavaria.glif                    |  12 +--
 .../glyphs/alphadasiavariaypogegrammeni.glif       |  14 +--
 .../glyphs/alphadasiaypogegrammeni.glif            |  14 +--
 src/Cantarell-Light.ufo/glyphs/alphamacron.glif    |  12 +--
 src/Cantarell-Light.ufo/glyphs/alphaoxia.glif      |  12 +--
 .../glyphs/alphaoxiaypogegrammeni.glif             |  14 +--
 .../glyphs/alphaperispomeni.glif                   |  12 +--
 .../glyphs/alphaperispomeniypogegrammeni.glif      |  14 +--
 src/Cantarell-Light.ufo/glyphs/alphapsili.glif     |  12 +--
 src/Cantarell-Light.ufo/glyphs/alphapsilioxia.glif |  12 +--
 .../glyphs/alphapsilioxiaypogegrammeni.glif        |  14 +--
 .../glyphs/alphapsiliperispomeni.glif              |  12 +--
 .../glyphs/alphapsiliperispomeniypogegrammeni.glif |  14 +--
 .../glyphs/alphapsilivaria.glif                    |  12 +--
 .../glyphs/alphapsilivariaypogegrammeni.glif       |  14 +--
 .../glyphs/alphapsiliypogegrammeni.glif            |  14 +--
 src/Cantarell-Light.ufo/glyphs/alphatonos.glif     |  12 +--
 src/Cantarell-Light.ufo/glyphs/alphavaria.glif     |  12 +--
 .../glyphs/alphavariaypogegrammeni.glif            |  14 +--
 src/Cantarell-Light.ufo/glyphs/alphavrachy.glif    |  12 +--
 .../glyphs/alphaypogegrammeni.glif                 |  12 +--
 src/Cantarell-Light.ufo/glyphs/beta.glif           |  90 +++++++++----------
 src/Cantarell-Light.ufo/glyphs/chi.glif            |  32 ++++---
 src/Cantarell-Light.ufo/glyphs/dasia.case.glif     |   2 -
 src/Cantarell-Light.ufo/glyphs/dasia.glif          |   6 --
 src/Cantarell-Light.ufo/glyphs/dasiaoxia.case.glif |   2 -
 src/Cantarell-Light.ufo/glyphs/dasiaoxia.glif      |   2 -
 .../glyphs/dasiaperispomeni.case.glif              |   4 +-
 .../glyphs/dasiavaria.case.glif                    |   2 -
 src/Cantarell-Light.ufo/glyphs/dasiavaria.glif     |   2 -
 .../glyphs/daspsiliiaperispomeni.glif              |   6 +-
 src/Cantarell-Light.ufo/glyphs/delta.glif          |  92 ++++++++++---------
 src/Cantarell-Light.ufo/glyphs/dialytikaoxia.glif  |   8 +-
 .../glyphs/dialytikaperispomeni.glif               |   8 +-
 src/Cantarell-Light.ufo/glyphs/dialytikavaria.glif |   8 +-
 src/Cantarell-Light.ufo/glyphs/dieresistonos.glif  |   2 -
 src/Cantarell-Light.ufo/glyphs/epsilon.glif        |  92 ++++++++++---------
 src/Cantarell-Light.ufo/glyphs/epsilondasia.glif   |  12 +--
 .../glyphs/epsilondasiaoxia.glif                   |  12 +--
 .../glyphs/epsilondasiavaria.glif                  |  12 +--
 src/Cantarell-Light.ufo/glyphs/epsilonoxia.glif    |  12 +--
 src/Cantarell-Light.ufo/glyphs/epsilonpsili.glif   |  12 +--
 .../glyphs/epsilonpsilioxia.glif                   |  12 +--
 .../glyphs/epsilonpsilivaria.glif                  |  12 +--
 src/Cantarell-Light.ufo/glyphs/epsilontonos.glif   |  12 +--
 src/Cantarell-Light.ufo/glyphs/epsilonvaria.glif   |  12 +--
 src/Cantarell-Light.ufo/glyphs/eta.glif            |  50 +++++------
 src/Cantarell-Light.ufo/glyphs/etadasia.glif       |  12 +--
 src/Cantarell-Light.ufo/glyphs/etadasiaoxia.glif   |  12 +--
 .../glyphs/etadasiaoxiaypogegrammeni.glif          |  14 +--
 .../glyphs/etadasiaperispomeni.glif                |  12 +--
 .../glyphs/etadasiaperispomeniypogegrammeni.glif   |  14 +--
 src/Cantarell-Light.ufo/glyphs/etadasiavaria.glif  |  12 +--
 .../glyphs/etadasiavariaypogegrammeni.glif         |  14 +--
 .../glyphs/etadasiaypogegrammeni.glif              |  14 +--
 src/Cantarell-Light.ufo/glyphs/etaoxia.glif        |  12 +--
 .../glyphs/etaoxiaypogegrammeni.glif               |  14 +--
 src/Cantarell-Light.ufo/glyphs/etaperispomeni.glif |  12 +--
 .../glyphs/etaperispomeniypogegrammeni.glif        |  14 +--
 src/Cantarell-Light.ufo/glyphs/etapsili.glif       |  12 +--
 src/Cantarell-Light.ufo/glyphs/etapsilioxia.glif   |  12 +--
 .../glyphs/etapsilioxiaypogegrammeni.glif          |  14 +--
 .../glyphs/etapsiliperispomeni.glif                |  12 +--
 .../glyphs/etapsiliperispomeniypogegrammeni.glif   |  14 +--
 src/Cantarell-Light.ufo/glyphs/etapsilivaria.glif  |  12 +--
 .../glyphs/etapsilivariaypogegrammeni.glif         |  14 +--
 .../glyphs/etapsiliypogegrammeni.glif              |  14 +--
 src/Cantarell-Light.ufo/glyphs/etatonos.glif       |  12 +--
 src/Cantarell-Light.ufo/glyphs/etavaria.glif       |  12 +--
 .../glyphs/etavariaypogegrammeni.glif              |  14 +--
 .../glyphs/etaypogegrammeni.glif                   |  12 +--
 src/Cantarell-Light.ufo/glyphs/gamma.glif          |  40 ++++-----
 src/Cantarell-Light.ufo/glyphs/iota.glif           |  38 ++++----
 src/Cantarell-Light.ufo/glyphs/iotadasia.glif      |  12 +--
 src/Cantarell-Light.ufo/glyphs/iotadasiaoxia.glif  |  12 +--
 .../glyphs/iotadasiaperispomeni.glif               |  12 +--
 src/Cantarell-Light.ufo/glyphs/iotadasiavaria.glif |  12 +--
 .../glyphs/iotadialytikaoxia.glif                  |  12 +--
 .../glyphs/iotadialytikaperispomeni.glif           |  12 +--
 .../glyphs/iotadialytikavaria.glif                 |  12 +--
 src/Cantarell-Light.ufo/glyphs/iotadieresis.glif   |  12 +--
 .../glyphs/iotadieresistonos.glif                  |  12 +--
 src/Cantarell-Light.ufo/glyphs/iotamacron.glif     |  12 +--
 src/Cantarell-Light.ufo/glyphs/iotaoxia.glif       |  12 +--
 .../glyphs/iotaperispomeni.glif                    |  12 +--
 src/Cantarell-Light.ufo/glyphs/iotapsili.glif      |  12 +--
 src/Cantarell-Light.ufo/glyphs/iotapsilioxia.glif  |  12 +--
 .../glyphs/iotapsiliperispomeni.glif               |  12 +--
 src/Cantarell-Light.ufo/glyphs/iotapsilivaria.glif |  12 +--
 src/Cantarell-Light.ufo/glyphs/iotatonos.glif      |  12 +--
 src/Cantarell-Light.ufo/glyphs/iotavaria.glif      |  12 +--
 src/Cantarell-Light.ufo/glyphs/iotavrachy.glif     |  12 +--
 src/Cantarell-Light.ufo/glyphs/kaiS_ymbol.glif     |  84 +++++++++--------
 src/Cantarell-Light.ufo/glyphs/kappa.glif          |  52 ++++++-----
 src/Cantarell-Light.ufo/glyphs/koronis.case.glif   |   2 -
 src/Cantarell-Light.ufo/glyphs/koronis.glif        |   2 -
 src/Cantarell-Light.ufo/glyphs/lambda.glif         |   6 --
 .../glyphs/lowernumeral-greek.glif                 |   6 +-
 src/Cantarell-Light.ufo/glyphs/mu.glif             |  78 ++++++++--------
 src/Cantarell-Light.ufo/glyphs/nu.glif             |  36 ++++----
 src/Cantarell-Light.ufo/glyphs/omega.glif          |  92 ++++++++++---------
 src/Cantarell-Light.ufo/glyphs/omegadasia.glif     |  12 +--
 src/Cantarell-Light.ufo/glyphs/omegadasiaoxia.glif |  12 +--
 .../glyphs/omegadasiaoxiaypogegrammeni.glif        |  14 +--
 .../glyphs/omegadasiaperispomeni.glif              |  12 +--
 .../glyphs/omegadasiaperispomeniypogegrammeni.glif |  14 +--
 .../glyphs/omegadasiavaria.glif                    |  12 +--
 .../glyphs/omegadasiavariaypogegrammeni.glif       |  14 +--
 .../glyphs/omegadasiaypogegrammeni.glif            |  14 +--
 src/Cantarell-Light.ufo/glyphs/omegaoxia.glif      |  12 +--
 .../glyphs/omegaoxiaypogegrammeni.glif             |  14 +--
 .../glyphs/omegaperispomeni.glif                   |  12 +--
 .../glyphs/omegaperispomeniypogegrammeni.glif      |  14 +--
 src/Cantarell-Light.ufo/glyphs/omegapsili.glif     |  12 +--
 src/Cantarell-Light.ufo/glyphs/omegapsilioxia.glif |  12 +--
 .../glyphs/omegapsilioxiaypogegrammeni.glif        |  14 +--
 .../glyphs/omegapsiliperispomeni.glif              |  12 +--
 .../glyphs/omegapsiliperispomeniypogegrammeni.glif |  14 +--
 .../glyphs/omegapsilivaria.glif                    |  12 +--
 .../glyphs/omegapsilivariaypogegrammeni.glif       |  14 +--
 .../glyphs/omegapsiliypogegrammeni.glif            |  14 +--
 src/Cantarell-Light.ufo/glyphs/omegatonos.glif     |  12 +--
 src/Cantarell-Light.ufo/glyphs/omegavaria.glif     |  12 +--
 .../glyphs/omegavariaypogegrammeni.glif            |  14 +--
 .../glyphs/omegaypogegrammeni.glif                 |  12 +--
 src/Cantarell-Light.ufo/glyphs/omicron.glif        |  56 ++++++------
 src/Cantarell-Light.ufo/glyphs/omicrondasia.glif   |  12 +--
 .../glyphs/omicrondasiaoxia.glif                   |  12 +--
 .../glyphs/omicrondasiavaria.glif                  |  12 +--
 src/Cantarell-Light.ufo/glyphs/omicronoxia.glif    |  12 +--
 src/Cantarell-Light.ufo/glyphs/omicronpsili.glif   |  12 +--
 .../glyphs/omicronpsilioxia.glif                   |  12 +--
 .../glyphs/omicronpsilivaria.glif                  |  12 +--
 src/Cantarell-Light.ufo/glyphs/omicrontonos.glif   |  12 +--
 src/Cantarell-Light.ufo/glyphs/omicronvaria.glif   |  12 +--
 src/Cantarell-Light.ufo/glyphs/oxia.case.glif      |   2 -
 src/Cantarell-Light.ufo/glyphs/oxia.glif           |   2 -
 src/Cantarell-Light.ufo/glyphs/perispomeni.glif    |  10 +--
 src/Cantarell-Light.ufo/glyphs/phi.glif            |  76 ++++++++--------
 src/Cantarell-Light.ufo/glyphs/pi.glif             |  52 ++++++-----
 src/Cantarell-Light.ufo/glyphs/prosgegrammeni.glif |   6 --
 src/Cantarell-Light.ufo/glyphs/psi.glif            |  60 ++++++-------
 src/Cantarell-Light.ufo/glyphs/psili.case.glif     |   2 -
 src/Cantarell-Light.ufo/glyphs/psili.glif          |   6 --
 src/Cantarell-Light.ufo/glyphs/psilioxia.case.glif |   2 -
 src/Cantarell-Light.ufo/glyphs/psilioxia.glif      |   2 -
 .../glyphs/psiliperispomeni.case.glif              |   4 +-
 .../glyphs/psiliperispomeni.glif                   |   8 +-
 .../glyphs/psilivaria.case.glif                    |   2 -
 src/Cantarell-Light.ufo/glyphs/psilivaria.glif     |   2 -
 src/Cantarell-Light.ufo/glyphs/rho.glif            |  68 +++++++-------
 src/Cantarell-Light.ufo/glyphs/rhodasia.glif       |  12 +--
 src/Cantarell-Light.ufo/glyphs/rhopsili.glif       |  12 +--
 src/Cantarell-Light.ufo/glyphs/sigma.glif          |  60 ++++++-------
 src/Cantarell-Light.ufo/glyphs/sigmafinal.glif     |  68 +++++++-------
 src/Cantarell-Light.ufo/glyphs/tau.glif            |  44 +++++----
 src/Cantarell-Light.ufo/glyphs/theta.glif          |  60 ++++++-------
 src/Cantarell-Light.ufo/glyphs/tonos.case.glif     |   2 -
 src/Cantarell-Light.ufo/glyphs/tonos.glif          |   6 --
 src/Cantarell-Light.ufo/glyphs/upsilon.glif        |  52 ++++++-----
 src/Cantarell-Light.ufo/glyphs/upsilondasia.glif   |  12 +--
 .../glyphs/upsilondasiaoxia.glif                   |  12 +--
 .../glyphs/upsilondasiaperispomeni.glif            |  12 +--
 .../glyphs/upsilondasiavaria.glif                  |  12 +--
 .../glyphs/upsilondialytikaoxia.glif               |  12 +--
 .../glyphs/upsilondialytikaperispomeni.glif        |  12 +--
 .../glyphs/upsilondialytikavaria.glif              |  12 +--
 .../glyphs/upsilondieresis.glif                    |  12 +--
 .../glyphs/upsilondieresistonos.glif               |  12 +--
 src/Cantarell-Light.ufo/glyphs/upsilonmacron.glif  |  12 +--
 src/Cantarell-Light.ufo/glyphs/upsilonoxia.glif    |  12 +--
 .../glyphs/upsilonperispomeni.glif                 |  12 +--
 src/Cantarell-Light.ufo/glyphs/upsilonpsili.glif   |  12 +--
 .../glyphs/upsilonpsilioxia.glif                   |  12 +--
 .../glyphs/upsilonpsiliperispomeni.glif            |  12 +--
 .../glyphs/upsilonpsilivaria.glif                  |  12 +--
 src/Cantarell-Light.ufo/glyphs/upsilontonos.glif   |   8 +-
 src/Cantarell-Light.ufo/glyphs/upsilonvaria.glif   |  12 +--
 src/Cantarell-Light.ufo/glyphs/upsilonvrachy.glif  |  12 +--
 src/Cantarell-Light.ufo/glyphs/varia.case.glif     |   2 -
 src/Cantarell-Light.ufo/glyphs/varia.glif          |   6 --
 src/Cantarell-Light.ufo/glyphs/vrachy.case.glif    |   2 -
 src/Cantarell-Light.ufo/glyphs/vrachy.glif         |   2 -
 src/Cantarell-Light.ufo/glyphs/xi.glif             | 100 ++++++++++-----------
 src/Cantarell-Light.ufo/glyphs/ypogegrammeni.glif  |   6 --
 src/Cantarell-Light.ufo/glyphs/zeta.glif           |  68 +++++++-------
 src/Cantarell-Regular.ufo/glyphs/A_lpha.glif       |   9 +-
 src/Cantarell-Regular.ufo/glyphs/A_lphadasia.glif  |  12 +--
 .../glyphs/A_lphadasiaoxia.glif                    |  12 +--
 .../glyphs/A_lphadasiaoxiaprosgegrammeni.glif      |  12 +--
 .../glyphs/A_lphadasiaperispomeni.glif             |  12 +--
 .../A_lphadasiaperispomeniprosgegrammeni.glif      |  12 +--
 .../glyphs/A_lphadasiaprosgegrammeni.glif          |  12 +--
 .../glyphs/A_lphadasiavaria.glif                   |  12 +--
 .../glyphs/A_lphadasiavariaprosgegrammeni.glif     |  12 +--
 src/Cantarell-Regular.ufo/glyphs/A_lphamacron.glif |  14 +--
 src/Cantarell-Regular.ufo/glyphs/A_lphaoxia.glif   |  12 +--
 .../glyphs/A_lphaprosgegrammeni.glif               |  12 +--
 src/Cantarell-Regular.ufo/glyphs/A_lphapsili.glif  |  12 +--
 .../glyphs/A_lphapsilioxia.glif                    |  12 +--
 .../glyphs/A_lphapsilioxiaprosgegrammeni.glif      |  12 +--
 .../glyphs/A_lphapsiliperispomeni.glif             |  12 +--
 .../A_lphapsiliperispomeniprosgegrammeni.glif      |  12 +--
 .../glyphs/A_lphapsiliprosgegrammeni.glif          |  12 +--
 .../glyphs/A_lphapsilivaria.glif                   |  12 +--
 .../glyphs/A_lphapsilivariaprosgegrammeni.glif     |  12 +--
 src/Cantarell-Regular.ufo/glyphs/A_lphatonos.glif  |  12 +--
 src/Cantarell-Regular.ufo/glyphs/A_lphavaria.glif  |  12 +--
 src/Cantarell-Regular.ufo/glyphs/A_lphavrachy.glif |  12 +--
 src/Cantarell-Regular.ufo/glyphs/B_eta.glif        |  10 +--
 src/Cantarell-Regular.ufo/glyphs/C_hi.glif         |  10 +--
 src/Cantarell-Regular.ufo/glyphs/D_elta.glif       |  36 ++++----
 src/Cantarell-Regular.ufo/glyphs/E_psilon.glif     |   9 +-
 .../glyphs/E_psilondasia.glif                      |  12 +--
 .../glyphs/E_psilondasiaoxia.glif                  |  12 +--
 .../glyphs/E_psilondasiavaria.glif                 |  12 +--
 src/Cantarell-Regular.ufo/glyphs/E_psilonoxia.glif |  12 +--
 .../glyphs/E_psilonpsili.glif                      |  12 +--
 .../glyphs/E_psilonpsilioxia.glif                  |  12 +--
 .../glyphs/E_psilonpsilivaria.glif                 |  12 +--
 .../glyphs/E_psilontonos.glif                      |  12 +--
 .../glyphs/E_psilonvaria.glif                      |  12 +--
 src/Cantarell-Regular.ufo/glyphs/E_ta.glif         |   9 +-
 src/Cantarell-Regular.ufo/glyphs/E_tadasia.glif    |  12 +--
 .../glyphs/E_tadasiaoxia.glif                      |  12 +--
 .../glyphs/E_tadasiaoxiaprosgegrammeni.glif        |  12 +--
 .../glyphs/E_tadasiaperispomeni.glif               |  12 +--
 .../glyphs/E_tadasiaperispomeniprosgegrammeni.glif |  12 +--
 .../glyphs/E_tadasiaprosgegrammeni.glif            |  12 +--
 .../glyphs/E_tadasiavaria.glif                     |  12 +--
 .../glyphs/E_tadasiavariaprosgegrammeni.glif       |  12 +--
 src/Cantarell-Regular.ufo/glyphs/E_taoxia.glif     |  12 +--
 .../glyphs/E_taprosgegrammeni.glif                 |  12 +--
 src/Cantarell-Regular.ufo/glyphs/E_tapsili.glif    |  12 +--
 .../glyphs/E_tapsilioxia.glif                      |  12 +--
 .../glyphs/E_tapsilioxiaprosgegrammeni.glif        |  12 +--
 .../glyphs/E_tapsiliperispomeni.glif               |  12 +--
 .../glyphs/E_tapsiliperispomeniprosgegrammeni.glif |  12 +--
 .../glyphs/E_tapsiliprosgegrammeni.glif            |  12 +--
 .../glyphs/E_tapsilivaria.glif                     |  12 +--
 .../glyphs/E_tapsilivariaprosgegrammeni.glif       |  12 +--
 src/Cantarell-Regular.ufo/glyphs/E_tatonos.glif    |  12 +--
 src/Cantarell-Regular.ufo/glyphs/E_tavaria.glif    |  12 +--
 src/Cantarell-Regular.ufo/glyphs/G_amma.glif       |  10 +--
 src/Cantarell-Regular.ufo/glyphs/I_ota.glif        |   9 +-
 src/Cantarell-Regular.ufo/glyphs/I_otadasia.glif   |  12 +--
 .../glyphs/I_otadasiaoxia.glif                     |  12 +--
 .../glyphs/I_otadasiaperispomeni.glif              |  12 +--
 .../glyphs/I_otadasiavaria.glif                    |  12 +--
 .../glyphs/I_otadieresis.glif                      |  12 +--
 src/Cantarell-Regular.ufo/glyphs/I_otamacron.glif  |  14 +--
 src/Cantarell-Regular.ufo/glyphs/I_otaoxia.glif    |  12 +--
 src/Cantarell-Regular.ufo/glyphs/I_otapsili.glif   |  12 +--
 .../glyphs/I_otapsilioxia.glif                     |  12 +--
 .../glyphs/I_otapsiliperispomeni.glif              |  12 +--
 .../glyphs/I_otapsilivaria.glif                    |  12 +--
 src/Cantarell-Regular.ufo/glyphs/I_otatonos.glif   |  12 +--
 src/Cantarell-Regular.ufo/glyphs/I_otavaria.glif   |  12 +--
 src/Cantarell-Regular.ufo/glyphs/I_otavrachy.glif  |  12 +--
 src/Cantarell-Regular.ufo/glyphs/K_appa.glif       |  10 +--
 src/Cantarell-Regular.ufo/glyphs/L_ambda.glif      |  24 +++--
 src/Cantarell-Regular.ufo/glyphs/M_u.glif          |  10 +--
 src/Cantarell-Regular.ufo/glyphs/N_u.glif          |  10 +--
 src/Cantarell-Regular.ufo/glyphs/O_mega.glif       |  78 ++++++++--------
 src/Cantarell-Regular.ufo/glyphs/O_megadasia.glif  |  13 +--
 .../glyphs/O_megadasiaoxia.glif                    |  13 +--
 .../glyphs/O_megadasiaoxiaprosgegrammeni.glif      |  15 +---
 .../glyphs/O_megadasiaperispomeni.glif             |  13 +--
 .../O_megadasiaperispomeniprosgegrammeni.glif      |  15 +---
 .../glyphs/O_megadasiaprosgegrammeni.glif          |  15 +---
 .../glyphs/O_megadasiavaria.glif                   |  13 +--
 .../glyphs/O_megadasiavariaprosgegrammeni.glif     |  15 +---
 src/Cantarell-Regular.ufo/glyphs/O_megaoxia.glif   |  13 +--
 .../glyphs/O_megaprosgegrammeni.glif               |  13 +--
 src/Cantarell-Regular.ufo/glyphs/O_megapsili.glif  |  13 +--
 .../glyphs/O_megapsilioxia.glif                    |  13 +--
 .../glyphs/O_megapsilioxiaprosgegrammeni.glif      |  15 +---
 .../glyphs/O_megapsiliperispomeni.glif             |  13 +--
 .../O_megapsiliperispomeniprosgegrammeni.glif      |  15 +---
 .../glyphs/O_megapsiliprosgegrammeni.glif          |  15 +---
 .../glyphs/O_megapsilivaria.glif                   |  13 +--
 .../glyphs/O_megapsilivariaprosgegrammeni.glif     |  15 +---
 src/Cantarell-Regular.ufo/glyphs/O_megatonos.glif  |  13 +--
 src/Cantarell-Regular.ufo/glyphs/O_megavaria.glif  |  13 +--
 src/Cantarell-Regular.ufo/glyphs/O_micron.glif     |  12 +--
 .../glyphs/O_microndasia.glif                      |  15 +---
 .../glyphs/O_microndasiaoxia.glif                  |  15 +---
 .../glyphs/O_microndasiavaria.glif                 |  15 +---
 src/Cantarell-Regular.ufo/glyphs/O_micronoxia.glif |  15 +---
 .../glyphs/O_micronpsili.glif                      |  15 +---
 .../glyphs/O_micronpsilioxia.glif                  |  15 +---
 .../glyphs/O_micronpsilivaria.glif                 |  15 +---
 .../glyphs/O_microntonos.glif                      |  15 +---
 .../glyphs/O_micronvaria.glif                      |  15 +---
 src/Cantarell-Regular.ufo/glyphs/P_hi.glif         |  60 ++++++-------
 src/Cantarell-Regular.ufo/glyphs/P_i.glif          |   9 +-
 src/Cantarell-Regular.ufo/glyphs/P_si.glif         |  56 ++++++------
 src/Cantarell-Regular.ufo/glyphs/R_ho.glif         |   9 +-
 src/Cantarell-Regular.ufo/glyphs/R_hodasia.glif    |  10 +--
 src/Cantarell-Regular.ufo/glyphs/S_igma.glif       |  34 ++++---
 src/Cantarell-Regular.ufo/glyphs/T_au.glif         |  11 +--
 src/Cantarell-Regular.ufo/glyphs/T_heta.glif       |   9 +-
 src/Cantarell-Regular.ufo/glyphs/U_psilon.glif     |   8 +-
 .../glyphs/U_psilondasia.glif                      |  11 +--
 .../glyphs/U_psilondasiaoxia.glif                  |  11 +--
 .../glyphs/U_psilondasiaperispomeni.glif           |  11 +--
 .../glyphs/U_psilondasiavaria.glif                 |  11 +--
 .../glyphs/U_psilondieresis.glif                   |  11 +--
 .../glyphs/U_psilonmacron.glif                     |  13 +--
 src/Cantarell-Regular.ufo/glyphs/U_psilonoxia.glif |  11 +--
 .../glyphs/U_psilontonos.glif                      |  11 +--
 .../glyphs/U_psilonvaria.glif                      |  11 +--
 .../glyphs/U_psilonvrachy.glif                     |  11 +--
 src/Cantarell-Regular.ufo/glyphs/X_i.glif          |   4 +-
 src/Cantarell-Regular.ufo/glyphs/Z_eta.glif        |  10 +--
 src/Cantarell-Regular.ufo/glyphs/alpha.glif        | 100 ++++++++++-----------
 src/Cantarell-Regular.ufo/glyphs/alphadasia.glif   |  12 +--
 .../glyphs/alphadasiaoxia.glif                     |  12 +--
 .../glyphs/alphadasiaoxiaypogegrammeni.glif        |  14 +--
 .../glyphs/alphadasiaperispomeni.glif              |  12 +--
 .../glyphs/alphadasiaperispomeniypogegrammeni.glif |  14 +--
 .../glyphs/alphadasiavaria.glif                    |  12 +--
 .../glyphs/alphadasiavariaypogegrammeni.glif       |  14 +--
 .../glyphs/alphadasiaypogegrammeni.glif            |  14 +--
 src/Cantarell-Regular.ufo/glyphs/alphamacron.glif  |  12 +--
 src/Cantarell-Regular.ufo/glyphs/alphaoxia.glif    |  12 +--
 .../glyphs/alphaoxiaypogegrammeni.glif             |  14 +--
 .../glyphs/alphaperispomeni.glif                   |  12 +--
 .../glyphs/alphaperispomeniypogegrammeni.glif      |  14 +--
 src/Cantarell-Regular.ufo/glyphs/alphapsili.glif   |  12 +--
 .../glyphs/alphapsilioxia.glif                     |  12 +--
 .../glyphs/alphapsilioxiaypogegrammeni.glif        |  14 +--
 .../glyphs/alphapsiliperispomeni.glif              |  12 +--
 .../glyphs/alphapsiliperispomeniypogegrammeni.glif |  14 +--
 .../glyphs/alphapsilivaria.glif                    |  12 +--
 .../glyphs/alphapsilivariaypogegrammeni.glif       |  14 +--
 .../glyphs/alphapsiliypogegrammeni.glif            |  14 +--
 src/Cantarell-Regular.ufo/glyphs/alphatonos.glif   |  12 +--
 src/Cantarell-Regular.ufo/glyphs/alphavaria.glif   |  12 +--
 .../glyphs/alphavariaypogegrammeni.glif            |  14 +--
 src/Cantarell-Regular.ufo/glyphs/alphavrachy.glif  |  12 +--
 .../glyphs/alphaypogegrammeni.glif                 |  12 +--
 src/Cantarell-Regular.ufo/glyphs/beta.glif         |  92 ++++++++++---------
 src/Cantarell-Regular.ufo/glyphs/chi.glif          |  32 ++++---
 src/Cantarell-Regular.ufo/glyphs/dasia.case.glif   |   2 -
 src/Cantarell-Regular.ufo/glyphs/dasia.glif        |   6 --
 .../glyphs/dasiaoxia.case.glif                     |   2 -
 src/Cantarell-Regular.ufo/glyphs/dasiaoxia.glif    |   2 -
 .../glyphs/dasiaperispomeni.case.glif              |   4 +-
 .../glyphs/dasiavaria.case.glif                    |   2 -
 src/Cantarell-Regular.ufo/glyphs/dasiavaria.glif   |   2 -
 .../glyphs/daspsiliiaperispomeni.glif              |   6 +-
 src/Cantarell-Regular.ufo/glyphs/delta.glif        |  92 ++++++++++---------
 .../glyphs/dialytikaoxia.glif                      |   8 +-
 .../glyphs/dialytikaperispomeni.glif               |   8 +-
 .../glyphs/dialytikavaria.glif                     |   8 +-
 .../glyphs/dieresistonos.glif                      |   2 -
 src/Cantarell-Regular.ufo/glyphs/epsilon.glif      |  92 ++++++++++---------
 src/Cantarell-Regular.ufo/glyphs/epsilondasia.glif |  12 +--
 .../glyphs/epsilondasiaoxia.glif                   |  12 +--
 .../glyphs/epsilondasiavaria.glif                  |  12 +--
 src/Cantarell-Regular.ufo/glyphs/epsilonoxia.glif  |  12 +--
 src/Cantarell-Regular.ufo/glyphs/epsilonpsili.glif |  12 +--
 .../glyphs/epsilonpsilioxia.glif                   |  12 +--
 .../glyphs/epsilonpsilivaria.glif                  |  12 +--
 src/Cantarell-Regular.ufo/glyphs/epsilontonos.glif |  12 +--
 src/Cantarell-Regular.ufo/glyphs/epsilonvaria.glif |  12 +--
 src/Cantarell-Regular.ufo/glyphs/eta.glif          |  50 +++++------
 src/Cantarell-Regular.ufo/glyphs/etadasia.glif     |  12 +--
 src/Cantarell-Regular.ufo/glyphs/etadasiaoxia.glif |  12 +--
 .../glyphs/etadasiaoxiaypogegrammeni.glif          |  14 +--
 .../glyphs/etadasiaperispomeni.glif                |  12 +--
 .../glyphs/etadasiaperispomeniypogegrammeni.glif   |  14 +--
 .../glyphs/etadasiavaria.glif                      |  12 +--
 .../glyphs/etadasiavariaypogegrammeni.glif         |  14 +--
 .../glyphs/etadasiaypogegrammeni.glif              |  14 +--
 src/Cantarell-Regular.ufo/glyphs/etaoxia.glif      |  12 +--
 .../glyphs/etaoxiaypogegrammeni.glif               |  14 +--
 .../glyphs/etaperispomeni.glif                     |  12 +--
 .../glyphs/etaperispomeniypogegrammeni.glif        |  14 +--
 src/Cantarell-Regular.ufo/glyphs/etapsili.glif     |  12 +--
 src/Cantarell-Regular.ufo/glyphs/etapsilioxia.glif |  12 +--
 .../glyphs/etapsilioxiaypogegrammeni.glif          |  14 +--
 .../glyphs/etapsiliperispomeni.glif                |  12 +--
 .../glyphs/etapsiliperispomeniypogegrammeni.glif   |  14 +--
 .../glyphs/etapsilivaria.glif                      |  12 +--
 .../glyphs/etapsilivariaypogegrammeni.glif         |  14 +--
 .../glyphs/etapsiliypogegrammeni.glif              |  14 +--
 src/Cantarell-Regular.ufo/glyphs/etatonos.glif     |  12 +--
 src/Cantarell-Regular.ufo/glyphs/etavaria.glif     |  12 +--
 .../glyphs/etavariaypogegrammeni.glif              |  14 +--
 .../glyphs/etaypogegrammeni.glif                   |  12 +--
 src/Cantarell-Regular.ufo/glyphs/gamma.glif        |  40 ++++-----
 src/Cantarell-Regular.ufo/glyphs/iota.glif         |  40 ++++-----
 src/Cantarell-Regular.ufo/glyphs/iotadasia.glif    |  12 +--
 .../glyphs/iotadasiaoxia.glif                      |  12 +--
 .../glyphs/iotadasiaperispomeni.glif               |  12 +--
 .../glyphs/iotadasiavaria.glif                     |  12 +--
 .../glyphs/iotadialytikaoxia.glif                  |  12 +--
 .../glyphs/iotadialytikaperispomeni.glif           |  12 +--
 .../glyphs/iotadialytikavaria.glif                 |  12 +--
 src/Cantarell-Regular.ufo/glyphs/iotadieresis.glif |  12 +--
 .../glyphs/iotadieresistonos.glif                  |  12 +--
 src/Cantarell-Regular.ufo/glyphs/iotamacron.glif   |  12 +--
 src/Cantarell-Regular.ufo/glyphs/iotaoxia.glif     |  12 +--
 .../glyphs/iotaperispomeni.glif                    |  12 +--
 src/Cantarell-Regular.ufo/glyphs/iotapsili.glif    |  12 +--
 .../glyphs/iotapsilioxia.glif                      |  12 +--
 .../glyphs/iotapsiliperispomeni.glif               |  12 +--
 .../glyphs/iotapsilivaria.glif                     |  12 +--
 src/Cantarell-Regular.ufo/glyphs/iotatonos.glif    |  12 +--
 src/Cantarell-Regular.ufo/glyphs/iotavaria.glif    |  12 +--
 src/Cantarell-Regular.ufo/glyphs/iotavrachy.glif   |  12 +--
 src/Cantarell-Regular.ufo/glyphs/kaiS_ymbol.glif   |  84 +++++++++--------
 src/Cantarell-Regular.ufo/glyphs/kappa.glif        |  52 ++++++-----
 src/Cantarell-Regular.ufo/glyphs/koronis.case.glif |   2 -
 src/Cantarell-Regular.ufo/glyphs/koronis.glif      |   2 -
 src/Cantarell-Regular.ufo/glyphs/lambda.glif       |   6 --
 .../glyphs/lowernumeral-greek.glif                 |   6 +-
 src/Cantarell-Regular.ufo/glyphs/mu.glif           |  78 ++++++++--------
 src/Cantarell-Regular.ufo/glyphs/nu.glif           |  36 ++++----
 src/Cantarell-Regular.ufo/glyphs/omega.glif        |  92 ++++++++++---------
 src/Cantarell-Regular.ufo/glyphs/omegadasia.glif   |  12 +--
 .../glyphs/omegadasiaoxia.glif                     |  12 +--
 .../glyphs/omegadasiaoxiaypogegrammeni.glif        |  14 +--
 .../glyphs/omegadasiaperispomeni.glif              |  12 +--
 .../glyphs/omegadasiaperispomeniypogegrammeni.glif |  14 +--
 .../glyphs/omegadasiavaria.glif                    |  12 +--
 .../glyphs/omegadasiavariaypogegrammeni.glif       |  14 +--
 .../glyphs/omegadasiaypogegrammeni.glif            |  14 +--
 src/Cantarell-Regular.ufo/glyphs/omegaoxia.glif    |  12 +--
 .../glyphs/omegaoxiaypogegrammeni.glif             |  14 +--
 .../glyphs/omegaperispomeni.glif                   |  12 +--
 .../glyphs/omegaperispomeniypogegrammeni.glif      |  14 +--
 src/Cantarell-Regular.ufo/glyphs/omegapsili.glif   |  12 +--
 .../glyphs/omegapsilioxia.glif                     |  12 +--
 .../glyphs/omegapsilioxiaypogegrammeni.glif        |  14 +--
 .../glyphs/omegapsiliperispomeni.glif              |  12 +--
 .../glyphs/omegapsiliperispomeniypogegrammeni.glif |  14 +--
 .../glyphs/omegapsilivaria.glif                    |  12 +--
 .../glyphs/omegapsilivariaypogegrammeni.glif       |  14 +--
 .../glyphs/omegapsiliypogegrammeni.glif            |  14 +--
 src/Cantarell-Regular.ufo/glyphs/omegatonos.glif   |  12 +--
 src/Cantarell-Regular.ufo/glyphs/omegavaria.glif   |  12 +--
 .../glyphs/omegavariaypogegrammeni.glif            |  14 +--
 .../glyphs/omegaypogegrammeni.glif                 |  12 +--
 src/Cantarell-Regular.ufo/glyphs/omicron.glif      |  56 ++++++------
 src/Cantarell-Regular.ufo/glyphs/omicrondasia.glif |  12 +--
 .../glyphs/omicrondasiaoxia.glif                   |  12 +--
 .../glyphs/omicrondasiavaria.glif                  |  12 +--
 src/Cantarell-Regular.ufo/glyphs/omicronoxia.glif  |  12 +--
 src/Cantarell-Regular.ufo/glyphs/omicronpsili.glif |  12 +--
 .../glyphs/omicronpsilioxia.glif                   |  12 +--
 .../glyphs/omicronpsilivaria.glif                  |  12 +--
 src/Cantarell-Regular.ufo/glyphs/omicrontonos.glif |  12 +--
 src/Cantarell-Regular.ufo/glyphs/omicronvaria.glif |  12 +--
 src/Cantarell-Regular.ufo/glyphs/oxia.case.glif    |   2 -
 src/Cantarell-Regular.ufo/glyphs/oxia.glif         |   2 -
 src/Cantarell-Regular.ufo/glyphs/perispomeni.glif  |  10 +--
 src/Cantarell-Regular.ufo/glyphs/phi.glif          |  76 ++++++++--------
 src/Cantarell-Regular.ufo/glyphs/pi.glif           |  52 ++++++-----
 .../glyphs/prosgegrammeni.glif                     |   6 --
 src/Cantarell-Regular.ufo/glyphs/psi.glif          |  60 ++++++-------
 src/Cantarell-Regular.ufo/glyphs/psili.case.glif   |   2 -
 src/Cantarell-Regular.ufo/glyphs/psili.glif        |   6 --
 .../glyphs/psilioxia.case.glif                     |   2 -
 src/Cantarell-Regular.ufo/glyphs/psilioxia.glif    |   2 -
 .../glyphs/psiliperispomeni.case.glif              |   4 +-
 .../glyphs/psiliperispomeni.glif                   |   8 +-
 .../glyphs/psilivaria.case.glif                    |   2 -
 src/Cantarell-Regular.ufo/glyphs/psilivaria.glif   |   2 -
 src/Cantarell-Regular.ufo/glyphs/rho.glif          |  68 +++++++-------
 src/Cantarell-Regular.ufo/glyphs/rhodasia.glif     |  12 +--
 src/Cantarell-Regular.ufo/glyphs/rhopsili.glif     |  12 +--
 src/Cantarell-Regular.ufo/glyphs/sigma.glif        |  60 ++++++-------
 src/Cantarell-Regular.ufo/glyphs/sigmafinal.glif   |  68 +++++++-------
 src/Cantarell-Regular.ufo/glyphs/tau.glif          |  44 +++++----
 src/Cantarell-Regular.ufo/glyphs/theta.glif        |  60 ++++++-------
 src/Cantarell-Regular.ufo/glyphs/tonos.case.glif   |   2 -
 src/Cantarell-Regular.ufo/glyphs/tonos.glif        |   6 --
 src/Cantarell-Regular.ufo/glyphs/upsilon.glif      |  52 ++++++-----
 src/Cantarell-Regular.ufo/glyphs/upsilondasia.glif |  12 +--
 .../glyphs/upsilondasiaoxia.glif                   |  12 +--
 .../glyphs/upsilondasiaperispomeni.glif            |  12 +--
 .../glyphs/upsilondasiavaria.glif                  |  12 +--
 .../glyphs/upsilondialytikaoxia.glif               |  12 +--
 .../glyphs/upsilondialytikaperispomeni.glif        |  12 +--
 .../glyphs/upsilondialytikavaria.glif              |  12 +--
 .../glyphs/upsilondieresis.glif                    |  12 +--
 .../glyphs/upsilondieresistonos.glif               |  12 +--
 .../glyphs/upsilonmacron.glif                      |  12 +--
 src/Cantarell-Regular.ufo/glyphs/upsilonoxia.glif  |  12 +--
 .../glyphs/upsilonperispomeni.glif                 |  12 +--
 src/Cantarell-Regular.ufo/glyphs/upsilonpsili.glif |  12 +--
 .../glyphs/upsilonpsilioxia.glif                   |  12 +--
 .../glyphs/upsilonpsiliperispomeni.glif            |  12 +--
 .../glyphs/upsilonpsilivaria.glif                  |  12 +--
 src/Cantarell-Regular.ufo/glyphs/upsilontonos.glif |   8 +-
 src/Cantarell-Regular.ufo/glyphs/upsilonvaria.glif |  12 +--
 .../glyphs/upsilonvrachy.glif                      |  12 +--
 src/Cantarell-Regular.ufo/glyphs/varia.case.glif   |   2 -
 src/Cantarell-Regular.ufo/glyphs/varia.glif        |   6 --
 src/Cantarell-Regular.ufo/glyphs/vrachy.case.glif  |   2 -
 src/Cantarell-Regular.ufo/glyphs/vrachy.glif       |   2 -
 src/Cantarell-Regular.ufo/glyphs/xi.glif           | 100 ++++++++++-----------
 .../glyphs/ypogegrammeni.glif                      |   6 --
 src/Cantarell-Regular.ufo/glyphs/zeta.glif         |  68 +++++++-------
 963 files changed, 4149 insertions(+), 11310 deletions(-)
---
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lpha.glif b/src/Cantarell-Bold.ufo/glyphs/A_lpha.glif
index b82d86ca..8fc1c5c6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lpha.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lpha.glif
@@ -1,18 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alpha" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="0391"/>
   <anchor x="353" y="0" name="bottom"/>
   <anchor x="353" y="694" name="top"/>
   <anchor x="100" y="694" name="topleft"/>
-  <anchor x="659" y="10" name="ogonek"/>
   <outline>
     <component base="A"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphadasia.glif b/src/Cantarell-Bold.ufo/glyphs/A_lphadasia.glif
index 8fdc4c11..b2dc4a8f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphadasia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphadasia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasia" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1F09"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasia.case" xOffset="-118"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaoxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaoxia.glif
index 2cb9fd5d..0ac65bbc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiaoxia" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1F0D"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiaoxia.case" xOffset="-321"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaoxiaprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaoxiaprosgegrammeni.glif
index c195b852..27465abd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaoxiaprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaoxiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiaoxiaprosgegrammeni" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1F8D"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiaoxia.case" xOffset="-321"/>
     <component base="prosgegrammeni" xOffset="91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaperispomeni.glif
index 69b76479..d87d39d5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiaperispomeni" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1F0F"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiaperispomeni.case" xOffset="-281" yOffset="-213"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaperispomeniprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaperispomeniprosgegrammeni.glif
index 78c15e31..c44bf166 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaperispomeniprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiaperispomeniprosgegrammeni" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1F8F"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiaperispomeni.case" xOffset="-281" yOffset="-213"/>
     <component base="prosgegrammeni" xOffset="91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaprosgegrammeni.glif
index 536da948..b42e32c0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphadasiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiaprosgegrammeni" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1F89"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasia.case" xOffset="-118"/>
     <component base="prosgegrammeni" xOffset="91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphadasiavaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_lphadasiavaria.glif
index 4286f452..23e8600b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphadasiavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphadasiavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiavaria" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1F0B"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiavaria.case" xOffset="-324"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphadasiavariaprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_lphadasiavariaprosgegrammeni.glif
index 34a8aad0..7eaecbd2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphadasiavariaprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphadasiavariaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiavariaprosgegrammeni" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1F8B"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiavaria.case" xOffset="-324"/>
     <component base="prosgegrammeni" xOffset="91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphamacron.glif b/src/Cantarell-Bold.ufo/glyphs/A_lphamacron.glif
index b2301388..ca20f9fa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphamacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphamacron.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphamacron" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1FB9"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
-    <component base="macron" xOffset="117" yOffset="204"/>
+    <component base="macron" xOffset="103" yOffset="204"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphaoxia.glif b/src/Cantarell-Bold.ufo/glyphs/A_lphaoxia.glif
index 54dd4dc0..fae632dd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphaoxia" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1FBB"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="oxia.case" xOffset="-113"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphaprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_lphaprosgegrammeni.glif
index f9fd7b05..0d630d0c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphaprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphaprosgegrammeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphaprosgegrammeni" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1FBC"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="prosgegrammeni" xOffset="91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphapsili.glif b/src/Cantarell-Bold.ufo/glyphs/A_lphapsili.glif
index 829c1753..1dd9bb98 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphapsili.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphapsili.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsili" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1F08"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psili.case" xOffset="-109"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphapsilioxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_lphapsilioxia.glif
index c1eac386..d744a158 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphapsilioxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphapsilioxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsilioxia" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1F0C"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psilioxia.case" xOffset="-317"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphapsilioxiaprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_lphapsilioxiaprosgegrammeni.glif
index 3696e40f..c26034b6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphapsilioxiaprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphapsilioxiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsilioxiaprosgegrammeni" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1F8C"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psilioxia.case" xOffset="-317"/>
     <component base="prosgegrammeni" xOffset="91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphapsiliperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_lphapsiliperispomeni.glif
index 1e47ddc7..e35ae5b3 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphapsiliperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphapsiliperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsiliperispomeni" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1F0E"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psiliperispomeni.case" xOffset="-281" yOffset="-213"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.5,0.09,0.79,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphapsiliperispomeniprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_lphapsiliperispomeniprosgegrammeni.glif
index 52af49bb..5c7e896d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphapsiliperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphapsiliperispomeniprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsiliperispomeniprosgegrammeni" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1F8E"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psiliperispomeni.case" xOffset="-281" yOffset="-213"/>
     <component base="prosgegrammeni" xOffset="91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphapsiliprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_lphapsiliprosgegrammeni.glif
index a39118bf..3307e982 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphapsiliprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphapsiliprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsiliprosgegrammeni" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1F88"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psili.case" xOffset="-109"/>
     <component base="prosgegrammeni" xOffset="91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphapsilivaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_lphapsilivaria.glif
index fa980ce1..6f66cc0d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphapsilivaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphapsilivaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsilivaria" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1F0A"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psilivaria.case" xOffset="-316"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.25,0.25,0.25,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphapsilivariaprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/A_lphapsilivariaprosgegrammeni.glif
index 3e0e90df..46005d36 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphapsilivariaprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphapsilivariaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsilivariaprosgegrammeni" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1F8A"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psilivaria.case" xOffset="-316"/>
     <component base="prosgegrammeni" xOffset="91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphatonos.glif b/src/Cantarell-Bold.ufo/glyphs/A_lphatonos.glif
index 48c506bd..f6c376fe 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphatonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphatonos.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphatonos" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="0386"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="tonos.case" xOffset="-113"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphavaria.glif b/src/Cantarell-Bold.ufo/glyphs/A_lphavaria.glif
index 55292f96..40d3d5cc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphavaria" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1FBA"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="varia.case" xOffset="-106"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/A_lphavrachy.glif b/src/Cantarell-Bold.ufo/glyphs/A_lphavrachy.glif
index 7c0b264b..b0edca10 100644
--- a/src/Cantarell-Bold.ufo/glyphs/A_lphavrachy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/A_lphavrachy.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphavrachy" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="1FB8"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="659" y="10" name="ogonek"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="100" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="vrachy.case" xOffset="120"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/B_eta.glif b/src/Cantarell-Bold.ufo/glyphs/B_eta.glif
index daa368d7..9b93e925 100644
--- a/src/Cantarell-Bold.ufo/glyphs/B_eta.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/B_eta.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Beta" format="2">
-  <advance width="652"/>
+  <advance width="670"/>
   <unicode hex="0392"/>
-  <anchor x="318" y="0" name="bottom"/>
-  <anchor x="318" y="694" name="top"/>
   <outline>
     <component base="B"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/C_hi.glif b/src/Cantarell-Bold.ufo/glyphs/C_hi.glif
index ddbb6f7e..f7363844 100644
--- a/src/Cantarell-Bold.ufo/glyphs/C_hi.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/C_hi.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chi" format="2">
-  <advance width="672"/>
+  <advance width="652"/>
   <unicode hex="03A7"/>
-  <anchor x="355" y="0" name="bottom"/>
-  <anchor x="343" y="694" name="top"/>
   <outline>
     <component base="X"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/D_elta.glif b/src/Cantarell-Bold.ufo/glyphs/D_elta.glif
index cd6f5061..742eae67 100644
--- a/src/Cantarell-Bold.ufo/glyphs/D_elta.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/D_elta.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Delta" format="2">
-  <advance width="690"/>
+  <advance width="673"/>
   <unicode hex="0394"/>
-  <anchor x="343" y="0" name="bottom"/>
-  <anchor x="343" y="694" name="top"/>
+  <anchor x="335" y="0" name="bottom"/>
+  <anchor x="335" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="31" y="0" type="line"/>
-      <point x="176" y="0" type="line"/>
-      <point x="360" y="620" type="line"/>
-      <point x="312" y="620" type="line"/>
-      <point x="505" y="0" type="line"/>
-      <point x="658" y="0" type="line"/>
-      <point x="658" y="111" type="line"/>
-      <point x="459" y="694" type="line"/>
-      <point x="238" y="694" type="line"/>
-      <point x="31" y="111" type="line"/>
+      <point x="23" y="0" type="line"/>
+      <point x="168" y="0" type="line"/>
+      <point x="352" y="620" type="line"/>
+      <point x="304" y="620" type="line"/>
+      <point x="497" y="0" type="line"/>
+      <point x="650" y="0" type="line"/>
+      <point x="650" y="111" type="line"/>
+      <point x="451" y="694" type="line"/>
+      <point x="230" y="694" type="line"/>
+      <point x="23" y="111" type="line"/>
     </contour>
     <contour>
-      <point x="146" y="0" type="line"/>
-      <point x="535" y="0" type="line"/>
-      <point x="535" y="152" type="line"/>
-      <point x="146" y="152" type="line"/>
+      <point x="138" y="0" type="line"/>
+      <point x="527" y="0" type="line"/>
+      <point x="527" y="152" type="line"/>
+      <point x="138" y="152" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -34,8 +34,6 @@
       <string>=A+30</string>
       <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
       <string>=A+30</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_psilon.glif b/src/Cantarell-Bold.ufo/glyphs/E_psilon.glif
index ca0d5831..54f3ca71 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_psilon.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_psilon.glif
@@ -1,18 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilon" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="0395"/>
   <anchor x="320" y="0" name="bottom"/>
   <anchor x="313" y="694" name="top"/>
   <anchor x="-33" y="694" name="topleft"/>
-  <anchor x="518" y="10" name="ogonek"/>
   <outline>
     <component base="E"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_psilondasia.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_psilondasia.glif
index 8d417ad8..40948005 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_psilondasia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_psilondasia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilondasia" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="1F19"/>
-  <anchor x="320" y="0" name="bottom"/>
-  <anchor x="518" y="10" name="ogonek"/>
-  <anchor x="313" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="dasia.case" xOffset="-251"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_psilondasiaoxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_psilondasiaoxia.glif
index fb15153b..ca315733 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_psilondasiaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_psilondasiaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilondasiaoxia" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="1F1D"/>
-  <anchor x="320" y="0" name="bottom"/>
-  <anchor x="518" y="10" name="ogonek"/>
-  <anchor x="313" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="dasiaoxia.case" xOffset="-454"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_psilondasiavaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_psilondasiavaria.glif
index 594d8347..53bee5bc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_psilondasiavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_psilondasiavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilondasiavaria" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="1F1B"/>
-  <anchor x="320" y="0" name="bottom"/>
-  <anchor x="518" y="10" name="ogonek"/>
-  <anchor x="313" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="dasiavaria.case" xOffset="-457"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_psilonoxia.glif b/src/Cantarell-Bold.ufo/glyphs/E_psilonoxia.glif
index ebeeb7a9..a804a559 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_psilonoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_psilonoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilonoxia" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="1FC9"/>
-  <anchor x="320" y="0" name="bottom"/>
-  <anchor x="518" y="10" name="ogonek"/>
-  <anchor x="313" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="oxia.case" xOffset="-246"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_psilonpsili.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_psilonpsili.glif
index 344d9778..a8f4636b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_psilonpsili.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_psilonpsili.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilonpsili" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="1F18"/>
-  <anchor x="320" y="0" name="bottom"/>
-  <anchor x="518" y="10" name="ogonek"/>
-  <anchor x="313" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="psili.case" xOffset="-242"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_psilonpsilioxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_psilonpsilioxia.glif
index 15eb0246..7f46a7bd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_psilonpsilioxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_psilonpsilioxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilonpsilioxia" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="1F1C"/>
-  <anchor x="320" y="0" name="bottom"/>
-  <anchor x="518" y="10" name="ogonek"/>
-  <anchor x="313" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="psilioxia.case" xOffset="-450"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_psilonpsilivaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_psilonpsilivaria.glif
index f57681d0..1693ae50 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_psilonpsilivaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_psilonpsilivaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilonpsilivaria" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="1F1A"/>
-  <anchor x="320" y="0" name="bottom"/>
-  <anchor x="518" y="10" name="ogonek"/>
-  <anchor x="313" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="psilivaria.case" xOffset="-449"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_psilontonos.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_psilontonos.glif
index 38602fbd..a6ef8220 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_psilontonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_psilontonos.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilontonos" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="0388"/>
-  <anchor x="320" y="0" name="bottom"/>
-  <anchor x="518" y="10" name="ogonek"/>
-  <anchor x="313" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="tonos.case" xOffset="-246"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_psilonvaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_psilonvaria.glif
index f2b04118..5315b3c1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_psilonvaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_psilonvaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilonvaria" format="2">
-  <advance width="610"/>
+  <advance width="619"/>
   <unicode hex="1FC8"/>
-  <anchor x="320" y="0" name="bottom"/>
-  <anchor x="518" y="10" name="ogonek"/>
-  <anchor x="313" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="varia.case" xOffset="-239"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_ta.glif b/src/Cantarell-Bold.ufo/glyphs/E_ta.glif
index 1dbc52c4..1d5f2a62 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_ta.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_ta.glif
@@ -1,18 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eta" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="0397"/>
   <anchor x="377" y="0" name="bottom"/>
   <anchor x="377" y="694" name="top"/>
   <anchor x="-33" y="694" name="topleft"/>
-  <anchor x="377" y="566" name="center"/>
   <outline>
     <component base="H"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tadasia.glif b/src/Cantarell-Bold.ufo/glyphs/E_tadasia.glif
index b4a6db51..8b1ad0aa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tadasia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tadasia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasia" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1F29"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasia.case" xOffset="-251"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tadasiaoxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_tadasiaoxia.glif
index f3a0d53f..0893605a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tadasiaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tadasiaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiaoxia" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1F2D"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiaoxia.case" xOffset="-454"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tadasiaoxiaprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_tadasiaoxiaprosgegrammeni.glif
index 7e2137a8..43899c1d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tadasiaoxiaprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tadasiaoxiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiaoxiaprosgegrammeni" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1F9D"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiaoxia.case" xOffset="-454"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tadasiaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_tadasiaperispomeni.glif
index 4edb1fb4..37852011 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tadasiaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tadasiaperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiaperispomeni" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1F2F"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiaperispomeni.case" xOffset="-414" yOffset="-213"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tadasiaperispomeniprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_tadasiaperispomeniprosgegrammeni.glif
index a061c579..1ffe5e8b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tadasiaperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tadasiaperispomeniprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiaperispomeniprosgegrammeni" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1F9F"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiaperispomeni.case" xOffset="-414" yOffset="-213"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tadasiaprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_tadasiaprosgegrammeni.glif
index 5b2d0ed5..76cd7110 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tadasiaprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tadasiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiaprosgegrammeni" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1F99"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasia.case" xOffset="-251"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tadasiavaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_tadasiavaria.glif
index 905a18fd..4d4d0961 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tadasiavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tadasiavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiavaria" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1F2B"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiavaria.case" xOffset="-457"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tadasiavariaprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_tadasiavariaprosgegrammeni.glif
index 8ddeb734..9f899c9d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tadasiavariaprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tadasiavariaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiavariaprosgegrammeni" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1F9B"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiavaria.case" xOffset="-457"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_taoxia.glif b/src/Cantarell-Bold.ufo/glyphs/E_taoxia.glif
index 133b056f..486567eb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_taoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_taoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etaoxia" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1FCB"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="oxia.case" xOffset="-246"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_taprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_taprosgegrammeni.glif
index 61c883b3..e17155d4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_taprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_taprosgegrammeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etaprosgegrammeni" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1FCC"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tapsili.glif b/src/Cantarell-Bold.ufo/glyphs/E_tapsili.glif
index 48374e9f..41ac2ca8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tapsili.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tapsili.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsili" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1F28"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psili.case" xOffset="-242"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tapsilioxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_tapsilioxia.glif
index 77d4760e..1c58cddb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tapsilioxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tapsilioxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsilioxia" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1F2C"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psilioxia.case" xOffset="-450"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tapsilioxiaprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_tapsilioxiaprosgegrammeni.glif
index cde74f59..f34d0162 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tapsilioxiaprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tapsilioxiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsilioxiaprosgegrammeni" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1F9C"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psilioxia.case" xOffset="-450"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tapsiliperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_tapsiliperispomeni.glif
index 971cb310..7ec91639 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tapsiliperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tapsiliperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsiliperispomeni" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1F2E"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psiliperispomeni.case" xOffset="-414" yOffset="-213"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.5,0.09,0.79,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tapsiliperispomeniprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_tapsiliperispomeniprosgegrammeni.glif
index 8d8bab1f..b1a8b754 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tapsiliperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tapsiliperispomeniprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsiliperispomeniprosgegrammeni" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1F9E"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psiliperispomeni.case" xOffset="-414" yOffset="-213"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tapsiliprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_tapsiliprosgegrammeni.glif
index 02c8f124..dd91b4e6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tapsiliprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tapsiliprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsiliprosgegrammeni" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1F98"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psili.case" xOffset="-242"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tapsilivaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_tapsilivaria.glif
index 9d5069ea..3855b9ca 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tapsilivaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tapsilivaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsilivaria" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1F2A"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psilivaria.case" xOffset="-449"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.25,0.25,0.25,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tapsilivariaprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/E_tapsilivariaprosgegrammeni.glif
index 7513f282..a6e1d6dd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tapsilivariaprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tapsilivariaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsilivariaprosgegrammeni" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1F9A"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psilivaria.case" xOffset="-449"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tatonos.glif b/src/Cantarell-Bold.ufo/glyphs/E_tatonos.glif
index 8a46462c..e790cd85 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tatonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tatonos.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etatonos" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="0389"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="tonos.case" xOffset="-246"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/E_tavaria.glif b/src/Cantarell-Bold.ufo/glyphs/E_tavaria.glif
index e6beb174..e27fe08e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/E_tavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/E_tavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etavaria" format="2">
-  <advance width="755"/>
+  <advance width="763"/>
   <unicode hex="1FCA"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="566" name="center"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="varia.case" xOffset="-239"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/G_amma.glif b/src/Cantarell-Bold.ufo/glyphs/G_amma.glif
index f44ba2fb..688045aa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/G_amma.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/G_amma.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gamma" format="2">
-  <advance width="553"/>
+  <advance width="570"/>
   <unicode hex="0393"/>
-  <anchor x="187" y="0" name="bottomright"/>
-  <anchor x="284" y="694" name="top"/>
   <outline>
     <component base="Ge-cy"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_ota.glif b/src/Cantarell-Bold.ufo/glyphs/I_ota.glif
index 7a52e841..d4de9cef 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_ota.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_ota.glif
@@ -1,18 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iota" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="0399"/>
   <anchor x="155" y="0" name="bottom"/>
   <anchor x="155" y="694" name="top"/>
   <anchor x="-33" y="694" name="topleft"/>
-  <anchor x="196" y="10" name="ogonek"/>
   <outline>
     <component base="I"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_otadasia.glif b/src/Cantarell-Bold.ufo/glyphs/I_otadasia.glif
index 9d61ccab..51763a05 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_otadasia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_otadasia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotadasia" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="1F39"/>
-  <anchor x="155" y="0" name="bottom"/>
-  <anchor x="196" y="10" name="ogonek"/>
-  <anchor x="155" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="dasia.case" xOffset="-251"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_otadasiaoxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/I_otadasiaoxia.glif
index 42f9f741..bd55058e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_otadasiaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_otadasiaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotadasiaoxia" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="1F3D"/>
-  <anchor x="155" y="0" name="bottom"/>
-  <anchor x="196" y="10" name="ogonek"/>
-  <anchor x="155" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="dasiaoxia.case" xOffset="-454"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_otadasiaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/I_otadasiaperispomeni.glif
index 40eefaee..62b3d247 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_otadasiaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_otadasiaperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotadasiaperispomeni" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="1F3F"/>
-  <anchor x="155" y="0" name="bottom"/>
-  <anchor x="196" y="10" name="ogonek"/>
-  <anchor x="155" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="dasiaperispomeni.case" xOffset="-414" yOffset="-213"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_otadasiavaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/I_otadasiavaria.glif
index f268c7a3..f92c7a25 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_otadasiavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_otadasiavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotadasiavaria" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="1F3B"/>
-  <anchor x="155" y="0" name="bottom"/>
-  <anchor x="196" y="10" name="ogonek"/>
-  <anchor x="155" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="dasiavaria.case" xOffset="-457"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_otadieresis.glif 
b/src/Cantarell-Bold.ufo/glyphs/I_otadieresis.glif
index b98589b5..fd1f185c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_otadieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_otadieresis.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotadieresis" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="03AA"/>
-  <anchor x="155" y="0" name="bottom"/>
-  <anchor x="196" y="10" name="ogonek"/>
-  <anchor x="155" y="906" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="dieresiscomb.case" xOffset="-120"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_otamacron.glif b/src/Cantarell-Bold.ufo/glyphs/I_otamacron.glif
index 175c537a..b0ba2472 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_otamacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_otamacron.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotamacron" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="1FD9"/>
-  <anchor x="155" y="0" name="bottom"/>
-  <anchor x="196" y="10" name="ogonek"/>
-  <anchor x="155" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
-    <component base="macron" xOffset="-81" yOffset="204"/>
+    <component base="macron" xOffset="-95" yOffset="204"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_otaoxia.glif b/src/Cantarell-Bold.ufo/glyphs/I_otaoxia.glif
index ccd08aaa..9dec300a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_otaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_otaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotaoxia" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="1FDB"/>
-  <anchor x="155" y="0" name="bottom"/>
-  <anchor x="196" y="10" name="ogonek"/>
-  <anchor x="155" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="oxia.case" xOffset="-246"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_otapsili.glif b/src/Cantarell-Bold.ufo/glyphs/I_otapsili.glif
index d866c885..bb5753ba 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_otapsili.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_otapsili.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotapsili" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="1F38"/>
-  <anchor x="155" y="0" name="bottom"/>
-  <anchor x="196" y="10" name="ogonek"/>
-  <anchor x="155" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="psili.case" xOffset="-242"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_otapsilioxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/I_otapsilioxia.glif
index 7e845f32..9d1d39bf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_otapsilioxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_otapsilioxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotapsilioxia" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="1F3C"/>
-  <anchor x="155" y="0" name="bottom"/>
-  <anchor x="196" y="10" name="ogonek"/>
-  <anchor x="155" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="psilioxia.case" xOffset="-450"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_otapsiliperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/I_otapsiliperispomeni.glif
index d94e8615..133315e6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_otapsiliperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_otapsiliperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotapsiliperispomeni" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="1F3E"/>
-  <anchor x="155" y="0" name="bottom"/>
-  <anchor x="196" y="10" name="ogonek"/>
-  <anchor x="155" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="psiliperispomeni.case" xOffset="-414" yOffset="-213"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_otapsilivaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/I_otapsilivaria.glif
index 8477a797..57390205 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_otapsilivaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_otapsilivaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotapsilivaria" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="1F3A"/>
-  <anchor x="155" y="0" name="bottom"/>
-  <anchor x="196" y="10" name="ogonek"/>
-  <anchor x="155" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="psilivaria.case" xOffset="-449"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_otatonos.glif b/src/Cantarell-Bold.ufo/glyphs/I_otatonos.glif
index cfd4f946..3e9cba66 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_otatonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_otatonos.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotatonos" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="038A"/>
-  <anchor x="155" y="0" name="bottom"/>
-  <anchor x="196" y="10" name="ogonek"/>
-  <anchor x="155" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="tonos.case" xOffset="-246"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_otavaria.glif b/src/Cantarell-Bold.ufo/glyphs/I_otavaria.glif
index c2466a6c..f65b5fb6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_otavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_otavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotavaria" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="1FDA"/>
-  <anchor x="155" y="0" name="bottom"/>
-  <anchor x="196" y="10" name="ogonek"/>
-  <anchor x="155" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="varia.case" xOffset="-239"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/I_otavrachy.glif b/src/Cantarell-Bold.ufo/glyphs/I_otavrachy.glif
index 927b5f43..57f81f9d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/I_otavrachy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/I_otavrachy.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotavrachy" format="2">
-  <advance width="310"/>
+  <advance width="318"/>
   <unicode hex="1FD8"/>
-  <anchor x="155" y="0" name="bottom"/>
-  <anchor x="196" y="10" name="ogonek"/>
-  <anchor x="155" y="694" name="top"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="vrachy.case" xOffset="-78"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/K_appa.glif b/src/Cantarell-Bold.ufo/glyphs/K_appa.glif
index c0c491c1..84a8f419 100644
--- a/src/Cantarell-Bold.ufo/glyphs/K_appa.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/K_appa.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kappa" format="2">
-  <advance width="686"/>
+  <advance width="691"/>
   <unicode hex="039A"/>
-  <anchor x="338" y="0" name="bottom"/>
-  <anchor x="338" y="694" name="top"/>
   <outline>
     <component base="K"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/L_ambda.glif b/src/Cantarell-Bold.ufo/glyphs/L_ambda.glif
index 3f86be5f..299c064a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/L_ambda.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/L_ambda.glif
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lambda" format="2">
-  <advance width="708"/>
+  <advance width="691"/>
   <unicode hex="039B"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="694" name="top"/>
+  <anchor x="345" y="0" name="bottom"/>
+  <anchor x="345" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="1" y="0" type="line"/>
-      <point x="186" y="0" type="line"/>
-      <point x="370" y="620" type="line"/>
-      <point x="322" y="620" type="line"/>
-      <point x="515" y="0" type="line"/>
-      <point x="706" y="0" type="line"/>
-      <point x="469" y="694" type="line"/>
-      <point x="248" y="694" type="line"/>
+      <point x="-7" y="0" type="line"/>
+      <point x="178" y="0" type="line"/>
+      <point x="362" y="620" type="line"/>
+      <point x="314" y="620" type="line"/>
+      <point x="507" y="0" type="line"/>
+      <point x="698" y="0" type="line"/>
+      <point x="461" y="694" type="line"/>
+      <point x="240" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -22,8 +22,6 @@
       <string>=A</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=A</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/M_u.glif b/src/Cantarell-Bold.ufo/glyphs/M_u.glif
index 58619ddd..59688476 100644
--- a/src/Cantarell-Bold.ufo/glyphs/M_u.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/M_u.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Mu" format="2">
-  <advance width="892"/>
+  <advance width="900"/>
   <unicode hex="039C"/>
-  <anchor x="447" y="0" name="bottom"/>
-  <anchor x="447" y="694" name="top"/>
   <outline>
     <component base="M"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/N_u.glif b/src/Cantarell-Bold.ufo/glyphs/N_u.glif
index 23b647d8..68772c0d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/N_u.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/N_u.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nu" format="2">
-  <advance width="780"/>
+  <advance width="788"/>
   <unicode hex="039D"/>
-  <anchor x="389" y="0" name="bottom"/>
-  <anchor x="389" y="694" name="top"/>
   <outline>
     <component base="N"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_mega.glif b/src/Cantarell-Bold.ufo/glyphs/O_mega.glif
index d6753578..0577fef7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_mega.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_mega.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omega" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="03A9"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
+  <anchor x="384" y="0" name="bottom"/>
+  <anchor x="406" y="694" name="top"/>
+  <anchor x="-23" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="379" y="704" type="curve" smooth="yes"/>
-      <point x="165" y="704"/>
-      <point x="26" y="572"/>
-      <point x="26" y="395" type="curve" smooth="yes"/>
-      <point x="26" y="301"/>
-      <point x="64" y="211"/>
-      <point x="149" y="142" type="curve"/>
-      <point x="149" y="150" type="line"/>
-      <point x="17" y="150" type="line"/>
-      <point x="17" y="0" type="line"/>
-      <point x="334" y="0" type="line"/>
-      <point x="334" y="131" type="line"/>
-      <point x="241" y="210"/>
-      <point x="206" y="288"/>
-      <point x="206" y="369" type="curve" smooth="yes"/>
-      <point x="206" y="480"/>
-      <point x="271" y="554"/>
-      <point x="372" y="554" type="curve" smooth="yes"/>
-      <point x="480" y="554"/>
-      <point x="546" y="481"/>
-      <point x="546" y="364" type="curve" smooth="yes"/>
-      <point x="546" y="283"/>
-      <point x="505" y="211"/>
-      <point x="412" y="131" type="curve"/>
-      <point x="412" y="0" type="line"/>
-      <point x="736" y="0" type="line"/>
-      <point x="736" y="150" type="line"/>
-      <point x="595" y="150" type="line"/>
-      <point x="595" y="143" type="line"/>
-      <point x="681" y="212"/>
-      <point x="726" y="310"/>
-      <point x="726" y="404" type="curve" smooth="yes"/>
-      <point x="726" y="575"/>
-      <point x="588" y="704"/>
+      <point x="390" y="704" type="curve" smooth="yes"/>
+      <point x="176" y="704"/>
+      <point x="37" y="572"/>
+      <point x="37" y="395" type="curve" smooth="yes"/>
+      <point x="37" y="301"/>
+      <point x="75" y="211"/>
+      <point x="160" y="142" type="curve"/>
+      <point x="160" y="150" type="line"/>
+      <point x="28" y="150" type="line"/>
+      <point x="28" y="0" type="line"/>
+      <point x="345" y="0" type="line"/>
+      <point x="345" y="131" type="line"/>
+      <point x="252" y="210"/>
+      <point x="217" y="288"/>
+      <point x="217" y="369" type="curve" smooth="yes"/>
+      <point x="217" y="480"/>
+      <point x="282" y="554"/>
+      <point x="383" y="554" type="curve" smooth="yes"/>
+      <point x="491" y="554"/>
+      <point x="557" y="481"/>
+      <point x="557" y="364" type="curve" smooth="yes"/>
+      <point x="557" y="283"/>
+      <point x="516" y="211"/>
+      <point x="423" y="131" type="curve"/>
+      <point x="423" y="0" type="line"/>
+      <point x="747" y="0" type="line"/>
+      <point x="747" y="150" type="line"/>
+      <point x="606" y="150" type="line"/>
+      <point x="606" y="143" type="line"/>
+      <point x="692" y="212"/>
+      <point x="737" y="310"/>
+      <point x="737" y="404" type="curve" smooth="yes"/>
+      <point x="737" y="575"/>
+      <point x="599" y="704"/>
     </contour>
   </outline>
   <lib>
@@ -53,8 +53,6 @@
       <string>=O-9</string>
       <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
       <string>=O-9</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megadasia.glif b/src/Cantarell-Bold.ufo/glyphs/O_megadasia.glif
index 964a8264..737c63ea 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megadasia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megadasia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasia" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1F69"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasia.case" xOffset="-252"/>
+    <component base="dasia.case" xOffset="-241"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megadasiaoxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_megadasiaoxia.glif
index 29d9cd59..d2907b26 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megadasiaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megadasiaoxia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiaoxia" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1F6D"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiaoxia.case" xOffset="-455"/>
+    <component base="dasiaoxia.case" xOffset="-444"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megadasiaoxiaprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_megadasiaoxiaprosgegrammeni.glif
index f35a0861..892f0204 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megadasiaoxiaprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megadasiaoxiaprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiaoxiaprosgegrammeni" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1FAD"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiaoxia.case" xOffset="-455"/>
-    <component base="prosgegrammeni" xOffset="111"/>
+    <component base="dasiaoxia.case" xOffset="-444"/>
+    <component base="prosgegrammeni" xOffset="122"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megadasiaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_megadasiaperispomeni.glif
index a38e90c7..6bd411e4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megadasiaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megadasiaperispomeni.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiaperispomeni" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1F6F"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiaperispomeni.case" xOffset="-415" yOffset="-213"/>
+    <component base="dasiaperispomeni.case" xOffset="-404" yOffset="-213"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megadasiaperispomeniprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_megadasiaperispomeniprosgegrammeni.glif
index 0038e43b..bc721e65 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megadasiaperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megadasiaperispomeniprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiaperispomeniprosgegrammeni" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1FAF"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiaperispomeni.case" xOffset="-415" yOffset="-213"/>
-    <component base="prosgegrammeni" xOffset="111"/>
+    <component base="dasiaperispomeni.case" xOffset="-404" yOffset="-213"/>
+    <component base="prosgegrammeni" xOffset="122"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megadasiaprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_megadasiaprosgegrammeni.glif
index f2dfe78e..4e9cae66 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megadasiaprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megadasiaprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiaprosgegrammeni" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1FA9"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasia.case" xOffset="-252"/>
-    <component base="prosgegrammeni" xOffset="111"/>
+    <component base="dasia.case" xOffset="-241"/>
+    <component base="prosgegrammeni" xOffset="122"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megadasiavaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_megadasiavaria.glif
index ea28ca70..44cf9f7d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megadasiavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megadasiavaria.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiavaria" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1F6B"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiavaria.case" xOffset="-458"/>
+    <component base="dasiavaria.case" xOffset="-447"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megadasiavariaprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_megadasiavariaprosgegrammeni.glif
index 36f99a05..1e7f09dc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megadasiavariaprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megadasiavariaprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiavariaprosgegrammeni" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1FAB"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiavaria.case" xOffset="-458"/>
-    <component base="prosgegrammeni" xOffset="111"/>
+    <component base="dasiavaria.case" xOffset="-447"/>
+    <component base="prosgegrammeni" xOffset="122"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megaoxia.glif b/src/Cantarell-Bold.ufo/glyphs/O_megaoxia.glif
index 801233af..4a77802e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megaoxia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegaoxia" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1FFB"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="oxia.case" xOffset="-247"/>
+    <component base="oxia.case" xOffset="-236"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megaprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_megaprosgegrammeni.glif
index d206ab0c..809a949d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megaprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megaprosgegrammeni.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegaprosgegrammeni" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1FFC"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="prosgegrammeni" xOffset="111"/>
+    <component base="prosgegrammeni" xOffset="122"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megapsili.glif b/src/Cantarell-Bold.ufo/glyphs/O_megapsili.glif
index 5bc108d1..4645b7a4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megapsili.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megapsili.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsili" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1F68"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psili.case" xOffset="-243"/>
+    <component base="psili.case" xOffset="-232"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megapsilioxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_megapsilioxia.glif
index af42ed62..732ae01d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megapsilioxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megapsilioxia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsilioxia" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1F6C"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psilioxia.case" xOffset="-451"/>
+    <component base="psilioxia.case" xOffset="-440"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megapsilioxiaprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_megapsilioxiaprosgegrammeni.glif
index 40f3efd2..d3d76ac4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megapsilioxiaprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megapsilioxiaprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsilioxiaprosgegrammeni" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1FAC"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psilioxia.case" xOffset="-451"/>
-    <component base="prosgegrammeni" xOffset="111"/>
+    <component base="psilioxia.case" xOffset="-440"/>
+    <component base="prosgegrammeni" xOffset="122"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megapsiliperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_megapsiliperispomeni.glif
index 1bdea1a4..5a02349f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megapsiliperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megapsiliperispomeni.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsiliperispomeni" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1F6E"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psiliperispomeni.case" xOffset="-415" yOffset="-213"/>
+    <component base="psiliperispomeni.case" xOffset="-404" yOffset="-213"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.5,0.09,0.79,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megapsiliperispomeniprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_megapsiliperispomeniprosgegrammeni.glif
index 412400a1..1cc5d21b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megapsiliperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megapsiliperispomeniprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsiliperispomeniprosgegrammeni" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1FAE"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psiliperispomeni.case" xOffset="-415" yOffset="-213"/>
-    <component base="prosgegrammeni" xOffset="111"/>
+    <component base="psiliperispomeni.case" xOffset="-404" yOffset="-213"/>
+    <component base="prosgegrammeni" xOffset="122"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megapsiliprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_megapsiliprosgegrammeni.glif
index 55390c58..3c6fcdcf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megapsiliprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megapsiliprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsiliprosgegrammeni" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1FA8"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psili.case" xOffset="-243"/>
-    <component base="prosgegrammeni" xOffset="111"/>
+    <component base="psili.case" xOffset="-232"/>
+    <component base="prosgegrammeni" xOffset="122"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megapsilivaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_megapsilivaria.glif
index d85ceb09..38a2fd84 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megapsilivaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megapsilivaria.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsilivaria" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1F6A"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psilivaria.case" xOffset="-450"/>
+    <component base="psilivaria.case" xOffset="-439"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megapsilivariaprosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_megapsilivariaprosgegrammeni.glif
index 3f0de300..eac5d93c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megapsilivariaprosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megapsilivariaprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsilivariaprosgegrammeni" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1FAA"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psilivaria.case" xOffset="-450"/>
-    <component base="prosgegrammeni" xOffset="111"/>
+    <component base="psilivaria.case" xOffset="-439"/>
+    <component base="prosgegrammeni" xOffset="122"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megatonos.glif b/src/Cantarell-Bold.ufo/glyphs/O_megatonos.glif
index 30deaf27..0f24f334 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megatonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megatonos.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegatonos" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="038F"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="tonos.case" xOffset="-247"/>
+    <component base="tonos.case" xOffset="-236"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_megavaria.glif b/src/Cantarell-Bold.ufo/glyphs/O_megavaria.glif
index 60c9d748..0588342a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_megavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_megavaria.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegavaria" format="2">
-  <advance width="753"/>
+  <advance width="775"/>
   <unicode hex="1FFA"/>
-  <anchor x="373" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
-  <anchor x="-34" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="varia.case" xOffset="-240"/>
+    <component base="varia.case" xOffset="-229"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_micron.glif b/src/Cantarell-Bold.ufo/glyphs/O_micron.glif
index 0366bd87..45d58488 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_micron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_micron.glif
@@ -1,21 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicron" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="039F"/>
   <anchor x="380" y="0" name="bottom"/>
   <anchor x="380" y="694" name="top"/>
   <anchor x="-25" y="694" name="topleft"/>
-  <anchor x="564" y="141" name="Qtail"/>
-  <anchor x="403" y="347" name="center"/>
-  <anchor x="465" y="10" name="ogonek"/>
-  <anchor x="626" y="694" name="topright"/>
   <outline>
     <component base="O"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_microndasia.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_microndasia.glif
index 25d1c8aa..94624340 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_microndasia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_microndasia.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicrondasia" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="1F49"/>
-  <anchor x="564" y="141" name="Qtail"/>
-  <anchor x="380" y="0" name="bottom"/>
-  <anchor x="403" y="347" name="center"/>
-  <anchor x="465" y="10" name="ogonek"/>
-  <anchor x="380" y="694" name="top"/>
-  <anchor x="-25" y="694" name="topleft"/>
-  <anchor x="626" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="dasia.case" xOffset="-243"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_microndasiaoxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_microndasiaoxia.glif
index 8f408475..a54a6bcb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_microndasiaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_microndasiaoxia.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicrondasiaoxia" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="1F4D"/>
-  <anchor x="564" y="141" name="Qtail"/>
-  <anchor x="380" y="0" name="bottom"/>
-  <anchor x="403" y="347" name="center"/>
-  <anchor x="465" y="10" name="ogonek"/>
-  <anchor x="380" y="694" name="top"/>
-  <anchor x="-25" y="694" name="topleft"/>
-  <anchor x="626" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="dasiaoxia.case" xOffset="-446"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_microndasiavaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_microndasiavaria.glif
index e2efabc4..ad53bd27 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_microndasiavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_microndasiavaria.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicrondasiavaria" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="1F4B"/>
-  <anchor x="564" y="141" name="Qtail"/>
-  <anchor x="380" y="0" name="bottom"/>
-  <anchor x="403" y="347" name="center"/>
-  <anchor x="465" y="10" name="ogonek"/>
-  <anchor x="380" y="694" name="top"/>
-  <anchor x="-25" y="694" name="topleft"/>
-  <anchor x="626" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="dasiavaria.case" xOffset="-449"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_micronoxia.glif b/src/Cantarell-Bold.ufo/glyphs/O_micronoxia.glif
index 66f0a589..24c72cf5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_micronoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_micronoxia.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicronoxia" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="1FF9"/>
-  <anchor x="564" y="141" name="Qtail"/>
-  <anchor x="380" y="0" name="bottom"/>
-  <anchor x="403" y="347" name="center"/>
-  <anchor x="465" y="10" name="ogonek"/>
-  <anchor x="380" y="694" name="top"/>
-  <anchor x="-25" y="694" name="topleft"/>
-  <anchor x="626" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="oxia.case" xOffset="-238"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_micronpsili.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_micronpsili.glif
index f37a27ff..506a6404 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_micronpsili.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_micronpsili.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicronpsili" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="1F48"/>
-  <anchor x="564" y="141" name="Qtail"/>
-  <anchor x="380" y="0" name="bottom"/>
-  <anchor x="403" y="347" name="center"/>
-  <anchor x="465" y="10" name="ogonek"/>
-  <anchor x="380" y="694" name="top"/>
-  <anchor x="-25" y="694" name="topleft"/>
-  <anchor x="626" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="psili.case" xOffset="-234"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_micronpsilioxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_micronpsilioxia.glif
index 6be10ad5..be3bd924 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_micronpsilioxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_micronpsilioxia.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicronpsilioxia" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="1F4C"/>
-  <anchor x="564" y="141" name="Qtail"/>
-  <anchor x="380" y="0" name="bottom"/>
-  <anchor x="403" y="347" name="center"/>
-  <anchor x="465" y="10" name="ogonek"/>
-  <anchor x="380" y="694" name="top"/>
-  <anchor x="-25" y="694" name="topleft"/>
-  <anchor x="626" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="psilioxia.case" xOffset="-442"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_micronpsilivaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_micronpsilivaria.glif
index cbc1415a..b66dd396 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_micronpsilivaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_micronpsilivaria.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicronpsilivaria" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="1F4A"/>
-  <anchor x="564" y="141" name="Qtail"/>
-  <anchor x="380" y="0" name="bottom"/>
-  <anchor x="403" y="347" name="center"/>
-  <anchor x="465" y="10" name="ogonek"/>
-  <anchor x="380" y="694" name="top"/>
-  <anchor x="-25" y="694" name="topleft"/>
-  <anchor x="626" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="psilivaria.case" xOffset="-441"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.25,0.25,0.25,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_microntonos.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_microntonos.glif
index c3f1cbd1..20e7adbf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_microntonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_microntonos.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicrontonos" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="038C"/>
-  <anchor x="564" y="141" name="Qtail"/>
-  <anchor x="380" y="0" name="bottom"/>
-  <anchor x="403" y="347" name="center"/>
-  <anchor x="465" y="10" name="ogonek"/>
-  <anchor x="380" y="694" name="top"/>
-  <anchor x="-25" y="694" name="topleft"/>
-  <anchor x="626" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="tonos.case" xOffset="-238"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/O_micronvaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/O_micronvaria.glif
index db860efa..739c2fef 100644
--- a/src/Cantarell-Bold.ufo/glyphs/O_micronvaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/O_micronvaria.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicronvaria" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="1FF8"/>
-  <anchor x="564" y="141" name="Qtail"/>
-  <anchor x="380" y="0" name="bottom"/>
-  <anchor x="403" y="347" name="center"/>
-  <anchor x="465" y="10" name="ogonek"/>
-  <anchor x="380" y="694" name="top"/>
-  <anchor x="-25" y="694" name="topleft"/>
-  <anchor x="626" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="varia.case" xOffset="-231"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/P_hi.glif b/src/Cantarell-Bold.ufo/glyphs/P_hi.glif
index 2ae8baee..fe5aef0e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/P_hi.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/P_hi.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Phi" format="2">
-  <advance width="814"/>
+  <advance width="822"/>
   <unicode hex="03A6"/>
   <outline>
     <contour>
-      <point x="401" y="68" type="curve" smooth="yes"/>
-      <point x="643" y="68"/>
-      <point x="794" y="174"/>
-      <point x="794" y="350" type="curve" smooth="yes"/>
-      <point x="794" y="524"/>
-      <point x="642" y="628"/>
-      <point x="410" y="628" type="curve" smooth="yes"/>
-      <point x="170" y="628"/>
-      <point x="20" y="521"/>
-      <point x="20" y="343" type="curve" smooth="yes"/>
-      <point x="20" y="171"/>
-      <point x="171" y="68"/>
+      <point x="405" y="68" type="curve" smooth="yes"/>
+      <point x="647" y="68"/>
+      <point x="798" y="174"/>
+      <point x="798" y="350" type="curve" smooth="yes"/>
+      <point x="798" y="524"/>
+      <point x="646" y="628"/>
+      <point x="414" y="628" type="curve" smooth="yes"/>
+      <point x="174" y="628"/>
+      <point x="24" y="521"/>
+      <point x="24" y="343" type="curve" smooth="yes"/>
+      <point x="24" y="171"/>
+      <point x="175" y="68"/>
     </contour>
     <contour>
-      <point x="410" y="217" type="curve" smooth="yes"/>
-      <point x="259" y="217"/>
-      <point x="189" y="271"/>
-      <point x="189" y="352" type="curve" smooth="yes"/>
-      <point x="189" y="428"/>
-      <point x="255" y="479"/>
-      <point x="400" y="479" type="curve" smooth="yes"/>
-      <point x="554" y="479"/>
-      <point x="625" y="424"/>
-      <point x="625" y="341" type="curve" smooth="yes"/>
-      <point x="625" y="267"/>
-      <point x="558" y="217"/>
+      <point x="414" y="217" type="curve" smooth="yes"/>
+      <point x="263" y="217"/>
+      <point x="193" y="271"/>
+      <point x="193" y="352" type="curve" smooth="yes"/>
+      <point x="193" y="428"/>
+      <point x="259" y="479"/>
+      <point x="404" y="479" type="curve" smooth="yes"/>
+      <point x="558" y="479"/>
+      <point x="629" y="424"/>
+      <point x="629" y="341" type="curve" smooth="yes"/>
+      <point x="629" y="267"/>
+      <point x="562" y="217"/>
     </contour>
     <contour>
-      <point x="318" y="-10" type="line"/>
-      <point x="494" y="-10" type="line"/>
-      <point x="494" y="704" type="line"/>
-      <point x="318" y="704" type="line"/>
+      <point x="322" y="-10" type="line"/>
+      <point x="498" y="-10" type="line"/>
+      <point x="498" y="704" type="line"/>
+      <point x="322" y="704" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -44,8 +44,6 @@
       <string>=Ef-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=Ef-cy</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/P_i.glif b/src/Cantarell-Bold.ufo/glyphs/P_i.glif
index b18fb082..601b2b61 100644
--- a/src/Cantarell-Bold.ufo/glyphs/P_i.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/P_i.glif
@@ -1,15 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Pi" format="2">
-  <advance width="736"/>
+  <advance width="744"/>
   <unicode hex="03A0"/>
-  <anchor x="716" y="0" name="bottomright"/>
   <outline>
     <component base="Pe-cy"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/P_si.glif b/src/Cantarell-Bold.ufo/glyphs/P_si.glif
index a72e96c5..baec91ca 100644
--- a/src/Cantarell-Bold.ufo/glyphs/P_si.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/P_si.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Psi" format="2">
-  <advance width="801"/>
+  <advance width="812"/>
   <unicode hex="03A8"/>
-  <anchor x="401" y="0" name="bottom"/>
-  <anchor x="401" y="694" name="top"/>
+  <anchor x="406" y="0" name="bottom"/>
+  <anchor x="406" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="344" y="187" type="curve"/>
-      <point x="353" y="340" type="line"/>
-      <point x="255" y="340"/>
-      <point x="203" y="386"/>
-      <point x="203" y="503" type="curve" smooth="yes"/>
-      <point x="203" y="694" type="line"/>
-      <point x="27" y="694" type="line"/>
-      <point x="27" y="473" type="line" smooth="yes"/>
-      <point x="27" y="293"/>
-      <point x="148" y="187"/>
+      <point x="349" y="187" type="curve"/>
+      <point x="358" y="340" type="line"/>
+      <point x="260" y="340"/>
+      <point x="208" y="386"/>
+      <point x="208" y="503" type="curve" smooth="yes"/>
+      <point x="208" y="694" type="line"/>
+      <point x="32" y="694" type="line"/>
+      <point x="32" y="473" type="line" smooth="yes"/>
+      <point x="32" y="293"/>
+      <point x="153" y="187"/>
     </contour>
     <contour>
-      <point x="449" y="187" type="line"/>
-      <point x="651" y="187"/>
-      <point x="775" y="293"/>
-      <point x="775" y="474" type="curve" smooth="yes"/>
-      <point x="775" y="694" type="line"/>
-      <point x="599" y="694" type="line"/>
-      <point x="599" y="485" type="line" smooth="yes"/>
-      <point x="599" y="379"/>
-      <point x="553" y="341"/>
-      <point x="460" y="340" type="curve"/>
+      <point x="454" y="187" type="line"/>
+      <point x="656" y="187"/>
+      <point x="780" y="293"/>
+      <point x="780" y="474" type="curve" smooth="yes"/>
+      <point x="780" y="694" type="line"/>
+      <point x="604" y="694" type="line"/>
+      <point x="604" y="485" type="line" smooth="yes"/>
+      <point x="604" y="379"/>
+      <point x="558" y="341"/>
+      <point x="465" y="340" type="curve"/>
     </contour>
     <contour>
-      <point x="313" y="0" type="line"/>
-      <point x="489" y="0" type="line"/>
-      <point x="489" y="694" type="line"/>
-      <point x="313" y="694" type="line"/>
+      <point x="318" y="0" type="line"/>
+      <point x="494" y="0" type="line"/>
+      <point x="494" y="694" type="line"/>
+      <point x="318" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -42,8 +42,6 @@
       <string>=U-25</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=U-25</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_ho.glif b/src/Cantarell-Bold.ufo/glyphs/R_ho.glif
index 0113200b..3b5d4736 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_ho.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_ho.glif
@@ -1,16 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rho" format="2">
-  <advance width="626"/>
+  <advance width="625"/>
   <unicode hex="03A1"/>
   <anchor x="-33" y="694" name="topleft"/>
-  <anchor x="325" y="0" name="bottom"/>
   <outline>
     <component base="P"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/R_hodasia.glif b/src/Cantarell-Bold.ufo/glyphs/R_hodasia.glif
index cd00fda1..f96a68db 100644
--- a/src/Cantarell-Bold.ufo/glyphs/R_hodasia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/R_hodasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rhodasia" format="2">
-  <advance width="626"/>
+  <advance width="625"/>
   <unicode hex="1FEC"/>
-  <anchor x="325" y="0" name="bottom"/>
-  <anchor x="-33" y="694" name="topleft"/>
   <outline>
     <component base="Rho"/>
     <component base="dasia.case" xOffset="-251"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/S_igma.glif b/src/Cantarell-Bold.ufo/glyphs/S_igma.glif
index 1a39a300..34d4122e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/S_igma.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/S_igma.glif
@@ -1,24 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sigma" format="2">
-  <advance width="594"/>
+  <advance width="611"/>
   <unicode hex="03A3"/>
   <outline>
     <contour>
-      <point x="438" y="356" type="line"/>
-      <point x="184" y="646" type="line"/>
-      <point x="184" y="542" type="line"/>
-      <point x="557" y="542" type="line"/>
-      <point x="557" y="694" type="line"/>
-      <point x="32" y="694" type="line"/>
-      <point x="32" y="583" type="line"/>
-      <point x="277" y="306" type="line"/>
-      <point x="277" y="401" type="line"/>
-      <point x="27" y="111" type="line"/>
-      <point x="27" y="0" type="line"/>
-      <point x="569" y="0" type="line"/>
-      <point x="569" y="152" type="line"/>
-      <point x="167" y="152" type="line"/>
-      <point x="167" y="40" type="line"/>
+      <point x="446" y="356" type="line"/>
+      <point x="192" y="646" type="line"/>
+      <point x="192" y="542" type="line"/>
+      <point x="565" y="542" type="line"/>
+      <point x="565" y="694" type="line"/>
+      <point x="40" y="694" type="line"/>
+      <point x="40" y="583" type="line"/>
+      <point x="285" y="306" type="line"/>
+      <point x="285" y="401" type="line"/>
+      <point x="35" y="111" type="line"/>
+      <point x="35" y="0" type="line"/>
+      <point x="577" y="0" type="line"/>
+      <point x="577" y="152" type="line"/>
+      <point x="175" y="152" type="line"/>
+      <point x="175" y="40" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -27,8 +27,6 @@
       <string>=Z+5</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=Z</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_au.glif b/src/Cantarell-Bold.ufo/glyphs/T_au.glif
index 4ee20c68..309ee746 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_au.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_au.glif
@@ -1,17 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tau" format="2">
-  <advance width="620"/>
+  <advance width="614"/>
   <unicode hex="03A4"/>
-  <anchor x="311" y="0" name="bottom"/>
-  <anchor x="310" y="327" name="center"/>
-  <anchor x="309" y="694" name="top"/>
   <outline>
     <component base="T"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/T_heta.glif b/src/Cantarell-Bold.ufo/glyphs/T_heta.glif
index 2824122e..5dc3fefd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/T_heta.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/T_heta.glif
@@ -1,14 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Theta" format="2">
-  <advance width="760"/>
+  <advance width="782"/>
   <unicode hex="0398"/>
   <anchor x="380" y="0" name="bottom"/>
   <anchor x="380" y="694" name="top"/>
-  <anchor x="564" y="141" name="Qtail"/>
-  <anchor x="403" y="347" name="center"/>
-  <anchor x="465" y="10" name="ogonek"/>
-  <anchor x="83" y="694" name="topleft"/>
-  <anchor x="626" y="694" name="topright"/>
   <outline>
     <contour>
       <point x="275" y="275" type="line"/>
@@ -24,8 +19,6 @@
       <string>=O</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=O</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_psilon.glif b/src/Cantarell-Bold.ufo/glyphs/U_psilon.glif
index 11379236..641fff9a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_psilon.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_psilon.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilon" format="2">
-  <advance width="653"/>
+  <advance width="673"/>
   <unicode hex="03A5"/>
   <anchor x="324" y="0" name="bottom"/>
   <anchor x="324" y="694" name="top"/>
@@ -8,10 +8,4 @@
   <outline>
     <component base="Y"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_psilondasia.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_psilondasia.glif
index 1c7ca272..23b282a9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_psilondasia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_psilondasia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilondasia" format="2">
-  <advance width="653"/>
+  <advance width="673"/>
   <unicode hex="1F59"/>
-  <anchor x="324" y="0" name="bottom"/>
-  <anchor x="324" y="694" name="top"/>
-  <anchor x="-101" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="dasia.case" xOffset="-319"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_psilondasiaoxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_psilondasiaoxia.glif
index a1987e4e..7d05a7a8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_psilondasiaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_psilondasiaoxia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilondasiaoxia" format="2">
-  <advance width="653"/>
+  <advance width="673"/>
   <unicode hex="1F5D"/>
-  <anchor x="324" y="0" name="bottom"/>
-  <anchor x="324" y="694" name="top"/>
-  <anchor x="-101" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="dasiaoxia.case" xOffset="-522"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_psilondasiaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_psilondasiaperispomeni.glif
index 26bb1af2..f0973f77 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_psilondasiaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_psilondasiaperispomeni.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilondasiaperispomeni" format="2">
-  <advance width="653"/>
+  <advance width="673"/>
   <unicode hex="1F5F"/>
-  <anchor x="324" y="0" name="bottom"/>
-  <anchor x="324" y="694" name="top"/>
-  <anchor x="-101" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="dasiaperispomeni.case" xOffset="-482" yOffset="-213"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.5,0.09,0.79,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_psilondasiavaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_psilondasiavaria.glif
index 2fb16f2c..fef5d048 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_psilondasiavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_psilondasiavaria.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilondasiavaria" format="2">
-  <advance width="653"/>
+  <advance width="673"/>
   <unicode hex="1F5B"/>
-  <anchor x="324" y="0" name="bottom"/>
-  <anchor x="324" y="694" name="top"/>
-  <anchor x="-101" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="dasiavaria.case" xOffset="-525"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.25,0.25,0.25,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_psilondieresis.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_psilondieresis.glif
index 84f656e8..60144786 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_psilondieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_psilondieresis.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilondieresis" format="2">
-  <advance width="653"/>
+  <advance width="673"/>
   <unicode hex="03AB"/>
-  <anchor x="324" y="0" name="bottom"/>
-  <anchor x="324" y="906" name="top"/>
-  <anchor x="-101" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="dieresiscomb.case" xOffset="49"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_psilonmacron.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_psilonmacron.glif
index a2bac03d..f9bac6a4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_psilonmacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_psilonmacron.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilonmacron" format="2">
-  <advance width="653"/>
+  <advance width="673"/>
   <unicode hex="1FE9"/>
-  <anchor x="324" y="0" name="bottom"/>
-  <anchor x="324" y="694" name="top"/>
-  <anchor x="-101" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
-    <component base="macron" xOffset="88" yOffset="204"/>
+    <component base="macron" xOffset="74" yOffset="204"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_psilonoxia.glif b/src/Cantarell-Bold.ufo/glyphs/U_psilonoxia.glif
index b6a4b77a..a0ef3eb8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_psilonoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_psilonoxia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilonoxia" format="2">
-  <advance width="653"/>
+  <advance width="673"/>
   <unicode hex="1FEB"/>
-  <anchor x="324" y="0" name="bottom"/>
-  <anchor x="324" y="694" name="top"/>
-  <anchor x="-101" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="oxia.case" xOffset="-314"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_psilontonos.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_psilontonos.glif
index 5c259afd..c594facb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_psilontonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_psilontonos.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilontonos" format="2">
-  <advance width="653"/>
+  <advance width="673"/>
   <unicode hex="038E"/>
-  <anchor x="324" y="0" name="bottom"/>
-  <anchor x="324" y="694" name="top"/>
-  <anchor x="-101" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="tonos.case" xOffset="-314"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_psilonvaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_psilonvaria.glif
index 4eb61870..ff067a9d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_psilonvaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_psilonvaria.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilonvaria" format="2">
-  <advance width="653"/>
+  <advance width="673"/>
   <unicode hex="1FEA"/>
-  <anchor x="324" y="0" name="bottom"/>
-  <anchor x="324" y="694" name="top"/>
-  <anchor x="-101" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="varia.case" xOffset="-307"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/U_psilonvrachy.glif 
b/src/Cantarell-Bold.ufo/glyphs/U_psilonvrachy.glif
index c3a61388..c2e34318 100644
--- a/src/Cantarell-Bold.ufo/glyphs/U_psilonvrachy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/U_psilonvrachy.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilonvrachy" format="2">
-  <advance width="653"/>
+  <advance width="673"/>
   <unicode hex="1FE8"/>
-  <anchor x="324" y="0" name="bottom"/>
-  <anchor x="324" y="694" name="top"/>
-  <anchor x="-101" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="vrachy.case" xOffset="91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/X_i.glif b/src/Cantarell-Bold.ufo/glyphs/X_i.glif
index c276d1f4..42a24d53 100644
--- a/src/Cantarell-Bold.ufo/glyphs/X_i.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/X_i.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Xi" format="2">
-  <advance width="605"/>
+  <advance width="610"/>
   <unicode hex="039E"/>
   <outline>
     <contour>
@@ -26,8 +26,6 @@
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=E</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/Z_eta.glif b/src/Cantarell-Bold.ufo/glyphs/Z_eta.glif
index 96120f3d..af5f7162 100644
--- a/src/Cantarell-Bold.ufo/glyphs/Z_eta.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/Z_eta.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zeta" format="2">
-  <advance width="650"/>
+  <advance width="667"/>
   <unicode hex="0396"/>
-  <anchor x="331" y="0" name="bottom"/>
-  <anchor x="331" y="694" name="top"/>
   <outline>
     <component base="Z"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alpha.glif b/src/Cantarell-Bold.ufo/glyphs/alpha.glif
index 90f2ebbc..20f7cd80 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alpha.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alpha.glif
@@ -1,57 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alpha" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="03B1"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
+  <anchor x="246" y="0" name="bottom"/>
+  <anchor x="272" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="220" y="-10" type="curve" smooth="yes"/>
-      <point x="331" y="-10"/>
-      <point x="403" y="70"/>
-      <point x="438" y="167" type="curve"/>
-      <point x="366" y="199" type="line"/>
-      <point x="341" y="158"/>
-      <point x="307" y="131"/>
-      <point x="270" y="131" type="curve" smooth="yes"/>
-      <point x="226" y="131"/>
-      <point x="198" y="173"/>
-      <point x="198" y="246" type="curve" smooth="yes"/>
-      <point x="198" y="316"/>
-      <point x="219" y="362"/>
-      <point x="266" y="362" type="curve" smooth="yes"/>
-      <point x="303" y="362"/>
-      <point x="332" y="320"/>
-      <point x="343" y="242" type="curve" smooth="yes"/>
-      <point x="356" y="149" type="line" smooth="yes"/>
-      <point x="370" y="49"/>
-      <point x="417" y="-8"/>
-      <point x="501" y="-8" type="curve" smooth="yes"/>
-      <point x="540" y="-8"/>
-      <point x="575" y="2"/>
-      <point x="608" y="15" type="curve"/>
-      <point x="575" y="130" type="line"/>
-      <point x="565" y="126"/>
-      <point x="548" y="122"/>
-      <point x="536" y="122" type="curve" smooth="yes"/>
-      <point x="515" y="122"/>
-      <point x="486" y="132"/>
-      <point x="475" y="192" type="curve" smooth="yes"/>
-      <point x="454" y="303" type="line" smooth="yes"/>
-      <point x="429" y="436"/>
-      <point x="361" y="500"/>
-      <point x="248" y="500" type="curve" smooth="yes"/>
-      <point x="104" y="500"/>
-      <point x="21" y="399"/>
-      <point x="21" y="235" type="curve" smooth="yes"/>
-      <point x="21" y="70"/>
-      <point x="113" y="-10"/>
+      <point x="232" y="-10" type="curve" smooth="yes"/>
+      <point x="343" y="-10"/>
+      <point x="415" y="70"/>
+      <point x="450" y="167" type="curve"/>
+      <point x="378" y="199" type="line"/>
+      <point x="353" y="158"/>
+      <point x="319" y="131"/>
+      <point x="282" y="131" type="curve" smooth="yes"/>
+      <point x="238" y="131"/>
+      <point x="210" y="173"/>
+      <point x="210" y="246" type="curve" smooth="yes"/>
+      <point x="210" y="316"/>
+      <point x="231" y="362"/>
+      <point x="278" y="362" type="curve" smooth="yes"/>
+      <point x="315" y="362"/>
+      <point x="344" y="320"/>
+      <point x="355" y="242" type="curve" smooth="yes"/>
+      <point x="368" y="149" type="line" smooth="yes"/>
+      <point x="382" y="49"/>
+      <point x="429" y="-8"/>
+      <point x="513" y="-8" type="curve" smooth="yes"/>
+      <point x="552" y="-8"/>
+      <point x="587" y="2"/>
+      <point x="620" y="15" type="curve"/>
+      <point x="587" y="130" type="line"/>
+      <point x="577" y="126"/>
+      <point x="560" y="122"/>
+      <point x="548" y="122" type="curve" smooth="yes"/>
+      <point x="527" y="122"/>
+      <point x="498" y="132"/>
+      <point x="487" y="192" type="curve" smooth="yes"/>
+      <point x="466" y="303" type="line" smooth="yes"/>
+      <point x="441" y="436"/>
+      <point x="373" y="500"/>
+      <point x="260" y="500" type="curve" smooth="yes"/>
+      <point x="116" y="500"/>
+      <point x="33" y="399"/>
+      <point x="33" y="235" type="curve" smooth="yes"/>
+      <point x="33" y="70"/>
+      <point x="125" y="-10"/>
     </contour>
     <contour>
-      <point x="476" y="167" type="line"/>
-      <point x="594" y="490" type="line"/>
-      <point x="440" y="490" type="line"/>
-      <point x="394" y="202" type="line"/>
+      <point x="488" y="167" type="line"/>
+      <point x="606" y="490" type="line"/>
+      <point x="452" y="490" type="line"/>
+      <point x="406" y="202" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -59,9 +59,7 @@
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>=d</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
-      <string>=l-4</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
+      <string>l</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphadasia.glif b/src/Cantarell-Bold.ufo/glyphs/alphadasia.glif
index 4335a357..e6a4edc9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphadasia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphadasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasia" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F01"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="729" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasia" xOffset="88"/>
+    <component base="dasia" xOffset="100"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphadasiaoxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphadasiaoxia.glif
index 3dd2bfd4..0288c0cd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphadasiaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphadasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiaoxia" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F05"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasiaoxia" xOffset="-22"/>
+    <component base="dasiaoxia" xOffset="-10"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphadasiaoxiaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphadasiaoxiaypogegrammeni.glif
index 70563910..900b427e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphadasiaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphadasiaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiaoxiaypogegrammeni" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F85"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasiaoxia" xOffset="-22"/>
-    <component base="ypogegrammeni" xOffset="-28"/>
+    <component base="dasiaoxia" xOffset="-10"/>
+    <component base="ypogegrammeni" xOffset="-16"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphadasiaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphadasiaperispomeni.glif
index bfdb2dda..4ec66581 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphadasiaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphadasiaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiaperispomeni" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F07"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="daspsiliiaperispomeni" xOffset="27"/>
+    <component base="daspsiliiaperispomeni" xOffset="23"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphadasiaperispomeniypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphadasiaperispomeniypogegrammeni.glif
index e5242b9d..dd1506e0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphadasiaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphadasiaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiaperispomeniypogegrammeni" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F87"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="daspsiliiaperispomeni" xOffset="27"/>
-    <component base="ypogegrammeni" xOffset="-28"/>
+    <component base="daspsiliiaperispomeni" xOffset="23"/>
+    <component base="ypogegrammeni" xOffset="-16"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphadasiavaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphadasiavaria.glif
index 2a1c7045..9950d1ff 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphadasiavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphadasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiavaria" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F03"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasiavaria" xOffset="-40"/>
+    <component base="dasiavaria" xOffset="-28"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphadasiavariaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphadasiavariaypogegrammeni.glif
index 04b51115..bb0acb94 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphadasiavariaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphadasiavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiavariaypogegrammeni" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F83"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasiavaria" xOffset="-40"/>
-    <component base="ypogegrammeni" xOffset="-28"/>
+    <component base="dasiavaria" xOffset="-28"/>
+    <component base="ypogegrammeni" xOffset="-16"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphadasiaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphadasiaypogegrammeni.glif
index 465c7392..f525c6df 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphadasiaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphadasiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiaypogegrammeni" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F81"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="729" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasia" xOffset="88"/>
-    <component base="ypogegrammeni" xOffset="-28"/>
+    <component base="dasia" xOffset="100"/>
+    <component base="ypogegrammeni" xOffset="-16"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphamacron.glif b/src/Cantarell-Bold.ufo/glyphs/alphamacron.glif
index 3d003e6a..e6517e58 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphamacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphamacron.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphamacron" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1FB1"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="macron" xOffset="24"/>
+    <component base="macron" xOffset="22"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphaoxia.glif b/src/Cantarell-Bold.ufo/glyphs/alphaoxia.glif
index 7d7afb67..cd607cec 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphaoxia" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F71"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="oxia" xOffset="119"/>
+    <component base="oxia" xOffset="131"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphaoxiaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphaoxiaypogegrammeni.glif
index ab81ead9..96d9c9bb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphaoxiaypogegrammeni" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1FB4"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="oxia" xOffset="119"/>
-    <component base="ypogegrammeni" xOffset="-28"/>
+    <component base="oxia" xOffset="131"/>
+    <component base="ypogegrammeni" xOffset="-16"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphaperispomeni.glif
index d4149f06..e2fec0fa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphaperispomeni" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1FB6"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="701" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="perispomeni" xOffset="27"/>
+    <component base="perispomeni" xOffset="23"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphaperispomeniypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphaperispomeniypogegrammeni.glif
index c326a5d6..a671f26e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphaperispomeniypogegrammeni" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1FB7"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="701" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="perispomeni" xOffset="27"/>
-    <component base="ypogegrammeni" xOffset="-28"/>
+    <component base="perispomeni" xOffset="23"/>
+    <component base="ypogegrammeni" xOffset="-16"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphapsili.glif b/src/Cantarell-Bold.ufo/glyphs/alphapsili.glif
index af801a58..90acc20a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphapsili.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphapsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsili" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F00"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="729" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psili" xOffset="86"/>
+    <component base="psili" xOffset="98"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphapsilioxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphapsilioxia.glif
index f505f37e..3926cca7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphapsilioxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphapsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsilioxia" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F04"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psilioxia" xOffset="-19"/>
+    <component base="psilioxia" xOffset="-7"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphapsilioxiaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphapsilioxiaypogegrammeni.glif
index 8dc780e4..509a4066 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphapsilioxiaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphapsilioxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsilioxiaypogegrammeni" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F84"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psilioxia" xOffset="-19"/>
-    <component base="ypogegrammeni" xOffset="-28"/>
+    <component base="psilioxia" xOffset="-7"/>
+    <component base="ypogegrammeni" xOffset="-16"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphapsiliperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphapsiliperispomeni.glif
index 857ec678..aa48610d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphapsiliperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphapsiliperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsiliperispomeni" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F06"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psiliperispomeni" xOffset="27"/>
+    <component base="psiliperispomeni" xOffset="23"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphapsiliperispomeniypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphapsiliperispomeniypogegrammeni.glif
index 91075664..6c8be0d8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphapsiliperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphapsiliperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsiliperispomeniypogegrammeni" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F86"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psiliperispomeni" xOffset="27"/>
-    <component base="ypogegrammeni" xOffset="-28"/>
+    <component base="psiliperispomeni" xOffset="23"/>
+    <component base="ypogegrammeni" xOffset="-16"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphapsilivaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphapsilivaria.glif
index d847dd93..7496ba33 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphapsilivaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphapsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsilivaria" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F02"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psilivaria" xOffset="-29"/>
+    <component base="psilivaria" xOffset="-17"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphapsilivariaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphapsilivariaypogegrammeni.glif
index b93fb534..0ce8cb6d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphapsilivariaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphapsilivariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsilivariaypogegrammeni" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F82"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psilivaria" xOffset="-29"/>
-    <component base="ypogegrammeni" xOffset="-28"/>
+    <component base="psilivaria" xOffset="-17"/>
+    <component base="ypogegrammeni" xOffset="-16"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphapsiliypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphapsiliypogegrammeni.glif
index c1cf2ac1..dc69c092 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphapsiliypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphapsiliypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsiliypogegrammeni" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F80"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="729" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psili" xOffset="86"/>
-    <component base="ypogegrammeni" xOffset="-28"/>
+    <component base="psili" xOffset="98"/>
+    <component base="ypogegrammeni" xOffset="-16"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphatonos.glif b/src/Cantarell-Bold.ufo/glyphs/alphatonos.glif
index 9c0f9fe4..5f7553b8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphatonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphatonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphatonos" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="03AC"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="tonos" xOffset="119"/>
+    <component base="tonos" xOffset="131"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphavaria.glif b/src/Cantarell-Bold.ufo/glyphs/alphavaria.glif
index 89897d3a..ff929c35 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphavaria" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1F70"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="varia" xOffset="71"/>
+    <component base="varia" xOffset="83"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphavariaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphavariaypogegrammeni.glif
index 69fb8744..f5928046 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphavariaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphavariaypogegrammeni" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1FB2"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="varia" xOffset="71"/>
-    <component base="ypogegrammeni" xOffset="-28"/>
+    <component base="varia" xOffset="83"/>
+    <component base="ypogegrammeni" xOffset="-16"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphavrachy.glif b/src/Cantarell-Bold.ufo/glyphs/alphavrachy.glif
index e5c9e0b9..fdbfdc76 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphavrachy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphavrachy.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphavrachy" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1FB0"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="729" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="vrachy" xOffset="44"/>
+    <component base="vrachy" xOffset="56"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/alphaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/alphaypogegrammeni.glif
index 1b50f020..0f636e81 100644
--- a/src/Cantarell-Bold.ufo/glyphs/alphaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/alphaypogegrammeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphaypogegrammeni" format="2">
-  <advance width="597"/>
+  <advance width="618"/>
   <unicode hex="1FB3"/>
-  <anchor x="234" y="0" name="bottom"/>
-  <anchor x="260" y="490" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="ypogegrammeni" xOffset="-28"/>
+    <component base="ypogegrammeni" xOffset="-16"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/beta.glif b/src/Cantarell-Bold.ufo/glyphs/beta.glif
index 231cf66a..d4ec55ee 100644
--- a/src/Cantarell-Bold.ufo/glyphs/beta.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/beta.glif
@@ -58,8 +58,6 @@
       <string>=germandbls</string>
       <key>com.schriftgestaltung.Glyphs.layer.leftMetricsKey</key>
       <string>=germandbls-5</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/chi.glif b/src/Cantarell-Bold.ufo/glyphs/chi.glif
index 645c3f41..b5e660fa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/chi.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/chi.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chi" format="2">
-  <advance width="562"/>
+  <advance width="565"/>
   <unicode hex="03C7"/>
   <outline>
     <contour>
@@ -30,8 +30,6 @@
       <string>=x-5</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=x-5</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dasia.case.glif b/src/Cantarell-Bold.ufo/glyphs/dasia.case.glif
index adf0f32f..bae226dc 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dasia.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dasia.case.glif
@@ -12,8 +12,6 @@
       <string>dasia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>dasia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dasia.glif b/src/Cantarell-Bold.ufo/glyphs/dasia.glif
index 824a225e..7937a729 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dasia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dasia.glif
@@ -7,10 +7,4 @@
   <outline>
     <component base="psili" xScale="-1" xOffset="346"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dasiaoxia.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/dasiaoxia.case.glif
index df307e0d..82c383f2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dasiaoxia.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dasiaoxia.case.glif
@@ -11,8 +11,6 @@
       <string>dasiaoxia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>dasiaoxia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dasiaoxia.glif b/src/Cantarell-Bold.ufo/glyphs/dasiaoxia.glif
index e922e167..744d7fcf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dasiaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dasiaoxia.glif
@@ -33,8 +33,6 @@
       <string>dasia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>oxia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dasiaperispomeni.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/dasiaperispomeni.case.glif
index 0500f0b2..867b26be 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dasiaperispomeni.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dasiaperispomeni.case.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dasiaperispomeni.case" format="2">
-  <advance width="458"/>
+  <advance width="500"/>
   <anchor x="381" y="907" name="_topleft"/>
   <outline>
     <component base="daspsiliiaperispomeni"/>
@@ -11,8 +11,6 @@
       <string>dasiaperispomeni</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>dasiaperispomeni</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dasiavaria.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/dasiavaria.case.glif
index 419f5757..e1f6eb86 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dasiavaria.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dasiavaria.case.glif
@@ -11,8 +11,6 @@
       <string>dasiavaria</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>dasiavaria</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dasiavaria.glif b/src/Cantarell-Bold.ufo/glyphs/dasiavaria.glif
index cd1bf2a9..14ca2002 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dasiavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dasiavaria.glif
@@ -33,8 +33,6 @@
       <string>dasia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>varia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/daspsiliiaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/daspsiliiaperispomeni.glif
index cc22b474..1f4ec7d1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/daspsiliiaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/daspsiliiaperispomeni.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="daspsiliiaperispomeni" format="2">
-  <advance width="458"/>
-  <anchor x="233" y="490" name="_top"/>
+  <advance width="500"/>
+  <anchor x="249" y="490" name="_top"/>
   <outline>
-    <component base="dasia" xOffset="61"/>
+    <component base="dasia" xOffset="77"/>
     <component base="perispomeni" yOffset="239"/>
   </outline>
   <lib>
diff --git a/src/Cantarell-Bold.ufo/glyphs/delta.glif b/src/Cantarell-Bold.ufo/glyphs/delta.glif
index a8bd530f..17a58f90 100644
--- a/src/Cantarell-Bold.ufo/glyphs/delta.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/delta.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="delta" format="2">
-  <advance width="559"/>
+  <advance width="589"/>
   <unicode hex="03B4"/>
   <outline>
     <contour>
-      <point x="518" y="688" type="line"/>
-      <point x="447" y="724"/>
-      <point x="368" y="749"/>
-      <point x="281" y="749" type="curve" smooth="yes"/>
-      <point x="149" y="749"/>
-      <point x="60" y="683"/>
-      <point x="60" y="581" type="curve" smooth="yes"/>
-      <point x="60" y="509"/>
-      <point x="109" y="431"/>
-      <point x="219" y="376" type="curve" smooth="yes"/>
-      <point x="331" y="320"/>
-      <point x="365" y="285"/>
-      <point x="365" y="227" type="curve" smooth="yes"/>
-      <point x="365" y="168"/>
-      <point x="330" y="134"/>
-      <point x="281" y="134" type="curve" smooth="yes"/>
-      <point x="227" y="134"/>
-      <point x="194" y="173"/>
-      <point x="194" y="230" type="curve" smooth="yes"/>
-      <point x="194" y="289"/>
-      <point x="228" y="355"/>
-      <point x="325" y="401" type="curve"/>
-      <point x="251" y="487" type="line"/>
-      <point x="137" y="439"/>
-      <point x="18" y="351"/>
-      <point x="18" y="217" type="curve" smooth="yes"/>
-      <point x="18" y="95"/>
-      <point x="113" y="-10"/>
-      <point x="268" y="-10" type="curve" smooth="yes"/>
-      <point x="427" y="-10"/>
-      <point x="541" y="95"/>
-      <point x="541" y="239" type="curve" smooth="yes"/>
-      <point x="541" y="355"/>
-      <point x="464" y="422"/>
-      <point x="358" y="475" type="curve" smooth="yes"/>
-      <point x="255" y="527"/>
-      <point x="236" y="550"/>
-      <point x="236" y="573" type="curve" smooth="yes"/>
-      <point x="236" y="598"/>
-      <point x="259" y="607"/>
-      <point x="295" y="607" type="curve" smooth="yes"/>
-      <point x="338" y="607"/>
-      <point x="410" y="590"/>
-      <point x="478" y="559" type="curve"/>
+      <point x="533" y="688" type="line"/>
+      <point x="462" y="724"/>
+      <point x="383" y="749"/>
+      <point x="296" y="749" type="curve" smooth="yes"/>
+      <point x="164" y="749"/>
+      <point x="75" y="683"/>
+      <point x="75" y="581" type="curve" smooth="yes"/>
+      <point x="75" y="509"/>
+      <point x="124" y="431"/>
+      <point x="234" y="376" type="curve" smooth="yes"/>
+      <point x="346" y="320"/>
+      <point x="380" y="285"/>
+      <point x="380" y="227" type="curve" smooth="yes"/>
+      <point x="380" y="168"/>
+      <point x="345" y="134"/>
+      <point x="296" y="134" type="curve" smooth="yes"/>
+      <point x="242" y="134"/>
+      <point x="209" y="173"/>
+      <point x="209" y="230" type="curve" smooth="yes"/>
+      <point x="209" y="289"/>
+      <point x="243" y="355"/>
+      <point x="340" y="401" type="curve"/>
+      <point x="266" y="487" type="line"/>
+      <point x="152" y="439"/>
+      <point x="33" y="351"/>
+      <point x="33" y="217" type="curve" smooth="yes"/>
+      <point x="33" y="95"/>
+      <point x="128" y="-10"/>
+      <point x="283" y="-10" type="curve" smooth="yes"/>
+      <point x="442" y="-10"/>
+      <point x="556" y="95"/>
+      <point x="556" y="239" type="curve" smooth="yes"/>
+      <point x="556" y="355"/>
+      <point x="479" y="422"/>
+      <point x="373" y="475" type="curve" smooth="yes"/>
+      <point x="270" y="527"/>
+      <point x="251" y="550"/>
+      <point x="251" y="573" type="curve" smooth="yes"/>
+      <point x="251" y="598"/>
+      <point x="274" y="607"/>
+      <point x="310" y="607" type="curve" smooth="yes"/>
+      <point x="353" y="607"/>
+      <point x="425" y="590"/>
+      <point x="493" y="559" type="curve"/>
     </contour>
   </outline>
   <lib>
@@ -56,8 +56,6 @@
       <string>=o</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=o</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dialytikaoxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/dialytikaoxia.glif
index c6f4776c..6ed7279d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dialytikaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dialytikaoxia.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dialytikaoxia" format="2">
-  <advance width="631"/>
+  <advance width="593"/>
   <unicode hex="1FEE"/>
-  <anchor x="281" y="490" name="_top"/>
+  <anchor x="269" y="490" name="_top"/>
   <outline>
-    <component base="dieresistonos" xOffset="-7"/>
+    <component base="dieresistonos" xOffset="-19"/>
   </outline>
   <lib>
     <dict>
@@ -12,8 +12,6 @@
       <string>=dieresis</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=dieresis</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dialytikaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/dialytikaperispomeni.glif
index 1286a734..6c31d58e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dialytikaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dialytikaperispomeni.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dialytikaperispomeni" format="2">
-  <advance width="538"/>
+  <advance width="500"/>
   <unicode hex="1FC1"/>
-  <anchor x="262" y="490" name="_top"/>
+  <anchor x="250" y="490" name="_top"/>
   <outline>
-    <component base="dieresiscomb" xOffset="-7"/>
-    <component base="perispomeni" xOffset="29" yOffset="236"/>
+    <component base="dieresiscomb" xOffset="-19"/>
+    <component base="perispomeni" xOffset="1" yOffset="236"/>
   </outline>
   <lib>
     <dict>
@@ -17,8 +17,6 @@
       <string>=dieresis</string>
       <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
       <string>=dieresis</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dialytikavaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/dialytikavaria.glif
index 7d352375..f6abbf50 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dialytikavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dialytikavaria.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dialytikavaria" format="2">
-  <advance width="631"/>
+  <advance width="593"/>
   <unicode hex="1FED"/>
-  <anchor x="336" y="490" name="_top"/>
+  <anchor x="324" y="490" name="_top"/>
   <outline>
-    <component base="dieresistonos" xScale="-1" xOffset="624"/>
+    <component base="dieresistonos" xScale="-1" xOffset="612"/>
   </outline>
   <lib>
     <dict>
@@ -12,8 +12,6 @@
       <string>dieresis</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>dieresis</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/dieresistonos.glif 
b/src/Cantarell-Bold.ufo/glyphs/dieresistonos.glif
index 11d1226a..c7a16296 100644
--- a/src/Cantarell-Bold.ufo/glyphs/dieresistonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/dieresistonos.glif
@@ -45,8 +45,6 @@
       <string>=dieresiscomb</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=dieresiscomb</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/epsilon.glif b/src/Cantarell-Bold.ufo/glyphs/epsilon.glif
index 37c57443..fa348345 100644
--- a/src/Cantarell-Bold.ufo/glyphs/epsilon.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/epsilon.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilon" format="2">
-  <advance width="472"/>
+  <advance width="492"/>
   <unicode hex="03B5"/>
-  <anchor x="255" y="0" name="bottom"/>
-  <anchor x="245" y="490" name="top"/>
+  <anchor x="270" y="0" name="bottom"/>
+  <anchor x="260" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="256" y="-10" type="curve" smooth="yes"/>
-      <point x="344" y="-10"/>
-      <point x="411" y="7"/>
-      <point x="469" y="26" type="curve"/>
-      <point x="435" y="144" type="line"/>
-      <point x="391" y="129"/>
-      <point x="330" y="118"/>
-      <point x="277" y="118" type="curve" smooth="yes"/>
-      <point x="216" y="118"/>
-      <point x="189" y="131"/>
-      <point x="189" y="157" type="curve" smooth="yes"/>
-      <point x="189" y="179"/>
-      <point x="209" y="193"/>
-      <point x="257" y="193" type="curve" smooth="yes"/>
-      <point x="354" y="193" type="line"/>
-      <point x="354" y="302" type="line"/>
-      <point x="265" y="302" type="line" smooth="yes"/>
-      <point x="215" y="302"/>
-      <point x="193" y="316"/>
-      <point x="193" y="337" type="curve" smooth="yes"/>
-      <point x="193" y="358"/>
-      <point x="216" y="372"/>
-      <point x="272" y="372" type="curve" smooth="yes"/>
-      <point x="314" y="372"/>
-      <point x="370" y="365"/>
-      <point x="419" y="351" type="curve"/>
-      <point x="440" y="472" type="line"/>
-      <point x="381" y="490"/>
-      <point x="307" y="500"/>
-      <point x="245" y="500" type="curve" smooth="yes"/>
-      <point x="114" y="500"/>
-      <point x="25" y="451"/>
-      <point x="25" y="363" type="curve" smooth="yes"/>
-      <point x="25" y="294"/>
-      <point x="93" y="251"/>
-      <point x="156" y="243" type="curve"/>
-      <point x="158" y="248" type="line"/>
-      <point x="85" y="244"/>
-      <point x="13" y="201"/>
-      <point x="13" y="123" type="curve" smooth="yes"/>
-      <point x="13" y="30"/>
-      <point x="124" y="-10"/>
+      <point x="271" y="-10" type="curve" smooth="yes"/>
+      <point x="359" y="-10"/>
+      <point x="426" y="7"/>
+      <point x="484" y="26" type="curve"/>
+      <point x="450" y="144" type="line"/>
+      <point x="406" y="129"/>
+      <point x="345" y="118"/>
+      <point x="292" y="118" type="curve" smooth="yes"/>
+      <point x="231" y="118"/>
+      <point x="204" y="131"/>
+      <point x="204" y="157" type="curve" smooth="yes"/>
+      <point x="204" y="179"/>
+      <point x="224" y="193"/>
+      <point x="272" y="193" type="curve" smooth="yes"/>
+      <point x="369" y="193" type="line"/>
+      <point x="369" y="302" type="line"/>
+      <point x="280" y="302" type="line" smooth="yes"/>
+      <point x="230" y="302"/>
+      <point x="208" y="316"/>
+      <point x="208" y="337" type="curve" smooth="yes"/>
+      <point x="208" y="358"/>
+      <point x="231" y="372"/>
+      <point x="287" y="372" type="curve" smooth="yes"/>
+      <point x="329" y="372"/>
+      <point x="385" y="365"/>
+      <point x="434" y="351" type="curve"/>
+      <point x="455" y="472" type="line"/>
+      <point x="396" y="490"/>
+      <point x="322" y="500"/>
+      <point x="260" y="500" type="curve" smooth="yes"/>
+      <point x="129" y="500"/>
+      <point x="40" y="451"/>
+      <point x="40" y="363" type="curve" smooth="yes"/>
+      <point x="40" y="294"/>
+      <point x="108" y="251"/>
+      <point x="171" y="243" type="curve"/>
+      <point x="173" y="248" type="line"/>
+      <point x="100" y="244"/>
+      <point x="28" y="201"/>
+      <point x="28" y="123" type="curve" smooth="yes"/>
+      <point x="28" y="30"/>
+      <point x="139" y="-10"/>
     </contour>
   </outline>
   <lib>
@@ -56,8 +56,6 @@
       <string>=o-5</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=e-25</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/epsilondasia.glif b/src/Cantarell-Bold.ufo/glyphs/epsilondasia.glif
index a3686771..3e28f7f5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/epsilondasia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/epsilondasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilondasia" format="2">
-  <advance width="472"/>
+  <advance width="492"/>
   <unicode hex="1F11"/>
-  <anchor x="255" y="0" name="bottom"/>
-  <anchor x="245" y="729" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="dasia" xOffset="73"/>
+    <component base="dasia" xOffset="88"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/epsilondasiaoxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/epsilondasiaoxia.glif
index be3526a7..b08ba1c9 100644
--- a/src/Cantarell-Bold.ufo/glyphs/epsilondasiaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/epsilondasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilondasiaoxia" format="2">
-  <advance width="472"/>
+  <advance width="492"/>
   <unicode hex="1F15"/>
-  <anchor x="255" y="0" name="bottom"/>
-  <anchor x="245" y="490" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="dasiaoxia" xOffset="-37"/>
+    <component base="dasiaoxia" xOffset="-22"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/epsilondasiavaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/epsilondasiavaria.glif
index 56b648ce..217ac829 100644
--- a/src/Cantarell-Bold.ufo/glyphs/epsilondasiavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/epsilondasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilondasiavaria" format="2">
-  <advance width="472"/>
+  <advance width="492"/>
   <unicode hex="1F13"/>
-  <anchor x="255" y="0" name="bottom"/>
-  <anchor x="245" y="490" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="dasiavaria" xOffset="-55"/>
+    <component base="dasiavaria" xOffset="-40"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/epsilonoxia.glif b/src/Cantarell-Bold.ufo/glyphs/epsilonoxia.glif
index aaa25e1e..81d511c0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/epsilonoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/epsilonoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilonoxia" format="2">
-  <advance width="472"/>
+  <advance width="492"/>
   <unicode hex="1F73"/>
-  <anchor x="255" y="0" name="bottom"/>
-  <anchor x="245" y="490" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="oxia" xOffset="104"/>
+    <component base="oxia" xOffset="119"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/epsilonpsili.glif b/src/Cantarell-Bold.ufo/glyphs/epsilonpsili.glif
index 7602eb84..b058bc3e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/epsilonpsili.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/epsilonpsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilonpsili" format="2">
-  <advance width="472"/>
+  <advance width="492"/>
   <unicode hex="1F10"/>
-  <anchor x="255" y="0" name="bottom"/>
-  <anchor x="245" y="729" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="psili" xOffset="71"/>
+    <component base="psili" xOffset="86"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/epsilonpsilioxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/epsilonpsilioxia.glif
index 482d4d54..bf929abd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/epsilonpsilioxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/epsilonpsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilonpsilioxia" format="2">
-  <advance width="472"/>
+  <advance width="492"/>
   <unicode hex="1F14"/>
-  <anchor x="255" y="0" name="bottom"/>
-  <anchor x="245" y="490" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="psilioxia" xOffset="-34"/>
+    <component base="psilioxia" xOffset="-19"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/epsilonpsilivaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/epsilonpsilivaria.glif
index ac2fc51f..753c47ab 100644
--- a/src/Cantarell-Bold.ufo/glyphs/epsilonpsilivaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/epsilonpsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilonpsilivaria" format="2">
-  <advance width="472"/>
+  <advance width="492"/>
   <unicode hex="1F12"/>
-  <anchor x="255" y="0" name="bottom"/>
-  <anchor x="245" y="490" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="psilivaria" xOffset="-44"/>
+    <component base="psilivaria" xOffset="-29"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/epsilontonos.glif b/src/Cantarell-Bold.ufo/glyphs/epsilontonos.glif
index fa14c5c2..bc4a010e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/epsilontonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/epsilontonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilontonos" format="2">
-  <advance width="472"/>
+  <advance width="492"/>
   <unicode hex="03AD"/>
-  <anchor x="255" y="0" name="bottom"/>
-  <anchor x="245" y="490" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="tonos" xOffset="104"/>
+    <component base="tonos" xOffset="119"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/epsilonvaria.glif b/src/Cantarell-Bold.ufo/glyphs/epsilonvaria.glif
index 58bbb832..ec9792f5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/epsilonvaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/epsilonvaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilonvaria" format="2">
-  <advance width="472"/>
+  <advance width="492"/>
   <unicode hex="1F72"/>
-  <anchor x="255" y="0" name="bottom"/>
-  <anchor x="245" y="490" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="varia" xOffset="56"/>
+    <component base="varia" xOffset="71"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/eta.glif b/src/Cantarell-Bold.ufo/glyphs/eta.glif
index 3ac4cea3..6b56de95 100644
--- a/src/Cantarell-Bold.ufo/glyphs/eta.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/eta.glif
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eta" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="03B7"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
+  <anchor x="148" y="0" name="bottom"/>
+  <anchor x="304" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="227" y="0" type="line"/>
-      <point x="227" y="376" type="line"/>
-      <point x="179" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <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="364" y="-217" type="line"/>
-      <point x="537" y="-217" type="line"/>
-      <point x="537" y="284" type="line" smooth="yes"/>
-      <point x="537" y="418"/>
-      <point x="474" y="496"/>
-      <point x="363" y="496" type="curve" smooth="yes"/>
-      <point x="293" y="496"/>
-      <point x="232" y="465"/>
-      <point x="192" y="408" type="curve"/>
-      <point x="211" y="305" type="line"/>
-      <point x="236" y="332"/>
-      <point x="264" y="346"/>
-      <point x="298" y="346" type="curve" smooth="yes"/>
-      <point x="345" y="346"/>
-      <point x="364" y="320"/>
-      <point x="364" y="265" type="curve" smooth="yes"/>
+      <point x="372" y="-217" type="line"/>
+      <point x="545" y="-217" type="line"/>
+      <point x="545" y="284" type="line" smooth="yes"/>
+      <point x="545" y="418"/>
+      <point x="482" y="496"/>
+      <point x="371" y="496" type="curve" smooth="yes"/>
+      <point x="301" y="496"/>
+      <point x="240" y="465"/>
+      <point x="200" y="408" type="curve"/>
+      <point x="219" y="305" type="line"/>
+      <point x="244" y="332"/>
+      <point x="272" y="346"/>
+      <point x="306" y="346" type="curve" smooth="yes"/>
+      <point x="353" y="346"/>
+      <point x="372" y="320"/>
+      <point x="372" y="265" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
@@ -37,8 +37,6 @@
       <string>=n</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=n</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etadasia.glif b/src/Cantarell-Bold.ufo/glyphs/etadasia.glif
index 18cfe360..5e9400b8 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etadasia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etadasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasia" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F21"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="729" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasia" xOffset="124"/>
+    <component base="dasia" xOffset="132"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etadasiaoxia.glif b/src/Cantarell-Bold.ufo/glyphs/etadasiaoxia.glif
index d32c8a20..1b493162 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etadasiaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etadasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiaoxia" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F25"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasiaoxia" xOffset="14"/>
+    <component base="dasiaoxia" xOffset="22"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etadasiaoxiaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/etadasiaoxiaypogegrammeni.glif
index fb7880e7..a552fd70 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etadasiaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etadasiaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiaoxiaypogegrammeni" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F95"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasiaoxia" xOffset="14"/>
-    <component base="ypogegrammeni" xOffset="-122"/>
+    <component base="dasiaoxia" xOffset="22"/>
+    <component base="ypogegrammeni" xOffset="-114"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etadasiaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/etadasiaperispomeni.glif
index 1e098757..eeb2ddea 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etadasiaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etadasiaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiaperispomeni" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F27"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="daspsiliiaperispomeni" xOffset="63"/>
+    <component base="daspsiliiaperispomeni" xOffset="55"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etadasiaperispomeniypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/etadasiaperispomeniypogegrammeni.glif
index eea4ee31..5035135f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etadasiaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etadasiaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiaperispomeniypogegrammeni" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F97"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="daspsiliiaperispomeni" xOffset="63"/>
-    <component base="ypogegrammeni" xOffset="-122"/>
+    <component base="daspsiliiaperispomeni" xOffset="55"/>
+    <component base="ypogegrammeni" xOffset="-114"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etadasiavaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/etadasiavaria.glif
index 252dc88d..5a8661f6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etadasiavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etadasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiavaria" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F23"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasiavaria" xOffset="-4"/>
+    <component base="dasiavaria" xOffset="4"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etadasiavariaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/etadasiavariaypogegrammeni.glif
index e8139fa0..4da1ce23 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etadasiavariaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etadasiavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiavariaypogegrammeni" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F93"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasiavaria" xOffset="-4"/>
-    <component base="ypogegrammeni" xOffset="-122"/>
+    <component base="dasiavaria" xOffset="4"/>
+    <component base="ypogegrammeni" xOffset="-114"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etadasiaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/etadasiaypogegrammeni.glif
index 43ef29be..034a4556 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etadasiaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etadasiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiaypogegrammeni" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F91"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="729" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasia" xOffset="124"/>
-    <component base="ypogegrammeni" xOffset="-122"/>
+    <component base="dasia" xOffset="132"/>
+    <component base="ypogegrammeni" xOffset="-114"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etaoxia.glif b/src/Cantarell-Bold.ufo/glyphs/etaoxia.glif
index a3f7de71..cb24629e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etaoxia" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F75"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="oxia" xOffset="155"/>
+    <component base="oxia" xOffset="163"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etaoxiaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/etaoxiaypogegrammeni.glif
index 53668685..40b89f4e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etaoxiaypogegrammeni" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1FC4"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="oxia" xOffset="155"/>
-    <component base="ypogegrammeni" xOffset="-122"/>
+    <component base="oxia" xOffset="163"/>
+    <component base="ypogegrammeni" xOffset="-114"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/etaperispomeni.glif
index 871be21d..3be43d37 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etaperispomeni" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1FC6"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="701" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="perispomeni" xOffset="63"/>
+    <component base="perispomeni" xOffset="55"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etaperispomeniypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/etaperispomeniypogegrammeni.glif
index 0cd40106..e71fecaf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etaperispomeniypogegrammeni" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1FC7"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="701" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="perispomeni" xOffset="63"/>
-    <component base="ypogegrammeni" xOffset="-122"/>
+    <component base="perispomeni" xOffset="55"/>
+    <component base="ypogegrammeni" xOffset="-114"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etapsili.glif b/src/Cantarell-Bold.ufo/glyphs/etapsili.glif
index 8b7e9b74..c3994d3f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etapsili.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etapsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsili" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F20"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="729" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psili" xOffset="122"/>
+    <component base="psili" xOffset="130"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etapsilioxia.glif b/src/Cantarell-Bold.ufo/glyphs/etapsilioxia.glif
index bc4fec57..10f70e1d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etapsilioxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etapsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsilioxia" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F24"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psilioxia" xOffset="17"/>
+    <component base="psilioxia" xOffset="25"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etapsilioxiaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/etapsilioxiaypogegrammeni.glif
index 62536aea..0dce7925 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etapsilioxiaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etapsilioxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsilioxiaypogegrammeni" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F94"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psilioxia" xOffset="17"/>
-    <component base="ypogegrammeni" xOffset="-122"/>
+    <component base="psilioxia" xOffset="25"/>
+    <component base="ypogegrammeni" xOffset="-114"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etapsiliperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/etapsiliperispomeni.glif
index 7902c175..b492da6d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etapsiliperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etapsiliperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsiliperispomeni" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F26"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psiliperispomeni" xOffset="63"/>
+    <component base="psiliperispomeni" xOffset="55"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etapsiliperispomeniypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/etapsiliperispomeniypogegrammeni.glif
index d3a43848..193abfa1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etapsiliperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etapsiliperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsiliperispomeniypogegrammeni" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F96"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psiliperispomeni" xOffset="63"/>
-    <component base="ypogegrammeni" xOffset="-122"/>
+    <component base="psiliperispomeni" xOffset="55"/>
+    <component base="ypogegrammeni" xOffset="-114"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etapsilivaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/etapsilivaria.glif
index 6a83cd51..e32341f4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etapsilivaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etapsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsilivaria" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F22"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psilivaria" xOffset="7"/>
+    <component base="psilivaria" xOffset="15"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etapsilivariaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/etapsilivariaypogegrammeni.glif
index f690f2f8..16e0361f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etapsilivariaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etapsilivariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsilivariaypogegrammeni" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F92"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psilivaria" xOffset="7"/>
-    <component base="ypogegrammeni" xOffset="-122"/>
+    <component base="psilivaria" xOffset="15"/>
+    <component base="ypogegrammeni" xOffset="-114"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etapsiliypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/etapsiliypogegrammeni.glif
index efbb7bca..7a440e80 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etapsiliypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etapsiliypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsiliypogegrammeni" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F90"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="729" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psili" xOffset="122"/>
-    <component base="ypogegrammeni" xOffset="-122"/>
+    <component base="psili" xOffset="130"/>
+    <component base="ypogegrammeni" xOffset="-114"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etatonos.glif b/src/Cantarell-Bold.ufo/glyphs/etatonos.glif
index 62ff10f0..9aade9c0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etatonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etatonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etatonos" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="03AE"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="tonos" xOffset="155"/>
+    <component base="tonos" xOffset="163"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etavaria.glif b/src/Cantarell-Bold.ufo/glyphs/etavaria.glif
index 5e8299c9..db7d2990 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etavaria" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1F74"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="varia" xOffset="107"/>
+    <component base="varia" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etavariaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/etavariaypogegrammeni.glif
index 3f6b7498..eb22f612 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etavariaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etavariaypogegrammeni" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1FC2"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="varia" xOffset="107"/>
-    <component base="ypogegrammeni" xOffset="-122"/>
+    <component base="varia" xOffset="115"/>
+    <component base="ypogegrammeni" xOffset="-114"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/etaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/etaypogegrammeni.glif
index ac1d267e..c7fd3ca7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/etaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/etaypogegrammeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etaypogegrammeni" format="2">
-  <advance width="579"/>
+  <advance width="596"/>
   <unicode hex="1FC3"/>
-  <anchor x="140" y="0" name="bottom"/>
-  <anchor x="296" y="490" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="ypogegrammeni" xOffset="-122"/>
+    <component base="ypogegrammeni" xOffset="-114"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/gamma.glif b/src/Cantarell-Bold.ufo/glyphs/gamma.glif
index cac5e269..dd5eb196 100644
--- a/src/Cantarell-Bold.ufo/glyphs/gamma.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/gamma.glif
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gamma" format="2">
-  <advance width="543"/>
+  <advance width="550"/>
   <unicode hex="03B3"/>
   <outline>
     <contour>
-      <point x="186" y="-10" type="line"/>
-      <point x="344" y="0" type="line"/>
-      <point x="412" y="127" type="line" smooth="yes"/>
-      <point x="482" y="258"/>
-      <point x="532" y="373"/>
-      <point x="532" y="490" type="curve"/>
-      <point x="359" y="490" type="line"/>
-      <point x="359" y="380"/>
-      <point x="324" y="267"/>
-      <point x="269" y="142" type="curve" smooth="yes"/>
-      <point x="258" y="117" type="line"/>
-      <point x="284" y="117" type="line"/>
-      <point x="182" y="490" type="line"/>
-      <point x="-8" y="490" type="line"/>
+      <point x="189" y="-10" type="line"/>
+      <point x="347" y="0" type="line"/>
+      <point x="415" y="127" type="line" smooth="yes"/>
+      <point x="485" y="258"/>
+      <point x="535" y="373"/>
+      <point x="535" y="490" type="curve"/>
+      <point x="362" y="490" type="line"/>
+      <point x="362" y="380"/>
+      <point x="327" y="267"/>
+      <point x="272" y="142" type="curve" smooth="yes"/>
+      <point x="261" y="117" type="line"/>
+      <point x="287" y="117" type="line"/>
+      <point x="185" y="490" type="line"/>
+      <point x="-5" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="179" y="-217" type="line"/>
-      <point x="357" y="-217" type="line"/>
-      <point x="344" y="0" type="line"/>
-      <point x="186" y="-10" type="line"/>
+      <point x="182" y="-217" type="line"/>
+      <point x="360" y="-217" type="line"/>
+      <point x="347" y="0" type="line"/>
+      <point x="189" y="-10" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -32,8 +32,6 @@
       <string>=nu</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=nu</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iota.glif b/src/Cantarell-Bold.ufo/glyphs/iota.glif
index eb98e796..b385bef0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iota.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iota.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iota" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="03B9"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="490" name="top"/>
+  <anchor x="187" y="0" name="bottom"/>
+  <anchor x="146" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="210" y="-8" type="curve" smooth="yes"/>
-      <point x="248" y="-8"/>
-      <point x="287" y="-1"/>
-      <point x="320" y="11" type="curve"/>
-      <point x="286" y="125" type="line"/>
-      <point x="276" y="122"/>
-      <point x="265" y="121"/>
-      <point x="259" y="121" type="curve" smooth="yes"/>
-      <point x="233" y="121"/>
-      <point x="219" y="137"/>
-      <point x="219" y="168" type="curve" smooth="yes"/>
-      <point x="219" y="490" type="line"/>
-      <point x="46" y="490" type="line"/>
-      <point x="46" y="147" type="line" smooth="yes"/>
-      <point x="46" y="48"/>
-      <point x="106" y="-8"/>
+      <point x="226" y="-8" type="curve" smooth="yes"/>
+      <point x="264" y="-8"/>
+      <point x="303" y="-1"/>
+      <point x="336" y="11" type="curve"/>
+      <point x="302" y="125" type="line"/>
+      <point x="292" y="122"/>
+      <point x="281" y="121"/>
+      <point x="275" y="121" type="curve" smooth="yes"/>
+      <point x="249" y="121"/>
+      <point x="235" y="137"/>
+      <point x="235" y="168" type="curve" smooth="yes"/>
+      <point x="235" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
+      <point x="62" y="147" type="line" smooth="yes"/>
+      <point x="62" y="48"/>
+      <point x="122" y="-8"/>
     </contour>
   </outline>
   <lib>
@@ -30,8 +30,6 @@
       <string>=l</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=l</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotadasia.glif b/src/Cantarell-Bold.ufo/glyphs/iotadasia.glif
index 06866abd..f5f68f84 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotadasia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotadasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadasia" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="1F31"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="729" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dasia" xOffset="-42"/>
+    <component base="dasia" xOffset="-26"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotadasiaoxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/iotadasiaoxia.glif
index 23452dbd..408b15ae 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotadasiaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotadasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadasiaoxia" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="1F35"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="490" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dasiaoxia" xOffset="-152"/>
+    <component base="dasiaoxia" xOffset="-136"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotadasiaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/iotadasiaperispomeni.glif
index c77436f2..a7169f28 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotadasiaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotadasiaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadasiaperispomeni" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="1F37"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="490" name="top"/>
   <outline>
     <component base="iota"/>
     <component base="daspsiliiaperispomeni" xOffset="-103"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotadasiavaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/iotadasiavaria.glif
index 713984d9..3a0842a0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotadasiavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotadasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadasiavaria" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="1F33"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="490" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dasiavaria" xOffset="-170"/>
+    <component base="dasiavaria" xOffset="-154"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotadialytikaoxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/iotadialytikaoxia.glif
index 247473dc..00da972e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotadialytikaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotadialytikaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadialytikaoxia" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="1FD3"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="490" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dialytikaoxia" xOffset="-151"/>
+    <component base="dialytikaoxia" xOffset="-123"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotadialytikaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/iotadialytikaperispomeni.glif
index 0ad1b5a3..616cc2fb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotadialytikaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotadialytikaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadialytikaperispomeni" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="1FD7"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="490" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dialytikaperispomeni" xOffset="-132"/>
+    <component base="dialytikaperispomeni" xOffset="-104"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotadialytikavaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/iotadialytikavaria.glif
index c84fec74..66c1e0f4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotadialytikavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotadialytikavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadialytikavaria" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="1FD2"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="490" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dialytikavaria" xOffset="-206"/>
+    <component base="dialytikavaria" xOffset="-178"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotadieresis.glif b/src/Cantarell-Bold.ufo/glyphs/iotadieresis.glif
index 880c4cc8..a6404bbb 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotadieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotadieresis.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadieresis" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="03CA"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="726" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dieresiscomb" xOffset="-139"/>
+    <component base="dieresiscomb" xOffset="-123"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotadieresistonos.glif 
b/src/Cantarell-Bold.ufo/glyphs/iotadieresistonos.glif
index 1fb2a364..b9c9b6ba 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotadieresistonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotadieresistonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadieresistonos" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="0390"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="490" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dieresistonos" xOffset="-165"/>
+    <component base="dieresistonos" xOffset="-149"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotamacron.glif b/src/Cantarell-Bold.ufo/glyphs/iotamacron.glif
index d904a0e5..0c042132 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotamacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotamacron.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotamacron" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="1FD1"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="490" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="macron" xOffset="-106"/>
+    <component base="macron" xOffset="-104"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotaoxia.glif b/src/Cantarell-Bold.ufo/glyphs/iotaoxia.glif
index 1f97846a..6585950f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotaoxia" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="1F77"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="490" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="oxia" xOffset="-11"/>
+    <component base="oxia" xOffset="5"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/iotaperispomeni.glif
index 97cee108..e7e983f5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotaperispomeni" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="1FD6"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="701" name="top"/>
   <outline>
     <component base="iota"/>
     <component base="perispomeni" xOffset="-103"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotapsili.glif b/src/Cantarell-Bold.ufo/glyphs/iotapsili.glif
index 10dd4bbe..8917d1fa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotapsili.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotapsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotapsili" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="1F30"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="729" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="psili" xOffset="-44"/>
+    <component base="psili" xOffset="-28"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotapsilioxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/iotapsilioxia.glif
index 10b846ee..879bc8a4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotapsilioxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotapsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotapsilioxia" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="1F34"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="490" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="psilioxia" xOffset="-149"/>
+    <component base="psilioxia" xOffset="-133"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotapsiliperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/iotapsiliperispomeni.glif
index 448d6c5a..9cea2e50 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotapsiliperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotapsiliperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotapsiliperispomeni" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="1F36"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="490" name="top"/>
   <outline>
     <component base="iota"/>
     <component base="psiliperispomeni" xOffset="-103"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotapsilivaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/iotapsilivaria.glif
index 2a5edc01..8dd7005e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotapsilivaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotapsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotapsilivaria" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="1F32"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="490" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="psilivaria" xOffset="-159"/>
+    <component base="psilivaria" xOffset="-143"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotatonos.glif b/src/Cantarell-Bold.ufo/glyphs/iotatonos.glif
index efd24d68..dab9a6da 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotatonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotatonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotatonos" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="03AF"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="490" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="tonos" xOffset="-11"/>
+    <component base="tonos" xOffset="5"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotavaria.glif b/src/Cantarell-Bold.ufo/glyphs/iotavaria.glif
index 8b217682..092ba756 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotavaria" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="1F76"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="490" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="varia" xOffset="-59"/>
+    <component base="varia" xOffset="-43"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/iotavrachy.glif b/src/Cantarell-Bold.ufo/glyphs/iotavrachy.glif
index 17b8898e..e13e05c7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/iotavrachy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/iotavrachy.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotavrachy" format="2">
-  <advance width="313"/>
+  <advance width="334"/>
   <unicode hex="1FD0"/>
-  <anchor x="171" y="0" name="bottom"/>
-  <anchor x="130" y="729" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="vrachy" xOffset="-86"/>
+    <component base="vrachy" xOffset="-70"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/kaiS_ymbol.glif b/src/Cantarell-Bold.ufo/glyphs/kaiS_ymbol.glif
index d6290897..1a65eda4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kaiS_ymbol.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kaiS_ymbol.glif
@@ -1,55 +1,55 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kaiSymbol" format="2">
-  <advance width="550"/>
+  <advance width="569"/>
   <unicode hex="03D7"/>
   <outline>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="227" y="0" type="line"/>
-      <point x="227" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <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="364" y="325" type="line"/>
-      <point x="260" y="199" type="line"/>
-      <point x="381" y="-44" type="line"/>
-      <point x="574" y="-44" type="line"/>
+      <point x="372" y="325" type="line"/>
+      <point x="268" y="199" type="line"/>
+      <point x="389" y="-44" type="line"/>
+      <point x="582" y="-44" type="line"/>
     </contour>
     <contour>
-      <point x="273" y="370" type="curve" smooth="yes"/>
-      <point x="206" y="277" type="line"/>
-      <point x="206" y="71" type="line"/>
-      <point x="351" y="253" type="line" smooth="yes"/>
-      <point x="405" y="321"/>
-      <point x="442" y="351"/>
-      <point x="488" y="351" type="curve" smooth="yes"/>
-      <point x="501" y="351"/>
-      <point x="511" y="350"/>
-      <point x="518" y="349" type="curve"/>
-      <point x="548" y="489" type="line"/>
-      <point x="523" y="495"/>
-      <point x="503" y="498"/>
-      <point x="481" y="498" type="curve" smooth="yes"/>
-      <point x="421" y="498"/>
-      <point x="354" y="482"/>
+      <point x="281" y="370" type="curve" smooth="yes"/>
+      <point x="214" y="277" type="line"/>
+      <point x="214" y="71" type="line"/>
+      <point x="359" y="253" type="line" smooth="yes"/>
+      <point x="413" y="321"/>
+      <point x="450" y="351"/>
+      <point x="496" y="351" type="curve" smooth="yes"/>
+      <point x="509" y="351"/>
+      <point x="519" y="350"/>
+      <point x="526" y="349" type="curve"/>
+      <point x="556" y="489" type="line"/>
+      <point x="531" y="495"/>
+      <point x="511" y="498"/>
+      <point x="489" y="498" type="curve" smooth="yes"/>
+      <point x="429" y="498"/>
+      <point x="362" y="482"/>
     </contour>
     <contour>
-      <point x="410" y="-149" type="curve" smooth="yes"/>
-      <point x="574" y="-44" type="line"/>
-      <point x="444" y="35" type="line"/>
-      <point x="338" y="-34" type="line" smooth="yes"/>
-      <point x="279" y="-72"/>
-      <point x="208" y="-88"/>
-      <point x="155" y="-88" type="curve" smooth="yes"/>
-      <point x="120" y="-88"/>
-      <point x="80" y="-79"/>
-      <point x="49" y="-66" type="curve"/>
-      <point x="9" y="-201" type="line"/>
-      <point x="49" y="-221"/>
-      <point x="107" y="-232"/>
-      <point x="151" y="-232" type="curve" smooth="yes"/>
-      <point x="245" y="-232"/>
-      <point x="327" y="-202"/>
+      <point x="418" y="-149" type="curve" smooth="yes"/>
+      <point x="582" y="-44" type="line"/>
+      <point x="452" y="35" type="line"/>
+      <point x="346" y="-34" type="line" smooth="yes"/>
+      <point x="287" y="-72"/>
+      <point x="216" y="-88"/>
+      <point x="163" y="-88" type="curve" smooth="yes"/>
+      <point x="128" y="-88"/>
+      <point x="88" y="-79"/>
+      <point x="57" y="-66" type="curve"/>
+      <point x="17" y="-201" type="line"/>
+      <point x="57" y="-221"/>
+      <point x="115" y="-232"/>
+      <point x="159" y="-232" type="curve" smooth="yes"/>
+      <point x="253" y="-232"/>
+      <point x="335" y="-202"/>
     </contour>
   </outline>
   <lib>
@@ -60,8 +60,6 @@
       <string>=kappa-20</string>
       <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
       <string>=kappa-10</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/kappa.glif b/src/Cantarell-Bold.ufo/glyphs/kappa.glif
index 4d2b0d31..d37f2cbf 100644
--- a/src/Cantarell-Bold.ufo/glyphs/kappa.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/kappa.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kappa" format="2">
-  <advance width="549"/>
+  <advance width="568"/>
   <unicode hex="03BA"/>
   <outline>
     <contour>
-      <point x="54" y="0" type="line"/>
-      <point x="227" y="0" type="line"/>
-      <point x="227" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <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="353" y="325" type="line"/>
-      <point x="249" y="200" type="line"/>
-      <point x="362" y="0" type="line"/>
-      <point x="563" y="0" type="line"/>
+      <point x="361" y="325" type="line"/>
+      <point x="257" y="200" type="line"/>
+      <point x="370" y="0" type="line"/>
+      <point x="571" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="273" y="370" type="curve" smooth="yes"/>
-      <point x="206" y="277" type="line"/>
-      <point x="206" y="71" type="line"/>
-      <point x="351" y="253" type="line" smooth="yes"/>
-      <point x="405" y="321"/>
-      <point x="442" y="351"/>
-      <point x="488" y="351" type="curve" smooth="yes"/>
-      <point x="501" y="351"/>
-      <point x="511" y="350"/>
-      <point x="518" y="349" type="curve"/>
-      <point x="548" y="489" type="line"/>
-      <point x="523" y="495"/>
-      <point x="503" y="498"/>
-      <point x="481" y="498" type="curve" smooth="yes"/>
-      <point x="421" y="498"/>
-      <point x="354" y="482"/>
+      <point x="281" y="370" type="curve" smooth="yes"/>
+      <point x="214" y="277" type="line"/>
+      <point x="214" y="71" type="line"/>
+      <point x="359" y="253" type="line" smooth="yes"/>
+      <point x="413" y="321"/>
+      <point x="450" y="351"/>
+      <point x="496" y="351" type="curve" smooth="yes"/>
+      <point x="509" y="351"/>
+      <point x="519" y="350"/>
+      <point x="526" y="349" type="curve"/>
+      <point x="556" y="489" type="line"/>
+      <point x="531" y="495"/>
+      <point x="511" y="498"/>
+      <point x="489" y="498" type="curve" smooth="yes"/>
+      <point x="429" y="498"/>
+      <point x="362" y="482"/>
     </contour>
   </outline>
   <lib>
@@ -40,8 +40,6 @@
       <string>=n</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=k+5</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/koronis.case.glif b/src/Cantarell-Bold.ufo/glyphs/koronis.case.glif
index b7ad1ba3..393f6c14 100644
--- a/src/Cantarell-Bold.ufo/glyphs/koronis.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/koronis.case.glif
@@ -10,8 +10,6 @@
       <string>psili.case</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psili.case</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/koronis.glif b/src/Cantarell-Bold.ufo/glyphs/koronis.glif
index e8cf0676..16a25308 100644
--- a/src/Cantarell-Bold.ufo/glyphs/koronis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/koronis.glif
@@ -11,8 +11,6 @@
       <string>psili</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psili</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lambda.glif b/src/Cantarell-Bold.ufo/glyphs/lambda.glif
index 61322118..6889d6c4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lambda.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lambda.glif
@@ -27,10 +27,4 @@
       <point x="173" y="602"/>
     </contour>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/lowernumeral-greek.glif 
b/src/Cantarell-Bold.ufo/glyphs/lowernumeral-greek.glif
index c476da67..b2e7da2f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/lowernumeral-greek.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/lowernumeral-greek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lowernumeral-greek" format="2">
-  <advance width="276"/>
+  <advance width="281"/>
   <unicode hex="0375"/>
   <outline>
-    <component base="minute" xScale="-1" yScale="-1" xOffset="291" yOffset="704"/>
+    <component base="minute" xScale="-1" yScale="-1" xOffset="321" yOffset="704"/>
   </outline>
   <lib>
     <dict>
@@ -11,8 +11,6 @@
       <string>quotesinglbase</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>quotesinglbase</string>
-      <key>public.markColor</key>
-      <string>0,0.67,0.91,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/mu.glif b/src/Cantarell-Bold.ufo/glyphs/mu.glif
index e77278f8..a5bee105 100644
--- a/src/Cantarell-Bold.ufo/glyphs/mu.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/mu.glif
@@ -1,50 +1,50 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="mu" format="2">
-  <advance width="621"/>
+  <advance width="634"/>
   <unicode hex="03BC"/>
-  <anchor x="292" y="490" name="top"/>
+  <anchor x="300" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="514" y="-8" type="curve" smooth="yes"/>
-      <point x="559" y="-8"/>
-      <point x="594" y="0"/>
-      <point x="628" y="13" type="curve"/>
-      <point x="596" y="125" type="line"/>
-      <point x="587" y="122"/>
-      <point x="579" y="121"/>
-      <point x="571" y="121" type="curve" smooth="yes"/>
-      <point x="549" y="121"/>
-      <point x="533" y="137"/>
-      <point x="533" y="168" type="curve" smooth="yes"/>
-      <point x="533" y="490" type="line"/>
-      <point x="360" y="490" type="line"/>
-      <point x="360" y="153" type="line" smooth="yes"/>
-      <point x="360" y="45"/>
-      <point x="428" y="-8"/>
+      <point x="522" y="-8" type="curve" smooth="yes"/>
+      <point x="567" y="-8"/>
+      <point x="602" y="0"/>
+      <point x="636" y="13" type="curve"/>
+      <point x="604" y="125" type="line"/>
+      <point x="595" y="122"/>
+      <point x="587" y="121"/>
+      <point x="579" y="121" type="curve" smooth="yes"/>
+      <point x="557" y="121"/>
+      <point x="541" y="137"/>
+      <point x="541" y="168" type="curve" smooth="yes"/>
+      <point x="541" y="490" type="line"/>
+      <point x="368" y="490" type="line"/>
+      <point x="368" y="153" type="line" smooth="yes"/>
+      <point x="368" y="45"/>
+      <point x="436" y="-8"/>
     </contour>
     <contour>
-      <point x="54" y="-217" type="line" smooth="yes"/>
-      <point x="232" y="-217" type="line"/>
-      <point x="210" y="25" type="line"/>
-      <point x="227" y="25" type="line"/>
-      <point x="227" y="490" type="line"/>
-      <point x="54" y="490" type="line"/>
+      <point x="62" y="-217" type="line" smooth="yes"/>
+      <point x="240" y="-217" type="line"/>
+      <point x="218" y="25" type="line"/>
+      <point x="235" y="25" type="line"/>
+      <point x="235" y="490" type="line"/>
+      <point x="62" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="269" y="-2" type="curve" smooth="yes"/>
-      <point x="335" y="-2"/>
-      <point x="382" y="42"/>
-      <point x="410" y="105" type="curve"/>
-      <point x="377" y="182" type="line"/>
-      <point x="352" y="155"/>
-      <point x="319" y="146"/>
-      <point x="297" y="146" type="curve" smooth="yes"/>
-      <point x="262" y="146"/>
-      <point x="219" y="163"/>
-      <point x="147" y="242" type="curve"/>
-      <point x="104" y="94" type="line"/>
-      <point x="193" y="17"/>
-      <point x="218" y="-2"/>
+      <point x="277" y="-2" type="curve" smooth="yes"/>
+      <point x="343" y="-2"/>
+      <point x="390" y="42"/>
+      <point x="418" y="105" type="curve"/>
+      <point x="385" y="182" type="line"/>
+      <point x="360" y="155"/>
+      <point x="327" y="146"/>
+      <point x="305" y="146" type="curve" smooth="yes"/>
+      <point x="270" y="146"/>
+      <point x="227" y="163"/>
+      <point x="155" y="242" type="curve"/>
+      <point x="112" y="94" type="line"/>
+      <point x="201" y="17"/>
+      <point x="226" y="-2"/>
     </contour>
   </outline>
   <lib>
@@ -53,8 +53,6 @@
       <string>=n</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=iota</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/nu.glif b/src/Cantarell-Bold.ufo/glyphs/nu.glif
index 51f0a24f..399308f5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/nu.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/nu.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nu" format="2">
-  <advance width="543"/>
+  <advance width="550"/>
   <unicode hex="03BD"/>
-  <anchor x="267" y="0" name="bottom"/>
-  <anchor x="267" y="490" name="top"/>
+  <anchor x="270" y="0" name="bottom"/>
+  <anchor x="270" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="259" y="124" type="line"/>
-      <point x="282" y="124" type="line"/>
-      <point x="182" y="490" type="line"/>
-      <point x="-8" y="490" type="line"/>
-      <point x="181" y="0" type="line"/>
-      <point x="342" y="0" type="line"/>
-      <point x="406" y="116" type="line" smooth="yes"/>
-      <point x="484" y="257"/>
-      <point x="532" y="373"/>
-      <point x="532" y="490" type="curve"/>
-      <point x="359" y="490" type="line"/>
-      <point x="359" y="380"/>
-      <point x="328" y="272"/>
-      <point x="272" y="152" type="curve" smooth="yes"/>
+      <point x="262" y="124" type="line"/>
+      <point x="285" y="124" type="line"/>
+      <point x="185" y="490" type="line"/>
+      <point x="-5" y="490" type="line"/>
+      <point x="184" y="0" type="line"/>
+      <point x="345" y="0" type="line"/>
+      <point x="409" y="116" type="line" smooth="yes"/>
+      <point x="487" y="257"/>
+      <point x="535" y="373"/>
+      <point x="535" y="490" type="curve"/>
+      <point x="362" y="490" type="line"/>
+      <point x="362" y="380"/>
+      <point x="331" y="272"/>
+      <point x="275" y="152" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
@@ -30,8 +30,6 @@
       <string>=v+15</string>
       <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
       <string>=v+20</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omega.glif b/src/Cantarell-Bold.ufo/glyphs/omega.glif
index 091550f1..13003047 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omega.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omega.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omega" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="03C9"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
+  <anchor x="382" y="0" name="bottom"/>
+  <anchor x="382" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="285" y="344" type="line"/>
-      <point x="285" y="243" type="line" smooth="yes"/>
-      <point x="285" y="174"/>
-      <point x="271" y="134"/>
-      <point x="240" y="134" type="curve" smooth="yes"/>
-      <point x="208" y="134"/>
-      <point x="199" y="178"/>
-      <point x="199" y="241" type="curve" smooth="yes"/>
-      <point x="199" y="315"/>
-      <point x="223" y="402"/>
-      <point x="254" y="490" type="curve"/>
-      <point x="78" y="490" type="line"/>
-      <point x="45" y="401"/>
-      <point x="23" y="320"/>
-      <point x="23" y="225" type="curve" smooth="yes"/>
-      <point x="23" y="93"/>
-      <point x="89" y="-10"/>
-      <point x="208" y="-10" type="curve" smooth="yes"/>
-      <point x="314" y="-10"/>
-      <point x="368" y="63"/>
-      <point x="373" y="159" type="curve"/>
-      <point x="358" y="154" type="line"/>
-      <point x="363" y="59"/>
-      <point x="422" y="-10"/>
-      <point x="522" y="-10" type="curve" smooth="yes"/>
-      <point x="646" y="-10"/>
-      <point x="714" y="96"/>
-      <point x="714" y="228" type="curve" smooth="yes"/>
-      <point x="714" y="322"/>
-      <point x="689" y="403"/>
-      <point x="656" y="490" type="curve"/>
-      <point x="480" y="490" type="line"/>
-      <point x="512" y="404"/>
-      <point x="538" y="315"/>
-      <point x="538" y="242" type="curve" smooth="yes"/>
-      <point x="538" y="178"/>
-      <point x="527" y="134"/>
-      <point x="493" y="134" type="curve" smooth="yes"/>
-      <point x="463" y="134"/>
-      <point x="449" y="173"/>
-      <point x="449" y="242" type="curve" smooth="yes"/>
-      <point x="449" y="344" type="line"/>
+      <point x="300" y="344" type="line"/>
+      <point x="300" y="243" type="line" smooth="yes"/>
+      <point x="300" y="174"/>
+      <point x="286" y="134"/>
+      <point x="255" y="134" type="curve" smooth="yes"/>
+      <point x="223" y="134"/>
+      <point x="214" y="178"/>
+      <point x="214" y="241" type="curve" smooth="yes"/>
+      <point x="214" y="315"/>
+      <point x="238" y="402"/>
+      <point x="269" y="490" type="curve"/>
+      <point x="93" y="490" type="line"/>
+      <point x="60" y="401"/>
+      <point x="38" y="320"/>
+      <point x="38" y="225" type="curve" smooth="yes"/>
+      <point x="38" y="93"/>
+      <point x="104" y="-10"/>
+      <point x="223" y="-10" type="curve" smooth="yes"/>
+      <point x="329" y="-10"/>
+      <point x="383" y="63"/>
+      <point x="388" y="159" type="curve"/>
+      <point x="373" y="154" type="line"/>
+      <point x="378" y="59"/>
+      <point x="437" y="-10"/>
+      <point x="537" y="-10" type="curve" smooth="yes"/>
+      <point x="661" y="-10"/>
+      <point x="729" y="96"/>
+      <point x="729" y="228" type="curve" smooth="yes"/>
+      <point x="729" y="322"/>
+      <point x="704" y="403"/>
+      <point x="671" y="490" type="curve"/>
+      <point x="495" y="490" type="line"/>
+      <point x="527" y="404"/>
+      <point x="553" y="315"/>
+      <point x="553" y="242" type="curve" smooth="yes"/>
+      <point x="553" y="178"/>
+      <point x="542" y="134"/>
+      <point x="508" y="134" type="curve" smooth="yes"/>
+      <point x="478" y="134"/>
+      <point x="464" y="173"/>
+      <point x="464" y="242" type="curve" smooth="yes"/>
+      <point x="464" y="344" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -56,8 +56,6 @@
       <string>=o+5</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=o+5</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegadasia.glif b/src/Cantarell-Bold.ufo/glyphs/omegadasia.glif
index e059bfb8..1905feba 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegadasia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegadasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasia" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1F61"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="729" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasia" xOffset="195"/>
+    <component base="dasia" xOffset="210"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegadasiaoxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegadasiaoxia.glif
index 7936d77b..41b090ed 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegadasiaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegadasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiaoxia" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1F65"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasiaoxia" xOffset="85"/>
+    <component base="dasiaoxia" xOffset="100"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegadasiaoxiaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegadasiaoxiaypogegrammeni.glif
index ec43de7d..f0e5d49f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegadasiaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegadasiaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiaoxiaypogegrammeni" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1FA5"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasiaoxia" xOffset="85"/>
-    <component base="ypogegrammeni" xOffset="105"/>
+    <component base="dasiaoxia" xOffset="100"/>
+    <component base="ypogegrammeni" xOffset="120"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegadasiaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegadasiaperispomeni.glif
index b95e8ce7..e68d805a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegadasiaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegadasiaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiaperispomeni" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1F67"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="daspsiliiaperispomeni" xOffset="134"/>
+    <component base="daspsiliiaperispomeni" xOffset="133"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegadasiaperispomeniypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegadasiaperispomeniypogegrammeni.glif
index 15f8b5ec..e401acec 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegadasiaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegadasiaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiaperispomeniypogegrammeni" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1FA7"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="daspsiliiaperispomeni" xOffset="134"/>
-    <component base="ypogegrammeni" xOffset="105"/>
+    <component base="daspsiliiaperispomeni" xOffset="133"/>
+    <component base="ypogegrammeni" xOffset="120"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegadasiavaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegadasiavaria.glif
index 5cc109e7..bce4270f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegadasiavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegadasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiavaria" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1F63"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasiavaria" xOffset="67"/>
+    <component base="dasiavaria" xOffset="82"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegadasiavariaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegadasiavariaypogegrammeni.glif
index f5651a72..021eef7c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegadasiavariaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegadasiavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiavariaypogegrammeni" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1FA3"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasiavaria" xOffset="67"/>
-    <component base="ypogegrammeni" xOffset="105"/>
+    <component base="dasiavaria" xOffset="82"/>
+    <component base="ypogegrammeni" xOffset="120"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegadasiaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegadasiaypogegrammeni.glif
index 8fbe11c4..b515b53d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegadasiaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegadasiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiaypogegrammeni" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1FA1"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="729" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasia" xOffset="195"/>
-    <component base="ypogegrammeni" xOffset="105"/>
+    <component base="dasia" xOffset="210"/>
+    <component base="ypogegrammeni" xOffset="120"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegaoxia.glif b/src/Cantarell-Bold.ufo/glyphs/omegaoxia.glif
index 3b8c90f0..7e2025b0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegaoxia" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1F7D"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="oxia" xOffset="226"/>
+    <component base="oxia" xOffset="241"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegaoxiaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegaoxiaypogegrammeni.glif
index e9112f44..a7693c03 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegaoxiaypogegrammeni" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1FF4"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="oxia" xOffset="226"/>
-    <component base="ypogegrammeni" xOffset="105"/>
+    <component base="oxia" xOffset="241"/>
+    <component base="ypogegrammeni" xOffset="120"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegaperispomeni.glif
index 54606621..9683ce40 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegaperispomeni" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1FF6"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="701" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="perispomeni" xOffset="134"/>
+    <component base="perispomeni" xOffset="133"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegaperispomeniypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegaperispomeniypogegrammeni.glif
index 96f5a0de..940d3972 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegaperispomeniypogegrammeni" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1FF7"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="701" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="perispomeni" xOffset="134"/>
-    <component base="ypogegrammeni" xOffset="105"/>
+    <component base="perispomeni" xOffset="133"/>
+    <component base="ypogegrammeni" xOffset="120"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegapsili.glif b/src/Cantarell-Bold.ufo/glyphs/omegapsili.glif
index 605b9cbe..c3bde0d5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegapsili.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegapsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsili" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1F60"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="729" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psili" xOffset="193"/>
+    <component base="psili" xOffset="208"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegapsilioxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegapsilioxia.glif
index 63cb85a2..f35f2653 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegapsilioxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegapsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsilioxia" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1F64"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psilioxia" xOffset="88"/>
+    <component base="psilioxia" xOffset="103"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegapsilioxiaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegapsilioxiaypogegrammeni.glif
index 1b5b13f9..2579175e 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegapsilioxiaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegapsilioxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsilioxiaypogegrammeni" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1FA4"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psilioxia" xOffset="88"/>
-    <component base="ypogegrammeni" xOffset="105"/>
+    <component base="psilioxia" xOffset="103"/>
+    <component base="ypogegrammeni" xOffset="120"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegapsiliperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegapsiliperispomeni.glif
index 60f8f93e..00d02276 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegapsiliperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegapsiliperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsiliperispomeni" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1F66"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psiliperispomeni" xOffset="134"/>
+    <component base="psiliperispomeni" xOffset="133"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegapsiliperispomeniypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegapsiliperispomeniypogegrammeni.glif
index c1aec412..bc7bb959 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegapsiliperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegapsiliperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsiliperispomeniypogegrammeni" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1FA6"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psiliperispomeni" xOffset="134"/>
-    <component base="ypogegrammeni" xOffset="105"/>
+    <component base="psiliperispomeni" xOffset="133"/>
+    <component base="ypogegrammeni" xOffset="120"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegapsilivaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegapsilivaria.glif
index e53231c4..10746607 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegapsilivaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegapsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsilivaria" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1F62"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psilivaria" xOffset="78"/>
+    <component base="psilivaria" xOffset="93"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegapsilivariaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegapsilivariaypogegrammeni.glif
index e341a9c7..c2446a7b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegapsilivariaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegapsilivariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsilivariaypogegrammeni" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1FA2"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psilivaria" xOffset="78"/>
-    <component base="ypogegrammeni" xOffset="105"/>
+    <component base="psilivaria" xOffset="93"/>
+    <component base="ypogegrammeni" xOffset="120"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegapsiliypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegapsiliypogegrammeni.glif
index 11d96df5..e50038f5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegapsiliypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegapsiliypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsiliypogegrammeni" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1FA0"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="729" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psili" xOffset="193"/>
-    <component base="ypogegrammeni" xOffset="105"/>
+    <component base="psili" xOffset="208"/>
+    <component base="ypogegrammeni" xOffset="120"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegatonos.glif b/src/Cantarell-Bold.ufo/glyphs/omegatonos.glif
index 2f0e3c66..202012a7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegatonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegatonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegatonos" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="03CE"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="tonos" xOffset="226"/>
+    <component base="tonos" xOffset="241"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegavaria.glif b/src/Cantarell-Bold.ufo/glyphs/omegavaria.glif
index 6aee4d3b..9e46fb7d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegavaria" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1F7C"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="varia" xOffset="178"/>
+    <component base="varia" xOffset="193"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegavariaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegavariaypogegrammeni.glif
index 779fbdf5..7e994f00 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegavariaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegavariaypogegrammeni" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1FF2"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="varia" xOffset="178"/>
-    <component base="ypogegrammeni" xOffset="105"/>
+    <component base="varia" xOffset="193"/>
+    <component base="ypogegrammeni" xOffset="120"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omegaypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/omegaypogegrammeni.glif
index 7b14f46e..6cfc061c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omegaypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omegaypogegrammeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegaypogegrammeni" format="2">
-  <advance width="737"/>
+  <advance width="767"/>
   <unicode hex="1FF3"/>
-  <anchor x="367" y="0" name="bottom"/>
-  <anchor x="367" y="490" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="ypogegrammeni" xOffset="105"/>
+    <component base="ypogegrammeni" xOffset="120"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omicron.glif b/src/Cantarell-Bold.ufo/glyphs/omicron.glif
index 1670bb75..340a7149 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omicron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omicron.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicron" format="2">
-  <advance width="559"/>
+  <advance width="589"/>
   <unicode hex="03BF"/>
-  <anchor x="278" y="0" name="bottom"/>
-  <anchor x="278" y="490" name="top"/>
+  <anchor x="293" y="0" name="bottom"/>
+  <anchor x="293" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="271" y="-10" type="curve" smooth="yes"/>
-      <point x="434" y="-10"/>
-      <point x="541" y="97"/>
-      <point x="541" y="254" type="curve" smooth="yes"/>
-      <point x="541" y="402"/>
-      <point x="444" y="500"/>
-      <point x="289" y="500" type="curve" smooth="yes"/>
-      <point x="125" y="500"/>
-      <point x="18" y="393"/>
-      <point x="18" y="235" type="curve" smooth="yes"/>
-      <point x="18" y="88"/>
-      <point x="115" y="-10"/>
+      <point x="286" y="-10" type="curve" smooth="yes"/>
+      <point x="449" y="-10"/>
+      <point x="556" y="97"/>
+      <point x="556" y="254" type="curve" smooth="yes"/>
+      <point x="556" y="402"/>
+      <point x="459" y="500"/>
+      <point x="304" y="500" type="curve" smooth="yes"/>
+      <point x="140" y="500"/>
+      <point x="33" y="393"/>
+      <point x="33" y="235" type="curve" smooth="yes"/>
+      <point x="33" y="88"/>
+      <point x="130" y="-10"/>
     </contour>
     <contour>
-      <point x="282" y="134" type="curve" smooth="yes"/>
-      <point x="224" y="134"/>
-      <point x="194" y="177"/>
-      <point x="194" y="246" type="curve" smooth="yes"/>
-      <point x="194" y="314"/>
-      <point x="222" y="356"/>
-      <point x="277" y="356" type="curve" smooth="yes"/>
-      <point x="335" y="356"/>
-      <point x="365" y="312"/>
-      <point x="365" y="240" type="curve" smooth="yes"/>
-      <point x="365" y="174"/>
-      <point x="337" y="134"/>
+      <point x="297" y="134" type="curve" smooth="yes"/>
+      <point x="239" y="134"/>
+      <point x="209" y="177"/>
+      <point x="209" y="246" type="curve" smooth="yes"/>
+      <point x="209" y="314"/>
+      <point x="237" y="356"/>
+      <point x="292" y="356" type="curve" smooth="yes"/>
+      <point x="350" y="356"/>
+      <point x="380" y="312"/>
+      <point x="380" y="240" type="curve" smooth="yes"/>
+      <point x="380" y="174"/>
+      <point x="352" y="134"/>
     </contour>
   </outline>
   <lib>
@@ -40,8 +40,6 @@
       <string>o</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>o</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omicrondasia.glif b/src/Cantarell-Bold.ufo/glyphs/omicrondasia.glif
index 3dfe6871..b7cb64de 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omicrondasia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omicrondasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicrondasia" format="2">
-  <advance width="559"/>
+  <advance width="589"/>
   <unicode hex="1F41"/>
-  <anchor x="278" y="0" name="bottom"/>
-  <anchor x="278" y="729" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="dasia" xOffset="106"/>
+    <component base="dasia" xOffset="121"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omicrondasiaoxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/omicrondasiaoxia.glif
index 1b5ae830..479fd6ad 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omicrondasiaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omicrondasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicrondasiaoxia" format="2">
-  <advance width="559"/>
+  <advance width="589"/>
   <unicode hex="1F45"/>
-  <anchor x="278" y="0" name="bottom"/>
-  <anchor x="278" y="490" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="dasiaoxia" xOffset="-4"/>
+    <component base="dasiaoxia" xOffset="11"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omicrondasiavaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/omicrondasiavaria.glif
index ece816bc..9070e373 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omicrondasiavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omicrondasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicrondasiavaria" format="2">
-  <advance width="559"/>
+  <advance width="589"/>
   <unicode hex="1F43"/>
-  <anchor x="278" y="0" name="bottom"/>
-  <anchor x="278" y="490" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="dasiavaria" xOffset="-22"/>
+    <component base="dasiavaria" xOffset="-7"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omicronoxia.glif b/src/Cantarell-Bold.ufo/glyphs/omicronoxia.glif
index 761e1a61..2eef5175 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omicronoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omicronoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicronoxia" format="2">
-  <advance width="559"/>
+  <advance width="589"/>
   <unicode hex="1F79"/>
-  <anchor x="278" y="0" name="bottom"/>
-  <anchor x="278" y="490" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="oxia" xOffset="137"/>
+    <component base="oxia" xOffset="152"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omicronpsili.glif b/src/Cantarell-Bold.ufo/glyphs/omicronpsili.glif
index 611b2ad5..da1a9bf6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omicronpsili.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omicronpsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicronpsili" format="2">
-  <advance width="559"/>
+  <advance width="589"/>
   <unicode hex="1F40"/>
-  <anchor x="278" y="0" name="bottom"/>
-  <anchor x="278" y="729" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="psili" xOffset="104"/>
+    <component base="psili" xOffset="119"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omicronpsilioxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/omicronpsilioxia.glif
index 9b000811..d679ac19 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omicronpsilioxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omicronpsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicronpsilioxia" format="2">
-  <advance width="559"/>
+  <advance width="589"/>
   <unicode hex="1F44"/>
-  <anchor x="278" y="0" name="bottom"/>
-  <anchor x="278" y="490" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="psilioxia" xOffset="-1"/>
+    <component base="psilioxia" xOffset="14"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omicronpsilivaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/omicronpsilivaria.glif
index 6b992056..d36a90b0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omicronpsilivaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omicronpsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicronpsilivaria" format="2">
-  <advance width="559"/>
+  <advance width="589"/>
   <unicode hex="1F42"/>
-  <anchor x="278" y="0" name="bottom"/>
-  <anchor x="278" y="490" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="psilivaria" xOffset="-11"/>
+    <component base="psilivaria" xOffset="4"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omicrontonos.glif b/src/Cantarell-Bold.ufo/glyphs/omicrontonos.glif
index 2f5ac5eb..165c7392 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omicrontonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omicrontonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicrontonos" format="2">
-  <advance width="559"/>
+  <advance width="589"/>
   <unicode hex="03CC"/>
-  <anchor x="278" y="0" name="bottom"/>
-  <anchor x="278" y="490" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="tonos" xOffset="137"/>
+    <component base="tonos" xOffset="152"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/omicronvaria.glif b/src/Cantarell-Bold.ufo/glyphs/omicronvaria.glif
index 58734f18..ae0ea9f5 100644
--- a/src/Cantarell-Bold.ufo/glyphs/omicronvaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/omicronvaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicronvaria" format="2">
-  <advance width="559"/>
+  <advance width="589"/>
   <unicode hex="1F78"/>
-  <anchor x="278" y="0" name="bottom"/>
-  <anchor x="278" y="490" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="varia" xOffset="89"/>
+    <component base="varia" xOffset="104"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oxia.case.glif b/src/Cantarell-Bold.ufo/glyphs/oxia.case.glif
index 2c7e7901..ba0d9ef1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oxia.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oxia.case.glif
@@ -11,8 +11,6 @@
       <string>tonos.case</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>tonos.case</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/oxia.glif b/src/Cantarell-Bold.ufo/glyphs/oxia.glif
index 3fa72c64..389cd204 100644
--- a/src/Cantarell-Bold.ufo/glyphs/oxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/oxia.glif
@@ -12,8 +12,6 @@
       <string>tonos</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>tonos</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/perispomeni.glif b/src/Cantarell-Bold.ufo/glyphs/perispomeni.glif
index ccfc2ff2..c08eda8c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/perispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/perispomeni.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="perispomeni" format="2">
-  <advance width="458"/>
+  <advance width="500"/>
   <unicode hex="1FC0"/>
-  <anchor x="233" y="490" name="_top"/>
-  <anchor x="233" y="701" name="top"/>
+  <anchor x="249" y="490" name="_top"/>
+  <anchor x="249" y="701" name="top"/>
   <outline>
-    <component base="tildecomb" xOffset="-2"/>
+    <component base="tildecomb" xOffset="14"/>
   </outline>
   <lib>
     <dict>
@@ -13,8 +13,6 @@
       <string>tilde</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>tilde</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/phi.glif b/src/Cantarell-Bold.ufo/glyphs/phi.glif
index f3d7e35a..469233ce 100644
--- a/src/Cantarell-Bold.ufo/glyphs/phi.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/phi.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="phi" format="2">
-  <advance width="746"/>
+  <advance width="774"/>
   <unicode hex="03C6"/>
   <outline>
     <contour>
-      <point x="290" y="-8" type="curve"/>
-      <point x="297" y="137" type="line"/>
-      <point x="237" y="137"/>
-      <point x="199" y="192"/>
-      <point x="199" y="277" type="curve" smooth="yes"/>
-      <point x="199" y="347"/>
-      <point x="217" y="408"/>
-      <point x="252" y="490" type="curve"/>
-      <point x="76" y="490" type="line"/>
-      <point x="41" y="406"/>
-      <point x="23" y="351"/>
-      <point x="23" y="258" type="curve" smooth="yes"/>
-      <point x="23" y="114"/>
-      <point x="109" y="-8"/>
+      <point x="305" y="-8" type="curve"/>
+      <point x="312" y="137" type="line"/>
+      <point x="252" y="137"/>
+      <point x="214" y="192"/>
+      <point x="214" y="277" type="curve" smooth="yes"/>
+      <point x="214" y="347"/>
+      <point x="232" y="408"/>
+      <point x="267" y="490" type="curve"/>
+      <point x="91" y="490" type="line"/>
+      <point x="56" y="406"/>
+      <point x="38" y="351"/>
+      <point x="38" y="258" type="curve" smooth="yes"/>
+      <point x="38" y="114"/>
+      <point x="124" y="-8"/>
     </contour>
     <contour>
-      <point x="447" y="137" type="curve"/>
-      <point x="440" y="-8" type="line"/>
-      <point x="595" y="-8"/>
-      <point x="726" y="104"/>
-      <point x="726" y="264" type="curve" smooth="yes"/>
-      <point x="726" y="427"/>
-      <point x="645" y="500"/>
-      <point x="506" y="500" type="curve" smooth="yes"/>
-      <point x="355" y="500"/>
-      <point x="282" y="412"/>
-      <point x="282" y="245" type="curve" smooth="yes"/>
-      <point x="282" y="-217" type="line"/>
-      <point x="455" y="-217" type="line"/>
-      <point x="455" y="268" type="line" smooth="yes"/>
-      <point x="455" y="334"/>
-      <point x="476" y="356"/>
-      <point x="504" y="356" type="curve" smooth="yes"/>
-      <point x="528" y="356"/>
-      <point x="550" y="336"/>
-      <point x="550" y="263" type="curve" smooth="yes"/>
-      <point x="550" y="172"/>
-      <point x="495" y="137"/>
+      <point x="462" y="137" type="curve"/>
+      <point x="455" y="-8" type="line"/>
+      <point x="610" y="-8"/>
+      <point x="741" y="104"/>
+      <point x="741" y="264" type="curve" smooth="yes"/>
+      <point x="741" y="427"/>
+      <point x="660" y="500"/>
+      <point x="521" y="500" type="curve" smooth="yes"/>
+      <point x="370" y="500"/>
+      <point x="297" y="412"/>
+      <point x="297" y="245" type="curve" smooth="yes"/>
+      <point x="297" y="-217" type="line"/>
+      <point x="470" y="-217" type="line"/>
+      <point x="470" y="268" type="line" smooth="yes"/>
+      <point x="470" y="334"/>
+      <point x="491" y="356"/>
+      <point x="519" y="356" type="curve" smooth="yes"/>
+      <point x="543" y="356"/>
+      <point x="565" y="336"/>
+      <point x="565" y="263" type="curve" smooth="yes"/>
+      <point x="565" y="172"/>
+      <point x="510" y="137"/>
     </contour>
   </outline>
   <lib>
@@ -50,8 +50,6 @@
       <string>=omega</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=p</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/pi.glif b/src/Cantarell-Bold.ufo/glyphs/pi.glif
index 88533326..8dc760fd 100644
--- a/src/Cantarell-Bold.ufo/glyphs/pi.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/pi.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="pi" format="2">
-  <advance width="664"/>
+  <advance width="672"/>
   <unicode hex="03C0"/>
   <outline>
     <contour>
-      <point x="536" y="-8" type="curve" smooth="yes"/>
-      <point x="578" y="-8"/>
-      <point x="607" y="-2"/>
-      <point x="647" y="11" type="curve"/>
-      <point x="616" y="127" type="line"/>
-      <point x="606" y="124"/>
-      <point x="598" y="123"/>
-      <point x="587" y="123" type="curve" smooth="yes"/>
-      <point x="558" y="123"/>
-      <point x="538" y="141"/>
-      <point x="538" y="186" type="curve" smooth="yes"/>
-      <point x="538" y="425" type="line"/>
-      <point x="365" y="425" type="line"/>
-      <point x="365" y="173" type="line" smooth="yes"/>
-      <point x="365" y="54"/>
-      <point x="430" y="-8"/>
+      <point x="543" y="-8" type="curve" smooth="yes"/>
+      <point x="585" y="-8"/>
+      <point x="614" y="-2"/>
+      <point x="654" y="11" type="curve"/>
+      <point x="623" y="127" type="line"/>
+      <point x="613" y="124"/>
+      <point x="605" y="123"/>
+      <point x="594" y="123" type="curve" smooth="yes"/>
+      <point x="565" y="123"/>
+      <point x="545" y="141"/>
+      <point x="545" y="186" type="curve" smooth="yes"/>
+      <point x="545" y="425" type="line"/>
+      <point x="372" y="425" type="line"/>
+      <point x="372" y="173" type="line" smooth="yes"/>
+      <point x="372" y="54"/>
+      <point x="437" y="-8"/>
     </contour>
     <contour>
-      <point x="94" y="0" type="line"/>
-      <point x="267" y="0" type="line"/>
-      <point x="267" y="425" type="line"/>
-      <point x="94" y="425" type="line"/>
+      <point x="101" y="0" type="line"/>
+      <point x="274" y="0" type="line"/>
+      <point x="274" y="425" type="line"/>
+      <point x="101" y="425" type="line"/>
     </contour>
     <contour>
-      <point x="5" y="355" type="line"/>
-      <point x="640" y="355" type="line"/>
-      <point x="640" y="490" type="line"/>
-      <point x="5" y="490" type="line"/>
+      <point x="12" y="355" type="line"/>
+      <point x="647" y="355" type="line"/>
+      <point x="647" y="490" type="line"/>
+      <point x="12" y="490" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -40,8 +40,6 @@
       <string>t</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=t+5</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/prosgegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/prosgegrammeni.glif
index 65f0806b..f899aba1 100644
--- a/src/Cantarell-Bold.ufo/glyphs/prosgegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/prosgegrammeni.glif
@@ -5,10 +5,4 @@
   <outline>
     <component base="ypogegrammeni"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/psi.glif b/src/Cantarell-Bold.ufo/glyphs/psi.glif
index 9b93362a..0fc09e28 100644
--- a/src/Cantarell-Bold.ufo/glyphs/psi.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/psi.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="psi" format="2">
-  <advance width="784"/>
+  <advance width="806"/>
   <unicode hex="03C8"/>
   <outline>
     <contour>
-      <point x="308" y="-217" type="line"/>
-      <point x="481" y="-217" type="line"/>
-      <point x="481" y="646" type="line"/>
-      <point x="308" y="646" type="line"/>
+      <point x="315" y="-217" type="line"/>
+      <point x="488" y="-217" type="line"/>
+      <point x="488" y="646" type="line"/>
+      <point x="315" y="646" type="line"/>
     </contour>
     <contour>
-      <point x="325" y="134" type="line"/>
-      <point x="253" y="134"/>
-      <point x="212" y="188"/>
-      <point x="212" y="269" type="curve" smooth="yes"/>
-      <point x="212" y="490" type="line"/>
-      <point x="39" y="490" type="line"/>
-      <point x="39" y="244" type="line" smooth="yes"/>
-      <point x="39" y="90"/>
-      <point x="164" y="-8"/>
-      <point x="318" y="-8" type="curve"/>
+      <point x="332" y="134" type="line"/>
+      <point x="260" y="134"/>
+      <point x="219" y="188"/>
+      <point x="219" y="269" type="curve" smooth="yes"/>
+      <point x="219" y="490" type="line"/>
+      <point x="46" y="490" type="line"/>
+      <point x="46" y="244" type="line" smooth="yes"/>
+      <point x="46" y="90"/>
+      <point x="171" y="-8"/>
+      <point x="325" y="-8" type="curve"/>
     </contour>
     <contour>
-      <point x="464" y="-8" type="line"/>
-      <point x="639" y="-8"/>
-      <point x="761" y="108"/>
-      <point x="761" y="252" type="curve" smooth="yes"/>
-      <point x="761" y="349"/>
-      <point x="744" y="410"/>
-      <point x="717" y="490" type="curve"/>
-      <point x="541" y="490" type="line"/>
-      <point x="567" y="410"/>
-      <point x="585" y="338"/>
-      <point x="585" y="267" type="curve" smooth="yes"/>
-      <point x="585" y="179"/>
-      <point x="537" y="134"/>
-      <point x="471" y="134" type="curve"/>
+      <point x="471" y="-8" type="line"/>
+      <point x="646" y="-8"/>
+      <point x="768" y="108"/>
+      <point x="768" y="252" type="curve" smooth="yes"/>
+      <point x="768" y="349"/>
+      <point x="751" y="410"/>
+      <point x="724" y="490" type="curve"/>
+      <point x="548" y="490" type="line"/>
+      <point x="574" y="410"/>
+      <point x="592" y="338"/>
+      <point x="592" y="267" type="curve" smooth="yes"/>
+      <point x="592" y="179"/>
+      <point x="544" y="134"/>
+      <point x="478" y="134" type="curve"/>
     </contour>
   </outline>
   <lib>
@@ -44,8 +44,6 @@
       <string>=upsilon</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=omega</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/psili.case.glif b/src/Cantarell-Bold.ufo/glyphs/psili.case.glif
index 2a6c318e..d5ea98d7 100644
--- a/src/Cantarell-Bold.ufo/glyphs/psili.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/psili.case.glif
@@ -12,8 +12,6 @@
       <string>psili</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psili</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/psili.glif b/src/Cantarell-Bold.ufo/glyphs/psili.glif
index f788ee7a..0c5d2d16 100644
--- a/src/Cantarell-Bold.ufo/glyphs/psili.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/psili.glif
@@ -22,10 +22,4 @@
       <point x="124" y="575"/>
     </contour>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/psilioxia.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/psilioxia.case.glif
index f3226eba..35f0ad45 100644
--- a/src/Cantarell-Bold.ufo/glyphs/psilioxia.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/psilioxia.case.glif
@@ -11,8 +11,6 @@
       <string>psilioxia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psilioxia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/psilioxia.glif b/src/Cantarell-Bold.ufo/glyphs/psilioxia.glif
index 34afeb07..b2b8155f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/psilioxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/psilioxia.glif
@@ -33,8 +33,6 @@
       <string>psili</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>oxia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/psiliperispomeni.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/psiliperispomeni.case.glif
index a16e40a0..a7d72b72 100644
--- a/src/Cantarell-Bold.ufo/glyphs/psiliperispomeni.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/psiliperispomeni.case.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="psiliperispomeni.case" format="2">
-  <advance width="458"/>
+  <advance width="500"/>
   <anchor x="381" y="907" name="_topleft"/>
   <outline>
     <component base="psiliperispomeni" yOffset="-51"/>
@@ -11,8 +11,6 @@
       <string>psiliperispomeni</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psiliperispomeni</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/psiliperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/psiliperispomeni.glif
index 1f7feb44..b589ff1f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/psiliperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/psiliperispomeni.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="psiliperispomeni" format="2">
-  <advance width="458"/>
+  <advance width="500"/>
   <unicode hex="1FCF"/>
-  <anchor x="233" y="490" name="_top"/>
+  <anchor x="249" y="490" name="_top"/>
   <outline>
-    <component base="psili" xOffset="59"/>
+    <component base="psili" xOffset="75"/>
     <component base="perispomeni" yOffset="239"/>
   </outline>
   <lib>
@@ -13,8 +13,6 @@
       <string>perispomeni</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>perispomeni</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/psilivaria.case.glif 
b/src/Cantarell-Bold.ufo/glyphs/psilivaria.case.glif
index 16fc2d7f..9f3f8147 100644
--- a/src/Cantarell-Bold.ufo/glyphs/psilivaria.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/psilivaria.case.glif
@@ -11,8 +11,6 @@
       <string>psilivaria</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psilivaria</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/psilivaria.glif b/src/Cantarell-Bold.ufo/glyphs/psilivaria.glif
index 5d01873f..9caa6478 100644
--- a/src/Cantarell-Bold.ufo/glyphs/psilivaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/psilivaria.glif
@@ -33,8 +33,6 @@
       <string>psili</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>varia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rho.glif b/src/Cantarell-Bold.ufo/glyphs/rho.glif
index af7ec17e..95a331a2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rho.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rho.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rho" format="2">
-  <advance width="561"/>
+  <advance width="584"/>
   <unicode hex="03C1"/>
-  <anchor x="273" y="0" name="bottom"/>
-  <anchor x="273" y="490" name="top"/>
+  <anchor x="281" y="0" name="bottom"/>
+  <anchor x="281" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="34" y="241" type="curve" smooth="yes"/>
-      <point x="34" y="-217" type="line"/>
-      <point x="212" y="-217" type="line"/>
-      <point x="195" y="51" type="line"/>
-      <point x="207" y="51" type="line"/>
-      <point x="207" y="239" type="line" smooth="yes"/>
-      <point x="207" y="321"/>
-      <point x="238" y="356"/>
-      <point x="287" y="356" type="curve" smooth="yes"/>
-      <point x="331" y="356"/>
-      <point x="367" y="317"/>
-      <point x="367" y="249" type="curve" smooth="yes"/>
-      <point x="367" y="177"/>
-      <point x="334" y="134"/>
-      <point x="279" y="134" type="curve" smooth="yes"/>
-      <point x="245" y="134"/>
-      <point x="209" y="151"/>
-      <point x="191" y="181" type="curve"/>
-      <point x="152" y="87" type="line"/>
-      <point x="185" y="25"/>
-      <point x="243" y="-10"/>
-      <point x="315" y="-10" type="curve" smooth="yes"/>
-      <point x="444" y="-10"/>
-      <point x="543" y="93"/>
-      <point x="543" y="254" type="curve" smooth="yes"/>
-      <point x="543" y="395"/>
-      <point x="461" y="500"/>
-      <point x="288" y="500" type="curve" smooth="yes"/>
-      <point x="131" y="500"/>
-      <point x="34" y="410"/>
+      <point x="42" y="241" type="curve" smooth="yes"/>
+      <point x="42" y="-217" type="line"/>
+      <point x="220" y="-217" type="line"/>
+      <point x="203" y="51" type="line"/>
+      <point x="215" y="51" type="line"/>
+      <point x="215" y="239" type="line" smooth="yes"/>
+      <point x="215" y="321"/>
+      <point x="246" y="356"/>
+      <point x="295" y="356" type="curve" smooth="yes"/>
+      <point x="339" y="356"/>
+      <point x="375" y="317"/>
+      <point x="375" y="249" type="curve" smooth="yes"/>
+      <point x="375" y="177"/>
+      <point x="342" y="134"/>
+      <point x="287" y="134" type="curve" smooth="yes"/>
+      <point x="253" y="134"/>
+      <point x="217" y="151"/>
+      <point x="199" y="181" type="curve"/>
+      <point x="160" y="87" type="line"/>
+      <point x="193" y="25"/>
+      <point x="251" y="-10"/>
+      <point x="323" y="-10" type="curve" smooth="yes"/>
+      <point x="452" y="-10"/>
+      <point x="551" y="93"/>
+      <point x="551" y="254" type="curve" smooth="yes"/>
+      <point x="551" y="395"/>
+      <point x="469" y="500"/>
+      <point x="296" y="500" type="curve" smooth="yes"/>
+      <point x="139" y="500"/>
+      <point x="42" y="410"/>
     </contour>
   </outline>
   <lib>
@@ -44,8 +44,6 @@
       <string>=p-20</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=o</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rhodasia.glif b/src/Cantarell-Bold.ufo/glyphs/rhodasia.glif
index 93aa0b83..8ecda15d 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rhodasia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rhodasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rhodasia" format="2">
-  <advance width="561"/>
+  <advance width="584"/>
   <unicode hex="1FE5"/>
-  <anchor x="273" y="0" name="bottom"/>
-  <anchor x="273" y="729" name="top"/>
   <outline>
     <component base="rho"/>
-    <component base="dasia" xOffset="101"/>
+    <component base="dasia" xOffset="109"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/rhopsili.glif b/src/Cantarell-Bold.ufo/glyphs/rhopsili.glif
index 009a156e..fd2b778a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/rhopsili.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/rhopsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rhopsili" format="2">
-  <advance width="561"/>
+  <advance width="584"/>
   <unicode hex="1FE4"/>
-  <anchor x="273" y="0" name="bottom"/>
-  <anchor x="273" y="729" name="top"/>
   <outline>
     <component base="rho"/>
-    <component base="psili" xOffset="99"/>
+    <component base="psili" xOffset="107"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/sigma.glif b/src/Cantarell-Bold.ufo/glyphs/sigma.glif
index 15bfeeb2..db7bd121 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sigma.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sigma.glif
@@ -1,45 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sigma" format="2">
-  <advance width="592"/>
+  <advance width="607"/>
   <unicode hex="03C3"/>
   <outline>
     <contour>
-      <point x="278" y="431" type="line"/>
-      <point x="338" y="365"/>
-      <point x="364" y="302"/>
-      <point x="364" y="235" type="curve" smooth="yes"/>
-      <point x="364" y="173"/>
-      <point x="332" y="134"/>
-      <point x="279" y="134" type="curve" smooth="yes"/>
-      <point x="223" y="134"/>
-      <point x="194" y="176"/>
-      <point x="194" y="244" type="curve" smooth="yes"/>
-      <point x="194" y="310"/>
-      <point x="229" y="355"/>
-      <point x="303" y="355" type="curve" smooth="yes"/>
-      <point x="592" y="355" type="line"/>
-      <point x="592" y="490" type="line"/>
-      <point x="297" y="490" type="line" smooth="yes"/>
-      <point x="132" y="490"/>
-      <point x="18" y="387"/>
-      <point x="18" y="231" type="curve" smooth="yes"/>
-      <point x="18" y="92"/>
-      <point x="111" y="-10"/>
-      <point x="268" y="-10" type="curve" smooth="yes"/>
-      <point x="430" y="-10"/>
-      <point x="535" y="88"/>
-      <point x="535" y="205" type="curve" smooth="yes"/>
-      <point x="535" y="302"/>
-      <point x="470" y="411"/>
-      <point x="375" y="481" type="curve"/>
+      <point x="293" y="431" type="line"/>
+      <point x="353" y="365"/>
+      <point x="379" y="302"/>
+      <point x="379" y="235" type="curve" smooth="yes"/>
+      <point x="379" y="173"/>
+      <point x="347" y="134"/>
+      <point x="294" y="134" type="curve" smooth="yes"/>
+      <point x="238" y="134"/>
+      <point x="209" y="176"/>
+      <point x="209" y="244" type="curve" smooth="yes"/>
+      <point x="209" y="310"/>
+      <point x="244" y="355"/>
+      <point x="318" y="355" type="curve" smooth="yes"/>
+      <point x="607" y="355" type="line"/>
+      <point x="607" y="490" type="line"/>
+      <point x="312" y="490" type="line" smooth="yes"/>
+      <point x="147" y="490"/>
+      <point x="33" y="387"/>
+      <point x="33" y="231" type="curve" smooth="yes"/>
+      <point x="33" y="92"/>
+      <point x="126" y="-10"/>
+      <point x="283" y="-10" type="curve" smooth="yes"/>
+      <point x="445" y="-10"/>
+      <point x="550" y="88"/>
+      <point x="550" y="205" type="curve" smooth="yes"/>
+      <point x="550" y="302"/>
+      <point x="485" y="411"/>
+      <point x="390" y="481" type="curve"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>=o</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/sigmafinal.glif b/src/Cantarell-Bold.ufo/glyphs/sigmafinal.glif
index 67257a09..056b52b6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/sigmafinal.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/sigmafinal.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sigmafinal" format="2">
-  <advance width="457"/>
+  <advance width="480"/>
   <unicode hex="03C2"/>
   <outline>
     <contour>
-      <point x="194" y="261" type="curve" smooth="yes"/>
-      <point x="194" y="313"/>
-      <point x="233" y="356"/>
-      <point x="305" y="356" type="curve" smooth="yes"/>
-      <point x="338" y="356"/>
-      <point x="378" y="349"/>
-      <point x="408" y="339" type="curve"/>
-      <point x="443" y="473" type="line"/>
-      <point x="403" y="490"/>
-      <point x="348" y="500"/>
-      <point x="296" y="500" type="curve" smooth="yes"/>
-      <point x="126" y="500"/>
-      <point x="18" y="407"/>
-      <point x="18" y="252" type="curve" smooth="yes"/>
-      <point x="18" y="113"/>
-      <point x="97" y="52"/>
-      <point x="201" y="14" type="curve" smooth="yes"/>
-      <point x="272" y="-12"/>
-      <point x="285" y="-41"/>
-      <point x="285" y="-66" type="curve" smooth="yes"/>
-      <point x="285" y="-93"/>
-      <point x="264" y="-120"/>
-      <point x="234" y="-155" type="curve"/>
-      <point x="334" y="-232" type="line"/>
-      <point x="389" y="-182"/>
-      <point x="443" y="-104"/>
-      <point x="443" y="-38" type="curve" smooth="yes"/>
-      <point x="443" y="37"/>
-      <point x="411" y="91"/>
-      <point x="294" y="134" type="curve" smooth="yes"/>
-      <point x="220" y="161"/>
-      <point x="194" y="208"/>
+      <point x="209" y="261" type="curve" smooth="yes"/>
+      <point x="209" y="313"/>
+      <point x="248" y="356"/>
+      <point x="320" y="356" type="curve" smooth="yes"/>
+      <point x="353" y="356"/>
+      <point x="393" y="349"/>
+      <point x="423" y="339" type="curve"/>
+      <point x="458" y="473" type="line"/>
+      <point x="418" y="490"/>
+      <point x="363" y="500"/>
+      <point x="311" y="500" type="curve" smooth="yes"/>
+      <point x="141" y="500"/>
+      <point x="33" y="407"/>
+      <point x="33" y="252" type="curve" smooth="yes"/>
+      <point x="33" y="113"/>
+      <point x="112" y="52"/>
+      <point x="216" y="14" type="curve" smooth="yes"/>
+      <point x="287" y="-12"/>
+      <point x="300" y="-41"/>
+      <point x="300" y="-66" type="curve" smooth="yes"/>
+      <point x="300" y="-93"/>
+      <point x="279" y="-120"/>
+      <point x="249" y="-155" type="curve"/>
+      <point x="349" y="-232" type="line"/>
+      <point x="404" y="-182"/>
+      <point x="458" y="-104"/>
+      <point x="458" y="-38" type="curve" smooth="yes"/>
+      <point x="458" y="37"/>
+      <point x="426" y="91"/>
+      <point x="309" y="134" type="curve" smooth="yes"/>
+      <point x="235" y="161"/>
+      <point x="209" y="208"/>
     </contour>
   </outline>
   <lib>
@@ -44,8 +44,6 @@
       <string>=c</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=c</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tau.glif b/src/Cantarell-Bold.ufo/glyphs/tau.glif
index f470d0f3..fd5d4e50 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tau.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tau.glif
@@ -1,31 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tau" format="2">
-  <advance width="487"/>
+  <advance width="507"/>
   <unicode hex="03C4"/>
   <outline>
     <contour>
-      <point x="0" y="355" type="line"/>
-      <point x="482" y="355" type="line"/>
-      <point x="482" y="490" type="line"/>
-      <point x="0" y="490" type="line"/>
+      <point x="10" y="355" type="line"/>
+      <point x="492" y="355" type="line"/>
+      <point x="492" y="490" type="line"/>
+      <point x="10" y="490" type="line"/>
     </contour>
     <contour>
-      <point x="340" y="-8" type="curve" smooth="yes"/>
-      <point x="385" y="-8"/>
-      <point x="425" y="2"/>
-      <point x="464" y="18" type="curve"/>
-      <point x="431" y="135" type="line"/>
-      <point x="416" y="129"/>
-      <point x="397" y="123"/>
-      <point x="378" y="123" type="curve" smooth="yes"/>
-      <point x="341" y="123"/>
-      <point x="317" y="145"/>
-      <point x="317" y="181" type="curve" smooth="yes"/>
-      <point x="317" y="490" type="line"/>
-      <point x="147" y="490" type="line"/>
-      <point x="147" y="176" type="line" smooth="yes"/>
-      <point x="147" y="60"/>
-      <point x="218" y="-8"/>
+      <point x="350" y="-8" type="curve" smooth="yes"/>
+      <point x="395" y="-8"/>
+      <point x="435" y="2"/>
+      <point x="474" y="18" type="curve"/>
+      <point x="441" y="135" type="line"/>
+      <point x="426" y="129"/>
+      <point x="407" y="123"/>
+      <point x="388" y="123" type="curve" smooth="yes"/>
+      <point x="351" y="123"/>
+      <point x="327" y="145"/>
+      <point x="327" y="181" type="curve" smooth="yes"/>
+      <point x="327" y="490" type="line"/>
+      <point x="157" y="490" type="line"/>
+      <point x="157" y="176" type="line" smooth="yes"/>
+      <point x="157" y="60"/>
+      <point x="228" y="-8"/>
     </contour>
   </outline>
   <lib>
@@ -34,8 +34,6 @@
       <string>=te-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=te-cy+5</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/theta.glif b/src/Cantarell-Bold.ufo/glyphs/theta.glif
index 308071e9..9a38a8fa 100644
--- a/src/Cantarell-Bold.ufo/glyphs/theta.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/theta.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="theta" format="2">
-  <advance width="585"/>
+  <advance width="615"/>
   <unicode hex="03B8"/>
   <outline>
     <contour>
-      <point x="289" y="-10" type="curve" smooth="yes"/>
-      <point x="451" y="-10"/>
-      <point x="562" y="104"/>
-      <point x="562" y="375" type="curve" smooth="yes"/>
-      <point x="562" y="638"/>
-      <point x="454" y="749"/>
-      <point x="295" y="749" type="curve" smooth="yes"/>
-      <point x="133" y="749"/>
-      <point x="23" y="637"/>
-      <point x="23" y="366" type="curve" smooth="yes"/>
-      <point x="23" y="103"/>
-      <point x="130" y="-10"/>
+      <point x="304" y="-10" type="curve" smooth="yes"/>
+      <point x="466" y="-10"/>
+      <point x="577" y="104"/>
+      <point x="577" y="375" type="curve" smooth="yes"/>
+      <point x="577" y="638"/>
+      <point x="469" y="749"/>
+      <point x="310" y="749" type="curve" smooth="yes"/>
+      <point x="148" y="749"/>
+      <point x="38" y="637"/>
+      <point x="38" y="366" type="curve" smooth="yes"/>
+      <point x="38" y="103"/>
+      <point x="145" y="-10"/>
     </contour>
     <contour>
-      <point x="295" y="134" type="curve" smooth="yes"/>
-      <point x="225" y="134"/>
-      <point x="197" y="206"/>
-      <point x="197" y="374" type="curve" smooth="yes"/>
-      <point x="197" y="539"/>
-      <point x="223" y="605"/>
-      <point x="289" y="605" type="curve" smooth="yes"/>
-      <point x="359" y="605"/>
-      <point x="388" y="533"/>
-      <point x="388" y="366" type="curve" smooth="yes"/>
-      <point x="388" y="202"/>
-      <point x="361" y="134"/>
+      <point x="310" y="134" type="curve" smooth="yes"/>
+      <point x="240" y="134"/>
+      <point x="212" y="206"/>
+      <point x="212" y="374" type="curve" smooth="yes"/>
+      <point x="212" y="539"/>
+      <point x="238" y="605"/>
+      <point x="304" y="605" type="curve" smooth="yes"/>
+      <point x="374" y="605"/>
+      <point x="403" y="533"/>
+      <point x="403" y="366" type="curve" smooth="yes"/>
+      <point x="403" y="202"/>
+      <point x="376" y="134"/>
     </contour>
     <contour>
-      <point x="93" y="308" type="line"/>
-      <point x="492" y="308" type="line"/>
-      <point x="492" y="443" type="line"/>
-      <point x="93" y="443" type="line"/>
+      <point x="108" y="308" type="line"/>
+      <point x="507" y="308" type="line"/>
+      <point x="507" y="443" type="line"/>
+      <point x="108" y="443" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -44,8 +44,6 @@
       <string>=o+5</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=o+5</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tonos.case.glif b/src/Cantarell-Bold.ufo/glyphs/tonos.case.glif
index 330fc05a..638c079c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tonos.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tonos.case.glif
@@ -11,8 +11,6 @@
       <string>tonos</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>tonos</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/tonos.glif b/src/Cantarell-Bold.ufo/glyphs/tonos.glif
index 3ec6adc0..8d495d0a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/tonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/tonos.glif
@@ -11,10 +11,4 @@
       <point x="90" y="553" type="line"/>
     </contour>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilon.glif b/src/Cantarell-Bold.ufo/glyphs/upsilon.glif
index b9aaa6e3..a1eba6da 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilon.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilon.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilon" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="03C5"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="490" name="top"/>
+  <anchor x="282" y="0" name="bottom"/>
+  <anchor x="270" y="490" name="top"/>
   <outline>
     <contour>
-      <point x="278" y="-10" type="curve" smooth="yes"/>
-      <point x="436" y="-10"/>
-      <point x="541" y="84"/>
-      <point x="541" y="241" type="curve" smooth="yes"/>
-      <point x="541" y="333"/>
-      <point x="518" y="415"/>
-      <point x="492" y="490" type="curve"/>
-      <point x="316" y="490" type="line"/>
-      <point x="341" y="418"/>
-      <point x="365" y="318"/>
-      <point x="365" y="249" type="curve" smooth="yes"/>
-      <point x="365" y="180"/>
-      <point x="339" y="137"/>
-      <point x="287" y="137" type="curve" smooth="yes"/>
-      <point x="233" y="137"/>
-      <point x="212" y="173"/>
-      <point x="212" y="234" type="curve" smooth="yes"/>
-      <point x="212" y="490" type="line"/>
-      <point x="39" y="490" type="line"/>
-      <point x="39" y="214" type="line" smooth="yes"/>
-      <point x="39" y="70"/>
-      <point x="133" y="-10"/>
+      <point x="285" y="-10" type="curve" smooth="yes"/>
+      <point x="443" y="-10"/>
+      <point x="548" y="84"/>
+      <point x="548" y="241" type="curve" smooth="yes"/>
+      <point x="548" y="333"/>
+      <point x="525" y="415"/>
+      <point x="499" y="490" type="curve"/>
+      <point x="323" y="490" type="line"/>
+      <point x="348" y="418"/>
+      <point x="372" y="318"/>
+      <point x="372" y="249" type="curve" smooth="yes"/>
+      <point x="372" y="180"/>
+      <point x="346" y="137"/>
+      <point x="294" y="137" type="curve" smooth="yes"/>
+      <point x="240" y="137"/>
+      <point x="219" y="173"/>
+      <point x="219" y="234" type="curve" smooth="yes"/>
+      <point x="219" y="490" type="line"/>
+      <point x="46" y="490" type="line"/>
+      <point x="46" y="214" type="line" smooth="yes"/>
+      <point x="46" y="70"/>
+      <point x="140" y="-10"/>
     </contour>
   </outline>
   <lib>
@@ -36,8 +36,6 @@
       <string>=u-5</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=omega</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilondasia.glif b/src/Cantarell-Bold.ufo/glyphs/upsilondasia.glif
index 3c8362fb..d0319de0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilondasia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilondasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondasia" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="1F51"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="729" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dasia" xOffset="91"/>
+    <component base="dasia" xOffset="98"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilondasiaoxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/upsilondasiaoxia.glif
index fba12536..acee2066 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilondasiaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilondasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondasiaoxia" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="1F55"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="490" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dasiaoxia" xOffset="-19"/>
+    <component base="dasiaoxia" xOffset="-12"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilondasiaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/upsilondasiaperispomeni.glif
index 049e6617..eaf3e788 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilondasiaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilondasiaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondasiaperispomeni" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="1F57"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="490" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="daspsiliiaperispomeni" xOffset="30"/>
+    <component base="daspsiliiaperispomeni" xOffset="21"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilondasiavaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/upsilondasiavaria.glif
index 85cf63f4..35ef095f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilondasiavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilondasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondasiavaria" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="1F53"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="490" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dasiavaria" xOffset="-37"/>
+    <component base="dasiavaria" xOffset="-30"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilondialytikaoxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/upsilondialytikaoxia.glif
index f5755fb0..8b8d1252 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilondialytikaoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilondialytikaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondialytikaoxia" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="1FE3"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="490" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dialytikaoxia" xOffset="-18"/>
+    <component base="dialytikaoxia" xOffset="1"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilondialytikaperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/upsilondialytikaperispomeni.glif
index 19d1b506..92d5bb8c 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilondialytikaperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilondialytikaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondialytikaperispomeni" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="1FE7"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="490" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dialytikaperispomeni" xOffset="1"/>
+    <component base="dialytikaperispomeni" xOffset="20"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilondialytikavaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/upsilondialytikavaria.glif
index 18cb73f4..59c12a07 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilondialytikavaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilondialytikavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondialytikavaria" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="1FE2"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="490" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dialytikavaria" xOffset="-73"/>
+    <component base="dialytikavaria" xOffset="-54"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilondieresis.glif 
b/src/Cantarell-Bold.ufo/glyphs/upsilondieresis.glif
index 69d589eb..0cd69ce2 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilondieresis.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilondieresis.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondieresis" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="03CB"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="726" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dieresiscomb" xOffset="-6"/>
+    <component base="dieresiscomb" xOffset="1"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilondieresistonos.glif 
b/src/Cantarell-Bold.ufo/glyphs/upsilondieresistonos.glif
index 5a6bc030..08446d13 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilondieresistonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilondieresistonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondieresistonos" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="03B0"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="490" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dieresistonos" xOffset="-32"/>
+    <component base="dieresistonos" xOffset="-25"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilonmacron.glif 
b/src/Cantarell-Bold.ufo/glyphs/upsilonmacron.glif
index 86842c93..e353e6d4 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilonmacron.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilonmacron.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonmacron" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="1FE1"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="490" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="macron" xOffset="27"/>
+    <component base="macron" xOffset="20"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilonoxia.glif b/src/Cantarell-Bold.ufo/glyphs/upsilonoxia.glif
index facc63e2..6e3177df 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilonoxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilonoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonoxia" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="1F7B"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="490" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="oxia" xOffset="122"/>
+    <component base="oxia" xOffset="129"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilonperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/upsilonperispomeni.glif
index 1a3b16c7..8c9c2b2a 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilonperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilonperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonperispomeni" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="1FE6"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="701" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="perispomeni" xOffset="30"/>
+    <component base="perispomeni" xOffset="21"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilonpsili.glif b/src/Cantarell-Bold.ufo/glyphs/upsilonpsili.glif
index 1417cb2c..f51bb390 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilonpsili.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilonpsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonpsili" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="1F50"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="729" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="psili" xOffset="89"/>
+    <component base="psili" xOffset="96"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilonpsilioxia.glif 
b/src/Cantarell-Bold.ufo/glyphs/upsilonpsilioxia.glif
index 69fac866..94a5ae33 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilonpsilioxia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilonpsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonpsilioxia" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="1F54"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="490" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="psilioxia" xOffset="-16"/>
+    <component base="psilioxia" xOffset="-9"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilonpsiliperispomeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/upsilonpsiliperispomeni.glif
index 01095886..5b64651f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilonpsiliperispomeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilonpsiliperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonpsiliperispomeni" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="1F56"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="490" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="psiliperispomeni" xOffset="30"/>
+    <component base="psiliperispomeni" xOffset="21"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilonpsilivaria.glif 
b/src/Cantarell-Bold.ufo/glyphs/upsilonpsilivaria.glif
index 05f4bcd9..62e7c7e0 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilonpsilivaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilonpsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonpsilivaria" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="1F52"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="490" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="psilivaria" xOffset="-26"/>
+    <component base="psilivaria" xOffset="-19"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilontonos.glif b/src/Cantarell-Bold.ufo/glyphs/upsilontonos.glif
index 7142db66..42945a0b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilontonos.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilontonos.glif
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilontonos" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="03CD"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="490" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="tonos" xOffset="122"/>
+    <component base="tonos" xOffset="129"/>
   </outline>
   <lib>
     <dict>
@@ -14,8 +12,6 @@
       <string>upsilon</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>upsilon</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilonvaria.glif b/src/Cantarell-Bold.ufo/glyphs/upsilonvaria.glif
index 107bed8f..728891fe 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilonvaria.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilonvaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonvaria" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="1F7A"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="490" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="varia" xOffset="74"/>
+    <component base="varia" xOffset="81"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/upsilonvrachy.glif 
b/src/Cantarell-Bold.ufo/glyphs/upsilonvrachy.glif
index 010ffd0c..8607dc18 100644
--- a/src/Cantarell-Bold.ufo/glyphs/upsilonvrachy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/upsilonvrachy.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonvrachy" format="2">
-  <advance width="564"/>
+  <advance width="586"/>
   <unicode hex="1FE0"/>
-  <anchor x="275" y="0" name="bottom"/>
-  <anchor x="263" y="729" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="vrachy" xOffset="47"/>
+    <component base="vrachy" xOffset="54"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/varia.case.glif b/src/Cantarell-Bold.ufo/glyphs/varia.case.glif
index 319d33d6..a4b143c6 100644
--- a/src/Cantarell-Bold.ufo/glyphs/varia.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/varia.case.glif
@@ -11,8 +11,6 @@
       <string>varia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>varia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/varia.glif b/src/Cantarell-Bold.ufo/glyphs/varia.glif
index 5eea37bb..8967345b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/varia.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/varia.glif
@@ -6,10 +6,4 @@
   <outline>
     <component base="tonos" xScale="-1" xOffset="337"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/vrachy.case.glif b/src/Cantarell-Bold.ufo/glyphs/vrachy.case.glif
index 74b58434..d7394f41 100644
--- a/src/Cantarell-Bold.ufo/glyphs/vrachy.case.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/vrachy.case.glif
@@ -11,8 +11,6 @@
       <string>brevecomb.case</string>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>475</integer>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/vrachy.glif b/src/Cantarell-Bold.ufo/glyphs/vrachy.glif
index af675253..cdd994ef 100644
--- a/src/Cantarell-Bold.ufo/glyphs/vrachy.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/vrachy.glif
@@ -13,8 +13,6 @@
       <string>brevecomb</string>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>440</integer>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/xi.glif b/src/Cantarell-Bold.ufo/glyphs/xi.glif
index 1e44a0b7..cea82f7f 100644
--- a/src/Cantarell-Bold.ufo/glyphs/xi.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/xi.glif
@@ -1,57 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="xi" format="2">
-  <advance width="454"/>
+  <advance width="469"/>
   <unicode hex="03BE"/>
   <outline>
     <contour>
-      <point x="32" y="739" type="line"/>
-      <point x="32" y="604" type="line"/>
-      <point x="309" y="604" type="line"/>
-      <point x="288" y="621" type="line"/>
-      <point x="240" y="610" type="line" smooth="yes"/>
-      <point x="129" y="585"/>
-      <point x="58" y="534"/>
-      <point x="58" y="462" type="curve" smooth="yes"/>
-      <point x="58" y="397"/>
-      <point x="118" y="351"/>
-      <point x="217" y="351" type="curve"/>
-      <point x="220" y="357" type="line"/>
-      <point x="104" y="357"/>
-      <point x="18" y="283"/>
-      <point x="18" y="189" type="curve" smooth="yes"/>
-      <point x="18" y="95"/>
-      <point x="82" y="37"/>
-      <point x="198" y="8" type="curve" smooth="yes"/>
-      <point x="276" y="-11"/>
-      <point x="302" y="-38"/>
-      <point x="302" y="-65" type="curve" smooth="yes"/>
-      <point x="302" y="-92"/>
-      <point x="281" y="-119"/>
-      <point x="251" y="-155" type="curve"/>
-      <point x="351" y="-232" type="line"/>
-      <point x="406" y="-182"/>
-      <point x="460" y="-105"/>
-      <point x="460" y="-44" type="curve" smooth="yes"/>
-      <point x="460" y="35"/>
-      <point x="425" y="87"/>
-      <point x="314" y="117" type="curve" smooth="yes"/>
-      <point x="224" y="141"/>
-      <point x="194" y="173"/>
-      <point x="194" y="212" type="curve" smooth="yes"/>
-      <point x="194" y="251"/>
-      <point x="222" y="285"/>
-      <point x="312" y="285" type="curve" smooth="yes"/>
-      <point x="428" y="285" type="line"/>
-      <point x="428" y="420" type="line"/>
-      <point x="322" y="420" type="line" smooth="yes"/>
-      <point x="253" y="420"/>
-      <point x="226" y="442"/>
-      <point x="226" y="474" type="curve" smooth="yes"/>
-      <point x="226" y="514"/>
-      <point x="282" y="548"/>
-      <point x="361" y="582" type="curve" smooth="yes"/>
-      <point x="480" y="633" type="line"/>
-      <point x="480" y="739" type="line"/>
+      <point x="47" y="739" type="line"/>
+      <point x="47" y="604" type="line"/>
+      <point x="324" y="604" type="line"/>
+      <point x="303" y="621" type="line"/>
+      <point x="255" y="610" type="line" smooth="yes"/>
+      <point x="144" y="585"/>
+      <point x="73" y="534"/>
+      <point x="73" y="462" type="curve" smooth="yes"/>
+      <point x="73" y="397"/>
+      <point x="133" y="351"/>
+      <point x="232" y="351" type="curve"/>
+      <point x="235" y="357" type="line"/>
+      <point x="119" y="357"/>
+      <point x="33" y="283"/>
+      <point x="33" y="189" type="curve" smooth="yes"/>
+      <point x="33" y="95"/>
+      <point x="97" y="37"/>
+      <point x="213" y="8" type="curve" smooth="yes"/>
+      <point x="291" y="-11"/>
+      <point x="317" y="-38"/>
+      <point x="317" y="-65" type="curve" smooth="yes"/>
+      <point x="317" y="-92"/>
+      <point x="296" y="-119"/>
+      <point x="266" y="-155" type="curve"/>
+      <point x="366" y="-232" type="line"/>
+      <point x="421" y="-182"/>
+      <point x="475" y="-105"/>
+      <point x="475" y="-44" type="curve" smooth="yes"/>
+      <point x="475" y="35"/>
+      <point x="440" y="87"/>
+      <point x="329" y="117" type="curve" smooth="yes"/>
+      <point x="239" y="141"/>
+      <point x="209" y="173"/>
+      <point x="209" y="212" type="curve" smooth="yes"/>
+      <point x="209" y="251"/>
+      <point x="237" y="285"/>
+      <point x="327" y="285" type="curve" smooth="yes"/>
+      <point x="443" y="285" type="line"/>
+      <point x="443" y="420" type="line"/>
+      <point x="337" y="420" type="line" smooth="yes"/>
+      <point x="268" y="420"/>
+      <point x="241" y="442"/>
+      <point x="241" y="474" type="curve" smooth="yes"/>
+      <point x="241" y="514"/>
+      <point x="297" y="548"/>
+      <point x="376" y="582" type="curve" smooth="yes"/>
+      <point x="495" y="633" type="line"/>
+      <point x="495" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -60,8 +60,6 @@
       <string>=o-5</string>
       <key>com.schriftgestaltung.Glyphs.layer.leftMetricsKey</key>
       <string>=o</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/ypogegrammeni.glif 
b/src/Cantarell-Bold.ufo/glyphs/ypogegrammeni.glif
index afd7276d..a01a036b 100644
--- a/src/Cantarell-Bold.ufo/glyphs/ypogegrammeni.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/ypogegrammeni.glif
@@ -23,10 +23,4 @@
       <point x="324" y="-55" type="line"/>
     </contour>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Bold.ufo/glyphs/zeta.glif b/src/Cantarell-Bold.ufo/glyphs/zeta.glif
index 22a704fd..83307257 100644
--- a/src/Cantarell-Bold.ufo/glyphs/zeta.glif
+++ b/src/Cantarell-Bold.ufo/glyphs/zeta.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zeta" format="2">
-  <advance width="428"/>
+  <advance width="443"/>
   <unicode hex="03B6"/>
   <outline>
     <contour>
-      <point x="194" y="253" type="curve" smooth="yes"/>
-      <point x="194" y="318"/>
-      <point x="259" y="391"/>
-      <point x="345" y="490" type="curve" smooth="yes"/>
-      <point x="473" y="636" type="line"/>
-      <point x="473" y="739" type="line"/>
-      <point x="18" y="739" type="line"/>
-      <point x="18" y="604" type="line"/>
-      <point x="334" y="604" type="line"/>
-      <point x="365" y="690" type="line"/>
-      <point x="213" y="546" type="line" smooth="yes"/>
-      <point x="105" y="443"/>
-      <point x="18" y="349"/>
-      <point x="18" y="232" type="curve" smooth="yes"/>
-      <point x="18" y="123"/>
-      <point x="89" y="69"/>
-      <point x="204" y="19" type="curve" smooth="yes"/>
-      <point x="284" y="-16"/>
-      <point x="296" y="-45"/>
-      <point x="296" y="-69" type="curve" smooth="yes"/>
-      <point x="296" y="-95"/>
-      <point x="275" y="-119"/>
-      <point x="245" y="-155" type="curve"/>
-      <point x="345" y="-232" type="line"/>
-      <point x="400" y="-182"/>
-      <point x="454" y="-104"/>
-      <point x="454" y="-43" type="curve" smooth="yes"/>
-      <point x="454" y="31"/>
-      <point x="427" y="81"/>
-      <point x="316" y="130" type="curve" smooth="yes"/>
-      <point x="239" y="164"/>
-      <point x="194" y="202"/>
+      <point x="209" y="253" type="curve" smooth="yes"/>
+      <point x="209" y="318"/>
+      <point x="274" y="391"/>
+      <point x="360" y="490" type="curve" smooth="yes"/>
+      <point x="488" y="636" type="line"/>
+      <point x="488" y="739" type="line"/>
+      <point x="33" y="739" type="line"/>
+      <point x="33" y="604" type="line"/>
+      <point x="349" y="604" type="line"/>
+      <point x="380" y="690" type="line"/>
+      <point x="228" y="546" type="line" smooth="yes"/>
+      <point x="120" y="443"/>
+      <point x="33" y="349"/>
+      <point x="33" y="232" type="curve" smooth="yes"/>
+      <point x="33" y="123"/>
+      <point x="104" y="69"/>
+      <point x="219" y="19" type="curve" smooth="yes"/>
+      <point x="299" y="-16"/>
+      <point x="311" y="-45"/>
+      <point x="311" y="-69" type="curve" smooth="yes"/>
+      <point x="311" y="-95"/>
+      <point x="290" y="-119"/>
+      <point x="260" y="-155" type="curve"/>
+      <point x="360" y="-232" type="line"/>
+      <point x="415" y="-182"/>
+      <point x="469" y="-104"/>
+      <point x="469" y="-43" type="curve" smooth="yes"/>
+      <point x="469" y="31"/>
+      <point x="442" y="81"/>
+      <point x="331" y="130" type="curve" smooth="yes"/>
+      <point x="254" y="164"/>
+      <point x="209" y="202"/>
     </contour>
   </outline>
   <lib>
@@ -44,8 +44,6 @@
       <string>=o-5</string>
       <key>com.schriftgestaltung.Glyphs.layer.leftMetricsKey</key>
       <string>=o</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lpha.glif b/src/Cantarell-Light.ufo/glyphs/A_lpha.glif
index cf9f3661..b06cb07e 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lpha.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lpha.glif
@@ -1,18 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alpha" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="0391"/>
   <anchor x="323" y="0" name="bottom"/>
   <anchor x="326" y="694" name="top"/>
   <anchor x="160" y="694" name="topleft"/>
-  <anchor x="583" y="10" name="ogonek"/>
   <outline>
     <component base="A"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphadasia.glif b/src/Cantarell-Light.ufo/glyphs/A_lphadasia.glif
index 8b4ceb17..7ccd0e8b 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphadasia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphadasia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasia" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1F09"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasia.case" xOffset="47"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphadasiaoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/A_lphadasiaoxia.glif
index 1e006437..529f7073 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphadasiaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphadasiaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiaoxia" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1F0D"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiaoxia.case" xOffset="-84"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphadasiaoxiaprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/A_lphadasiaoxiaprosgegrammeni.glif
index e3430c06..917e847f 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphadasiaoxiaprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphadasiaoxiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiaoxiaprosgegrammeni" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1F8D"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiaoxia.case" xOffset="-84"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphadasiaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/A_lphadasiaperispomeni.glif
index 1171141f..d0e967d1 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphadasiaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphadasiaperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiaperispomeni" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1F0F"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiaperispomeni.case" xOffset="-179" yOffset="-121"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphadasiaperispomeniprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/A_lphadasiaperispomeniprosgegrammeni.glif
index 6a52598e..e68e5cda 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphadasiaperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphadasiaperispomeniprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiaperispomeniprosgegrammeni" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1F8F"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiaperispomeni.case" xOffset="-179" yOffset="-121"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphadasiaprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/A_lphadasiaprosgegrammeni.glif
index 9f8fc39b..4f542ec5 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphadasiaprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphadasiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiaprosgegrammeni" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1F89"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasia.case" xOffset="47"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphadasiavaria.glif 
b/src/Cantarell-Light.ufo/glyphs/A_lphadasiavaria.glif
index 6e5bcde4..2e246104 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphadasiavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphadasiavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiavaria" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1F0B"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiavaria.case" xOffset="-75"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphadasiavariaprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/A_lphadasiavariaprosgegrammeni.glif
index 8de4a2d1..6ca593d2 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphadasiavariaprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphadasiavariaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiavariaprosgegrammeni" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1F8B"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiavaria.case" xOffset="-75"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphamacron.glif 
b/src/Cantarell-Light.ufo/glyphs/A_lphamacron.glif
index 1fa7bdb1..b5636082 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphamacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphamacron.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphamacron" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1FB9"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
-    <component base="macron" xOffset="95" yOffset="214"/>
+    <component base="macron" xOffset="75" yOffset="214"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphaoxia.glif b/src/Cantarell-Light.ufo/glyphs/A_lphaoxia.glif
index e0dfe6e5..2893e9e6 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphaoxia" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1FBB"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="oxia.case" xOffset="27"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphaprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/A_lphaprosgegrammeni.glif
index 738196b7..86420171 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphaprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphaprosgegrammeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphaprosgegrammeni" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1FBC"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphapsili.glif b/src/Cantarell-Light.ufo/glyphs/A_lphapsili.glif
index e206784d..11d01d2f 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphapsili.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphapsili.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsili" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1F08"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psili.case" xOffset="40"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphapsilioxia.glif 
b/src/Cantarell-Light.ufo/glyphs/A_lphapsilioxia.glif
index 436b6a6c..666d4c33 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphapsilioxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphapsilioxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsilioxia" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1F0C"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psilioxia.case" xOffset="-84"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphapsilioxiaprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/A_lphapsilioxiaprosgegrammeni.glif
index 2e59a9d1..90e79679 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphapsilioxiaprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphapsilioxiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsilioxiaprosgegrammeni" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1F8C"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psilioxia.case" xOffset="-84"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphapsiliperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/A_lphapsiliperispomeni.glif
index 66d9341f..298872c0 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphapsiliperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphapsiliperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsiliperispomeni" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1F0E"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psiliperispomeni.case" xOffset="-179" yOffset="-121"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.5,0.09,0.79,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphapsiliperispomeniprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/A_lphapsiliperispomeniprosgegrammeni.glif
index c5bede13..6abde565 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphapsiliperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphapsiliperispomeniprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsiliperispomeniprosgegrammeni" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1F8E"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psiliperispomeni.case" xOffset="-179" yOffset="-121"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphapsiliprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/A_lphapsiliprosgegrammeni.glif
index 82ce3a96..d04ea015 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphapsiliprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphapsiliprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsiliprosgegrammeni" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1F88"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psili.case" xOffset="40"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphapsilivaria.glif 
b/src/Cantarell-Light.ufo/glyphs/A_lphapsilivaria.glif
index 874a3d44..24e64810 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphapsilivaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphapsilivaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsilivaria" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1F0A"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psilivaria.case" xOffset="-80"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.25,0.25,0.25,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphapsilivariaprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/A_lphapsilivariaprosgegrammeni.glif
index 0ddd540f..1a9ffceb 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphapsilivariaprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphapsilivariaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsilivariaprosgegrammeni" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1F8A"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psilivaria.case" xOffset="-80"/>
     <component base="prosgegrammeni" xOffset="115"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphatonos.glif b/src/Cantarell-Light.ufo/glyphs/A_lphatonos.glif
index d4b62f4b..c3bf6d61 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphatonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphatonos.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphatonos" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="0386"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="tonos.case" xOffset="27"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphavaria.glif b/src/Cantarell-Light.ufo/glyphs/A_lphavaria.glif
index e23631a2..f496caca 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphavaria" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1FBA"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="varia.case" xOffset="39"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/A_lphavrachy.glif 
b/src/Cantarell-Light.ufo/glyphs/A_lphavrachy.glif
index 2fdc2d75..4b90a5fe 100644
--- a/src/Cantarell-Light.ufo/glyphs/A_lphavrachy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/A_lphavrachy.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphavrachy" format="2">
-  <advance width="634"/>
+  <advance width="626"/>
   <unicode hex="1FB8"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="583" y="10" name="ogonek"/>
-  <anchor x="326" y="694" name="top"/>
-  <anchor x="160" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
-    <component base="vrachy.case" xOffset="136"/>
+    <component base="vrachy.case" xOffset="123"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/B_eta.glif b/src/Cantarell-Light.ufo/glyphs/B_eta.glif
index 959b92c0..ca863444 100644
--- a/src/Cantarell-Light.ufo/glyphs/B_eta.glif
+++ b/src/Cantarell-Light.ufo/glyphs/B_eta.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Beta" format="2">
-  <advance width="619"/>
+  <advance width="633"/>
   <unicode hex="0392"/>
-  <anchor x="267" y="0" name="bottom"/>
-  <anchor x="267" y="694" name="top"/>
   <outline>
     <component base="B"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/C_hi.glif b/src/Cantarell-Light.ufo/glyphs/C_hi.glif
index 87d127d3..60fde65e 100644
--- a/src/Cantarell-Light.ufo/glyphs/C_hi.glif
+++ b/src/Cantarell-Light.ufo/glyphs/C_hi.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chi" format="2">
-  <advance width="594"/>
+  <advance width="598"/>
   <unicode hex="03A7"/>
-  <anchor x="299" y="0" name="bottom"/>
-  <anchor x="299" y="694" name="top"/>
   <outline>
     <component base="X"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/D_elta.glif b/src/Cantarell-Light.ufo/glyphs/D_elta.glif
index b0c3a373..b41ec272 100644
--- a/src/Cantarell-Light.ufo/glyphs/D_elta.glif
+++ b/src/Cantarell-Light.ufo/glyphs/D_elta.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Delta" format="2">
-  <advance width="633"/>
+  <advance width="620"/>
   <unicode hex="0394"/>
-  <anchor x="322" y="0" name="bottom"/>
-  <anchor x="325" y="694" name="top"/>
+  <anchor x="316" y="0" name="bottom"/>
+  <anchor x="319" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="49" y="0" type="line"/>
-      <point x="65" y="0" type="line"/>
-      <point x="325" y="676" type="line"/>
-      <point x="321" y="676" type="line"/>
-      <point x="564" y="0" type="line"/>
-      <point x="583" y="0" type="line"/>
-      <point x="583" y="15" type="line"/>
-      <point x="336" y="694" type="line"/>
-      <point x="313" y="694" type="line"/>
-      <point x="49" y="16" type="line"/>
+      <point x="43" y="0" type="line"/>
+      <point x="59" y="0" type="line"/>
+      <point x="319" y="676" type="line"/>
+      <point x="315" y="676" type="line"/>
+      <point x="558" y="0" type="line"/>
+      <point x="577" y="0" type="line"/>
+      <point x="577" y="15" type="line"/>
+      <point x="330" y="694" type="line"/>
+      <point x="307" y="694" type="line"/>
+      <point x="43" y="16" type="line"/>
     </contour>
     <contour>
-      <point x="60" y="0" type="line"/>
-      <point x="569" y="0" type="line"/>
-      <point x="569" y="18" type="line"/>
-      <point x="60" y="18" type="line"/>
+      <point x="54" y="0" type="line"/>
+      <point x="563" y="0" type="line"/>
+      <point x="563" y="18" type="line"/>
+      <point x="54" y="18" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -34,8 +34,6 @@
       <string>=A+5</string>
       <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
       <string>=A+5</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_psilon.glif b/src/Cantarell-Light.ufo/glyphs/E_psilon.glif
index 6592a859..82b062ed 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_psilon.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_psilon.glif
@@ -1,18 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilon" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="0395"/>
   <anchor x="304" y="0" name="bottom"/>
   <anchor x="303" y="694" name="top"/>
   <anchor x="7" y="694" name="topleft"/>
-  <anchor x="498" y="10" name="ogonek"/>
   <outline>
     <component base="E"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_psilondasia.glif 
b/src/Cantarell-Light.ufo/glyphs/E_psilondasia.glif
index 930ecdad..5109fd0f 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_psilondasia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_psilondasia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilondasia" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1F19"/>
-  <anchor x="304" y="0" name="bottom"/>
-  <anchor x="498" y="10" name="ogonek"/>
-  <anchor x="303" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="dasia.case" xOffset="-106"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_psilondasiaoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/E_psilondasiaoxia.glif
index 476ca077..8eec32ca 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_psilondasiaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_psilondasiaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilondasiaoxia" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1F1D"/>
-  <anchor x="304" y="0" name="bottom"/>
-  <anchor x="498" y="10" name="ogonek"/>
-  <anchor x="303" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="dasiaoxia.case" xOffset="-237"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_psilondasiavaria.glif 
b/src/Cantarell-Light.ufo/glyphs/E_psilondasiavaria.glif
index 643c1453..c30b2d19 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_psilondasiavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_psilondasiavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilondasiavaria" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1F1B"/>
-  <anchor x="304" y="0" name="bottom"/>
-  <anchor x="498" y="10" name="ogonek"/>
-  <anchor x="303" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="dasiavaria.case" xOffset="-228"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_psilonoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/E_psilonoxia.glif
index 5e98f5c7..74b6099e 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_psilonoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_psilonoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilonoxia" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1FC9"/>
-  <anchor x="304" y="0" name="bottom"/>
-  <anchor x="498" y="10" name="ogonek"/>
-  <anchor x="303" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="oxia.case" xOffset="-126"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_psilonpsili.glif 
b/src/Cantarell-Light.ufo/glyphs/E_psilonpsili.glif
index 8d1b41c0..c25bef10 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_psilonpsili.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_psilonpsili.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilonpsili" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1F18"/>
-  <anchor x="304" y="0" name="bottom"/>
-  <anchor x="498" y="10" name="ogonek"/>
-  <anchor x="303" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="psili.case" xOffset="-113"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_psilonpsilioxia.glif 
b/src/Cantarell-Light.ufo/glyphs/E_psilonpsilioxia.glif
index 9c93fbe5..be7e51dd 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_psilonpsilioxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_psilonpsilioxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilonpsilioxia" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1F1C"/>
-  <anchor x="304" y="0" name="bottom"/>
-  <anchor x="498" y="10" name="ogonek"/>
-  <anchor x="303" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="psilioxia.case" xOffset="-237"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_psilonpsilivaria.glif 
b/src/Cantarell-Light.ufo/glyphs/E_psilonpsilivaria.glif
index 44aa7133..7f514a47 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_psilonpsilivaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_psilonpsilivaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilonpsilivaria" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1F1A"/>
-  <anchor x="304" y="0" name="bottom"/>
-  <anchor x="498" y="10" name="ogonek"/>
-  <anchor x="303" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="psilivaria.case" xOffset="-233"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_psilontonos.glif 
b/src/Cantarell-Light.ufo/glyphs/E_psilontonos.glif
index f22310ea..41340a46 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_psilontonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_psilontonos.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilontonos" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="0388"/>
-  <anchor x="304" y="0" name="bottom"/>
-  <anchor x="498" y="10" name="ogonek"/>
-  <anchor x="303" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="tonos.case" xOffset="-126"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_psilonvaria.glif 
b/src/Cantarell-Light.ufo/glyphs/E_psilonvaria.glif
index 1898e176..e9f24aba 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_psilonvaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_psilonvaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilonvaria" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="1FC8"/>
-  <anchor x="304" y="0" name="bottom"/>
-  <anchor x="498" y="10" name="ogonek"/>
-  <anchor x="303" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="varia.case" xOffset="-114"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_ta.glif b/src/Cantarell-Light.ufo/glyphs/E_ta.glif
index 761998b2..94c8fbdd 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_ta.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_ta.glif
@@ -1,18 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eta" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="0397"/>
   <anchor x="353" y="0" name="bottom"/>
   <anchor x="353" y="694" name="top"/>
   <anchor x="7" y="694" name="topleft"/>
-  <anchor x="353" y="534" name="center"/>
   <outline>
     <component base="H"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tadasia.glif b/src/Cantarell-Light.ufo/glyphs/E_tadasia.glif
index 4edfc951..ba6db349 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tadasia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tadasia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasia" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1F29"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasia.case" xOffset="-106"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tadasiaoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/E_tadasiaoxia.glif
index 08013ed3..4aabf4fb 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tadasiaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tadasiaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiaoxia" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1F2D"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiaoxia.case" xOffset="-237"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tadasiaoxiaprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/E_tadasiaoxiaprosgegrammeni.glif
index 280e5bd3..47717853 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tadasiaoxiaprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tadasiaoxiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiaoxiaprosgegrammeni" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1F9D"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiaoxia.case" xOffset="-237"/>
     <component base="prosgegrammeni" xOffset="145"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tadasiaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/E_tadasiaperispomeni.glif
index d69c13b9..61059bb9 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tadasiaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tadasiaperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiaperispomeni" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1F2F"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiaperispomeni.case" xOffset="-332" yOffset="-121"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tadasiaperispomeniprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/E_tadasiaperispomeniprosgegrammeni.glif
index e1bc1078..ba3ec523 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tadasiaperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tadasiaperispomeniprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiaperispomeniprosgegrammeni" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1F9F"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiaperispomeni.case" xOffset="-332" yOffset="-121"/>
     <component base="prosgegrammeni" xOffset="145"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tadasiaprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/E_tadasiaprosgegrammeni.glif
index 5084b0b6..45e2778f 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tadasiaprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tadasiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiaprosgegrammeni" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1F99"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasia.case" xOffset="-106"/>
     <component base="prosgegrammeni" xOffset="145"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tadasiavaria.glif 
b/src/Cantarell-Light.ufo/glyphs/E_tadasiavaria.glif
index c682b616..d8c7e12f 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tadasiavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tadasiavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiavaria" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1F2B"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiavaria.case" xOffset="-228"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tadasiavariaprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/E_tadasiavariaprosgegrammeni.glif
index ace6a2d1..bc1c62cb 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tadasiavariaprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tadasiavariaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiavariaprosgegrammeni" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1F9B"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiavaria.case" xOffset="-228"/>
     <component base="prosgegrammeni" xOffset="145"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_taoxia.glif b/src/Cantarell-Light.ufo/glyphs/E_taoxia.glif
index f1b7a664..d6e79d86 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_taoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_taoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etaoxia" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1FCB"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="oxia.case" xOffset="-126"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_taprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/E_taprosgegrammeni.glif
index ec446bfd..9ac17763 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_taprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_taprosgegrammeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etaprosgegrammeni" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1FCC"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="prosgegrammeni" xOffset="145"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tapsili.glif b/src/Cantarell-Light.ufo/glyphs/E_tapsili.glif
index 8440cc7c..c4b3d8cb 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tapsili.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tapsili.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsili" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1F28"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psili.case" xOffset="-113"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tapsilioxia.glif 
b/src/Cantarell-Light.ufo/glyphs/E_tapsilioxia.glif
index f707c423..23924b33 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tapsilioxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tapsilioxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsilioxia" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1F2C"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psilioxia.case" xOffset="-237"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tapsilioxiaprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/E_tapsilioxiaprosgegrammeni.glif
index 0ca45ab0..428c77a8 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tapsilioxiaprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tapsilioxiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsilioxiaprosgegrammeni" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1F9C"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psilioxia.case" xOffset="-237"/>
     <component base="prosgegrammeni" xOffset="145"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tapsiliperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/E_tapsiliperispomeni.glif
index 9a5b9284..959165e9 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tapsiliperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tapsiliperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsiliperispomeni" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1F2E"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psiliperispomeni.case" xOffset="-332" yOffset="-121"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.5,0.09,0.79,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tapsiliperispomeniprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/E_tapsiliperispomeniprosgegrammeni.glif
index a2f8b774..38202f47 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tapsiliperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tapsiliperispomeniprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsiliperispomeniprosgegrammeni" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1F9E"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psiliperispomeni.case" xOffset="-332" yOffset="-121"/>
     <component base="prosgegrammeni" xOffset="145"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tapsiliprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/E_tapsiliprosgegrammeni.glif
index cc7144a1..0b027e41 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tapsiliprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tapsiliprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsiliprosgegrammeni" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1F98"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psili.case" xOffset="-113"/>
     <component base="prosgegrammeni" xOffset="145"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tapsilivaria.glif 
b/src/Cantarell-Light.ufo/glyphs/E_tapsilivaria.glif
index b5df80e2..a74fd89a 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tapsilivaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tapsilivaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsilivaria" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1F2A"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psilivaria.case" xOffset="-233"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.25,0.25,0.25,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tapsilivariaprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/E_tapsilivariaprosgegrammeni.glif
index cebb0378..63096898 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tapsilivariaprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tapsilivariaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsilivariaprosgegrammeni" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1F9A"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psilivaria.case" xOffset="-233"/>
     <component base="prosgegrammeni" xOffset="145"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tatonos.glif b/src/Cantarell-Light.ufo/glyphs/E_tatonos.glif
index 418176ca..da87c200 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tatonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tatonos.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etatonos" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="0389"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="tonos.case" xOffset="-126"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/E_tavaria.glif b/src/Cantarell-Light.ufo/glyphs/E_tavaria.glif
index a9349ac7..35583904 100644
--- a/src/Cantarell-Light.ufo/glyphs/E_tavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/E_tavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etavaria" format="2">
-  <advance width="702"/>
+  <advance width="728"/>
   <unicode hex="1FCA"/>
-  <anchor x="353" y="0" name="bottom"/>
-  <anchor x="353" y="534" name="center"/>
-  <anchor x="353" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="varia.case" xOffset="-114"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/G_amma.glif b/src/Cantarell-Light.ufo/glyphs/G_amma.glif
index e97ac91f..587eda30 100644
--- a/src/Cantarell-Light.ufo/glyphs/G_amma.glif
+++ b/src/Cantarell-Light.ufo/glyphs/G_amma.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gamma" format="2">
-  <advance width="509"/>
+  <advance width="535"/>
   <unicode hex="0393"/>
-  <anchor x="169" y="0" name="bottomright"/>
-  <anchor x="265" y="694" name="top"/>
   <outline>
     <component base="Ge-cy"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_ota.glif b/src/Cantarell-Light.ufo/glyphs/I_ota.glif
index 68dc6d10..2135d987 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_ota.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_ota.glif
@@ -1,18 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iota" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="0399"/>
   <anchor x="121" y="0" name="bottom"/>
   <anchor x="121" y="694" name="top"/>
   <anchor x="7" y="694" name="topleft"/>
-  <anchor x="125" y="10" name="ogonek"/>
   <outline>
     <component base="I"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_otadasia.glif b/src/Cantarell-Light.ufo/glyphs/I_otadasia.glif
index 00938d7e..f04f647d 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_otadasia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_otadasia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotadasia" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="1F39"/>
-  <anchor x="121" y="0" name="bottom"/>
-  <anchor x="125" y="10" name="ogonek"/>
-  <anchor x="121" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="dasia.case" xOffset="-106"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_otadasiaoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/I_otadasiaoxia.glif
index 1ae73220..e2c66b02 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_otadasiaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_otadasiaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotadasiaoxia" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="1F3D"/>
-  <anchor x="121" y="0" name="bottom"/>
-  <anchor x="125" y="10" name="ogonek"/>
-  <anchor x="121" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="dasiaoxia.case" xOffset="-237"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_otadasiaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/I_otadasiaperispomeni.glif
index 1b0bcdcb..2dffcdef 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_otadasiaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_otadasiaperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotadasiaperispomeni" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="1F3F"/>
-  <anchor x="121" y="0" name="bottom"/>
-  <anchor x="125" y="10" name="ogonek"/>
-  <anchor x="121" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="dasiaperispomeni.case" xOffset="-332" yOffset="-121"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_otadasiavaria.glif 
b/src/Cantarell-Light.ufo/glyphs/I_otadasiavaria.glif
index 573a6c2b..0d8afde6 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_otadasiavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_otadasiavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotadasiavaria" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="1F3B"/>
-  <anchor x="121" y="0" name="bottom"/>
-  <anchor x="125" y="10" name="ogonek"/>
-  <anchor x="121" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="dasiavaria.case" xOffset="-228"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_otadieresis.glif 
b/src/Cantarell-Light.ufo/glyphs/I_otadieresis.glif
index 1948c532..323f9e5e 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_otadieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_otadieresis.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotadieresis" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="03AA"/>
-  <anchor x="121" y="0" name="bottom"/>
-  <anchor x="125" y="10" name="ogonek"/>
-  <anchor x="121" y="839" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="dieresiscomb.case" xOffset="-99"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_otamacron.glif b/src/Cantarell-Light.ufo/glyphs/I_otamacron.glif
index 1b9ff555..caf60fdd 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_otamacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_otamacron.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotamacron" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="1FD9"/>
-  <anchor x="121" y="0" name="bottom"/>
-  <anchor x="125" y="10" name="ogonek"/>
-  <anchor x="121" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
-    <component base="macron" xOffset="-110" yOffset="214"/>
+    <component base="macron" xOffset="-130" yOffset="214"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_otaoxia.glif b/src/Cantarell-Light.ufo/glyphs/I_otaoxia.glif
index 0b6f5643..fd95c0a4 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_otaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_otaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotaoxia" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="1FDB"/>
-  <anchor x="121" y="0" name="bottom"/>
-  <anchor x="125" y="10" name="ogonek"/>
-  <anchor x="121" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="oxia.case" xOffset="-126"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_otapsili.glif b/src/Cantarell-Light.ufo/glyphs/I_otapsili.glif
index 7974eaa7..c45e2399 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_otapsili.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_otapsili.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotapsili" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="1F38"/>
-  <anchor x="121" y="0" name="bottom"/>
-  <anchor x="125" y="10" name="ogonek"/>
-  <anchor x="121" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="psili.case" xOffset="-113"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_otapsilioxia.glif 
b/src/Cantarell-Light.ufo/glyphs/I_otapsilioxia.glif
index 42bf3aa9..71e266c8 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_otapsilioxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_otapsilioxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotapsilioxia" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="1F3C"/>
-  <anchor x="121" y="0" name="bottom"/>
-  <anchor x="125" y="10" name="ogonek"/>
-  <anchor x="121" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="psilioxia.case" xOffset="-237"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_otapsiliperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/I_otapsiliperispomeni.glif
index bc3adcf7..b12ddd9d 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_otapsiliperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_otapsiliperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotapsiliperispomeni" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="1F3E"/>
-  <anchor x="121" y="0" name="bottom"/>
-  <anchor x="125" y="10" name="ogonek"/>
-  <anchor x="121" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="psiliperispomeni.case" xOffset="-332" yOffset="-121"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_otapsilivaria.glif 
b/src/Cantarell-Light.ufo/glyphs/I_otapsilivaria.glif
index 3dd65d3a..c825b766 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_otapsilivaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_otapsilivaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotapsilivaria" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="1F3A"/>
-  <anchor x="121" y="0" name="bottom"/>
-  <anchor x="125" y="10" name="ogonek"/>
-  <anchor x="121" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="psilivaria.case" xOffset="-233"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_otatonos.glif b/src/Cantarell-Light.ufo/glyphs/I_otatonos.glif
index 92f66222..b0dc95b0 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_otatonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_otatonos.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotatonos" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="038A"/>
-  <anchor x="121" y="0" name="bottom"/>
-  <anchor x="125" y="10" name="ogonek"/>
-  <anchor x="121" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="tonos.case" xOffset="-126"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_otavaria.glif b/src/Cantarell-Light.ufo/glyphs/I_otavaria.glif
index 31d06115..559fec48 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_otavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_otavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotavaria" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="1FDA"/>
-  <anchor x="121" y="0" name="bottom"/>
-  <anchor x="125" y="10" name="ogonek"/>
-  <anchor x="121" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="varia.case" xOffset="-114"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/I_otavrachy.glif b/src/Cantarell-Light.ufo/glyphs/I_otavrachy.glif
index 68d8cd1d..314c7247 100644
--- a/src/Cantarell-Light.ufo/glyphs/I_otavrachy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/I_otavrachy.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotavrachy" format="2">
-  <advance width="241"/>
+  <advance width="267"/>
   <unicode hex="1FD8"/>
-  <anchor x="121" y="0" name="bottom"/>
-  <anchor x="125" y="10" name="ogonek"/>
-  <anchor x="121" y="694" name="top"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
-    <component base="vrachy.case" xOffset="-69"/>
+    <component base="vrachy.case" xOffset="-82"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/K_appa.glif b/src/Cantarell-Light.ufo/glyphs/K_appa.glif
index ec5b2fb5..da0a6490 100644
--- a/src/Cantarell-Light.ufo/glyphs/K_appa.glif
+++ b/src/Cantarell-Light.ufo/glyphs/K_appa.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kappa" format="2">
-  <advance width="552"/>
+  <advance width="578"/>
   <unicode hex="039A"/>
-  <anchor x="283" y="0" name="bottom"/>
-  <anchor x="283" y="694" name="top"/>
   <outline>
     <component base="K"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/L_ambda.glif b/src/Cantarell-Light.ufo/glyphs/L_ambda.glif
index 1fe23fdb..1bdbca7d 100644
--- a/src/Cantarell-Light.ufo/glyphs/L_ambda.glif
+++ b/src/Cantarell-Light.ufo/glyphs/L_ambda.glif
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lambda" format="2">
-  <advance width="634"/>
+  <advance width="621"/>
   <unicode hex="039B"/>
-  <anchor x="323" y="0" name="bottom"/>
-  <anchor x="326" y="694" name="top"/>
+  <anchor x="317" y="0" name="bottom"/>
+  <anchor x="320" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="44" y="0" type="line"/>
-      <point x="66" y="0" type="line"/>
-      <point x="326" y="676" type="line"/>
-      <point x="322" y="676" type="line"/>
-      <point x="565" y="0" type="line"/>
-      <point x="589" y="0" type="line"/>
-      <point x="337" y="694" type="line"/>
-      <point x="314" y="694" type="line"/>
+      <point x="38" y="0" type="line"/>
+      <point x="60" y="0" type="line"/>
+      <point x="320" y="676" type="line"/>
+      <point x="316" y="676" type="line"/>
+      <point x="559" y="0" type="line"/>
+      <point x="583" y="0" type="line"/>
+      <point x="331" y="694" type="line"/>
+      <point x="308" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -22,8 +22,6 @@
       <string>=A</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=A</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/M_u.glif b/src/Cantarell-Light.ufo/glyphs/M_u.glif
index 4969f070..9fecf3ca 100644
--- a/src/Cantarell-Light.ufo/glyphs/M_u.glif
+++ b/src/Cantarell-Light.ufo/glyphs/M_u.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Mu" format="2">
-  <advance width="835"/>
+  <advance width="861"/>
   <unicode hex="039C"/>
-  <anchor x="432" y="0" name="bottom"/>
-  <anchor x="432" y="694" name="top"/>
   <outline>
     <component base="M"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/N_u.glif b/src/Cantarell-Light.ufo/glyphs/N_u.glif
index ba5f308a..1293c029 100644
--- a/src/Cantarell-Light.ufo/glyphs/N_u.glif
+++ b/src/Cantarell-Light.ufo/glyphs/N_u.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nu" format="2">
-  <advance width="732"/>
+  <advance width="758"/>
   <unicode hex="039D"/>
-  <anchor x="377" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
   <outline>
     <component base="N"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_mega.glif b/src/Cantarell-Light.ufo/glyphs/O_mega.glif
index a622e24f..4a847c24 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_mega.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_mega.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omega" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="03A9"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
+  <anchor x="379" y="0" name="bottom"/>
+  <anchor x="378" y="694" name="top"/>
+  <anchor x="43" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="378" y="703" type="curve" smooth="yes"/>
-      <point x="182" y="703"/>
-      <point x="71" y="556"/>
-      <point x="71" y="377" type="curve" smooth="yes"/>
-      <point x="71" y="221"/>
-      <point x="163" y="83"/>
-      <point x="295" y="10" type="curve"/>
-      <point x="295" y="19" type="line"/>
-      <point x="58" y="19" type="line"/>
-      <point x="58" y="0" type="line"/>
-      <point x="320" y="0" type="line"/>
-      <point x="320" y="16" type="line"/>
-      <point x="190" y="89"/>
-      <point x="93" y="223"/>
-      <point x="93" y="376" type="curve" smooth="yes"/>
-      <point x="93" y="549"/>
-      <point x="194" y="684"/>
-      <point x="375" y="684" type="curve" smooth="yes"/>
-      <point x="562" y="684"/>
-      <point x="663" y="550"/>
-      <point x="663" y="382" type="curve" smooth="yes"/>
-      <point x="663" y="232"/>
-      <point x="567" y="94"/>
-      <point x="438" y="16" type="curve"/>
-      <point x="438" y="0" type="line"/>
-      <point x="701" y="0" type="line"/>
-      <point x="701" y="19" type="line"/>
-      <point x="464" y="19" type="line"/>
-      <point x="464" y="11" type="line"/>
-      <point x="586" y="83"/>
-      <point x="685" y="230"/>
-      <point x="685" y="384" type="curve" smooth="yes"/>
-      <point x="685" y="559"/>
-      <point x="570" y="703"/>
+      <point x="379" y="703" type="curve" smooth="yes"/>
+      <point x="183" y="703"/>
+      <point x="72" y="556"/>
+      <point x="72" y="377" type="curve" smooth="yes"/>
+      <point x="72" y="221"/>
+      <point x="164" y="83"/>
+      <point x="296" y="10" type="curve"/>
+      <point x="296" y="19" type="line"/>
+      <point x="59" y="19" type="line"/>
+      <point x="59" y="0" type="line"/>
+      <point x="321" y="0" type="line"/>
+      <point x="321" y="16" type="line"/>
+      <point x="191" y="89"/>
+      <point x="94" y="223"/>
+      <point x="94" y="376" type="curve" smooth="yes"/>
+      <point x="94" y="549"/>
+      <point x="195" y="684"/>
+      <point x="376" y="684" type="curve" smooth="yes"/>
+      <point x="563" y="684"/>
+      <point x="664" y="550"/>
+      <point x="664" y="382" type="curve" smooth="yes"/>
+      <point x="664" y="232"/>
+      <point x="568" y="94"/>
+      <point x="439" y="16" type="curve"/>
+      <point x="439" y="0" type="line"/>
+      <point x="702" y="0" type="line"/>
+      <point x="702" y="19" type="line"/>
+      <point x="465" y="19" type="line"/>
+      <point x="465" y="11" type="line"/>
+      <point x="587" y="83"/>
+      <point x="686" y="230"/>
+      <point x="686" y="384" type="curve" smooth="yes"/>
+      <point x="686" y="559"/>
+      <point x="571" y="703"/>
     </contour>
   </outline>
   <lib>
@@ -49,8 +49,6 @@
       <string>=O-13</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=O-10</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megadasia.glif b/src/Cantarell-Light.ufo/glyphs/O_megadasia.glif
index 5afe6129..7d5b4be1 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megadasia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megadasia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasia" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1F69"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasia.case" xOffset="-71"/>
+    <component base="dasia.case" xOffset="-70"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megadasiaoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/O_megadasiaoxia.glif
index 559f2fd7..43cf2537 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megadasiaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megadasiaoxia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiaoxia" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1F6D"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiaoxia.case" xOffset="-202"/>
+    <component base="dasiaoxia.case" xOffset="-201"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megadasiaoxiaprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/O_megadasiaoxiaprosgegrammeni.glif
index af11e8cb..1c635312 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megadasiaoxiaprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megadasiaoxiaprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiaoxiaprosgegrammeni" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1FAD"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiaoxia.case" xOffset="-202"/>
-    <component base="prosgegrammeni" xOffset="170"/>
+    <component base="dasiaoxia.case" xOffset="-201"/>
+    <component base="prosgegrammeni" xOffset="171"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megadasiaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/O_megadasiaperispomeni.glif
index ac4a374d..7d859794 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megadasiaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megadasiaperispomeni.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiaperispomeni" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1F6F"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiaperispomeni.case" xOffset="-297" yOffset="-121"/>
+    <component base="dasiaperispomeni.case" xOffset="-296" yOffset="-121"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megadasiaperispomeniprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/O_megadasiaperispomeniprosgegrammeni.glif
index a85bf082..85c7ab51 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megadasiaperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megadasiaperispomeniprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiaperispomeniprosgegrammeni" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1FAF"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiaperispomeni.case" xOffset="-297" yOffset="-121"/>
-    <component base="prosgegrammeni" xOffset="170"/>
+    <component base="dasiaperispomeni.case" xOffset="-296" yOffset="-121"/>
+    <component base="prosgegrammeni" xOffset="171"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megadasiaprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/O_megadasiaprosgegrammeni.glif
index cc07e71f..9c91da6e 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megadasiaprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megadasiaprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiaprosgegrammeni" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1FA9"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasia.case" xOffset="-71"/>
-    <component base="prosgegrammeni" xOffset="170"/>
+    <component base="dasia.case" xOffset="-70"/>
+    <component base="prosgegrammeni" xOffset="171"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megadasiavaria.glif 
b/src/Cantarell-Light.ufo/glyphs/O_megadasiavaria.glif
index 2a164551..6dc56f5f 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megadasiavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megadasiavaria.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiavaria" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1F6B"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiavaria.case" xOffset="-193"/>
+    <component base="dasiavaria.case" xOffset="-192"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megadasiavariaprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/O_megadasiavariaprosgegrammeni.glif
index 466d290b..f7cc2a7d 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megadasiavariaprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megadasiavariaprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiavariaprosgegrammeni" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1FAB"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiavaria.case" xOffset="-193"/>
-    <component base="prosgegrammeni" xOffset="170"/>
+    <component base="dasiavaria.case" xOffset="-192"/>
+    <component base="prosgegrammeni" xOffset="171"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megaoxia.glif b/src/Cantarell-Light.ufo/glyphs/O_megaoxia.glif
index 7e7ae974..3120d5f7 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megaoxia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegaoxia" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1FFB"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="oxia.case" xOffset="-91"/>
+    <component base="oxia.case" xOffset="-90"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megaprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/O_megaprosgegrammeni.glif
index 3cb2fe37..d3e335ac 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megaprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megaprosgegrammeni.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegaprosgegrammeni" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1FFC"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="prosgegrammeni" xOffset="170"/>
+    <component base="prosgegrammeni" xOffset="171"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megapsili.glif b/src/Cantarell-Light.ufo/glyphs/O_megapsili.glif
index 0a9452ae..e78dad83 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megapsili.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megapsili.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsili" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1F68"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psili.case" xOffset="-78"/>
+    <component base="psili.case" xOffset="-77"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megapsilioxia.glif 
b/src/Cantarell-Light.ufo/glyphs/O_megapsilioxia.glif
index f76c3450..ab80b17c 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megapsilioxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megapsilioxia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsilioxia" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1F6C"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psilioxia.case" xOffset="-202"/>
+    <component base="psilioxia.case" xOffset="-201"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megapsilioxiaprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/O_megapsilioxiaprosgegrammeni.glif
index c05351e5..4623a3a1 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megapsilioxiaprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megapsilioxiaprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsilioxiaprosgegrammeni" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1FAC"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psilioxia.case" xOffset="-202"/>
-    <component base="prosgegrammeni" xOffset="170"/>
+    <component base="psilioxia.case" xOffset="-201"/>
+    <component base="prosgegrammeni" xOffset="171"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megapsiliperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/O_megapsiliperispomeni.glif
index ba95d903..c9ba4fde 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megapsiliperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megapsiliperispomeni.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsiliperispomeni" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1F6E"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psiliperispomeni.case" xOffset="-297" yOffset="-121"/>
+    <component base="psiliperispomeni.case" xOffset="-296" yOffset="-121"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.5,0.09,0.79,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megapsiliperispomeniprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/O_megapsiliperispomeniprosgegrammeni.glif
index 0f9319af..199ce560 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megapsiliperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megapsiliperispomeniprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsiliperispomeniprosgegrammeni" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1FAE"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psiliperispomeni.case" xOffset="-297" yOffset="-121"/>
-    <component base="prosgegrammeni" xOffset="170"/>
+    <component base="psiliperispomeni.case" xOffset="-296" yOffset="-121"/>
+    <component base="prosgegrammeni" xOffset="171"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megapsiliprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/O_megapsiliprosgegrammeni.glif
index abfb60c2..99187380 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megapsiliprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megapsiliprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsiliprosgegrammeni" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1FA8"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psili.case" xOffset="-78"/>
-    <component base="prosgegrammeni" xOffset="170"/>
+    <component base="psili.case" xOffset="-77"/>
+    <component base="prosgegrammeni" xOffset="171"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megapsilivaria.glif 
b/src/Cantarell-Light.ufo/glyphs/O_megapsilivaria.glif
index 5cb58725..e16f9433 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megapsilivaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megapsilivaria.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsilivaria" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1F6A"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psilivaria.case" xOffset="-198"/>
+    <component base="psilivaria.case" xOffset="-197"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megapsilivariaprosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/O_megapsilivariaprosgegrammeni.glif
index b71e080c..6ed9eb86 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megapsilivariaprosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megapsilivariaprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsilivariaprosgegrammeni" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1FAA"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psilivaria.case" xOffset="-198"/>
-    <component base="prosgegrammeni" xOffset="170"/>
+    <component base="psilivaria.case" xOffset="-197"/>
+    <component base="prosgegrammeni" xOffset="171"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megatonos.glif b/src/Cantarell-Light.ufo/glyphs/O_megatonos.glif
index 065cfa55..876ec33e 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megatonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megatonos.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegatonos" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="038F"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="tonos.case" xOffset="-91"/>
+    <component base="tonos.case" xOffset="-90"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_megavaria.glif b/src/Cantarell-Light.ufo/glyphs/O_megavaria.glif
index 739eadb2..5256adc9 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_megavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_megavaria.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegavaria" format="2">
-  <advance width="763"/>
+  <advance width="764"/>
   <unicode hex="1FFA"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="377" y="694" name="top"/>
-  <anchor x="42" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="varia.case" xOffset="-79"/>
+    <component base="varia.case" xOffset="-78"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_micron.glif b/src/Cantarell-Light.ufo/glyphs/O_micron.glif
index 1ce6704b..c2202dce 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_micron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_micron.glif
@@ -1,21 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicron" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="039F"/>
   <anchor x="378" y="0" name="bottom"/>
   <anchor x="378" y="694" name="top"/>
   <anchor x="43" y="694" name="topleft"/>
-  <anchor x="598" y="94" name="Qtail"/>
-  <anchor x="379" y="345" name="center"/>
-  <anchor x="459" y="10" name="ogonek"/>
-  <anchor x="653" y="694" name="topright"/>
   <outline>
     <component base="O"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_microndasia.glif 
b/src/Cantarell-Light.ufo/glyphs/O_microndasia.glif
index 1e25eeb8..f89517d7 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_microndasia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_microndasia.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicrondasia" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1F49"/>
-  <anchor x="598" y="94" name="Qtail"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="379" y="345" name="center"/>
-  <anchor x="459" y="10" name="ogonek"/>
-  <anchor x="378" y="694" name="top"/>
-  <anchor x="43" y="694" name="topleft"/>
-  <anchor x="653" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="dasia.case" xOffset="-70"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_microndasiaoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/O_microndasiaoxia.glif
index 32153a0b..bbe243bf 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_microndasiaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_microndasiaoxia.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicrondasiaoxia" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1F4D"/>
-  <anchor x="598" y="94" name="Qtail"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="379" y="345" name="center"/>
-  <anchor x="459" y="10" name="ogonek"/>
-  <anchor x="378" y="694" name="top"/>
-  <anchor x="43" y="694" name="topleft"/>
-  <anchor x="653" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="dasiaoxia.case" xOffset="-201"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_microndasiavaria.glif 
b/src/Cantarell-Light.ufo/glyphs/O_microndasiavaria.glif
index d255d9b8..346b7438 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_microndasiavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_microndasiavaria.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicrondasiavaria" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1F4B"/>
-  <anchor x="598" y="94" name="Qtail"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="379" y="345" name="center"/>
-  <anchor x="459" y="10" name="ogonek"/>
-  <anchor x="378" y="694" name="top"/>
-  <anchor x="43" y="694" name="topleft"/>
-  <anchor x="653" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="dasiavaria.case" xOffset="-192"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_micronoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/O_micronoxia.glif
index 1e4d4063..79d3f9e6 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_micronoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_micronoxia.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicronoxia" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1FF9"/>
-  <anchor x="598" y="94" name="Qtail"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="379" y="345" name="center"/>
-  <anchor x="459" y="10" name="ogonek"/>
-  <anchor x="378" y="694" name="top"/>
-  <anchor x="43" y="694" name="topleft"/>
-  <anchor x="653" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="oxia.case" xOffset="-90"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_micronpsili.glif 
b/src/Cantarell-Light.ufo/glyphs/O_micronpsili.glif
index ea80a205..b6910ed5 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_micronpsili.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_micronpsili.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicronpsili" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1F48"/>
-  <anchor x="598" y="94" name="Qtail"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="379" y="345" name="center"/>
-  <anchor x="459" y="10" name="ogonek"/>
-  <anchor x="378" y="694" name="top"/>
-  <anchor x="43" y="694" name="topleft"/>
-  <anchor x="653" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="psili.case" xOffset="-77"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_micronpsilioxia.glif 
b/src/Cantarell-Light.ufo/glyphs/O_micronpsilioxia.glif
index 4cdbad31..d25f1d9f 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_micronpsilioxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_micronpsilioxia.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicronpsilioxia" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1F4C"/>
-  <anchor x="598" y="94" name="Qtail"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="379" y="345" name="center"/>
-  <anchor x="459" y="10" name="ogonek"/>
-  <anchor x="378" y="694" name="top"/>
-  <anchor x="43" y="694" name="topleft"/>
-  <anchor x="653" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="psilioxia.case" xOffset="-201"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_micronpsilivaria.glif 
b/src/Cantarell-Light.ufo/glyphs/O_micronpsilivaria.glif
index 46d69cf4..a7938af3 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_micronpsilivaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_micronpsilivaria.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicronpsilivaria" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1F4A"/>
-  <anchor x="598" y="94" name="Qtail"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="379" y="345" name="center"/>
-  <anchor x="459" y="10" name="ogonek"/>
-  <anchor x="378" y="694" name="top"/>
-  <anchor x="43" y="694" name="topleft"/>
-  <anchor x="653" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="psilivaria.case" xOffset="-197"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.25,0.25,0.25,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_microntonos.glif 
b/src/Cantarell-Light.ufo/glyphs/O_microntonos.glif
index 31e2cdf9..eed547da 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_microntonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_microntonos.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicrontonos" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="038C"/>
-  <anchor x="598" y="94" name="Qtail"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="379" y="345" name="center"/>
-  <anchor x="459" y="10" name="ogonek"/>
-  <anchor x="378" y="694" name="top"/>
-  <anchor x="43" y="694" name="topleft"/>
-  <anchor x="653" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="tonos.case" xOffset="-90"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/O_micronvaria.glif 
b/src/Cantarell-Light.ufo/glyphs/O_micronvaria.glif
index adec933e..700f1faf 100644
--- a/src/Cantarell-Light.ufo/glyphs/O_micronvaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/O_micronvaria.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicronvaria" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="1FF8"/>
-  <anchor x="598" y="94" name="Qtail"/>
-  <anchor x="378" y="0" name="bottom"/>
-  <anchor x="379" y="345" name="center"/>
-  <anchor x="459" y="10" name="ogonek"/>
-  <anchor x="378" y="694" name="top"/>
-  <anchor x="43" y="694" name="topleft"/>
-  <anchor x="653" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="varia.case" xOffset="-78"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/P_hi.glif b/src/Cantarell-Light.ufo/glyphs/P_hi.glif
index 04e520d8..9899dce7 100644
--- a/src/Cantarell-Light.ufo/glyphs/P_hi.glif
+++ b/src/Cantarell-Light.ufo/glyphs/P_hi.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Phi" format="2">
-  <advance width="788"/>
+  <advance width="792"/>
   <unicode hex="03A6"/>
   <outline>
     <contour>
-      <point x="392" y="87" type="curve" smooth="yes"/>
-      <point x="596" y="87"/>
-      <point x="727" y="187"/>
-      <point x="727" y="349" type="curve" smooth="yes"/>
-      <point x="727" y="508"/>
-      <point x="591" y="609"/>
-      <point x="393" y="609" type="curve" smooth="yes"/>
-      <point x="191" y="609"/>
-      <point x="61" y="508"/>
-      <point x="61" y="344" type="curve" smooth="yes"/>
-      <point x="61" y="187"/>
-      <point x="196" y="87"/>
+      <point x="394" y="87" type="curve" smooth="yes"/>
+      <point x="598" y="87"/>
+      <point x="729" y="187"/>
+      <point x="729" y="349" type="curve" smooth="yes"/>
+      <point x="729" y="508"/>
+      <point x="593" y="609"/>
+      <point x="395" y="609" type="curve" smooth="yes"/>
+      <point x="193" y="609"/>
+      <point x="63" y="508"/>
+      <point x="63" y="344" type="curve" smooth="yes"/>
+      <point x="63" y="187"/>
+      <point x="198" y="87"/>
     </contour>
     <contour>
-      <point x="395" y="106" type="curve" smooth="yes"/>
-      <point x="211" y="106"/>
-      <point x="83" y="197"/>
-      <point x="83" y="347" type="curve" smooth="yes"/>
-      <point x="83" y="498"/>
-      <point x="203" y="590"/>
-      <point x="389" y="590" type="curve" smooth="yes"/>
-      <point x="576" y="590"/>
-      <point x="705" y="498"/>
-      <point x="705" y="346" type="curve" smooth="yes"/>
-      <point x="705" y="197"/>
-      <point x="584" y="106"/>
+      <point x="397" y="106" type="curve" smooth="yes"/>
+      <point x="213" y="106"/>
+      <point x="85" y="197"/>
+      <point x="85" y="347" type="curve" smooth="yes"/>
+      <point x="85" y="498"/>
+      <point x="205" y="590"/>
+      <point x="391" y="590" type="curve" smooth="yes"/>
+      <point x="578" y="590"/>
+      <point x="707" y="498"/>
+      <point x="707" y="346" type="curve" smooth="yes"/>
+      <point x="707" y="197"/>
+      <point x="586" y="106"/>
     </contour>
     <contour>
-      <point x="381" y="-10" type="line"/>
-      <point x="403" y="-10" type="line"/>
-      <point x="403" y="704" type="line"/>
-      <point x="381" y="704" type="line"/>
+      <point x="383" y="-10" type="line"/>
+      <point x="405" y="-10" type="line"/>
+      <point x="405" y="704" type="line"/>
+      <point x="383" y="704" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -44,8 +44,6 @@
       <string>=Ef-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=Ef-cy</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/P_i.glif b/src/Cantarell-Light.ufo/glyphs/P_i.glif
index ccd6d1a7..e9e0ac9c 100644
--- a/src/Cantarell-Light.ufo/glyphs/P_i.glif
+++ b/src/Cantarell-Light.ufo/glyphs/P_i.glif
@@ -1,15 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Pi" format="2">
-  <advance width="671"/>
+  <advance width="697"/>
   <unicode hex="03A0"/>
-  <anchor x="651" y="0" name="bottomright"/>
   <outline>
     <component base="Pe-cy"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/P_si.glif b/src/Cantarell-Light.ufo/glyphs/P_si.glif
index adb55aba..1d921493 100644
--- a/src/Cantarell-Light.ufo/glyphs/P_si.glif
+++ b/src/Cantarell-Light.ufo/glyphs/P_si.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Psi" format="2">
-  <advance width="768"/>
+  <advance width="786"/>
   <unicode hex="03A8"/>
-  <anchor x="384" y="0" name="bottom"/>
-  <anchor x="384" y="694" name="top"/>
+  <anchor x="393" y="0" name="bottom"/>
+  <anchor x="393" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="376" y="220" type="curve"/>
-      <point x="378" y="239" type="line"/>
-      <point x="210" y="239"/>
-      <point x="96" y="329"/>
-      <point x="96" y="486" type="curve" smooth="yes"/>
-      <point x="96" y="694" type="line"/>
-      <point x="74" y="694" type="line"/>
-      <point x="74" y="482" type="line" smooth="yes"/>
-      <point x="74" y="319"/>
-      <point x="196" y="220"/>
+      <point x="385" y="220" type="curve"/>
+      <point x="387" y="239" type="line"/>
+      <point x="219" y="239"/>
+      <point x="105" y="329"/>
+      <point x="105" y="486" type="curve" smooth="yes"/>
+      <point x="105" y="694" type="line"/>
+      <point x="83" y="694" type="line"/>
+      <point x="83" y="482" type="line" smooth="yes"/>
+      <point x="83" y="319"/>
+      <point x="205" y="220"/>
     </contour>
     <contour>
-      <point x="390" y="220" type="line"/>
-      <point x="583" y="220"/>
-      <point x="694" y="316"/>
-      <point x="694" y="480" type="curve" smooth="yes"/>
-      <point x="694" y="694" type="line"/>
-      <point x="672" y="694" type="line"/>
-      <point x="672" y="477" type="line" smooth="yes"/>
-      <point x="672" y="326"/>
-      <point x="568" y="239"/>
-      <point x="392" y="239" type="curve"/>
+      <point x="399" y="220" type="line"/>
+      <point x="592" y="220"/>
+      <point x="703" y="316"/>
+      <point x="703" y="480" type="curve" smooth="yes"/>
+      <point x="703" y="694" type="line"/>
+      <point x="681" y="694" type="line"/>
+      <point x="681" y="477" type="line" smooth="yes"/>
+      <point x="681" y="326"/>
+      <point x="577" y="239"/>
+      <point x="401" y="239" type="curve"/>
     </contour>
     <contour>
-      <point x="373" y="0" type="line"/>
-      <point x="395" y="0" type="line"/>
-      <point x="395" y="694" type="line"/>
-      <point x="373" y="694" type="line"/>
+      <point x="382" y="0" type="line"/>
+      <point x="404" y="0" type="line"/>
+      <point x="404" y="694" type="line"/>
+      <point x="382" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -42,8 +42,6 @@
       <string>=U-25</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=U-25</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_ho.glif b/src/Cantarell-Light.ufo/glyphs/R_ho.glif
index 941d29f7..4aaf9c7b 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_ho.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_ho.glif
@@ -1,16 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rho" format="2">
-  <advance width="572"/>
+  <advance width="584"/>
   <unicode hex="03A1"/>
   <anchor x="7" y="694" name="topleft"/>
-  <anchor x="318" y="0" name="bottom"/>
   <outline>
     <component base="P"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/R_hodasia.glif b/src/Cantarell-Light.ufo/glyphs/R_hodasia.glif
index 495a7890..d74545fd 100644
--- a/src/Cantarell-Light.ufo/glyphs/R_hodasia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/R_hodasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rhodasia" format="2">
-  <advance width="572"/>
+  <advance width="584"/>
   <unicode hex="1FEC"/>
-  <anchor x="318" y="0" name="bottom"/>
-  <anchor x="7" y="694" name="topleft"/>
   <outline>
     <component base="Rho"/>
     <component base="dasia.case" xOffset="-106"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/S_igma.glif b/src/Cantarell-Light.ufo/glyphs/S_igma.glif
index 82c88322..d14d6192 100644
--- a/src/Cantarell-Light.ufo/glyphs/S_igma.glif
+++ b/src/Cantarell-Light.ufo/glyphs/S_igma.glif
@@ -27,8 +27,6 @@
       <string>=Z+5</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=Z</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_au.glif b/src/Cantarell-Light.ufo/glyphs/T_au.glif
index a210ece3..adebb032 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_au.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_au.glif
@@ -1,17 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tau" format="2">
-  <advance width="589"/>
+  <advance width="535"/>
   <unicode hex="03A4"/>
-  <anchor x="292" y="0" name="bottom"/>
-  <anchor x="295" y="357" name="center"/>
-  <anchor x="295" y="694" name="top"/>
   <outline>
     <component base="T"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/T_heta.glif b/src/Cantarell-Light.ufo/glyphs/T_heta.glif
index f1485f0e..83f67b4f 100644
--- a/src/Cantarell-Light.ufo/glyphs/T_heta.glif
+++ b/src/Cantarell-Light.ufo/glyphs/T_heta.glif
@@ -1,14 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Theta" format="2">
-  <advance width="754"/>
+  <advance width="755"/>
   <unicode hex="0398"/>
   <anchor x="378" y="0" name="bottom"/>
   <anchor x="378" y="694" name="top"/>
-  <anchor x="598" y="94" name="Qtail"/>
-  <anchor x="379" y="345" name="center"/>
-  <anchor x="459" y="10" name="ogonek"/>
-  <anchor x="-3" y="694" name="topleft"/>
-  <anchor x="653" y="694" name="topright"/>
   <outline>
     <contour>
       <point x="193" y="342" type="line"/>
@@ -24,8 +19,6 @@
       <string>=O</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=O</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_psilon.glif b/src/Cantarell-Light.ufo/glyphs/U_psilon.glif
index 44fa43d8..9f2f7c4f 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_psilon.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_psilon.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilon" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="03A5"/>
   <anchor x="265" y="0" name="bottom"/>
   <anchor x="265" y="694" name="top"/>
@@ -8,10 +8,4 @@
   <outline>
     <component base="Y"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_psilondasia.glif 
b/src/Cantarell-Light.ufo/glyphs/U_psilondasia.glif
index b7de5404..f55e88e3 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_psilondasia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_psilondasia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilondasia" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="1F59"/>
-  <anchor x="265" y="0" name="bottom"/>
-  <anchor x="265" y="694" name="top"/>
-  <anchor x="-39" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="dasia.case" xOffset="-152"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_psilondasiaoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/U_psilondasiaoxia.glif
index 5a628d2d..a1dae75b 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_psilondasiaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_psilondasiaoxia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilondasiaoxia" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="1F5D"/>
-  <anchor x="265" y="0" name="bottom"/>
-  <anchor x="265" y="694" name="top"/>
-  <anchor x="-39" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="dasiaoxia.case" xOffset="-283"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_psilondasiaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/U_psilondasiaperispomeni.glif
index 18515ba4..f7033f43 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_psilondasiaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_psilondasiaperispomeni.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilondasiaperispomeni" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="1F5F"/>
-  <anchor x="265" y="0" name="bottom"/>
-  <anchor x="265" y="694" name="top"/>
-  <anchor x="-39" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="dasiaperispomeni.case" xOffset="-378" yOffset="-121"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.5,0.09,0.79,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_psilondasiavaria.glif 
b/src/Cantarell-Light.ufo/glyphs/U_psilondasiavaria.glif
index f390b709..4a683b44 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_psilondasiavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_psilondasiavaria.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilondasiavaria" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="1F5B"/>
-  <anchor x="265" y="0" name="bottom"/>
-  <anchor x="265" y="694" name="top"/>
-  <anchor x="-39" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="dasiavaria.case" xOffset="-274"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.25,0.25,0.25,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_psilondieresis.glif 
b/src/Cantarell-Light.ufo/glyphs/U_psilondieresis.glif
index 687d2802..68892a47 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_psilondieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_psilondieresis.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilondieresis" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="03AB"/>
-  <anchor x="265" y="0" name="bottom"/>
-  <anchor x="265" y="839" name="top"/>
-  <anchor x="-39" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="dieresiscomb.case" xOffset="45"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_psilonmacron.glif 
b/src/Cantarell-Light.ufo/glyphs/U_psilonmacron.glif
index 484bbabc..fbb88642 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_psilonmacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_psilonmacron.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilonmacron" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="1FE9"/>
-  <anchor x="265" y="0" name="bottom"/>
-  <anchor x="265" y="694" name="top"/>
-  <anchor x="-39" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
-    <component base="macron" xOffset="34" yOffset="214"/>
+    <component base="macron" xOffset="14" yOffset="214"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_psilonoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/U_psilonoxia.glif
index f6a0cee6..c951ba46 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_psilonoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_psilonoxia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilonoxia" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="1FEB"/>
-  <anchor x="265" y="0" name="bottom"/>
-  <anchor x="265" y="694" name="top"/>
-  <anchor x="-39" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="oxia.case" xOffset="-172"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_psilontonos.glif 
b/src/Cantarell-Light.ufo/glyphs/U_psilontonos.glif
index 57c9a9cb..394c952e 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_psilontonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_psilontonos.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilontonos" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="038E"/>
-  <anchor x="265" y="0" name="bottom"/>
-  <anchor x="265" y="694" name="top"/>
-  <anchor x="-39" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="tonos.case" xOffset="-172"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_psilonvaria.glif 
b/src/Cantarell-Light.ufo/glyphs/U_psilonvaria.glif
index 0931b699..44d81598 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_psilonvaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_psilonvaria.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilonvaria" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="1FEA"/>
-  <anchor x="265" y="0" name="bottom"/>
-  <anchor x="265" y="694" name="top"/>
-  <anchor x="-39" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="varia.case" xOffset="-160"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/U_psilonvrachy.glif 
b/src/Cantarell-Light.ufo/glyphs/U_psilonvrachy.glif
index 2952614f..135809cb 100644
--- a/src/Cantarell-Light.ufo/glyphs/U_psilonvrachy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/U_psilonvrachy.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilonvrachy" format="2">
-  <advance width="528"/>
+  <advance width="556"/>
   <unicode hex="1FE8"/>
-  <anchor x="265" y="0" name="bottom"/>
-  <anchor x="265" y="694" name="top"/>
-  <anchor x="-39" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
-    <component base="vrachy.case" xOffset="75"/>
+    <component base="vrachy.case" xOffset="62"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/X_i.glif b/src/Cantarell-Light.ufo/glyphs/X_i.glif
index 842524f0..e2d08692 100644
--- a/src/Cantarell-Light.ufo/glyphs/X_i.glif
+++ b/src/Cantarell-Light.ufo/glyphs/X_i.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Xi" format="2">
-  <advance width="538"/>
+  <advance width="551"/>
   <unicode hex="039E"/>
   <outline>
     <contour>
@@ -26,8 +26,6 @@
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=E</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/Z_eta.glif b/src/Cantarell-Light.ufo/glyphs/Z_eta.glif
index be230c31..a2558f0f 100644
--- a/src/Cantarell-Light.ufo/glyphs/Z_eta.glif
+++ b/src/Cantarell-Light.ufo/glyphs/Z_eta.glif
@@ -2,15 +2,7 @@
 <glyph name="Zeta" format="2">
   <advance width="616"/>
   <unicode hex="0396"/>
-  <anchor x="298" y="0" name="bottom"/>
-  <anchor x="298" y="694" name="top"/>
   <outline>
     <component base="Z"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alpha.glif b/src/Cantarell-Light.ufo/glyphs/alpha.glif
index b68e924b..9fe2ae2e 100644
--- a/src/Cantarell-Light.ufo/glyphs/alpha.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alpha.glif
@@ -1,57 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alpha" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="03B1"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
+  <anchor x="236" y="0" name="bottom"/>
+  <anchor x="255" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="222" y="-7" type="curve" smooth="yes"/>
-      <point x="328" y="-7"/>
-      <point x="385" y="96"/>
-      <point x="418" y="188" type="curve"/>
-      <point x="407" y="200" type="line"/>
-      <point x="371" y="106"/>
-      <point x="320" y="11"/>
-      <point x="224" y="11" type="curve" smooth="yes"/>
-      <point x="134" y="11"/>
-      <point x="78" y="97"/>
-      <point x="78" y="240" type="curve" smooth="yes"/>
-      <point x="78" y="379"/>
-      <point x="135" y="468"/>
-      <point x="229" y="468" type="curve" smooth="yes"/>
-      <point x="340" y="468"/>
-      <point x="367" y="331"/>
-      <point x="389" y="253" type="curve" smooth="yes"/>
-      <point x="427" y="119" type="line" smooth="yes"/>
-      <point x="448" y="46"/>
-      <point x="466" y="-3"/>
-      <point x="519" y="-3" type="curve" smooth="yes"/>
-      <point x="540" y="-3"/>
-      <point x="559" y="5"/>
-      <point x="573" y="14" type="curve"/>
-      <point x="567" y="27" type="line"/>
-      <point x="557" y="21"/>
-      <point x="540" y="13"/>
-      <point x="523" y="13" type="curve" smooth="yes"/>
-      <point x="478" y="13"/>
-      <point x="463" y="60"/>
-      <point x="445" y="125" type="curve" smooth="yes"/>
-      <point x="408" y="258" type="line" smooth="yes"/>
-      <point x="383" y="348"/>
-      <point x="350" y="486"/>
-      <point x="230" y="486" type="curve" smooth="yes"/>
-      <point x="123" y="486"/>
-      <point x="57" y="391"/>
-      <point x="57" y="238" type="curve" smooth="yes"/>
-      <point x="57" y="85"/>
-      <point x="122" y="-7"/>
+      <point x="233" y="-7" type="curve" smooth="yes"/>
+      <point x="339" y="-7"/>
+      <point x="396" y="96"/>
+      <point x="429" y="188" type="curve"/>
+      <point x="418" y="200" type="line"/>
+      <point x="382" y="106"/>
+      <point x="331" y="11"/>
+      <point x="235" y="11" type="curve" smooth="yes"/>
+      <point x="145" y="11"/>
+      <point x="89" y="97"/>
+      <point x="89" y="240" type="curve" smooth="yes"/>
+      <point x="89" y="379"/>
+      <point x="146" y="468"/>
+      <point x="240" y="468" type="curve" smooth="yes"/>
+      <point x="351" y="468"/>
+      <point x="378" y="331"/>
+      <point x="400" y="253" type="curve" smooth="yes"/>
+      <point x="438" y="119" type="line" smooth="yes"/>
+      <point x="459" y="46"/>
+      <point x="477" y="-3"/>
+      <point x="530" y="-3" type="curve" smooth="yes"/>
+      <point x="551" y="-3"/>
+      <point x="570" y="5"/>
+      <point x="584" y="14" type="curve"/>
+      <point x="578" y="27" type="line"/>
+      <point x="568" y="21"/>
+      <point x="551" y="13"/>
+      <point x="534" y="13" type="curve" smooth="yes"/>
+      <point x="489" y="13"/>
+      <point x="474" y="60"/>
+      <point x="456" y="125" type="curve" smooth="yes"/>
+      <point x="419" y="258" type="line" smooth="yes"/>
+      <point x="394" y="348"/>
+      <point x="361" y="486"/>
+      <point x="241" y="486" type="curve" smooth="yes"/>
+      <point x="134" y="486"/>
+      <point x="68" y="391"/>
+      <point x="68" y="238" type="curve" smooth="yes"/>
+      <point x="68" y="85"/>
+      <point x="133" y="-7"/>
     </contour>
     <contour>
-      <point x="423" y="190" type="line"/>
-      <point x="521" y="480" type="line"/>
-      <point x="499" y="480" type="line"/>
-      <point x="411" y="202" type="line"/>
+      <point x="434" y="190" type="line"/>
+      <point x="532" y="480" type="line"/>
+      <point x="510" y="480" type="line"/>
+      <point x="422" y="202" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -59,9 +59,9 @@
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>=d</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
-      <string>=l-4</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
+      <string>l</string>
+      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
+      <string>=l-10</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphadasia.glif b/src/Cantarell-Light.ufo/glyphs/alphadasia.glif
index 23dbc1a4..1b52f08e 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphadasia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphadasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasia" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F01"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="684" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasia" xOffset="136"/>
+    <component base="dasia" xOffset="147"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphadasiaoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/alphadasiaoxia.glif
index 189b263c..9ce69566 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphadasiaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphadasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiaoxia" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F05"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasiaoxia" xOffset="89"/>
+    <component base="dasiaoxia" xOffset="100"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphadasiaoxiaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/alphadasiaoxiaypogegrammeni.glif
index fa654ed9..0baf9b1b 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphadasiaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphadasiaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiaoxiaypogegrammeni" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F85"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasiaoxia" xOffset="89"/>
-    <component base="ypogegrammeni" xOffset="17"/>
+    <component base="dasiaoxia" xOffset="100"/>
+    <component base="ypogegrammeni" xOffset="28"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphadasiaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/alphadasiaperispomeni.glif
index 3b065a75..d83363a9 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphadasiaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphadasiaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiaperispomeni" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F07"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="daspsiliiaperispomeni" xOffset="27"/>
+    <component base="daspsiliiaperispomeni" xOffset="8"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphadasiaperispomeniypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/alphadasiaperispomeniypogegrammeni.glif
index 3f7393c5..b470c63c 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphadasiaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphadasiaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiaperispomeniypogegrammeni" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F87"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="daspsiliiaperispomeni" xOffset="27"/>
-    <component base="ypogegrammeni" xOffset="17"/>
+    <component base="daspsiliiaperispomeni" xOffset="8"/>
+    <component base="ypogegrammeni" xOffset="28"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphadasiavaria.glif 
b/src/Cantarell-Light.ufo/glyphs/alphadasiavaria.glif
index 047ca263..9776385a 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphadasiavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphadasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiavaria" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F03"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasiavaria" xOffset="74"/>
+    <component base="dasiavaria" xOffset="85"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphadasiavariaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/alphadasiavariaypogegrammeni.glif
index 29ecea50..cd5ee493 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphadasiavariaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphadasiavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiavariaypogegrammeni" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F83"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasiavaria" xOffset="74"/>
-    <component base="ypogegrammeni" xOffset="17"/>
+    <component base="dasiavaria" xOffset="85"/>
+    <component base="ypogegrammeni" xOffset="28"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphadasiaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/alphadasiaypogegrammeni.glif
index cdcb94df..cd202295 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphadasiaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphadasiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiaypogegrammeni" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F81"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="684" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasia" xOffset="136"/>
-    <component base="ypogegrammeni" xOffset="17"/>
+    <component base="dasia" xOffset="147"/>
+    <component base="ypogegrammeni" xOffset="28"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphamacron.glif b/src/Cantarell-Light.ufo/glyphs/alphamacron.glif
index a566c707..58f16543 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphamacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphamacron.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphamacron" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1FB1"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="macron" xOffset="13"/>
+    <component base="macron" xOffset="4"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphaoxia.glif b/src/Cantarell-Light.ufo/glyphs/alphaoxia.glif
index 99608a48..c19b3941 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphaoxia" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F71"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="oxia" xOffset="151"/>
+    <component base="oxia" xOffset="162"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphaoxiaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/alphaoxiaypogegrammeni.glif
index bf6e016e..fdd16a09 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphaoxiaypogegrammeni" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1FB4"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="oxia" xOffset="151"/>
-    <component base="ypogegrammeni" xOffset="17"/>
+    <component base="oxia" xOffset="162"/>
+    <component base="ypogegrammeni" xOffset="28"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/alphaperispomeni.glif
index 02a5781e..62cabf5c 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphaperispomeni" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1FB6"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="612" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="perispomeni" xOffset="27"/>
+    <component base="perispomeni" xOffset="8"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphaperispomeniypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/alphaperispomeniypogegrammeni.glif
index b3aeab96..e1679ef0 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphaperispomeniypogegrammeni" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1FB7"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="612" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="perispomeni" xOffset="27"/>
-    <component base="ypogegrammeni" xOffset="17"/>
+    <component base="perispomeni" xOffset="8"/>
+    <component base="ypogegrammeni" xOffset="28"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphapsili.glif b/src/Cantarell-Light.ufo/glyphs/alphapsili.glif
index a4f0c364..8124776e 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphapsili.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphapsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsili" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F00"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="684" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psili" xOffset="146"/>
+    <component base="psili" xOffset="157"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphapsilioxia.glif 
b/src/Cantarell-Light.ufo/glyphs/alphapsilioxia.glif
index 10a42258..69455c4c 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphapsilioxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphapsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsilioxia" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F04"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psilioxia" xOffset="93"/>
+    <component base="psilioxia" xOffset="104"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphapsilioxiaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/alphapsilioxiaypogegrammeni.glif
index 2710c7cd..952249a3 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphapsilioxiaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphapsilioxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsilioxiaypogegrammeni" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F84"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psilioxia" xOffset="93"/>
-    <component base="ypogegrammeni" xOffset="17"/>
+    <component base="psilioxia" xOffset="104"/>
+    <component base="ypogegrammeni" xOffset="28"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphapsiliperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/alphapsiliperispomeni.glif
index 332da413..f38b008a 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphapsiliperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphapsiliperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsiliperispomeni" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F06"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psiliperispomeni" xOffset="27"/>
+    <component base="psiliperispomeni" xOffset="8"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphapsiliperispomeniypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/alphapsiliperispomeniypogegrammeni.glif
index 6d37d772..635ead53 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphapsiliperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphapsiliperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsiliperispomeniypogegrammeni" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F86"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psiliperispomeni" xOffset="27"/>
-    <component base="ypogegrammeni" xOffset="17"/>
+    <component base="psiliperispomeni" xOffset="8"/>
+    <component base="ypogegrammeni" xOffset="28"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphapsilivaria.glif 
b/src/Cantarell-Light.ufo/glyphs/alphapsilivaria.glif
index 7b6d2673..0dc4c9b1 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphapsilivaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphapsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsilivaria" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F02"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psilivaria" xOffset="75"/>
+    <component base="psilivaria" xOffset="86"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphapsilivariaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/alphapsilivariaypogegrammeni.glif
index d7efb212..56ee789a 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphapsilivariaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphapsilivariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsilivariaypogegrammeni" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F82"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psilivaria" xOffset="75"/>
-    <component base="ypogegrammeni" xOffset="17"/>
+    <component base="psilivaria" xOffset="86"/>
+    <component base="ypogegrammeni" xOffset="28"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphapsiliypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/alphapsiliypogegrammeni.glif
index 9c752ce7..9130b2a6 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphapsiliypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphapsiliypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsiliypogegrammeni" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F80"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="684" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psili" xOffset="146"/>
-    <component base="ypogegrammeni" xOffset="17"/>
+    <component base="psili" xOffset="157"/>
+    <component base="ypogegrammeni" xOffset="28"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphatonos.glif b/src/Cantarell-Light.ufo/glyphs/alphatonos.glif
index 6fc2468d..61905ee8 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphatonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphatonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphatonos" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="03AC"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="tonos" xOffset="151"/>
+    <component base="tonos" xOffset="162"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphavaria.glif b/src/Cantarell-Light.ufo/glyphs/alphavaria.glif
index 34988e34..0b164fcc 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphavaria" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1F70"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="varia" xOffset="113"/>
+    <component base="varia" xOffset="124"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphavariaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/alphavariaypogegrammeni.glif
index 5451b655..f2503e79 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphavariaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphavariaypogegrammeni" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1FB2"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="varia" xOffset="113"/>
-    <component base="ypogegrammeni" xOffset="17"/>
+    <component base="varia" xOffset="124"/>
+    <component base="ypogegrammeni" xOffset="28"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphavrachy.glif b/src/Cantarell-Light.ufo/glyphs/alphavrachy.glif
index b19290c0..13ab3135 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphavrachy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphavrachy.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphavrachy" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1FB0"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="665" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="vrachy" xOffset="58"/>
+    <component base="vrachy" xOffset="69"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/alphaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/alphaypogegrammeni.glif
index f6609045..494bb1bc 100644
--- a/src/Cantarell-Light.ufo/glyphs/alphaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/alphaypogegrammeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphaypogegrammeni" format="2">
-  <advance width="589"/>
+  <advance width="610"/>
   <unicode hex="1FB3"/>
-  <anchor x="225" y="0" name="bottom"/>
-  <anchor x="244" y="480" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="ypogegrammeni" xOffset="17"/>
+    <component base="ypogegrammeni" xOffset="28"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/beta.glif b/src/Cantarell-Light.ufo/glyphs/beta.glif
index ea0b545e..4eec9c42 100644
--- a/src/Cantarell-Light.ufo/glyphs/beta.glif
+++ b/src/Cantarell-Light.ufo/glyphs/beta.glif
@@ -4,50 +4,50 @@
   <unicode hex="03B2"/>
   <outline>
     <contour>
-      <point x="320" y="8" type="curve" smooth="yes"/>
-      <point x="231" y="8"/>
-      <point x="161" y="64"/>
-      <point x="112" y="130" type="curve"/>
-      <point x="105" y="108" type="line"/>
-      <point x="160" y="42"/>
-      <point x="225" y="-10"/>
-      <point x="321" y="-10" type="curve" smooth="yes"/>
-      <point x="427" y="-10"/>
-      <point x="497" y="65"/>
-      <point x="497" y="193" type="curve" smooth="yes"/>
-      <point x="497" y="318"/>
-      <point x="393" y="396"/>
-      <point x="284" y="396" type="curve"/>
-      <point x="283" y="393" type="line"/>
-      <point x="371" y="396"/>
-      <point x="447" y="475"/>
-      <point x="447" y="574" type="curve" smooth="yes"/>
-      <point x="447" y="672"/>
-      <point x="390" y="749"/>
-      <point x="281" y="749" type="curve" smooth="yes"/>
-      <point x="156" y="749"/>
-      <point x="97" y="661"/>
-      <point x="97" y="520" type="curve" smooth="yes"/>
-      <point x="97" y="-217" type="line"/>
-      <point x="118" y="-217" type="line"/>
-      <point x="118" y="524" type="line" smooth="yes"/>
-      <point x="118" y="652"/>
-      <point x="169" y="731"/>
-      <point x="279" y="731" type="curve" smooth="yes"/>
-      <point x="376" y="731"/>
-      <point x="426" y="662"/>
-      <point x="426" y="572" type="curve" smooth="yes"/>
-      <point x="426" y="478"/>
-      <point x="350" y="402"/>
-      <point x="261" y="402" type="curve" smooth="yes"/>
-      <point x="202" y="402" type="line"/>
-      <point x="202" y="385" type="line"/>
-      <point x="264" y="385" type="line" smooth="yes"/>
-      <point x="376" y="385"/>
-      <point x="476" y="315"/>
-      <point x="476" y="191" type="curve" smooth="yes"/>
-      <point x="476" y="77"/>
-      <point x="413" y="8"/>
+      <point x="325" y="8" type="curve" smooth="yes"/>
+      <point x="236" y="8"/>
+      <point x="166" y="64"/>
+      <point x="117" y="130" type="curve"/>
+      <point x="110" y="108" type="line"/>
+      <point x="165" y="42"/>
+      <point x="230" y="-10"/>
+      <point x="326" y="-10" type="curve" smooth="yes"/>
+      <point x="432" y="-10"/>
+      <point x="502" y="65"/>
+      <point x="502" y="193" type="curve" smooth="yes"/>
+      <point x="502" y="318"/>
+      <point x="398" y="396"/>
+      <point x="289" y="396" type="curve"/>
+      <point x="288" y="393" type="line"/>
+      <point x="376" y="396"/>
+      <point x="452" y="475"/>
+      <point x="452" y="574" type="curve" smooth="yes"/>
+      <point x="452" y="672"/>
+      <point x="395" y="749"/>
+      <point x="286" y="749" type="curve" smooth="yes"/>
+      <point x="161" y="749"/>
+      <point x="102" y="661"/>
+      <point x="102" y="520" type="curve" smooth="yes"/>
+      <point x="102" y="-217" type="line"/>
+      <point x="123" y="-217" type="line"/>
+      <point x="123" y="524" type="line" smooth="yes"/>
+      <point x="123" y="652"/>
+      <point x="174" y="731"/>
+      <point x="284" y="731" type="curve" smooth="yes"/>
+      <point x="381" y="731"/>
+      <point x="431" y="662"/>
+      <point x="431" y="572" type="curve" smooth="yes"/>
+      <point x="431" y="478"/>
+      <point x="355" y="402"/>
+      <point x="266" y="402" type="curve" smooth="yes"/>
+      <point x="207" y="402" type="line"/>
+      <point x="207" y="385" type="line"/>
+      <point x="269" y="385" type="line" smooth="yes"/>
+      <point x="381" y="385"/>
+      <point x="481" y="315"/>
+      <point x="481" y="191" type="curve" smooth="yes"/>
+      <point x="481" y="77"/>
+      <point x="418" y="8"/>
     </contour>
   </outline>
   <lib>
@@ -58,8 +58,6 @@
       <string>=germandbls</string>
       <key>com.schriftgestaltung.Glyphs.layer.leftMetricsKey</key>
       <string>=germandbls-5</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/chi.glif b/src/Cantarell-Light.ufo/glyphs/chi.glif
index 480f0cf4..fdc5a18a 100644
--- a/src/Cantarell-Light.ufo/glyphs/chi.glif
+++ b/src/Cantarell-Light.ufo/glyphs/chi.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chi" format="2">
-  <advance width="479"/>
+  <advance width="488"/>
   <unicode hex="03C7"/>
   <outline>
     <contour>
-      <point x="436" y="-217" type="line"/>
-      <point x="459" y="-217" type="line"/>
-      <point x="246" y="145" type="line"/>
-      <point x="50" y="480" type="line"/>
-      <point x="27" y="480" type="line"/>
-      <point x="236" y="126" type="line"/>
+      <point x="441" y="-217" type="line"/>
+      <point x="464" y="-217" type="line"/>
+      <point x="251" y="145" type="line"/>
+      <point x="55" y="480" type="line"/>
+      <point x="32" y="480" type="line"/>
+      <point x="241" y="126" type="line"/>
     </contour>
     <contour>
-      <point x="27" y="-217" type="line"/>
-      <point x="50" y="-217" type="line"/>
-      <point x="244" y="121" type="line"/>
-      <point x="233" y="139" type="line"/>
+      <point x="32" y="-217" type="line"/>
+      <point x="55" y="-217" type="line"/>
+      <point x="249" y="121" type="line"/>
+      <point x="238" y="139" type="line"/>
     </contour>
     <contour>
-      <point x="251" y="131" type="line"/>
-      <point x="453" y="480" type="line"/>
-      <point x="430" y="480" type="line"/>
-      <point x="239" y="147" type="line"/>
+      <point x="256" y="131" type="line"/>
+      <point x="458" y="480" type="line"/>
+      <point x="435" y="480" type="line"/>
+      <point x="244" y="147" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -32,8 +32,6 @@
       <string>=x-5</string>
       <key>com.schriftgestaltung.Glyphs.layer.leftMetricsKey</key>
       <string>=x</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dasia.case.glif b/src/Cantarell-Light.ufo/glyphs/dasia.case.glif
index cd85cd97..e7cb8264 100644
--- a/src/Cantarell-Light.ufo/glyphs/dasia.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dasia.case.glif
@@ -12,8 +12,6 @@
       <string>dasia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>dasia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dasia.glif b/src/Cantarell-Light.ufo/glyphs/dasia.glif
index eabec2f5..f72f9508 100644
--- a/src/Cantarell-Light.ufo/glyphs/dasia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dasia.glif
@@ -7,10 +7,4 @@
   <outline>
     <component base="psili" xScale="-1" xOffset="202"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dasiaoxia.case.glif 
b/src/Cantarell-Light.ufo/glyphs/dasiaoxia.case.glif
index fa44799a..3e4423b0 100644
--- a/src/Cantarell-Light.ufo/glyphs/dasiaoxia.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dasiaoxia.case.glif
@@ -11,8 +11,6 @@
       <string>dasiaoxia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>dasiaoxia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dasiaoxia.glif b/src/Cantarell-Light.ufo/glyphs/dasiaoxia.glif
index 4b440c8a..7908d50d 100644
--- a/src/Cantarell-Light.ufo/glyphs/dasiaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dasiaoxia.glif
@@ -33,8 +33,6 @@
       <string>dasia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>oxia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dasiaperispomeni.case.glif 
b/src/Cantarell-Light.ufo/glyphs/dasiaperispomeni.case.glif
index f1838df5..af14649a 100644
--- a/src/Cantarell-Light.ufo/glyphs/dasiaperispomeni.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dasiaperispomeni.case.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dasiaperispomeni.case" format="2">
-  <advance width="482"/>
+  <advance width="500"/>
   <anchor x="339" y="815" name="_topleft"/>
   <outline>
     <component base="daspsiliiaperispomeni"/>
@@ -11,8 +11,6 @@
       <string>dasiaperispomeni</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>dasiaperispomeni</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dasiavaria.case.glif 
b/src/Cantarell-Light.ufo/glyphs/dasiavaria.case.glif
index 51b210ec..1ccaca20 100644
--- a/src/Cantarell-Light.ufo/glyphs/dasiavaria.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dasiavaria.case.glif
@@ -11,8 +11,6 @@
       <string>dasiavaria</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>dasiavaria</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dasiavaria.glif b/src/Cantarell-Light.ufo/glyphs/dasiavaria.glif
index 5318c7a3..3ab1e26b 100644
--- a/src/Cantarell-Light.ufo/glyphs/dasiavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dasiavaria.glif
@@ -33,8 +33,6 @@
       <string>dasia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>varia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/daspsiliiaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/daspsiliiaperispomeni.glif
index abd3e503..c722b8e8 100644
--- a/src/Cantarell-Light.ufo/glyphs/daspsiliiaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/daspsiliiaperispomeni.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="daspsiliiaperispomeni" format="2">
-  <advance width="482"/>
-  <anchor x="217" y="480" name="_top"/>
+  <advance width="500"/>
+  <anchor x="247" y="480" name="_top"/>
   <outline>
-    <component base="dasia" xOffset="109"/>
+    <component base="dasia" xOffset="139"/>
     <component base="perispomeni" yOffset="204"/>
   </outline>
   <lib>
diff --git a/src/Cantarell-Light.ufo/glyphs/delta.glif b/src/Cantarell-Light.ufo/glyphs/delta.glif
index c0924d25..a6a255b3 100644
--- a/src/Cantarell-Light.ufo/glyphs/delta.glif
+++ b/src/Cantarell-Light.ufo/glyphs/delta.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="delta" format="2">
-  <advance width="533"/>
+  <advance width="555"/>
   <unicode hex="03B4"/>
   <outline>
     <contour>
-      <point x="457" y="688" type="line"/>
-      <point x="404" y="719"/>
-      <point x="330" y="749"/>
-      <point x="254" y="749" type="curve" smooth="yes"/>
-      <point x="164" y="749"/>
-      <point x="111" y="706"/>
-      <point x="111" y="640" type="curve" smooth="yes"/>
-      <point x="111" y="574"/>
-      <point x="164" y="523"/>
-      <point x="263" y="459" type="curve" smooth="yes"/>
-      <point x="379" y="383"/>
-      <point x="455" y="311"/>
-      <point x="455" y="192" type="curve" smooth="yes"/>
-      <point x="455" y="87"/>
-      <point x="384" y="8"/>
-      <point x="266" y="8" type="curve" smooth="yes"/>
-      <point x="154" y="8"/>
-      <point x="78" y="92"/>
-      <point x="78" y="197" type="curve" smooth="yes"/>
-      <point x="78" y="297"/>
-      <point x="148" y="391"/>
-      <point x="274" y="461" type="curve"/>
-      <point x="261" y="471" type="line"/>
-      <point x="136" y="403"/>
-      <point x="57" y="308"/>
-      <point x="57" y="194" type="curve" smooth="yes"/>
-      <point x="57" y="78"/>
-      <point x="141" y="-10"/>
-      <point x="264" y="-10" type="curve" smooth="yes"/>
-      <point x="394" y="-10"/>
-      <point x="476" y="77"/>
-      <point x="476" y="195" type="curve" smooth="yes"/>
-      <point x="476" y="317"/>
-      <point x="397" y="396"/>
-      <point x="276" y="473" type="curve" smooth="yes"/>
-      <point x="178" y="535"/>
-      <point x="132" y="584"/>
-      <point x="132" y="643" type="curve" smooth="yes"/>
-      <point x="132" y="696"/>
-      <point x="180" y="731"/>
-      <point x="256" y="731" type="curve" smooth="yes"/>
-      <point x="324" y="731"/>
-      <point x="400" y="703"/>
-      <point x="451" y="674" type="curve"/>
+      <point x="468" y="688" type="line"/>
+      <point x="415" y="719"/>
+      <point x="341" y="749"/>
+      <point x="265" y="749" type="curve" smooth="yes"/>
+      <point x="175" y="749"/>
+      <point x="122" y="706"/>
+      <point x="122" y="640" type="curve" smooth="yes"/>
+      <point x="122" y="574"/>
+      <point x="175" y="523"/>
+      <point x="274" y="459" type="curve" smooth="yes"/>
+      <point x="390" y="383"/>
+      <point x="466" y="311"/>
+      <point x="466" y="192" type="curve" smooth="yes"/>
+      <point x="466" y="87"/>
+      <point x="395" y="8"/>
+      <point x="277" y="8" type="curve" smooth="yes"/>
+      <point x="165" y="8"/>
+      <point x="89" y="92"/>
+      <point x="89" y="197" type="curve" smooth="yes"/>
+      <point x="89" y="297"/>
+      <point x="159" y="391"/>
+      <point x="285" y="461" type="curve"/>
+      <point x="272" y="471" type="line"/>
+      <point x="147" y="403"/>
+      <point x="68" y="308"/>
+      <point x="68" y="194" type="curve" smooth="yes"/>
+      <point x="68" y="78"/>
+      <point x="152" y="-10"/>
+      <point x="275" y="-10" type="curve" smooth="yes"/>
+      <point x="405" y="-10"/>
+      <point x="487" y="77"/>
+      <point x="487" y="195" type="curve" smooth="yes"/>
+      <point x="487" y="317"/>
+      <point x="408" y="396"/>
+      <point x="287" y="473" type="curve" smooth="yes"/>
+      <point x="189" y="535"/>
+      <point x="143" y="584"/>
+      <point x="143" y="643" type="curve" smooth="yes"/>
+      <point x="143" y="696"/>
+      <point x="191" y="731"/>
+      <point x="267" y="731" type="curve" smooth="yes"/>
+      <point x="335" y="731"/>
+      <point x="411" y="703"/>
+      <point x="462" y="674" type="curve"/>
     </contour>
   </outline>
   <lib>
@@ -56,8 +56,6 @@
       <string>=o</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=o</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dialytikaoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/dialytikaoxia.glif
index 71ce7f8f..5e7fb988 100644
--- a/src/Cantarell-Light.ufo/glyphs/dialytikaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dialytikaoxia.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dialytikaoxia" format="2">
-  <advance width="438"/>
+  <advance width="500"/>
   <unicode hex="1FEE"/>
-  <anchor x="200" y="480" name="_top"/>
+  <anchor x="232" y="480" name="_top"/>
   <outline>
-    <component base="dieresistonos" xOffset="-1"/>
+    <component base="dieresistonos" xOffset="31"/>
   </outline>
   <lib>
     <dict>
@@ -12,8 +12,6 @@
       <string>=dieresis</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=dieresis</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dialytikaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/dialytikaperispomeni.glif
index ddc5d0e2..62820862 100644
--- a/src/Cantarell-Light.ufo/glyphs/dialytikaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dialytikaperispomeni.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dialytikaperispomeni" format="2">
-  <advance width="482"/>
+  <advance width="500"/>
   <unicode hex="1FC1"/>
-  <anchor x="217" y="480" name="_top"/>
+  <anchor x="247" y="480" name="_top"/>
   <outline>
-    <component base="dieresiscomb" xOffset="-2"/>
+    <component base="dieresiscomb" xOffset="28"/>
     <component base="perispomeni" yOffset="159"/>
   </outline>
   <lib>
@@ -13,8 +13,6 @@
       <string>=perispomeni</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=perispomeni</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dialytikavaria.glif 
b/src/Cantarell-Light.ufo/glyphs/dialytikavaria.glif
index a4571b06..3a60ed86 100644
--- a/src/Cantarell-Light.ufo/glyphs/dialytikavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dialytikavaria.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dialytikavaria" format="2">
-  <advance width="438"/>
+  <advance width="500"/>
   <unicode hex="1FED"/>
-  <anchor x="238" y="480" name="_top"/>
+  <anchor x="270" y="480" name="_top"/>
   <outline>
-    <component base="dieresistonos" xScale="-1" xOffset="437"/>
+    <component base="dieresistonos" xScale="-1" xOffset="469"/>
   </outline>
   <lib>
     <dict>
@@ -12,8 +12,6 @@
       <string>dieresis</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>dieresis</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/dieresistonos.glif 
b/src/Cantarell-Light.ufo/glyphs/dieresistonos.glif
index 9b2b48f1..43d9144c 100644
--- a/src/Cantarell-Light.ufo/glyphs/dieresistonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/dieresistonos.glif
@@ -45,8 +45,6 @@
       <string>=dieresiscomb</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=dieresiscomb</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/epsilon.glif b/src/Cantarell-Light.ufo/glyphs/epsilon.glif
index c39b4a72..98d1e9e3 100644
--- a/src/Cantarell-Light.ufo/glyphs/epsilon.glif
+++ b/src/Cantarell-Light.ufo/glyphs/epsilon.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilon" format="2">
-  <advance width="447"/>
+  <advance width="474"/>
   <unicode hex="03B5"/>
-  <anchor x="237" y="0" name="bottom"/>
-  <anchor x="222" y="480" name="top"/>
+  <anchor x="248" y="0" name="bottom"/>
+  <anchor x="233" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="234" y="-7" type="curve" smooth="yes"/>
-      <point x="303" y="-7"/>
-      <point x="372" y="15"/>
-      <point x="425" y="42" type="curve"/>
-      <point x="420" y="56" type="line"/>
-      <point x="368" y="32"/>
-      <point x="298" y="11"/>
-      <point x="240" y="11" type="curve" smooth="yes"/>
-      <point x="134" y="11"/>
-      <point x="69" y="53"/>
-      <point x="69" y="127" type="curve" smooth="yes"/>
-      <point x="69" y="199"/>
-      <point x="143" y="244"/>
-      <point x="242" y="244" type="curve" smooth="yes"/>
-      <point x="320" y="244" type="line"/>
-      <point x="320" y="261" type="line"/>
-      <point x="246" y="261" type="line" smooth="yes"/>
-      <point x="148" y="261"/>
-      <point x="86" y="300"/>
-      <point x="86" y="364" type="curve" smooth="yes"/>
-      <point x="86" y="430"/>
-      <point x="144" y="468"/>
-      <point x="237" y="468" type="curve" smooth="yes"/>
-      <point x="287" y="468"/>
-      <point x="336" y="457"/>
-      <point x="390" y="436" type="curve"/>
-      <point x="394" y="450" type="line"/>
-      <point x="337" y="475"/>
-      <point x="283" y="486"/>
-      <point x="235" y="486" type="curve" smooth="yes"/>
-      <point x="131" y="486"/>
-      <point x="66" y="438"/>
-      <point x="66" y="366" type="curve" smooth="yes"/>
-      <point x="66" y="298"/>
-      <point x="126" y="251"/>
-      <point x="211" y="250" type="curve"/>
-      <point x="213" y="255" type="line"/>
-      <point x="124" y="256"/>
-      <point x="49" y="206"/>
-      <point x="49" y="124" type="curve" smooth="yes"/>
-      <point x="49" y="45"/>
-      <point x="120" y="-7"/>
+      <point x="245" y="-7" type="curve" smooth="yes"/>
+      <point x="314" y="-7"/>
+      <point x="383" y="15"/>
+      <point x="436" y="42" type="curve"/>
+      <point x="431" y="56" type="line"/>
+      <point x="379" y="32"/>
+      <point x="309" y="11"/>
+      <point x="251" y="11" type="curve" smooth="yes"/>
+      <point x="145" y="11"/>
+      <point x="80" y="53"/>
+      <point x="80" y="127" type="curve" smooth="yes"/>
+      <point x="80" y="199"/>
+      <point x="154" y="244"/>
+      <point x="253" y="244" type="curve" smooth="yes"/>
+      <point x="331" y="244" type="line"/>
+      <point x="331" y="261" type="line"/>
+      <point x="257" y="261" type="line" smooth="yes"/>
+      <point x="159" y="261"/>
+      <point x="97" y="300"/>
+      <point x="97" y="364" type="curve" smooth="yes"/>
+      <point x="97" y="430"/>
+      <point x="155" y="468"/>
+      <point x="248" y="468" type="curve" smooth="yes"/>
+      <point x="298" y="468"/>
+      <point x="347" y="457"/>
+      <point x="401" y="436" type="curve"/>
+      <point x="405" y="450" type="line"/>
+      <point x="348" y="475"/>
+      <point x="294" y="486"/>
+      <point x="246" y="486" type="curve" smooth="yes"/>
+      <point x="142" y="486"/>
+      <point x="77" y="438"/>
+      <point x="77" y="366" type="curve" smooth="yes"/>
+      <point x="77" y="298"/>
+      <point x="137" y="251"/>
+      <point x="222" y="250" type="curve"/>
+      <point x="224" y="255" type="line"/>
+      <point x="135" y="256"/>
+      <point x="60" y="206"/>
+      <point x="60" y="124" type="curve" smooth="yes"/>
+      <point x="60" y="45"/>
+      <point x="131" y="-7"/>
     </contour>
   </outline>
   <lib>
@@ -58,8 +58,6 @@
       <string>=e-25</string>
       <key>com.schriftgestaltung.Glyphs.layer.leftMetricsKey</key>
       <string>=o-8</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/epsilondasia.glif 
b/src/Cantarell-Light.ufo/glyphs/epsilondasia.glif
index e382912d..fdc0e97b 100644
--- a/src/Cantarell-Light.ufo/glyphs/epsilondasia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/epsilondasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilondasia" format="2">
-  <advance width="447"/>
+  <advance width="474"/>
   <unicode hex="1F11"/>
-  <anchor x="237" y="0" name="bottom"/>
-  <anchor x="222" y="684" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="dasia" xOffset="114"/>
+    <component base="dasia" xOffset="125"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/epsilondasiaoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/epsilondasiaoxia.glif
index e5d733fb..11a2574a 100644
--- a/src/Cantarell-Light.ufo/glyphs/epsilondasiaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/epsilondasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilondasiaoxia" format="2">
-  <advance width="447"/>
+  <advance width="474"/>
   <unicode hex="1F15"/>
-  <anchor x="237" y="0" name="bottom"/>
-  <anchor x="222" y="480" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="dasiaoxia" xOffset="67"/>
+    <component base="dasiaoxia" xOffset="78"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/epsilondasiavaria.glif 
b/src/Cantarell-Light.ufo/glyphs/epsilondasiavaria.glif
index acbfbdfb..0578562b 100644
--- a/src/Cantarell-Light.ufo/glyphs/epsilondasiavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/epsilondasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilondasiavaria" format="2">
-  <advance width="447"/>
+  <advance width="474"/>
   <unicode hex="1F13"/>
-  <anchor x="237" y="0" name="bottom"/>
-  <anchor x="222" y="480" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="dasiavaria" xOffset="52"/>
+    <component base="dasiavaria" xOffset="63"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/epsilonoxia.glif b/src/Cantarell-Light.ufo/glyphs/epsilonoxia.glif
index 0ff161f0..2177346b 100644
--- a/src/Cantarell-Light.ufo/glyphs/epsilonoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/epsilonoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilonoxia" format="2">
-  <advance width="447"/>
+  <advance width="474"/>
   <unicode hex="1F73"/>
-  <anchor x="237" y="0" name="bottom"/>
-  <anchor x="222" y="480" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="oxia" xOffset="129"/>
+    <component base="oxia" xOffset="140"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/epsilonpsili.glif 
b/src/Cantarell-Light.ufo/glyphs/epsilonpsili.glif
index 8361ff72..854c99fe 100644
--- a/src/Cantarell-Light.ufo/glyphs/epsilonpsili.glif
+++ b/src/Cantarell-Light.ufo/glyphs/epsilonpsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilonpsili" format="2">
-  <advance width="447"/>
+  <advance width="474"/>
   <unicode hex="1F10"/>
-  <anchor x="237" y="0" name="bottom"/>
-  <anchor x="222" y="684" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="psili" xOffset="124"/>
+    <component base="psili" xOffset="135"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/epsilonpsilioxia.glif 
b/src/Cantarell-Light.ufo/glyphs/epsilonpsilioxia.glif
index 8f276d03..a6c955f8 100644
--- a/src/Cantarell-Light.ufo/glyphs/epsilonpsilioxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/epsilonpsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilonpsilioxia" format="2">
-  <advance width="447"/>
+  <advance width="474"/>
   <unicode hex="1F14"/>
-  <anchor x="237" y="0" name="bottom"/>
-  <anchor x="222" y="480" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="psilioxia" xOffset="71"/>
+    <component base="psilioxia" xOffset="82"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/epsilonpsilivaria.glif 
b/src/Cantarell-Light.ufo/glyphs/epsilonpsilivaria.glif
index 66c19da1..9ff96c75 100644
--- a/src/Cantarell-Light.ufo/glyphs/epsilonpsilivaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/epsilonpsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilonpsilivaria" format="2">
-  <advance width="447"/>
+  <advance width="474"/>
   <unicode hex="1F12"/>
-  <anchor x="237" y="0" name="bottom"/>
-  <anchor x="222" y="480" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="psilivaria" xOffset="53"/>
+    <component base="psilivaria" xOffset="64"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/epsilontonos.glif 
b/src/Cantarell-Light.ufo/glyphs/epsilontonos.glif
index 3bbbc7f6..ed6da2c9 100644
--- a/src/Cantarell-Light.ufo/glyphs/epsilontonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/epsilontonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilontonos" format="2">
-  <advance width="447"/>
+  <advance width="474"/>
   <unicode hex="03AD"/>
-  <anchor x="237" y="0" name="bottom"/>
-  <anchor x="222" y="480" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="tonos" xOffset="129"/>
+    <component base="tonos" xOffset="140"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/epsilonvaria.glif 
b/src/Cantarell-Light.ufo/glyphs/epsilonvaria.glif
index 71b5b34a..6a3e007a 100644
--- a/src/Cantarell-Light.ufo/glyphs/epsilonvaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/epsilonvaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilonvaria" format="2">
-  <advance width="447"/>
+  <advance width="474"/>
   <unicode hex="1F72"/>
-  <anchor x="237" y="0" name="bottom"/>
-  <anchor x="222" y="480" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="varia" xOffset="91"/>
+    <component base="varia" xOffset="102"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/eta.glif b/src/Cantarell-Light.ufo/glyphs/eta.glif
index a2193dcd..4c686009 100644
--- a/src/Cantarell-Light.ufo/glyphs/eta.glif
+++ b/src/Cantarell-Light.ufo/glyphs/eta.glif
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eta" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="03B7"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
+  <anchor x="117" y="0" name="bottom"/>
+  <anchor x="281" 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="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="399" type="line"/>
+      <point x="124" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="423" y="-217" type="line"/>
-      <point x="444" y="-217" type="line"/>
-      <point x="444" y="314" type="line" smooth="yes"/>
-      <point x="444" 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="423" y="411"/>
-      <point x="423" y="314" type="curve" smooth="yes"/>
+      <point x="442" y="-217" type="line"/>
+      <point x="463" y="-217" type="line"/>
+      <point x="463" y="314" type="line" smooth="yes"/>
+      <point x="463" y="421"/>
+      <point x="405" y="486"/>
+      <point x="299" y="486" type="curve" smooth="yes"/>
+      <point x="223" y="486"/>
+      <point x="153" y="454"/>
+      <point x="112" y="399" type="curve"/>
+      <point x="121" y="388" type="line"/>
+      <point x="155" y="436"/>
+      <point x="225" y="468"/>
+      <point x="296" y="468" type="curve" smooth="yes"/>
+      <point x="391" y="468"/>
+      <point x="442" y="411"/>
+      <point x="442" y="314" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
@@ -37,8 +37,6 @@
       <string>=n</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=n</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etadasia.glif b/src/Cantarell-Light.ufo/glyphs/etadasia.glif
index 4288565e..dbf41fe5 100644
--- a/src/Cantarell-Light.ufo/glyphs/etadasia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etadasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasia" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F21"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="684" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasia" xOffset="154"/>
+    <component base="dasia" xOffset="173"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etadasiaoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/etadasiaoxia.glif
index e703f6c8..d9b99bed 100644
--- a/src/Cantarell-Light.ufo/glyphs/etadasiaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etadasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiaoxia" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F25"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasiaoxia" xOffset="107"/>
+    <component base="dasiaoxia" xOffset="126"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etadasiaoxiaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/etadasiaoxiaypogegrammeni.glif
index 0738b208..d57ee9f3 100644
--- a/src/Cantarell-Light.ufo/glyphs/etadasiaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etadasiaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiaoxiaypogegrammeni" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F95"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasiaoxia" xOffset="107"/>
-    <component base="ypogegrammeni" xOffset="-110"/>
+    <component base="dasiaoxia" xOffset="126"/>
+    <component base="ypogegrammeni" xOffset="-91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etadasiaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/etadasiaperispomeni.glif
index d91e2993..adc52054 100644
--- a/src/Cantarell-Light.ufo/glyphs/etadasiaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etadasiaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiaperispomeni" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F27"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="daspsiliiaperispomeni" xOffset="45"/>
+    <component base="daspsiliiaperispomeni" xOffset="34"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etadasiaperispomeniypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/etadasiaperispomeniypogegrammeni.glif
index 68cffccd..d7f1f490 100644
--- a/src/Cantarell-Light.ufo/glyphs/etadasiaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etadasiaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiaperispomeniypogegrammeni" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F97"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="daspsiliiaperispomeni" xOffset="45"/>
-    <component base="ypogegrammeni" xOffset="-110"/>
+    <component base="daspsiliiaperispomeni" xOffset="34"/>
+    <component base="ypogegrammeni" xOffset="-91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etadasiavaria.glif 
b/src/Cantarell-Light.ufo/glyphs/etadasiavaria.glif
index e23dff3a..65bb42aa 100644
--- a/src/Cantarell-Light.ufo/glyphs/etadasiavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etadasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiavaria" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F23"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasiavaria" xOffset="92"/>
+    <component base="dasiavaria" xOffset="111"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etadasiavariaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/etadasiavariaypogegrammeni.glif
index 8f303dc5..a7b25f89 100644
--- a/src/Cantarell-Light.ufo/glyphs/etadasiavariaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etadasiavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiavariaypogegrammeni" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F93"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasiavaria" xOffset="92"/>
-    <component base="ypogegrammeni" xOffset="-110"/>
+    <component base="dasiavaria" xOffset="111"/>
+    <component base="ypogegrammeni" xOffset="-91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etadasiaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/etadasiaypogegrammeni.glif
index 6b2439e7..af662f5c 100644
--- a/src/Cantarell-Light.ufo/glyphs/etadasiaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etadasiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiaypogegrammeni" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F91"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="684" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasia" xOffset="154"/>
-    <component base="ypogegrammeni" xOffset="-110"/>
+    <component base="dasia" xOffset="173"/>
+    <component base="ypogegrammeni" xOffset="-91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etaoxia.glif b/src/Cantarell-Light.ufo/glyphs/etaoxia.glif
index 2a3ddc1c..3787825e 100644
--- a/src/Cantarell-Light.ufo/glyphs/etaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etaoxia" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F75"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="oxia" xOffset="169"/>
+    <component base="oxia" xOffset="188"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etaoxiaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/etaoxiaypogegrammeni.glif
index 88f3c504..bd1c85ad 100644
--- a/src/Cantarell-Light.ufo/glyphs/etaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etaoxiaypogegrammeni" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1FC4"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="oxia" xOffset="169"/>
-    <component base="ypogegrammeni" xOffset="-110"/>
+    <component base="oxia" xOffset="188"/>
+    <component base="ypogegrammeni" xOffset="-91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/etaperispomeni.glif
index 93e875f1..7d7390bb 100644
--- a/src/Cantarell-Light.ufo/glyphs/etaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etaperispomeni" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1FC6"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="612" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="perispomeni" xOffset="45"/>
+    <component base="perispomeni" xOffset="34"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etaperispomeniypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/etaperispomeniypogegrammeni.glif
index 860d7972..3479c07c 100644
--- a/src/Cantarell-Light.ufo/glyphs/etaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etaperispomeniypogegrammeni" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1FC7"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="612" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="perispomeni" xOffset="45"/>
-    <component base="ypogegrammeni" xOffset="-110"/>
+    <component base="perispomeni" xOffset="34"/>
+    <component base="ypogegrammeni" xOffset="-91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etapsili.glif b/src/Cantarell-Light.ufo/glyphs/etapsili.glif
index b9b270ab..166c1157 100644
--- a/src/Cantarell-Light.ufo/glyphs/etapsili.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etapsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsili" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F20"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="684" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psili" xOffset="164"/>
+    <component base="psili" xOffset="183"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etapsilioxia.glif 
b/src/Cantarell-Light.ufo/glyphs/etapsilioxia.glif
index 589f346a..07fdb298 100644
--- a/src/Cantarell-Light.ufo/glyphs/etapsilioxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etapsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsilioxia" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F24"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psilioxia" xOffset="111"/>
+    <component base="psilioxia" xOffset="130"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etapsilioxiaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/etapsilioxiaypogegrammeni.glif
index 744c489b..99acac79 100644
--- a/src/Cantarell-Light.ufo/glyphs/etapsilioxiaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etapsilioxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsilioxiaypogegrammeni" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F94"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psilioxia" xOffset="111"/>
-    <component base="ypogegrammeni" xOffset="-110"/>
+    <component base="psilioxia" xOffset="130"/>
+    <component base="ypogegrammeni" xOffset="-91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etapsiliperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/etapsiliperispomeni.glif
index 2fe27d26..c9293aca 100644
--- a/src/Cantarell-Light.ufo/glyphs/etapsiliperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etapsiliperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsiliperispomeni" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F26"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psiliperispomeni" xOffset="45"/>
+    <component base="psiliperispomeni" xOffset="34"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etapsiliperispomeniypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/etapsiliperispomeniypogegrammeni.glif
index 2e3496f7..8fc0de04 100644
--- a/src/Cantarell-Light.ufo/glyphs/etapsiliperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etapsiliperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsiliperispomeniypogegrammeni" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F96"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psiliperispomeni" xOffset="45"/>
-    <component base="ypogegrammeni" xOffset="-110"/>
+    <component base="psiliperispomeni" xOffset="34"/>
+    <component base="ypogegrammeni" xOffset="-91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etapsilivaria.glif 
b/src/Cantarell-Light.ufo/glyphs/etapsilivaria.glif
index bb748f7f..90c4b949 100644
--- a/src/Cantarell-Light.ufo/glyphs/etapsilivaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etapsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsilivaria" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F22"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psilivaria" xOffset="93"/>
+    <component base="psilivaria" xOffset="112"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etapsilivariaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/etapsilivariaypogegrammeni.glif
index 53811b45..daf0a887 100644
--- a/src/Cantarell-Light.ufo/glyphs/etapsilivariaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etapsilivariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsilivariaypogegrammeni" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F92"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psilivaria" xOffset="93"/>
-    <component base="ypogegrammeni" xOffset="-110"/>
+    <component base="psilivaria" xOffset="112"/>
+    <component base="ypogegrammeni" xOffset="-91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etapsiliypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/etapsiliypogegrammeni.glif
index 7cbc7492..a1df0329 100644
--- a/src/Cantarell-Light.ufo/glyphs/etapsiliypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etapsiliypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsiliypogegrammeni" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F90"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="684" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psili" xOffset="164"/>
-    <component base="ypogegrammeni" xOffset="-110"/>
+    <component base="psili" xOffset="183"/>
+    <component base="ypogegrammeni" xOffset="-91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etatonos.glif b/src/Cantarell-Light.ufo/glyphs/etatonos.glif
index c317b610..5e91c0c1 100644
--- a/src/Cantarell-Light.ufo/glyphs/etatonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etatonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etatonos" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="03AE"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="tonos" xOffset="169"/>
+    <component base="tonos" xOffset="188"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etavaria.glif b/src/Cantarell-Light.ufo/glyphs/etavaria.glif
index f7e4706e..804b1957 100644
--- a/src/Cantarell-Light.ufo/glyphs/etavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etavaria" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1F74"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="varia" xOffset="131"/>
+    <component base="varia" xOffset="150"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etavariaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/etavariaypogegrammeni.glif
index 8499017a..199e68f0 100644
--- a/src/Cantarell-Light.ufo/glyphs/etavariaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etavariaypogegrammeni" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1FC2"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="varia" xOffset="131"/>
-    <component base="ypogegrammeni" xOffset="-110"/>
+    <component base="varia" xOffset="150"/>
+    <component base="ypogegrammeni" xOffset="-91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/etaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/etaypogegrammeni.glif
index a402237d..8d25b250 100644
--- a/src/Cantarell-Light.ufo/glyphs/etaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/etaypogegrammeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etaypogegrammeni" format="2">
-  <advance width="523"/>
+  <advance width="561"/>
   <unicode hex="1FC3"/>
-  <anchor x="98" y="0" name="bottom"/>
-  <anchor x="262" y="480" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="ypogegrammeni" xOffset="-110"/>
+    <component base="ypogegrammeni" xOffset="-91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/gamma.glif b/src/Cantarell-Light.ufo/glyphs/gamma.glif
index 50a4fa2a..24bc58c5 100644
--- a/src/Cantarell-Light.ufo/glyphs/gamma.glif
+++ b/src/Cantarell-Light.ufo/glyphs/gamma.glif
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gamma" format="2">
-  <advance width="458"/>
+  <advance width="468"/>
   <unicode hex="03B3"/>
   <outline>
     <contour>
-      <point x="227" y="-4" type="line"/>
-      <point x="246" y="-2" type="line"/>
-      <point x="303" y="124" type="line" smooth="yes"/>
-      <point x="365" y="261"/>
-      <point x="416" y="371"/>
-      <point x="416" y="480" type="curve"/>
-      <point x="395" y="480" type="line"/>
-      <point x="395" y="374"/>
-      <point x="344" y="262"/>
-      <point x="287" y="134" type="curve" smooth="yes"/>
-      <point x="232" y="10" type="line"/>
-      <point x="241" y="10" type="line"/>
-      <point x="50" y="480" type="line"/>
-      <point x="27" y="480" type="line"/>
+      <point x="232" y="-4" type="line"/>
+      <point x="251" y="-2" type="line"/>
+      <point x="308" y="124" type="line" smooth="yes"/>
+      <point x="370" y="261"/>
+      <point x="421" y="371"/>
+      <point x="421" y="480" type="curve"/>
+      <point x="400" y="480" type="line"/>
+      <point x="400" y="374"/>
+      <point x="349" y="262"/>
+      <point x="292" y="134" type="curve" smooth="yes"/>
+      <point x="237" y="10" type="line"/>
+      <point x="246" y="10" type="line"/>
+      <point x="55" y="480" type="line"/>
+      <point x="32" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="225" y="-217" type="line"/>
-      <point x="249" y="-217" type="line"/>
-      <point x="246" y="-2" type="line"/>
-      <point x="227" y="-4" type="line"/>
+      <point x="230" y="-217" type="line"/>
+      <point x="254" y="-217" type="line"/>
+      <point x="251" y="-2" type="line"/>
+      <point x="232" y="-4" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -32,8 +32,6 @@
       <string>=nu</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=nu</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iota.glif b/src/Cantarell-Light.ufo/glyphs/iota.glif
index 3b64875b..798bc5a7 100644
--- a/src/Cantarell-Light.ufo/glyphs/iota.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iota.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iota" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="03B9"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="480" name="top"/>
+  <anchor x="158" y="0" name="bottom"/>
+  <anchor x="118" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="164" y="-2" type="curve" smooth="yes"/>
-      <point x="181" y="-2"/>
-      <point x="199" y="2"/>
-      <point x="213" y="8" type="curve"/>
-      <point x="208" y="22" type="line"/>
-      <point x="197" y="17"/>
-      <point x="182" y="14"/>
-      <point x="169" y="14" type="curve" smooth="yes"/>
-      <point x="130" y="14"/>
-      <point x="107" y="43"/>
-      <point x="107" y="87" type="curve" smooth="yes"/>
+      <point x="185" y="-2" type="curve" smooth="yes"/>
+      <point x="202" y="-2"/>
+      <point x="220" y="2"/>
+      <point x="234" y="8" type="curve"/>
+      <point x="229" y="22" type="line"/>
+      <point x="218" y="17"/>
+      <point x="203" y="14"/>
+      <point x="190" y="14" type="curve" smooth="yes"/>
+      <point x="151" y="14"/>
+      <point x="128" y="43"/>
+      <point x="128" y="87" type="curve" smooth="yes"/>
+      <point x="128" y="480" type="line"/>
       <point x="107" y="480" type="line"/>
-      <point x="86" y="480" type="line"/>
-      <point x="86" y="83" type="line" smooth="yes"/>
-      <point x="86" y="31"/>
-      <point x="116" y="-2"/>
+      <point x="107" y="83" type="line" smooth="yes"/>
+      <point x="107" y="31"/>
+      <point x="137" y="-2"/>
     </contour>
   </outline>
   <lib>
@@ -30,8 +30,6 @@
       <string>=l</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=l</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotadasia.glif b/src/Cantarell-Light.ufo/glyphs/iotadasia.glif
index 7086961e..82a8ceaf 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotadasia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotadasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadasia" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="1F31"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="684" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dasia" xOffset="-11"/>
+    <component base="dasia" xOffset="10"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotadasiaoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/iotadasiaoxia.glif
index 3db78366..f9925a74 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotadasiaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotadasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadasiaoxia" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="1F35"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="480" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dasiaoxia" xOffset="-58"/>
+    <component base="dasiaoxia" xOffset="-37"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotadasiaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/iotadasiaperispomeni.glif
index 6bd070fe..5e7b5e8b 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotadasiaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotadasiaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadasiaperispomeni" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="1F37"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="480" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="daspsiliiaperispomeni" xOffset="-120"/>
+    <component base="daspsiliiaperispomeni" xOffset="-129"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotadasiavaria.glif 
b/src/Cantarell-Light.ufo/glyphs/iotadasiavaria.glif
index fe13b882..2a70d3e2 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotadasiavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotadasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadasiavaria" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="1F33"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="480" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dasiavaria" xOffset="-73"/>
+    <component base="dasiavaria" xOffset="-52"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotadialytikaoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/iotadialytikaoxia.glif
index c2d70e6f..95b362e4 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotadialytikaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotadialytikaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadialytikaoxia" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="1FD3"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="480" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dialytikaoxia" xOffset="-103"/>
+    <component base="dialytikaoxia" xOffset="-114"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotadialytikaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/iotadialytikaperispomeni.glif
index 7b11c1c9..5e7555db 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotadialytikaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotadialytikaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadialytikaperispomeni" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="1FD7"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="480" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dialytikaperispomeni" xOffset="-120"/>
+    <component base="dialytikaperispomeni" xOffset="-129"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotadialytikavaria.glif 
b/src/Cantarell-Light.ufo/glyphs/iotadialytikavaria.glif
index 6cf577c3..8559c84c 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotadialytikavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotadialytikavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadialytikavaria" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="1FD2"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="480" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dialytikavaria" xOffset="-141"/>
+    <component base="dialytikavaria" xOffset="-152"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotadieresis.glif 
b/src/Cantarell-Light.ufo/glyphs/iotadieresis.glif
index d9dc823c..76b86416 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotadieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotadieresis.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadieresis" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="03CA"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="639" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dieresiscomb" xOffset="-122"/>
+    <component base="dieresiscomb" xOffset="-101"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotadieresistonos.glif 
b/src/Cantarell-Light.ufo/glyphs/iotadieresistonos.glif
index 87ffb18b..d4c70c4c 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotadieresistonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotadieresistonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadieresistonos" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="0390"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="480" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dieresistonos" xOffset="-105"/>
+    <component base="dieresistonos" xOffset="-84"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotamacron.glif b/src/Cantarell-Light.ufo/glyphs/iotamacron.glif
index e7a7148f..840ba2a8 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotamacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotamacron.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotamacron" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="1FD1"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="480" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="macron" xOffset="-134"/>
+    <component base="macron" xOffset="-133"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotaoxia.glif b/src/Cantarell-Light.ufo/glyphs/iotaoxia.glif
index d5b40844..995f16b6 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotaoxia" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="1F77"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="480" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="oxia" xOffset="4"/>
+    <component base="oxia" xOffset="25"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/iotaperispomeni.glif
index 1ecea08d..d5cd8040 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotaperispomeni" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="1FD6"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="612" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="perispomeni" xOffset="-120"/>
+    <component base="perispomeni" xOffset="-129"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotapsili.glif b/src/Cantarell-Light.ufo/glyphs/iotapsili.glif
index 618b74ef..c4fc5763 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotapsili.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotapsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotapsili" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="1F30"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="684" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="psili" xOffset="-1"/>
+    <component base="psili" xOffset="20"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotapsilioxia.glif 
b/src/Cantarell-Light.ufo/glyphs/iotapsilioxia.glif
index ca313c18..1cc0e0ac 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotapsilioxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotapsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotapsilioxia" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="1F34"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="480" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="psilioxia" xOffset="-54"/>
+    <component base="psilioxia" xOffset="-33"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotapsiliperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/iotapsiliperispomeni.glif
index 48d3f29a..a29fa14f 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotapsiliperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotapsiliperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotapsiliperispomeni" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="1F36"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="480" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="psiliperispomeni" xOffset="-120"/>
+    <component base="psiliperispomeni" xOffset="-129"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotapsilivaria.glif 
b/src/Cantarell-Light.ufo/glyphs/iotapsilivaria.glif
index f5cfe7d9..06b21ebf 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotapsilivaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotapsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotapsilivaria" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="1F32"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="480" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="psilivaria" xOffset="-72"/>
+    <component base="psilivaria" xOffset="-51"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotatonos.glif b/src/Cantarell-Light.ufo/glyphs/iotatonos.glif
index c13683ce..1cf249a5 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotatonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotatonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotatonos" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="03AF"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="480" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="tonos" xOffset="4"/>
+    <component base="tonos" xOffset="25"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotavaria.glif b/src/Cantarell-Light.ufo/glyphs/iotavaria.glif
index 9f2037dc..fcd9a80f 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotavaria" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="1F76"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="480" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="varia" xOffset="-34"/>
+    <component base="varia" xOffset="-13"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/iotavrachy.glif b/src/Cantarell-Light.ufo/glyphs/iotavrachy.glif
index 670360c5..241ac75c 100644
--- a/src/Cantarell-Light.ufo/glyphs/iotavrachy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/iotavrachy.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotavrachy" format="2">
-  <advance width="233"/>
+  <advance width="270"/>
   <unicode hex="1FD0"/>
-  <anchor x="137" y="0" name="bottom"/>
-  <anchor x="97" y="665" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="vrachy" xOffset="-89"/>
+    <component base="vrachy" xOffset="-68"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/kaiS_ymbol.glif b/src/Cantarell-Light.ufo/glyphs/kaiS_ymbol.glif
index 41a3ad42..3e02240c 100644
--- a/src/Cantarell-Light.ufo/glyphs/kaiS_ymbol.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kaiS_ymbol.glif
@@ -1,55 +1,55 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kaiSymbol" format="2">
-  <advance width="458"/>
+  <advance width="492"/>
   <unicode hex="03D7"/>
   <outline>
     <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="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="214" y="296" type="line"/>
-      <point x="203" y="279" type="line"/>
-      <point x="435" y="-42" type="line"/>
-      <point x="461" y="-42" type="line"/>
+      <point x="233" y="296" type="line"/>
+      <point x="222" y="279" type="line"/>
+      <point x="454" y="-42" type="line"/>
+      <point x="480" y="-42" type="line"/>
     </contour>
     <contour>
-      <point x="203" y="298" type="curve" smooth="yes"/>
-      <point x="101" y="160" type="line"/>
-      <point x="101" y="131" type="line"/>
-      <point x="217" y="287" type="line" smooth="yes"/>
-      <point x="295" y="392"/>
-      <point x="355" y="470"/>
-      <point x="408" y="470" type="curve" smooth="yes"/>
-      <point x="415" y="470"/>
-      <point x="423" y="469"/>
-      <point x="434" y="466" type="curve"/>
-      <point x="439" y="482" type="line"/>
-      <point x="426" y="486"/>
-      <point x="418" y="488"/>
-      <point x="407" y="488" type="curve" smooth="yes"/>
-      <point x="343" y="488"/>
-      <point x="283" y="406"/>
+      <point x="222" y="298" type="curve" smooth="yes"/>
+      <point x="120" y="160" type="line"/>
+      <point x="120" y="131" type="line"/>
+      <point x="236" y="287" type="line" smooth="yes"/>
+      <point x="314" y="392"/>
+      <point x="374" y="470"/>
+      <point x="427" y="470" type="curve" smooth="yes"/>
+      <point x="434" y="470"/>
+      <point x="442" y="469"/>
+      <point x="453" y="466" type="curve"/>
+      <point x="458" y="482" type="line"/>
+      <point x="445" y="486"/>
+      <point x="437" y="488"/>
+      <point x="426" y="488" type="curve" smooth="yes"/>
+      <point x="362" y="488"/>
+      <point x="302" y="406"/>
     </contour>
     <contour>
-      <point x="355" y="-131" type="curve" smooth="yes"/>
-      <point x="461" y="-42" type="line"/>
-      <point x="442" y="-33" type="line"/>
-      <point x="345" y="-115" type="line" smooth="yes"/>
-      <point x="284" y="-166"/>
-      <point x="220" y="-199"/>
-      <point x="172" y="-199" type="curve" smooth="yes"/>
-      <point x="137" y="-199"/>
-      <point x="107" y="-190"/>
-      <point x="71" y="-169" type="curve"/>
-      <point x="63" y="-184" type="line"/>
-      <point x="106" y="-210"/>
-      <point x="135" y="-217"/>
-      <point x="169" y="-217" type="curve" smooth="yes"/>
-      <point x="228" y="-217"/>
-      <point x="289" y="-187"/>
+      <point x="374" y="-131" type="curve" smooth="yes"/>
+      <point x="480" y="-42" type="line"/>
+      <point x="461" y="-33" type="line"/>
+      <point x="364" y="-115" type="line" smooth="yes"/>
+      <point x="303" y="-166"/>
+      <point x="239" y="-199"/>
+      <point x="191" y="-199" type="curve" smooth="yes"/>
+      <point x="156" y="-199"/>
+      <point x="126" y="-190"/>
+      <point x="90" y="-169" type="curve"/>
+      <point x="82" y="-184" type="line"/>
+      <point x="125" y="-210"/>
+      <point x="154" y="-217"/>
+      <point x="188" y="-217" type="curve" smooth="yes"/>
+      <point x="247" y="-217"/>
+      <point x="308" y="-187"/>
     </contour>
   </outline>
   <lib>
@@ -60,8 +60,6 @@
       <string>=kappa-20</string>
       <key>com.schriftgestaltung.Glyphs.layer.leftMetricsKey</key>
       <string>=kappa-25</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/kappa.glif b/src/Cantarell-Light.ufo/glyphs/kappa.glif
index ca4ea430..8c888805 100644
--- a/src/Cantarell-Light.ufo/glyphs/kappa.glif
+++ b/src/Cantarell-Light.ufo/glyphs/kappa.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kappa" format="2">
-  <advance width="456"/>
+  <advance width="490"/>
   <unicode hex="03BA"/>
   <outline>
     <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="107" y="0" type="line"/>
+      <point x="128" y="0" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="214" y="296" type="line"/>
-      <point x="203" y="279" type="line"/>
-      <point x="410" y="0" type="line"/>
-      <point x="437" y="0" type="line"/>
+      <point x="233" y="296" type="line"/>
+      <point x="222" y="279" type="line"/>
+      <point x="429" y="0" type="line"/>
+      <point x="456" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="203" y="298" type="curve" smooth="yes"/>
-      <point x="101" y="160" type="line"/>
-      <point x="101" y="131" type="line"/>
-      <point x="217" y="287" type="line" smooth="yes"/>
-      <point x="295" y="392"/>
-      <point x="355" y="470"/>
-      <point x="408" y="470" type="curve" smooth="yes"/>
-      <point x="415" y="470"/>
-      <point x="423" y="469"/>
-      <point x="434" y="466" type="curve"/>
-      <point x="439" y="482" type="line"/>
-      <point x="426" y="486"/>
-      <point x="418" y="488"/>
-      <point x="407" y="488" type="curve" smooth="yes"/>
-      <point x="343" y="488"/>
-      <point x="283" y="406"/>
+      <point x="222" y="298" type="curve" smooth="yes"/>
+      <point x="120" y="160" type="line"/>
+      <point x="120" y="131" type="line"/>
+      <point x="236" y="287" type="line" smooth="yes"/>
+      <point x="314" y="392"/>
+      <point x="374" y="470"/>
+      <point x="427" y="470" type="curve" smooth="yes"/>
+      <point x="434" y="470"/>
+      <point x="442" y="469"/>
+      <point x="453" y="466" type="curve"/>
+      <point x="458" y="482" type="line"/>
+      <point x="445" y="486"/>
+      <point x="437" y="488"/>
+      <point x="426" y="488" type="curve" smooth="yes"/>
+      <point x="362" y="488"/>
+      <point x="302" y="406"/>
     </contour>
   </outline>
   <lib>
@@ -42,8 +42,6 @@
       <string>=k+5</string>
       <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
       <string>=k+10</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/koronis.case.glif 
b/src/Cantarell-Light.ufo/glyphs/koronis.case.glif
index d1a55489..9c5476dd 100644
--- a/src/Cantarell-Light.ufo/glyphs/koronis.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/koronis.case.glif
@@ -10,8 +10,6 @@
       <string>psili.case</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psili.case</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/koronis.glif b/src/Cantarell-Light.ufo/glyphs/koronis.glif
index d2c325ea..fc3fa2e4 100644
--- a/src/Cantarell-Light.ufo/glyphs/koronis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/koronis.glif
@@ -11,8 +11,6 @@
       <string>psili</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psili</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lambda.glif b/src/Cantarell-Light.ufo/glyphs/lambda.glif
index 16ba2a25..e1792d22 100644
--- a/src/Cantarell-Light.ufo/glyphs/lambda.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lambda.glif
@@ -27,10 +27,4 @@
       <point x="158" y="702"/>
     </contour>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/lowernumeral-greek.glif 
b/src/Cantarell-Light.ufo/glyphs/lowernumeral-greek.glif
index 04dc6c3b..569859b4 100644
--- a/src/Cantarell-Light.ufo/glyphs/lowernumeral-greek.glif
+++ b/src/Cantarell-Light.ufo/glyphs/lowernumeral-greek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lowernumeral-greek" format="2">
-  <advance width="228"/>
+  <advance width="229"/>
   <unicode hex="0375"/>
   <outline>
-    <component base="minute" xScale="-1" yScale="-1" xOffset="212" yOffset="694"/>
+    <component base="minute" xScale="-1" yScale="-1" xOffset="256" yOffset="694"/>
   </outline>
   <lib>
     <dict>
@@ -11,8 +11,6 @@
       <string>quotesinglbase</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>quotesinglbase</string>
-      <key>public.markColor</key>
-      <string>0,0.67,0.91,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/mu.glif b/src/Cantarell-Light.ufo/glyphs/mu.glif
index 796a600f..f5ca59bd 100644
--- a/src/Cantarell-Light.ufo/glyphs/mu.glif
+++ b/src/Cantarell-Light.ufo/glyphs/mu.glif
@@ -1,50 +1,50 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="mu" format="2">
-  <advance width="553"/>
+  <advance width="588"/>
   <unicode hex="03BC"/>
-  <anchor x="257" y="480" name="top"/>
+  <anchor x="276" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="482" y="-2" type="curve" smooth="yes"/>
-      <point x="501" y="-2"/>
-      <point x="519" y="4"/>
-      <point x="533" y="10" type="curve"/>
-      <point x="528" y="23" type="line"/>
-      <point x="512" y="17"/>
-      <point x="499" y="14"/>
-      <point x="485" y="14" type="curve" smooth="yes"/>
-      <point x="458" y="14"/>
-      <point x="438" y="39"/>
-      <point x="438" y="80" type="curve" smooth="yes"/>
-      <point x="438" y="480" type="line"/>
-      <point x="417" y="480" type="line"/>
-      <point x="417" y="79" type="line" smooth="yes"/>
-      <point x="417" y="28"/>
-      <point x="444" y="-2"/>
+      <point x="501" y="-2" type="curve" smooth="yes"/>
+      <point x="520" y="-2"/>
+      <point x="538" y="4"/>
+      <point x="552" y="10" type="curve"/>
+      <point x="547" y="23" type="line"/>
+      <point x="531" y="17"/>
+      <point x="518" y="14"/>
+      <point x="504" y="14" type="curve" smooth="yes"/>
+      <point x="477" y="14"/>
+      <point x="457" y="39"/>
+      <point x="457" y="80" type="curve" smooth="yes"/>
+      <point x="457" y="480" type="line"/>
+      <point x="436" y="480" type="line"/>
+      <point x="436" y="79" type="line" smooth="yes"/>
+      <point x="436" y="28"/>
+      <point x="463" y="-2"/>
     </contour>
     <contour>
-      <point x="88" y="-217" type="line"/>
-      <point x="112" y="-217" type="line"/>
-      <point x="106" y="73" type="line"/>
-      <point x="109" y="73" type="line"/>
-      <point x="109" y="480" type="line"/>
-      <point x="88" y="480" type="line"/>
+      <point x="107" y="-217" type="line"/>
+      <point x="131" y="-217" type="line"/>
+      <point x="125" y="73" type="line"/>
+      <point x="128" y="73" type="line"/>
+      <point x="128" y="480" type="line"/>
+      <point x="107" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="252" y="-6" type="curve" smooth="yes"/>
-      <point x="319" y="-6"/>
-      <point x="386" y="26"/>
-      <point x="435" y="77" type="curve"/>
-      <point x="426" y="88" type="line"/>
-      <point x="380" y="41"/>
-      <point x="317" y="12"/>
-      <point x="256" y="12" type="curve" smooth="yes"/>
-      <point x="200" y="12"/>
-      <point x="149" y="43"/>
-      <point x="109" y="96" type="curve"/>
-      <point x="93" y="87" type="line"/>
-      <point x="135" y="28"/>
-      <point x="187" y="-6"/>
+      <point x="271" y="-6" type="curve" smooth="yes"/>
+      <point x="338" y="-6"/>
+      <point x="405" y="26"/>
+      <point x="454" y="77" type="curve"/>
+      <point x="445" y="88" type="line"/>
+      <point x="399" y="41"/>
+      <point x="336" y="12"/>
+      <point x="275" y="12" type="curve" smooth="yes"/>
+      <point x="219" y="12"/>
+      <point x="168" y="43"/>
+      <point x="128" y="96" type="curve"/>
+      <point x="112" y="87" type="line"/>
+      <point x="154" y="28"/>
+      <point x="206" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -53,8 +53,6 @@
       <string>=n</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=iota</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/nu.glif b/src/Cantarell-Light.ufo/glyphs/nu.glif
index 76512b1a..690254f6 100644
--- a/src/Cantarell-Light.ufo/glyphs/nu.glif
+++ b/src/Cantarell-Light.ufo/glyphs/nu.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nu" format="2">
-  <advance width="458"/>
+  <advance width="468"/>
   <unicode hex="03BD"/>
-  <anchor x="233" y="0" name="bottom"/>
-  <anchor x="233" y="480" name="top"/>
+  <anchor x="238" y="0" name="bottom"/>
+  <anchor x="238" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="229" y="14" type="line"/>
-      <point x="238" y="14" type="line"/>
-      <point x="50" y="480" type="line"/>
-      <point x="27" y="480" type="line"/>
-      <point x="224" y="0" type="line"/>
-      <point x="242" y="0" type="line"/>
-      <point x="303" y="124" type="line" smooth="yes"/>
-      <point x="370" y="261"/>
-      <point x="416" y="371"/>
-      <point x="416" y="480" type="curve"/>
-      <point x="395" y="480" type="line"/>
-      <point x="395" y="374"/>
-      <point x="348" y="261"/>
-      <point x="288" y="136" type="curve" smooth="yes"/>
+      <point x="234" y="14" type="line"/>
+      <point x="243" y="14" type="line"/>
+      <point x="55" y="480" type="line"/>
+      <point x="32" y="480" type="line"/>
+      <point x="229" y="0" type="line"/>
+      <point x="247" y="0" type="line"/>
+      <point x="308" y="124" type="line" smooth="yes"/>
+      <point x="375" y="261"/>
+      <point x="421" y="371"/>
+      <point x="421" y="480" type="curve"/>
+      <point x="400" y="480" type="line"/>
+      <point x="400" y="374"/>
+      <point x="353" y="261"/>
+      <point x="293" y="136" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
@@ -28,8 +28,6 @@
       <string>=v</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=v+15</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omega.glif b/src/Cantarell-Light.ufo/glyphs/omega.glif
index fba28038..f400da2d 100644
--- a/src/Cantarell-Light.ufo/glyphs/omega.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omega.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omega" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="03C9"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
+  <anchor x="367" y="0" name="bottom"/>
+  <anchor x="367" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="346" y="360" type="line"/>
-      <point x="346" y="203" type="line" smooth="yes"/>
-      <point x="346" y="79"/>
-      <point x="296" y="16"/>
-      <point x="221" y="16" type="curve" smooth="yes"/>
-      <point x="120" y="16"/>
-      <point x="83" y="114"/>
-      <point x="83" y="209" type="curve" smooth="yes"/>
-      <point x="83" y="297"/>
-      <point x="118" y="403"/>
-      <point x="154" y="480" type="curve"/>
-      <point x="132" y="480" type="line"/>
-      <point x="96" y="400"/>
-      <point x="62" y="308"/>
-      <point x="62" y="208" type="curve" smooth="yes"/>
-      <point x="62" y="94"/>
-      <point x="108" y="-4"/>
-      <point x="220" y="-4" type="curve" smooth="yes"/>
-      <point x="303" y="-4"/>
-      <point x="361" y="63"/>
-      <point x="361" y="193" type="curve"/>
-      <point x="352" y="188" type="line"/>
-      <point x="352" y="63"/>
-      <point x="409" y="-4"/>
-      <point x="494" y="-4" type="curve" smooth="yes"/>
-      <point x="602" y="-4"/>
-      <point x="650" y="102"/>
-      <point x="650" y="215" type="curve" smooth="yes"/>
-      <point x="650" y="311"/>
-      <point x="614" y="400"/>
-      <point x="577" y="480" type="curve"/>
-      <point x="555" y="480" type="line"/>
-      <point x="592" y="403"/>
-      <point x="629" y="300"/>
-      <point x="629" y="216" type="curve" smooth="yes"/>
-      <point x="629" y="122"/>
-      <point x="590" y="16"/>
-      <point x="493" y="16" type="curve" smooth="yes"/>
-      <point x="416" y="16"/>
-      <point x="367" y="80"/>
-      <point x="367" y="205" type="curve" smooth="yes"/>
-      <point x="367" y="360" type="line"/>
+      <point x="357" y="360" type="line"/>
+      <point x="357" y="203" type="line" smooth="yes"/>
+      <point x="357" y="79"/>
+      <point x="307" y="16"/>
+      <point x="232" y="16" type="curve" smooth="yes"/>
+      <point x="131" y="16"/>
+      <point x="94" y="114"/>
+      <point x="94" y="209" type="curve" smooth="yes"/>
+      <point x="94" y="297"/>
+      <point x="129" y="403"/>
+      <point x="165" y="480" type="curve"/>
+      <point x="143" y="480" type="line"/>
+      <point x="107" y="400"/>
+      <point x="73" y="308"/>
+      <point x="73" y="208" type="curve" smooth="yes"/>
+      <point x="73" y="94"/>
+      <point x="119" y="-4"/>
+      <point x="231" y="-4" type="curve" smooth="yes"/>
+      <point x="314" y="-4"/>
+      <point x="372" y="63"/>
+      <point x="372" y="193" type="curve"/>
+      <point x="363" y="188" type="line"/>
+      <point x="363" y="63"/>
+      <point x="420" y="-4"/>
+      <point x="505" y="-4" type="curve" smooth="yes"/>
+      <point x="613" y="-4"/>
+      <point x="661" y="102"/>
+      <point x="661" y="215" type="curve" smooth="yes"/>
+      <point x="661" y="311"/>
+      <point x="625" y="400"/>
+      <point x="588" y="480" type="curve"/>
+      <point x="566" y="480" type="line"/>
+      <point x="603" y="403"/>
+      <point x="640" y="300"/>
+      <point x="640" y="216" type="curve" smooth="yes"/>
+      <point x="640" y="122"/>
+      <point x="601" y="16"/>
+      <point x="504" y="16" type="curve" smooth="yes"/>
+      <point x="427" y="16"/>
+      <point x="378" y="80"/>
+      <point x="378" y="205" type="curve" smooth="yes"/>
+      <point x="378" y="360" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -56,8 +56,6 @@
       <string>=o+5</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=o+5</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegadasia.glif b/src/Cantarell-Light.ufo/glyphs/omegadasia.glif
index 17e2ca12..c5d0e9d4 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegadasia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegadasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasia" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1F61"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="684" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasia" xOffset="248"/>
+    <component base="dasia" xOffset="259"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegadasiaoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/omegadasiaoxia.glif
index aba53b31..921e7836 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegadasiaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegadasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiaoxia" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1F65"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasiaoxia" xOffset="201"/>
+    <component base="dasiaoxia" xOffset="212"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegadasiaoxiaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/omegadasiaoxiaypogegrammeni.glif
index bc3a785f..9ac60a12 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegadasiaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegadasiaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiaoxiaypogegrammeni" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1FA5"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasiaoxia" xOffset="201"/>
-    <component base="ypogegrammeni" xOffset="148"/>
+    <component base="dasiaoxia" xOffset="212"/>
+    <component base="ypogegrammeni" xOffset="159"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegadasiaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/omegadasiaperispomeni.glif
index 8d885d52..751b6e40 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegadasiaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegadasiaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiaperispomeni" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1F67"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="daspsiliiaperispomeni" xOffset="139"/>
+    <component base="daspsiliiaperispomeni" xOffset="120"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegadasiaperispomeniypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/omegadasiaperispomeniypogegrammeni.glif
index 646a47d5..cef192e5 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegadasiaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegadasiaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiaperispomeniypogegrammeni" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1FA7"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="daspsiliiaperispomeni" xOffset="139"/>
-    <component base="ypogegrammeni" xOffset="148"/>
+    <component base="daspsiliiaperispomeni" xOffset="120"/>
+    <component base="ypogegrammeni" xOffset="159"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegadasiavaria.glif 
b/src/Cantarell-Light.ufo/glyphs/omegadasiavaria.glif
index 71ac8d66..63173556 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegadasiavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegadasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiavaria" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1F63"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasiavaria" xOffset="186"/>
+    <component base="dasiavaria" xOffset="197"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegadasiavariaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/omegadasiavariaypogegrammeni.glif
index 4a73ec56..8f03e937 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegadasiavariaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegadasiavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiavariaypogegrammeni" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1FA3"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasiavaria" xOffset="186"/>
-    <component base="ypogegrammeni" xOffset="148"/>
+    <component base="dasiavaria" xOffset="197"/>
+    <component base="ypogegrammeni" xOffset="159"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegadasiaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/omegadasiaypogegrammeni.glif
index bcc009b1..513311b8 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegadasiaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegadasiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiaypogegrammeni" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1FA1"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="684" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasia" xOffset="248"/>
-    <component base="ypogegrammeni" xOffset="148"/>
+    <component base="dasia" xOffset="259"/>
+    <component base="ypogegrammeni" xOffset="159"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegaoxia.glif b/src/Cantarell-Light.ufo/glyphs/omegaoxia.glif
index 2da764de..43bd62d7 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegaoxia" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1F7D"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="oxia" xOffset="263"/>
+    <component base="oxia" xOffset="274"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegaoxiaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/omegaoxiaypogegrammeni.glif
index cde60b21..30194c9c 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegaoxiaypogegrammeni" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1FF4"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="oxia" xOffset="263"/>
-    <component base="ypogegrammeni" xOffset="148"/>
+    <component base="oxia" xOffset="274"/>
+    <component base="ypogegrammeni" xOffset="159"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/omegaperispomeni.glif
index 078e13f5..32f843f2 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegaperispomeni" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1FF6"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="612" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="perispomeni" xOffset="139"/>
+    <component base="perispomeni" xOffset="120"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegaperispomeniypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/omegaperispomeniypogegrammeni.glif
index 9b7dcd4c..79e1286f 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegaperispomeniypogegrammeni" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1FF7"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="612" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="perispomeni" xOffset="139"/>
-    <component base="ypogegrammeni" xOffset="148"/>
+    <component base="perispomeni" xOffset="120"/>
+    <component base="ypogegrammeni" xOffset="159"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegapsili.glif b/src/Cantarell-Light.ufo/glyphs/omegapsili.glif
index aad40043..5982eb7b 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegapsili.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegapsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsili" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1F60"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="684" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psili" xOffset="258"/>
+    <component base="psili" xOffset="269"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegapsilioxia.glif 
b/src/Cantarell-Light.ufo/glyphs/omegapsilioxia.glif
index c647bb5f..ccb1513b 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegapsilioxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegapsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsilioxia" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1F64"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psilioxia" xOffset="205"/>
+    <component base="psilioxia" xOffset="216"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegapsilioxiaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/omegapsilioxiaypogegrammeni.glif
index 2512eb20..01e817d4 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegapsilioxiaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegapsilioxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsilioxiaypogegrammeni" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1FA4"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psilioxia" xOffset="205"/>
-    <component base="ypogegrammeni" xOffset="148"/>
+    <component base="psilioxia" xOffset="216"/>
+    <component base="ypogegrammeni" xOffset="159"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegapsiliperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/omegapsiliperispomeni.glif
index 5812113f..43adf74f 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegapsiliperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegapsiliperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsiliperispomeni" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1F66"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psiliperispomeni" xOffset="139"/>
+    <component base="psiliperispomeni" xOffset="120"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegapsiliperispomeniypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/omegapsiliperispomeniypogegrammeni.glif
index 4b84402f..8fae8cdd 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegapsiliperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegapsiliperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsiliperispomeniypogegrammeni" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1FA6"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psiliperispomeni" xOffset="139"/>
-    <component base="ypogegrammeni" xOffset="148"/>
+    <component base="psiliperispomeni" xOffset="120"/>
+    <component base="ypogegrammeni" xOffset="159"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegapsilivaria.glif 
b/src/Cantarell-Light.ufo/glyphs/omegapsilivaria.glif
index 6017fc5f..e9be6e94 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegapsilivaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegapsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsilivaria" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1F62"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psilivaria" xOffset="187"/>
+    <component base="psilivaria" xOffset="198"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegapsilivariaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/omegapsilivariaypogegrammeni.glif
index 8095052b..a3ffb219 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegapsilivariaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegapsilivariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsilivariaypogegrammeni" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1FA2"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psilivaria" xOffset="187"/>
-    <component base="ypogegrammeni" xOffset="148"/>
+    <component base="psilivaria" xOffset="198"/>
+    <component base="ypogegrammeni" xOffset="159"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegapsiliypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/omegapsiliypogegrammeni.glif
index 7e2ee55e..6b3e3bbc 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegapsiliypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegapsiliypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsiliypogegrammeni" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1FA0"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="684" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psili" xOffset="258"/>
-    <component base="ypogegrammeni" xOffset="148"/>
+    <component base="psili" xOffset="269"/>
+    <component base="ypogegrammeni" xOffset="159"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegatonos.glif b/src/Cantarell-Light.ufo/glyphs/omegatonos.glif
index cd6eb5f5..df085f4c 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegatonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegatonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegatonos" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="03CE"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="tonos" xOffset="263"/>
+    <component base="tonos" xOffset="274"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegavaria.glif b/src/Cantarell-Light.ufo/glyphs/omegavaria.glif
index d02ffb16..97224bb9 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegavaria" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1F7C"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="varia" xOffset="225"/>
+    <component base="varia" xOffset="236"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegavariaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/omegavariaypogegrammeni.glif
index 18ef7628..e47a9840 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegavariaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegavariaypogegrammeni" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1FF2"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="varia" xOffset="225"/>
-    <component base="ypogegrammeni" xOffset="148"/>
+    <component base="varia" xOffset="236"/>
+    <component base="ypogegrammeni" xOffset="159"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omegaypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/omegaypogegrammeni.glif
index 85a34560..e95c5475 100644
--- a/src/Cantarell-Light.ufo/glyphs/omegaypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omegaypogegrammeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegaypogegrammeni" format="2">
-  <advance width="712"/>
+  <advance width="734"/>
   <unicode hex="1FF3"/>
-  <anchor x="356" y="0" name="bottom"/>
-  <anchor x="356" y="480" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="ypogegrammeni" xOffset="148"/>
+    <component base="ypogegrammeni" xOffset="159"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omicron.glif b/src/Cantarell-Light.ufo/glyphs/omicron.glif
index c001f1b3..63f9220a 100644
--- a/src/Cantarell-Light.ufo/glyphs/omicron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omicron.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicron" format="2">
-  <advance width="531"/>
+  <advance width="553"/>
   <unicode hex="03BF"/>
-  <anchor x="267" y="0" name="bottom"/>
-  <anchor x="257" y="480" name="top"/>
+  <anchor x="278" y="0" name="bottom"/>
+  <anchor x="268" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="266" y="-10" type="curve" smooth="yes"/>
-      <point x="391" y="-10"/>
-      <point x="474" y="91"/>
-      <point x="474" y="240" type="curve" smooth="yes"/>
-      <point x="474" y="388"/>
-      <point x="392" y="486"/>
-      <point x="268" y="486" type="curve" smooth="yes"/>
-      <point x="140" y="486"/>
-      <point x="57" y="385"/>
-      <point x="57" y="237" type="curve" smooth="yes"/>
-      <point x="57" y="90"/>
-      <point x="139" y="-10"/>
+      <point x="277" y="-10" type="curve" smooth="yes"/>
+      <point x="402" y="-10"/>
+      <point x="485" y="91"/>
+      <point x="485" y="240" type="curve" smooth="yes"/>
+      <point x="485" y="388"/>
+      <point x="403" y="486"/>
+      <point x="279" y="486" type="curve" smooth="yes"/>
+      <point x="151" y="486"/>
+      <point x="68" y="385"/>
+      <point x="68" y="237" type="curve" smooth="yes"/>
+      <point x="68" y="90"/>
+      <point x="150" y="-10"/>
     </contour>
     <contour>
-      <point x="268" y="8" type="curve" smooth="yes"/>
-      <point x="151" y="8"/>
-      <point x="78" y="102"/>
-      <point x="78" y="239" type="curve" smooth="yes"/>
-      <point x="78" y="373"/>
-      <point x="148" y="468"/>
-      <point x="263" y="468" type="curve" smooth="yes"/>
-      <point x="379" y="468"/>
-      <point x="453" y="377"/>
-      <point x="453" y="237" type="curve" smooth="yes"/>
-      <point x="453" y="98"/>
-      <point x="380" y="8"/>
+      <point x="279" y="8" type="curve" smooth="yes"/>
+      <point x="162" y="8"/>
+      <point x="89" y="102"/>
+      <point x="89" y="239" type="curve" smooth="yes"/>
+      <point x="89" y="373"/>
+      <point x="159" y="468"/>
+      <point x="274" y="468" type="curve" smooth="yes"/>
+      <point x="390" y="468"/>
+      <point x="464" y="377"/>
+      <point x="464" y="237" type="curve" smooth="yes"/>
+      <point x="464" y="98"/>
+      <point x="391" y="8"/>
     </contour>
   </outline>
   <lib>
@@ -40,8 +40,6 @@
       <string>o</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>o</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omicrondasia.glif 
b/src/Cantarell-Light.ufo/glyphs/omicrondasia.glif
index 39b0247c..c9f4139d 100644
--- a/src/Cantarell-Light.ufo/glyphs/omicrondasia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omicrondasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicrondasia" format="2">
-  <advance width="531"/>
+  <advance width="553"/>
   <unicode hex="1F41"/>
-  <anchor x="267" y="0" name="bottom"/>
-  <anchor x="257" y="684" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="dasia" xOffset="149"/>
+    <component base="dasia" xOffset="160"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omicrondasiaoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/omicrondasiaoxia.glif
index 933df379..0e82efd6 100644
--- a/src/Cantarell-Light.ufo/glyphs/omicrondasiaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omicrondasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicrondasiaoxia" format="2">
-  <advance width="531"/>
+  <advance width="553"/>
   <unicode hex="1F45"/>
-  <anchor x="267" y="0" name="bottom"/>
-  <anchor x="257" y="480" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="dasiaoxia" xOffset="102"/>
+    <component base="dasiaoxia" xOffset="113"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omicrondasiavaria.glif 
b/src/Cantarell-Light.ufo/glyphs/omicrondasiavaria.glif
index ee667826..84ebbba0 100644
--- a/src/Cantarell-Light.ufo/glyphs/omicrondasiavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omicrondasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicrondasiavaria" format="2">
-  <advance width="531"/>
+  <advance width="553"/>
   <unicode hex="1F43"/>
-  <anchor x="267" y="0" name="bottom"/>
-  <anchor x="257" y="480" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="dasiavaria" xOffset="87"/>
+    <component base="dasiavaria" xOffset="98"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omicronoxia.glif b/src/Cantarell-Light.ufo/glyphs/omicronoxia.glif
index 9e14d3ba..757f496c 100644
--- a/src/Cantarell-Light.ufo/glyphs/omicronoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omicronoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicronoxia" format="2">
-  <advance width="531"/>
+  <advance width="553"/>
   <unicode hex="1F79"/>
-  <anchor x="267" y="0" name="bottom"/>
-  <anchor x="257" y="480" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="oxia" xOffset="164"/>
+    <component base="oxia" xOffset="175"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omicronpsili.glif 
b/src/Cantarell-Light.ufo/glyphs/omicronpsili.glif
index bf70ee9e..d1d09a8a 100644
--- a/src/Cantarell-Light.ufo/glyphs/omicronpsili.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omicronpsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicronpsili" format="2">
-  <advance width="531"/>
+  <advance width="553"/>
   <unicode hex="1F40"/>
-  <anchor x="267" y="0" name="bottom"/>
-  <anchor x="257" y="684" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="psili" xOffset="159"/>
+    <component base="psili" xOffset="170"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omicronpsilioxia.glif 
b/src/Cantarell-Light.ufo/glyphs/omicronpsilioxia.glif
index 76e27dc4..a1f17f2e 100644
--- a/src/Cantarell-Light.ufo/glyphs/omicronpsilioxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omicronpsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicronpsilioxia" format="2">
-  <advance width="531"/>
+  <advance width="553"/>
   <unicode hex="1F44"/>
-  <anchor x="267" y="0" name="bottom"/>
-  <anchor x="257" y="480" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="psilioxia" xOffset="106"/>
+    <component base="psilioxia" xOffset="117"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omicronpsilivaria.glif 
b/src/Cantarell-Light.ufo/glyphs/omicronpsilivaria.glif
index 58a3520e..48bd382e 100644
--- a/src/Cantarell-Light.ufo/glyphs/omicronpsilivaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omicronpsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicronpsilivaria" format="2">
-  <advance width="531"/>
+  <advance width="553"/>
   <unicode hex="1F42"/>
-  <anchor x="267" y="0" name="bottom"/>
-  <anchor x="257" y="480" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="psilivaria" xOffset="88"/>
+    <component base="psilivaria" xOffset="99"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omicrontonos.glif 
b/src/Cantarell-Light.ufo/glyphs/omicrontonos.glif
index 78e15da4..faef58e5 100644
--- a/src/Cantarell-Light.ufo/glyphs/omicrontonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omicrontonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicrontonos" format="2">
-  <advance width="531"/>
+  <advance width="553"/>
   <unicode hex="03CC"/>
-  <anchor x="267" y="0" name="bottom"/>
-  <anchor x="257" y="480" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="tonos" xOffset="164"/>
+    <component base="tonos" xOffset="175"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/omicronvaria.glif 
b/src/Cantarell-Light.ufo/glyphs/omicronvaria.glif
index 5555228a..8ea752ac 100644
--- a/src/Cantarell-Light.ufo/glyphs/omicronvaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/omicronvaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicronvaria" format="2">
-  <advance width="531"/>
+  <advance width="553"/>
   <unicode hex="1F78"/>
-  <anchor x="267" y="0" name="bottom"/>
-  <anchor x="257" y="480" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="varia" xOffset="126"/>
+    <component base="varia" xOffset="137"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/oxia.case.glif b/src/Cantarell-Light.ufo/glyphs/oxia.case.glif
index 427ad404..56214b40 100644
--- a/src/Cantarell-Light.ufo/glyphs/oxia.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oxia.case.glif
@@ -11,8 +11,6 @@
       <string>tonos.case</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>tonos.case</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/oxia.glif b/src/Cantarell-Light.ufo/glyphs/oxia.glif
index 76c8dd97..d088be61 100644
--- a/src/Cantarell-Light.ufo/glyphs/oxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/oxia.glif
@@ -12,8 +12,6 @@
       <string>tonos</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>tonos</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/perispomeni.glif b/src/Cantarell-Light.ufo/glyphs/perispomeni.glif
index 8f067fa1..5083c3f6 100644
--- a/src/Cantarell-Light.ufo/glyphs/perispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/perispomeni.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="perispomeni" format="2">
-  <advance width="482"/>
+  <advance width="500"/>
   <unicode hex="1FC0"/>
-  <anchor x="217" y="480" name="_top"/>
-  <anchor x="217" y="612" name="top"/>
+  <anchor x="247" y="480" name="_top"/>
+  <anchor x="247" y="612" name="top"/>
   <outline>
-    <component base="tildecomb" xOffset="-18"/>
+    <component base="tildecomb" xOffset="12"/>
   </outline>
   <lib>
     <dict>
@@ -13,8 +13,6 @@
       <string>tilde</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>tilde</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/phi.glif b/src/Cantarell-Light.ufo/glyphs/phi.glif
index 38b0f57b..b0ac3271 100644
--- a/src/Cantarell-Light.ufo/glyphs/phi.glif
+++ b/src/Cantarell-Light.ufo/glyphs/phi.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="phi" format="2">
-  <advance width="661"/>
+  <advance width="683"/>
   <unicode hex="03C6"/>
   <outline>
     <contour>
-      <point x="318" y="-4" type="curve"/>
-      <point x="320" y="14" type="line"/>
-      <point x="189" y="14"/>
-      <point x="83" y="102"/>
-      <point x="83" y="241" type="curve" smooth="yes"/>
-      <point x="83" y="320"/>
-      <point x="103" y="402"/>
-      <point x="144" y="480" type="curve"/>
-      <point x="122" y="480" type="line"/>
-      <point x="83" y="407"/>
-      <point x="62" y="325"/>
-      <point x="62" y="237" type="curve" smooth="yes"/>
-      <point x="62" y="89"/>
-      <point x="173" y="-4"/>
+      <point x="329" y="-4" type="curve"/>
+      <point x="331" y="14" type="line"/>
+      <point x="200" y="14"/>
+      <point x="94" y="102"/>
+      <point x="94" y="241" type="curve" smooth="yes"/>
+      <point x="94" y="320"/>
+      <point x="114" y="402"/>
+      <point x="155" y="480" type="curve"/>
+      <point x="133" y="480" type="line"/>
+      <point x="94" y="407"/>
+      <point x="73" y="325"/>
+      <point x="73" y="237" type="curve" smooth="yes"/>
+      <point x="73" y="89"/>
+      <point x="184" y="-4"/>
     </contour>
     <contour>
-      <point x="335" y="14" type="curve"/>
-      <point x="333" y="-4" type="line"/>
-      <point x="503" y="-4"/>
-      <point x="604" y="90"/>
-      <point x="604" y="258" type="curve" smooth="yes"/>
-      <point x="604" y="391"/>
-      <point x="550" y="486"/>
-      <point x="455" y="486" type="curve" smooth="yes"/>
-      <point x="363" y="486"/>
-      <point x="316" y="418"/>
-      <point x="316" y="276" type="curve" smooth="yes"/>
-      <point x="316" y="-217" type="line"/>
-      <point x="337" y="-217" type="line"/>
-      <point x="337" y="274" type="line" smooth="yes"/>
-      <point x="337" y="408"/>
-      <point x="373" y="468"/>
-      <point x="454" y="468" type="curve" smooth="yes"/>
-      <point x="539" y="468"/>
-      <point x="583" y="380"/>
-      <point x="583" y="254" type="curve" smooth="yes"/>
-      <point x="583" y="101"/>
-      <point x="485" y="14"/>
+      <point x="346" y="14" type="curve"/>
+      <point x="344" y="-4" type="line"/>
+      <point x="514" y="-4"/>
+      <point x="615" y="90"/>
+      <point x="615" y="258" type="curve" smooth="yes"/>
+      <point x="615" y="391"/>
+      <point x="561" y="486"/>
+      <point x="466" y="486" type="curve" smooth="yes"/>
+      <point x="374" y="486"/>
+      <point x="327" y="418"/>
+      <point x="327" y="276" type="curve" smooth="yes"/>
+      <point x="327" y="-217" type="line"/>
+      <point x="348" y="-217" type="line"/>
+      <point x="348" y="274" type="line" smooth="yes"/>
+      <point x="348" y="408"/>
+      <point x="384" y="468"/>
+      <point x="465" y="468" type="curve" smooth="yes"/>
+      <point x="550" y="468"/>
+      <point x="594" y="380"/>
+      <point x="594" y="254" type="curve" smooth="yes"/>
+      <point x="594" y="101"/>
+      <point x="496" y="14"/>
     </contour>
   </outline>
   <lib>
@@ -50,8 +50,6 @@
       <string>=omega</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=p</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/pi.glif b/src/Cantarell-Light.ufo/glyphs/pi.glif
index b0407703..be939b0a 100644
--- a/src/Cantarell-Light.ufo/glyphs/pi.glif
+++ b/src/Cantarell-Light.ufo/glyphs/pi.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="pi" format="2">
-  <advance width="553"/>
+  <advance width="579"/>
   <unicode hex="03C0"/>
   <outline>
     <contour>
-      <point x="471" y="-2" type="curve" smooth="yes"/>
-      <point x="491" y="-2"/>
-      <point x="506" y="3"/>
-      <point x="522" y="10" type="curve"/>
-      <point x="517" y="24" type="line"/>
-      <point x="502" y="18"/>
-      <point x="489" y="15"/>
-      <point x="473" y="15" type="curve" smooth="yes"/>
-      <point x="444" y="15"/>
-      <point x="425" y="35"/>
-      <point x="425" y="75" type="curve" smooth="yes"/>
-      <point x="425" y="471" type="line"/>
-      <point x="404" y="471" type="line"/>
-      <point x="404" y="71" type="line" smooth="yes"/>
-      <point x="404" y="23"/>
-      <point x="431" y="-2"/>
+      <point x="489" y="-2" type="curve" smooth="yes"/>
+      <point x="509" y="-2"/>
+      <point x="524" y="3"/>
+      <point x="540" y="10" type="curve"/>
+      <point x="535" y="24" type="line"/>
+      <point x="520" y="18"/>
+      <point x="507" y="15"/>
+      <point x="491" y="15" type="curve" smooth="yes"/>
+      <point x="462" y="15"/>
+      <point x="443" y="35"/>
+      <point x="443" y="75" type="curve" smooth="yes"/>
+      <point x="443" y="471" type="line"/>
+      <point x="422" y="471" type="line"/>
+      <point x="422" y="71" type="line" smooth="yes"/>
+      <point x="422" y="23"/>
+      <point x="449" y="-2"/>
     </contour>
     <contour>
-      <point x="115" y="0" type="line"/>
-      <point x="136" y="0" type="line"/>
-      <point x="136" y="471" type="line"/>
-      <point x="115" y="471" type="line"/>
+      <point x="133" y="0" type="line"/>
+      <point x="154" y="0" type="line"/>
+      <point x="154" y="471" type="line"/>
+      <point x="133" y="471" type="line"/>
     </contour>
     <contour>
-      <point x="29" y="463" type="line"/>
-      <point x="509" y="463" type="line"/>
-      <point x="509" y="480" type="line"/>
-      <point x="29" y="480" type="line"/>
+      <point x="47" y="463" type="line"/>
+      <point x="527" y="463" type="line"/>
+      <point x="527" y="480" type="line"/>
+      <point x="47" y="480" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -40,8 +40,6 @@
       <string>t</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=t+5</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/prosgegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/prosgegrammeni.glif
index 136218d7..10ec3112 100644
--- a/src/Cantarell-Light.ufo/glyphs/prosgegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/prosgegrammeni.glif
@@ -5,10 +5,4 @@
   <outline>
     <component base="ypogegrammeni"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/psi.glif b/src/Cantarell-Light.ufo/glyphs/psi.glif
index 7d142d2d..19bb38ed 100644
--- a/src/Cantarell-Light.ufo/glyphs/psi.glif
+++ b/src/Cantarell-Light.ufo/glyphs/psi.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="psi" format="2">
-  <advance width="667"/>
+  <advance width="696"/>
   <unicode hex="03C8"/>
   <outline>
     <contour>
-      <point x="326" y="-217" type="line"/>
-      <point x="347" y="-217" type="line"/>
-      <point x="347" y="642" type="line"/>
-      <point x="326" y="642" type="line"/>
+      <point x="344" y="-217" type="line"/>
+      <point x="365" y="-217" type="line"/>
+      <point x="365" y="642" type="line"/>
+      <point x="344" y="642" type="line"/>
     </contour>
     <contour>
-      <point x="330" y="14" type="line"/>
-      <point x="197" y="14"/>
-      <point x="96" y="81"/>
-      <point x="96" y="237" type="curve" smooth="yes"/>
-      <point x="96" y="480" type="line"/>
-      <point x="75" y="480" type="line"/>
-      <point x="75" y="233" type="line" smooth="yes"/>
-      <point x="75" y="71"/>
-      <point x="182" y="-4"/>
-      <point x="328" y="-4" type="curve"/>
+      <point x="348" y="14" type="line"/>
+      <point x="215" y="14"/>
+      <point x="114" y="81"/>
+      <point x="114" y="237" type="curve" smooth="yes"/>
+      <point x="114" y="480" type="line"/>
+      <point x="93" y="480" type="line"/>
+      <point x="93" y="233" type="line" smooth="yes"/>
+      <point x="93" y="71"/>
+      <point x="200" y="-4"/>
+      <point x="346" y="-4" type="curve"/>
     </contour>
     <contour>
-      <point x="343" y="-4" type="line"/>
-      <point x="501" y="-4"/>
-      <point x="605" y="81"/>
-      <point x="605" y="237" type="curve" smooth="yes"/>
-      <point x="605" y="332"/>
-      <point x="582" y="402"/>
-      <point x="553" y="480" type="curve"/>
-      <point x="531" y="480" type="line"/>
-      <point x="562" y="404"/>
-      <point x="584" y="321"/>
-      <point x="584" y="238" type="curve" smooth="yes"/>
-      <point x="584" y="91"/>
-      <point x="486" y="14"/>
-      <point x="345" y="14" type="curve"/>
+      <point x="361" y="-4" type="line"/>
+      <point x="519" y="-4"/>
+      <point x="623" y="81"/>
+      <point x="623" y="237" type="curve" smooth="yes"/>
+      <point x="623" y="332"/>
+      <point x="600" y="402"/>
+      <point x="571" y="480" type="curve"/>
+      <point x="549" y="480" type="line"/>
+      <point x="580" y="404"/>
+      <point x="602" y="321"/>
+      <point x="602" y="238" type="curve" smooth="yes"/>
+      <point x="602" y="91"/>
+      <point x="504" y="14"/>
+      <point x="363" y="14" type="curve"/>
     </contour>
   </outline>
   <lib>
@@ -44,8 +44,6 @@
       <string>=upsilon</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=omega</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/psili.case.glif b/src/Cantarell-Light.ufo/glyphs/psili.case.glif
index 8ebee9f3..3aadb1ac 100644
--- a/src/Cantarell-Light.ufo/glyphs/psili.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/psili.case.glif
@@ -12,8 +12,6 @@
       <string>psili</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psili</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/psili.glif b/src/Cantarell-Light.ufo/glyphs/psili.glif
index 2cc6fe14..0111b05b 100644
--- a/src/Cantarell-Light.ufo/glyphs/psili.glif
+++ b/src/Cantarell-Light.ufo/glyphs/psili.glif
@@ -22,10 +22,4 @@
       <point x="102" y="606"/>
     </contour>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/psilioxia.case.glif 
b/src/Cantarell-Light.ufo/glyphs/psilioxia.case.glif
index d4883d01..a5cc09cd 100644
--- a/src/Cantarell-Light.ufo/glyphs/psilioxia.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/psilioxia.case.glif
@@ -11,8 +11,6 @@
       <string>psilioxia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psilioxia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/psilioxia.glif b/src/Cantarell-Light.ufo/glyphs/psilioxia.glif
index a47f20f4..fb80761d 100644
--- a/src/Cantarell-Light.ufo/glyphs/psilioxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/psilioxia.glif
@@ -33,8 +33,6 @@
       <string>psili</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>oxia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/psiliperispomeni.case.glif 
b/src/Cantarell-Light.ufo/glyphs/psiliperispomeni.case.glif
index b21de313..5b02d1bb 100644
--- a/src/Cantarell-Light.ufo/glyphs/psiliperispomeni.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/psiliperispomeni.case.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="psiliperispomeni.case" format="2">
-  <advance width="482"/>
+  <advance width="500"/>
   <anchor x="339" y="815" name="_topleft"/>
   <outline>
     <component base="psiliperispomeni" yOffset="-59"/>
@@ -11,8 +11,6 @@
       <string>psiliperispomeni</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psiliperispomeni</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/psiliperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/psiliperispomeni.glif
index 11da9ca8..a9951781 100644
--- a/src/Cantarell-Light.ufo/glyphs/psiliperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/psiliperispomeni.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="psiliperispomeni" format="2">
-  <advance width="482"/>
+  <advance width="500"/>
   <unicode hex="1FCF"/>
-  <anchor x="217" y="480" name="_top"/>
+  <anchor x="247" y="480" name="_top"/>
   <outline>
-    <component base="psili" xOffset="119"/>
+    <component base="psili" xOffset="149"/>
     <component base="perispomeni" yOffset="204"/>
   </outline>
   <lib>
@@ -13,8 +13,6 @@
       <string>perispomeni</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>perispomeni</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/psilivaria.case.glif 
b/src/Cantarell-Light.ufo/glyphs/psilivaria.case.glif
index 009d3b3d..cf0eb589 100644
--- a/src/Cantarell-Light.ufo/glyphs/psilivaria.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/psilivaria.case.glif
@@ -11,8 +11,6 @@
       <string>psilivaria</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psilivaria</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/psilivaria.glif b/src/Cantarell-Light.ufo/glyphs/psilivaria.glif
index f9f095d6..c5969af1 100644
--- a/src/Cantarell-Light.ufo/glyphs/psilivaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/psilivaria.glif
@@ -33,8 +33,6 @@
       <string>psili</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>varia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rho.glif b/src/Cantarell-Light.ufo/glyphs/rho.glif
index 828314bd..77dcabe7 100644
--- a/src/Cantarell-Light.ufo/glyphs/rho.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rho.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rho" format="2">
-  <advance width="518"/>
+  <advance width="548"/>
   <unicode hex="03C1"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="253" y="480" name="top"/>
+  <anchor x="272" y="0" name="bottom"/>
+  <anchor x="272" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="68" y="262" type="curve" smooth="yes"/>
-      <point x="68" y="-217" type="line"/>
-      <point x="92" y="-217" type="line"/>
-      <point x="86" y="79" type="line"/>
-      <point x="89" y="79" type="line"/>
-      <point x="89" y="259" type="line" smooth="yes"/>
-      <point x="89" y="392"/>
-      <point x="161" y="468"/>
-      <point x="262" y="468" type="curve" smooth="yes"/>
-      <point x="376" y="468"/>
-      <point x="440" y="378"/>
-      <point x="440" y="237" type="curve" smooth="yes"/>
-      <point x="440" y="97"/>
-      <point x="365" y="8"/>
-      <point x="252" y="8" type="curve" smooth="yes"/>
-      <point x="172" y="8"/>
-      <point x="109" y="53"/>
-      <point x="79" y="126" type="curve"/>
-      <point x="76" y="96" type="line"/>
-      <point x="109" y="29"/>
-      <point x="170" y="-10"/>
-      <point x="250" y="-10" type="curve" smooth="yes"/>
-      <point x="376" y="-10"/>
-      <point x="461" y="90"/>
-      <point x="461" y="240" type="curve" smooth="yes"/>
-      <point x="461" y="389"/>
-      <point x="388" y="486"/>
-      <point x="264" y="486" type="curve" smooth="yes"/>
-      <point x="150" y="486"/>
-      <point x="68" y="405"/>
+      <point x="87" y="262" type="curve" smooth="yes"/>
+      <point x="87" y="-217" type="line"/>
+      <point x="111" y="-217" type="line"/>
+      <point x="105" y="79" type="line"/>
+      <point x="108" y="79" type="line"/>
+      <point x="108" y="259" type="line" smooth="yes"/>
+      <point x="108" y="392"/>
+      <point x="180" y="468"/>
+      <point x="281" y="468" type="curve" smooth="yes"/>
+      <point x="395" y="468"/>
+      <point x="459" y="378"/>
+      <point x="459" y="237" type="curve" smooth="yes"/>
+      <point x="459" y="97"/>
+      <point x="384" y="8"/>
+      <point x="271" y="8" type="curve" smooth="yes"/>
+      <point x="191" 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="189" y="-10"/>
+      <point x="269" y="-10" type="curve" smooth="yes"/>
+      <point x="395" y="-10"/>
+      <point x="480" y="90"/>
+      <point x="480" y="240" type="curve" smooth="yes"/>
+      <point x="480" y="389"/>
+      <point x="407" y="486"/>
+      <point x="283" y="486" type="curve" smooth="yes"/>
+      <point x="169" y="486"/>
+      <point x="87" y="405"/>
     </contour>
   </outline>
   <lib>
@@ -44,8 +44,6 @@
       <string>=p-20</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=o</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rhodasia.glif b/src/Cantarell-Light.ufo/glyphs/rhodasia.glif
index 64a67852..0c36fc7d 100644
--- a/src/Cantarell-Light.ufo/glyphs/rhodasia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rhodasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rhodasia" format="2">
-  <advance width="518"/>
+  <advance width="548"/>
   <unicode hex="1FE5"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="253" y="684" name="top"/>
   <outline>
     <component base="rho"/>
-    <component base="dasia" xOffset="145"/>
+    <component base="dasia" xOffset="164"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/rhopsili.glif b/src/Cantarell-Light.ufo/glyphs/rhopsili.glif
index d5fd3357..113b5bc2 100644
--- a/src/Cantarell-Light.ufo/glyphs/rhopsili.glif
+++ b/src/Cantarell-Light.ufo/glyphs/rhopsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rhopsili" format="2">
-  <advance width="518"/>
+  <advance width="548"/>
   <unicode hex="1FE4"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="253" y="684" name="top"/>
   <outline>
     <component base="rho"/>
-    <component base="psili" xOffset="155"/>
+    <component base="psili" xOffset="174"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sigma.glif b/src/Cantarell-Light.ufo/glyphs/sigma.glif
index f9a77a62..877164aa 100644
--- a/src/Cantarell-Light.ufo/glyphs/sigma.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sigma.glif
@@ -1,45 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sigma" format="2">
-  <advance width="560"/>
+  <advance width="571"/>
   <unicode hex="03C3"/>
   <outline>
     <contour>
-      <point x="353" y="471" type="line"/>
-      <point x="405" y="414"/>
-      <point x="456" y="324"/>
-      <point x="456" y="224" type="curve" smooth="yes"/>
-      <point x="456" y="94"/>
-      <point x="383" y="8"/>
-      <point x="269" y="8" type="curve" smooth="yes"/>
-      <point x="155" y="8"/>
-      <point x="78" y="97"/>
-      <point x="78" y="236" type="curve" smooth="yes"/>
-      <point x="78" y="368"/>
-      <point x="162" y="463"/>
-      <point x="302" y="463" type="curve" smooth="yes"/>
-      <point x="550" y="463" type="line"/>
-      <point x="550" y="480" type="line"/>
-      <point x="300" y="480" type="line" smooth="yes"/>
-      <point x="149" y="480"/>
-      <point x="57" y="379"/>
-      <point x="57" y="234" type="curve" smooth="yes"/>
-      <point x="57" y="85"/>
-      <point x="143" y="-10"/>
-      <point x="267" y="-10" type="curve" smooth="yes"/>
-      <point x="393" y="-10"/>
-      <point x="477" y="87"/>
-      <point x="477" y="227" type="curve" smooth="yes"/>
-      <point x="477" y="331"/>
-      <point x="421" y="426"/>
-      <point x="368" y="479" type="curve"/>
+      <point x="364" y="471" type="line"/>
+      <point x="416" y="414"/>
+      <point x="467" y="324"/>
+      <point x="467" y="224" type="curve" smooth="yes"/>
+      <point x="467" y="94"/>
+      <point x="394" y="8"/>
+      <point x="280" y="8" type="curve" smooth="yes"/>
+      <point x="166" y="8"/>
+      <point x="89" y="97"/>
+      <point x="89" y="236" type="curve" smooth="yes"/>
+      <point x="89" y="368"/>
+      <point x="173" y="463"/>
+      <point x="313" y="463" type="curve" smooth="yes"/>
+      <point x="561" y="463" type="line"/>
+      <point x="561" y="480" type="line"/>
+      <point x="311" y="480" type="line" smooth="yes"/>
+      <point x="160" y="480"/>
+      <point x="68" y="379"/>
+      <point x="68" y="234" type="curve" smooth="yes"/>
+      <point x="68" y="85"/>
+      <point x="154" y="-10"/>
+      <point x="278" y="-10" type="curve" smooth="yes"/>
+      <point x="404" y="-10"/>
+      <point x="488" y="87"/>
+      <point x="488" y="227" type="curve" smooth="yes"/>
+      <point x="488" y="331"/>
+      <point x="432" y="426"/>
+      <point x="379" y="479" type="curve"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>=o</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/sigmafinal.glif b/src/Cantarell-Light.ufo/glyphs/sigmafinal.glif
index 8574bd1a..d74e8641 100644
--- a/src/Cantarell-Light.ufo/glyphs/sigmafinal.glif
+++ b/src/Cantarell-Light.ufo/glyphs/sigmafinal.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sigmafinal" format="2">
-  <advance width="430"/>
+  <advance width="464"/>
   <unicode hex="03C2"/>
   <outline>
     <contour>
-      <point x="78" y="269" type="curve" smooth="yes"/>
-      <point x="78" y="383"/>
-      <point x="151" y="468"/>
-      <point x="273" y="468" type="curve" smooth="yes"/>
-      <point x="317" y="468"/>
-      <point x="357" y="457"/>
-      <point x="395" y="436" type="curve"/>
-      <point x="402" y="452" type="line"/>
-      <point x="361" y="475"/>
-      <point x="320" y="486"/>
-      <point x="275" y="486" type="curve" smooth="yes"/>
-      <point x="140" y="486"/>
-      <point x="57" y="390"/>
-      <point x="57" y="264" type="curve" smooth="yes"/>
-      <point x="57" y="143"/>
-      <point x="124" y="81"/>
-      <point x="237" y="36" type="curve" smooth="yes"/>
-      <point x="327" y="0"/>
-      <point x="380" y="-36"/>
-      <point x="380" y="-86" type="curve" smooth="yes"/>
-      <point x="380" y="-124"/>
-      <point x="344" y="-169"/>
-      <point x="313" y="-207" type="curve"/>
-      <point x="326" y="-219" type="line"/>
-      <point x="363" y="-175"/>
-      <point x="401" y="-129"/>
-      <point x="401" y="-82" type="curve" smooth="yes"/>
-      <point x="401" y="-27"/>
-      <point x="350" y="11"/>
-      <point x="245" y="53" type="curve" smooth="yes"/>
-      <point x="142" y="94"/>
-      <point x="78" y="153"/>
+      <point x="89" y="269" type="curve" smooth="yes"/>
+      <point x="89" y="383"/>
+      <point x="162" y="468"/>
+      <point x="284" y="468" type="curve" smooth="yes"/>
+      <point x="328" y="468"/>
+      <point x="368" y="457"/>
+      <point x="406" y="436" type="curve"/>
+      <point x="413" y="452" type="line"/>
+      <point x="372" y="475"/>
+      <point x="331" y="486"/>
+      <point x="286" y="486" type="curve" smooth="yes"/>
+      <point x="151" y="486"/>
+      <point x="68" y="390"/>
+      <point x="68" y="264" type="curve" smooth="yes"/>
+      <point x="68" y="143"/>
+      <point x="135" y="81"/>
+      <point x="248" y="36" type="curve" smooth="yes"/>
+      <point x="338" y="0"/>
+      <point x="391" y="-36"/>
+      <point x="391" y="-86" type="curve" smooth="yes"/>
+      <point x="391" y="-124"/>
+      <point x="355" y="-169"/>
+      <point x="324" y="-207" type="curve"/>
+      <point x="337" y="-219" type="line"/>
+      <point x="374" y="-175"/>
+      <point x="412" y="-129"/>
+      <point x="412" y="-82" type="curve" smooth="yes"/>
+      <point x="412" y="-27"/>
+      <point x="361" y="11"/>
+      <point x="256" y="53" type="curve" smooth="yes"/>
+      <point x="153" y="94"/>
+      <point x="89" y="153"/>
     </contour>
   </outline>
   <lib>
@@ -44,8 +44,6 @@
       <string>=c</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=c</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tau.glif b/src/Cantarell-Light.ufo/glyphs/tau.glif
index 802e775f..2eff32c0 100644
--- a/src/Cantarell-Light.ufo/glyphs/tau.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tau.glif
@@ -1,31 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tau" format="2">
-  <advance width="434"/>
+  <advance width="442"/>
   <unicode hex="03C4"/>
   <outline>
     <contour>
-      <point x="12" y="463" type="line"/>
-      <point x="417" y="463" type="line"/>
-      <point x="417" y="480" type="line"/>
-      <point x="12" y="480" type="line"/>
+      <point x="16" y="463" type="line"/>
+      <point x="421" y="463" type="line"/>
+      <point x="421" y="480" type="line"/>
+      <point x="16" y="480" type="line"/>
     </contour>
     <contour>
-      <point x="286" y="-3" type="curve" smooth="yes"/>
-      <point x="309" y="-3"/>
-      <point x="334" y="3"/>
-      <point x="352" y="12" type="curve"/>
-      <point x="347" y="26" type="line"/>
-      <point x="330" y="18"/>
-      <point x="307" y="14"/>
-      <point x="288" y="14" type="curve" smooth="yes"/>
-      <point x="247" y="14"/>
-      <point x="219" y="42"/>
-      <point x="219" y="93" type="curve" smooth="yes"/>
-      <point x="219" y="480" type="line"/>
-      <point x="199" y="480" type="line"/>
-      <point x="199" y="89" type="line" smooth="yes"/>
-      <point x="199" y="31"/>
-      <point x="232" y="-3"/>
+      <point x="290" y="-3" type="curve" smooth="yes"/>
+      <point x="313" y="-3"/>
+      <point x="338" y="3"/>
+      <point x="356" y="12" type="curve"/>
+      <point x="351" y="26" type="line"/>
+      <point x="334" y="18"/>
+      <point x="311" y="14"/>
+      <point x="292" y="14" type="curve" smooth="yes"/>
+      <point x="251" y="14"/>
+      <point x="223" y="42"/>
+      <point x="223" y="93" type="curve" smooth="yes"/>
+      <point x="223" y="480" type="line"/>
+      <point x="203" y="480" type="line"/>
+      <point x="203" y="89" type="line" smooth="yes"/>
+      <point x="203" y="31"/>
+      <point x="236" y="-3"/>
     </contour>
   </outline>
   <lib>
@@ -34,8 +34,6 @@
       <string>=te-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=te-cy+5</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/theta.glif b/src/Cantarell-Light.ufo/glyphs/theta.glif
index 0b07260e..45df7177 100644
--- a/src/Cantarell-Light.ufo/glyphs/theta.glif
+++ b/src/Cantarell-Light.ufo/glyphs/theta.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="theta" format="2">
-  <advance width="558"/>
+  <advance width="580"/>
   <unicode hex="03B8"/>
   <outline>
     <contour>
-      <point x="277" y="-10" type="curve" smooth="yes"/>
-      <point x="425" y="-10"/>
-      <point x="496" y="129"/>
-      <point x="496" y="374" type="curve" smooth="yes"/>
-      <point x="496" y="609"/>
-      <point x="427" y="749"/>
-      <point x="279" y="749" type="curve" smooth="yes"/>
-      <point x="131" y="749"/>
-      <point x="62" y="612"/>
-      <point x="62" y="367" type="curve" smooth="yes"/>
-      <point x="62" y="132"/>
-      <point x="129" y="-10"/>
+      <point x="288" y="-10" type="curve" smooth="yes"/>
+      <point x="436" y="-10"/>
+      <point x="507" y="129"/>
+      <point x="507" y="374" type="curve" smooth="yes"/>
+      <point x="507" y="609"/>
+      <point x="438" y="749"/>
+      <point x="290" y="749" type="curve" smooth="yes"/>
+      <point x="142" y="749"/>
+      <point x="73" y="612"/>
+      <point x="73" y="367" type="curve" smooth="yes"/>
+      <point x="73" y="132"/>
+      <point x="140" y="-10"/>
     </contour>
     <contour>
-      <point x="279" y="8" type="curve" smooth="yes"/>
-      <point x="145" y="8"/>
-      <point x="83" y="145"/>
-      <point x="83" y="371" type="curve" smooth="yes"/>
-      <point x="83" y="596"/>
-      <point x="143" y="731"/>
-      <point x="277" y="731" type="curve" smooth="yes"/>
-      <point x="411" y="731"/>
-      <point x="475" y="594"/>
-      <point x="475" y="369" type="curve" smooth="yes"/>
-      <point x="475" y="145"/>
-      <point x="413" y="8"/>
+      <point x="290" y="8" type="curve" smooth="yes"/>
+      <point x="156" y="8"/>
+      <point x="94" y="145"/>
+      <point x="94" y="371" type="curve" smooth="yes"/>
+      <point x="94" y="596"/>
+      <point x="154" y="731"/>
+      <point x="288" y="731" type="curve" smooth="yes"/>
+      <point x="422" y="731"/>
+      <point x="486" y="594"/>
+      <point x="486" y="369" type="curve" smooth="yes"/>
+      <point x="486" y="145"/>
+      <point x="424" y="8"/>
     </contour>
     <contour>
-      <point x="72" y="369" type="line"/>
-      <point x="485" y="369" type="line"/>
-      <point x="485" y="386" type="line"/>
-      <point x="72" y="386" type="line"/>
+      <point x="83" y="369" type="line"/>
+      <point x="496" y="369" type="line"/>
+      <point x="496" y="386" type="line"/>
+      <point x="83" y="386" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -44,8 +44,6 @@
       <string>=o+5</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=o+5</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tonos.case.glif b/src/Cantarell-Light.ufo/glyphs/tonos.case.glif
index c7ecdf0d..167b9bbc 100644
--- a/src/Cantarell-Light.ufo/glyphs/tonos.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tonos.case.glif
@@ -11,8 +11,6 @@
       <string>tonos</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>tonos</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/tonos.glif b/src/Cantarell-Light.ufo/glyphs/tonos.glif
index edcf8b77..4d5010c4 100644
--- a/src/Cantarell-Light.ufo/glyphs/tonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/tonos.glif
@@ -11,10 +11,4 @@
       <point x="90" y="574" type="line"/>
     </contour>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilon.glif b/src/Cantarell-Light.ufo/glyphs/upsilon.glif
index e429d138..7d5a4541 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilon.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilon.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilon" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="03C5"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="480" name="top"/>
+  <anchor x="244" y="0" name="bottom"/>
+  <anchor x="244" y="480" name="top"/>
   <outline>
     <contour>
-      <point x="257" y="-6" type="curve" smooth="yes"/>
-      <point x="393" y="-6"/>
-      <point x="442" y="93"/>
-      <point x="442" y="229" type="curve" smooth="yes"/>
-      <point x="442" y="325"/>
-      <point x="418" y="400"/>
-      <point x="390" y="480" type="curve"/>
-      <point x="368" y="480" type="line"/>
-      <point x="397" y="401"/>
-      <point x="421" y="316"/>
-      <point x="421" y="230" type="curve" smooth="yes"/>
-      <point x="421" y="105"/>
-      <point x="379" y="12"/>
-      <point x="259" y="12" type="curve" smooth="yes"/>
-      <point x="161" y="12"/>
-      <point x="96" y="75"/>
-      <point x="96" y="201" type="curve" smooth="yes"/>
-      <point x="96" y="480" type="line"/>
-      <point x="75" y="480" type="line"/>
-      <point x="75" y="199" type="line" smooth="yes"/>
-      <point x="75" y="64"/>
-      <point x="149" y="-6"/>
+      <point x="275" y="-6" type="curve" smooth="yes"/>
+      <point x="411" y="-6"/>
+      <point x="460" y="93"/>
+      <point x="460" y="229" type="curve" smooth="yes"/>
+      <point x="460" y="325"/>
+      <point x="436" y="400"/>
+      <point x="408" y="480" type="curve"/>
+      <point x="386" y="480" type="line"/>
+      <point x="415" y="401"/>
+      <point x="439" y="316"/>
+      <point x="439" y="230" type="curve" smooth="yes"/>
+      <point x="439" y="105"/>
+      <point x="397" y="12"/>
+      <point x="277" y="12" type="curve" smooth="yes"/>
+      <point x="179" y="12"/>
+      <point x="114" y="75"/>
+      <point x="114" y="201" type="curve" smooth="yes"/>
+      <point x="114" y="480" type="line"/>
+      <point x="93" y="480" type="line"/>
+      <point x="93" y="199" type="line" smooth="yes"/>
+      <point x="93" y="64"/>
+      <point x="167" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -38,8 +38,6 @@
       <string>=omega</string>
       <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
       <string>=o+6</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilondasia.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilondasia.glif
index 08c375a1..bcb62e46 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilondasia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilondasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondasia" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="1F51"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="684" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dasia" xOffset="118"/>
+    <component base="dasia" xOffset="136"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilondasiaoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilondasiaoxia.glif
index c8b6cf20..43255c21 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilondasiaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilondasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondasiaoxia" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="1F55"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="480" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dasiaoxia" xOffset="71"/>
+    <component base="dasiaoxia" xOffset="89"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilondasiaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilondasiaperispomeni.glif
index e68b9944..099d6035 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilondasiaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilondasiaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondasiaperispomeni" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="1F57"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="480" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="daspsiliiaperispomeni" xOffset="9"/>
+    <component base="daspsiliiaperispomeni" xOffset="-3"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilondasiavaria.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilondasiavaria.glif
index 0a7472e3..a0c06906 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilondasiavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilondasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondasiavaria" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="1F53"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="480" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dasiavaria" xOffset="56"/>
+    <component base="dasiavaria" xOffset="74"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilondialytikaoxia.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilondialytikaoxia.glif
index c5b5f080..25942a53 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilondialytikaoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilondialytikaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondialytikaoxia" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="1FE3"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="480" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dialytikaoxia" xOffset="26"/>
+    <component base="dialytikaoxia" xOffset="12"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilondialytikaperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilondialytikaperispomeni.glif
index e2dbce48..cb716397 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilondialytikaperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilondialytikaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondialytikaperispomeni" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="1FE7"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="480" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dialytikaperispomeni" xOffset="9"/>
+    <component base="dialytikaperispomeni" xOffset="-3"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilondialytikavaria.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilondialytikavaria.glif
index da02d1bd..4af4ce63 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilondialytikavaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilondialytikavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondialytikavaria" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="1FE2"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="480" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dialytikavaria" xOffset="-12"/>
+    <component base="dialytikavaria" xOffset="-26"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilondieresis.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilondieresis.glif
index c7130a4d..405364b5 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilondieresis.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilondieresis.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondieresis" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="03CB"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="639" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dieresiscomb" xOffset="7"/>
+    <component base="dieresiscomb" xOffset="25"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilondieresistonos.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilondieresistonos.glif
index e6d024da..4184915e 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilondieresistonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilondieresistonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondieresistonos" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="03B0"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="480" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dieresistonos" xOffset="24"/>
+    <component base="dieresistonos" xOffset="42"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilonmacron.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilonmacron.glif
index c1bc5b90..94b9568e 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilonmacron.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilonmacron.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonmacron" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="1FE1"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="480" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="macron" xOffset="-5"/>
+    <component base="macron" xOffset="-7"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilonoxia.glif b/src/Cantarell-Light.ufo/glyphs/upsilonoxia.glif
index 07e1f916..09096026 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilonoxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilonoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonoxia" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="1F7B"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="480" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="oxia" xOffset="133"/>
+    <component base="oxia" xOffset="151"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilonperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilonperispomeni.glif
index 8088124d..0044035f 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilonperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilonperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonperispomeni" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="1FE6"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="612" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="perispomeni" xOffset="9"/>
+    <component base="perispomeni" xOffset="-3"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilonpsili.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilonpsili.glif
index c3ea150e..7de30e48 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilonpsili.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilonpsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonpsili" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="1F50"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="684" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="psili" xOffset="128"/>
+    <component base="psili" xOffset="146"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilonpsilioxia.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilonpsilioxia.glif
index 1dd07b47..8ca40cef 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilonpsilioxia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilonpsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonpsilioxia" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="1F54"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="480" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="psilioxia" xOffset="75"/>
+    <component base="psilioxia" xOffset="93"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilonpsiliperispomeni.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilonpsiliperispomeni.glif
index ab7f9897..d972f3e3 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilonpsiliperispomeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilonpsiliperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonpsiliperispomeni" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="1F56"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="480" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="psiliperispomeni" xOffset="9"/>
+    <component base="psiliperispomeni" xOffset="-3"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilonpsilivaria.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilonpsilivaria.glif
index d49fe7ac..305f5829 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilonpsilivaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilonpsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonpsilivaria" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="1F52"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="480" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="psilivaria" xOffset="57"/>
+    <component base="psilivaria" xOffset="75"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilontonos.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilontonos.glif
index d1088234..86981d11 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilontonos.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilontonos.glif
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilontonos" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="03CD"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="480" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="tonos" xOffset="133"/>
+    <component base="tonos" xOffset="151"/>
   </outline>
   <lib>
     <dict>
@@ -14,8 +12,6 @@
       <string>upsilon</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>upsilon</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilonvaria.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilonvaria.glif
index cae096d8..f9ab1133 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilonvaria.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilonvaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonvaria" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="1F7A"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="480" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="varia" xOffset="95"/>
+    <component base="varia" xOffset="113"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/upsilonvrachy.glif 
b/src/Cantarell-Light.ufo/glyphs/upsilonvrachy.glif
index 68d70294..fc144e0d 100644
--- a/src/Cantarell-Light.ufo/glyphs/upsilonvrachy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/upsilonvrachy.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonvrachy" format="2">
-  <advance width="505"/>
+  <advance width="534"/>
   <unicode hex="1FE0"/>
-  <anchor x="226" y="0" name="bottom"/>
-  <anchor x="226" y="665" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="vrachy" xOffset="40"/>
+    <component base="vrachy" xOffset="58"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/varia.case.glif b/src/Cantarell-Light.ufo/glyphs/varia.case.glif
index 8558a48d..bb530a38 100644
--- a/src/Cantarell-Light.ufo/glyphs/varia.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/varia.case.glif
@@ -11,8 +11,6 @@
       <string>varia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>varia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/varia.glif b/src/Cantarell-Light.ufo/glyphs/varia.glif
index 453ad125..3a425615 100644
--- a/src/Cantarell-Light.ufo/glyphs/varia.glif
+++ b/src/Cantarell-Light.ufo/glyphs/varia.glif
@@ -6,10 +6,4 @@
   <outline>
     <component base="tonos" xScale="-1" xOffset="223"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/vrachy.case.glif b/src/Cantarell-Light.ufo/glyphs/vrachy.case.glif
index 0997fdc7..c2565b08 100644
--- a/src/Cantarell-Light.ufo/glyphs/vrachy.case.glif
+++ b/src/Cantarell-Light.ufo/glyphs/vrachy.case.glif
@@ -11,8 +11,6 @@
       <string>brevecomb.case</string>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>416</integer>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/vrachy.glif b/src/Cantarell-Light.ufo/glyphs/vrachy.glif
index e89ab22b..a20d2804 100644
--- a/src/Cantarell-Light.ufo/glyphs/vrachy.glif
+++ b/src/Cantarell-Light.ufo/glyphs/vrachy.glif
@@ -13,8 +13,6 @@
       <string>brevecomb</string>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>382</integer>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/xi.glif b/src/Cantarell-Light.ufo/glyphs/xi.glif
index bb37e82a..fe8ea4f7 100644
--- a/src/Cantarell-Light.ufo/glyphs/xi.glif
+++ b/src/Cantarell-Light.ufo/glyphs/xi.glif
@@ -1,65 +1,63 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="xi" format="2">
-  <advance width="410"/>
+  <advance width="421"/>
   <unicode hex="03BE"/>
   <outline>
     <contour>
-      <point x="62" y="739" type="line"/>
-      <point x="62" y="722" type="line"/>
-      <point x="394" y="722" type="line"/>
-      <point x="387" y="728" type="line"/>
-      <point x="273" y="675" type="line" smooth="yes"/>
-      <point x="187" y="635"/>
-      <point x="84" y="573"/>
-      <point x="84" y="490" type="curve" smooth="yes"/>
-      <point x="84" y="425"/>
-      <point x="139" y="372"/>
-      <point x="230" y="372" type="curve"/>
-      <point x="232" y="377" type="line"/>
-      <point x="133" y="377"/>
-      <point x="52" y="301"/>
-      <point x="52" y="216" type="curve" smooth="yes"/>
-      <point x="52" y="125"/>
-      <point x="117" y="73"/>
-      <point x="228" y="31" type="curve" smooth="yes"/>
-      <point x="318" y="-3"/>
-      <point x="367" y="-31"/>
-      <point x="367" y="-83" type="curve" smooth="yes"/>
-      <point x="367" y="-122"/>
-      <point x="330" y="-169"/>
-      <point x="298" y="-207" type="curve"/>
-      <point x="311" y="-219" type="line"/>
-      <point x="349" y="-175"/>
-      <point x="388" y="-127"/>
-      <point x="388" y="-79" type="curve" smooth="yes"/>
-      <point x="388" y="-23"/>
-      <point x="340" y="9"/>
-      <point x="240" y="47" type="curve" smooth="yes"/>
-      <point x="134" y="87"/>
-      <point x="74" y="136"/>
-      <point x="74" y="220" type="curve" smooth="yes"/>
-      <point x="74" y="291"/>
-      <point x="147" y="367"/>
-      <point x="252" y="367" type="curve" smooth="yes"/>
-      <point x="368" y="367" type="line"/>
-      <point x="368" y="384" type="line"/>
-      <point x="256" y="384" type="line" smooth="yes"/>
-      <point x="149" y="384"/>
-      <point x="106" y="437"/>
-      <point x="106" y="493" type="curve" smooth="yes"/>
-      <point x="106" y="565"/>
-      <point x="201" y="622"/>
-      <point x="284" y="662" type="curve" smooth="yes"/>
-      <point x="412" y="724" type="line"/>
-      <point x="412" y="739" type="line"/>
+      <point x="73" y="739" type="line"/>
+      <point x="73" y="722" type="line"/>
+      <point x="405" y="722" type="line"/>
+      <point x="398" y="728" type="line"/>
+      <point x="284" y="675" type="line" smooth="yes"/>
+      <point x="198" y="635"/>
+      <point x="95" y="573"/>
+      <point x="95" y="490" type="curve" smooth="yes"/>
+      <point x="95" y="425"/>
+      <point x="150" y="372"/>
+      <point x="241" y="372" type="curve"/>
+      <point x="243" y="377" type="line"/>
+      <point x="144" y="377"/>
+      <point x="63" y="301"/>
+      <point x="63" y="216" type="curve" smooth="yes"/>
+      <point x="63" y="125"/>
+      <point x="128" y="73"/>
+      <point x="239" y="31" type="curve" smooth="yes"/>
+      <point x="329" y="-3"/>
+      <point x="378" y="-31"/>
+      <point x="378" y="-83" type="curve" smooth="yes"/>
+      <point x="378" y="-122"/>
+      <point x="341" y="-169"/>
+      <point x="309" y="-207" type="curve"/>
+      <point x="322" y="-219" type="line"/>
+      <point x="360" y="-175"/>
+      <point x="399" y="-127"/>
+      <point x="399" y="-79" type="curve" smooth="yes"/>
+      <point x="399" y="-23"/>
+      <point x="351" y="9"/>
+      <point x="251" y="47" type="curve" smooth="yes"/>
+      <point x="145" y="87"/>
+      <point x="85" y="136"/>
+      <point x="85" y="220" type="curve" smooth="yes"/>
+      <point x="85" y="291"/>
+      <point x="158" y="367"/>
+      <point x="263" y="367" type="curve" smooth="yes"/>
+      <point x="379" y="367" type="line"/>
+      <point x="379" y="384" type="line"/>
+      <point x="267" y="384" type="line" smooth="yes"/>
+      <point x="160" y="384"/>
+      <point x="117" y="437"/>
+      <point x="117" y="493" type="curve" smooth="yes"/>
+      <point x="117" y="565"/>
+      <point x="212" y="622"/>
+      <point x="295" y="662" type="curve" smooth="yes"/>
+      <point x="423" y="724" type="line"/>
+      <point x="423" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>=o-5</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/ypogegrammeni.glif 
b/src/Cantarell-Light.ufo/glyphs/ypogegrammeni.glif
index 8aecc2a3..605c3fee 100644
--- a/src/Cantarell-Light.ufo/glyphs/ypogegrammeni.glif
+++ b/src/Cantarell-Light.ufo/glyphs/ypogegrammeni.glif
@@ -23,10 +23,4 @@
       <point x="218" y="-90" type="line"/>
     </contour>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Light.ufo/glyphs/zeta.glif b/src/Cantarell-Light.ufo/glyphs/zeta.glif
index bf20ebb5..cb46f5dd 100644
--- a/src/Cantarell-Light.ufo/glyphs/zeta.glif
+++ b/src/Cantarell-Light.ufo/glyphs/zeta.glif
@@ -1,49 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zeta" format="2">
-  <advance width="379"/>
+  <advance width="390"/>
   <unicode hex="03B6"/>
   <outline>
     <contour>
-      <point x="82" y="221" type="curve" smooth="yes"/>
-      <point x="82" y="319"/>
-      <point x="162" y="416"/>
-      <point x="266" y="546" type="curve" smooth="yes"/>
-      <point x="409" y="724" type="line"/>
-      <point x="409" y="739" type="line"/>
-      <point x="52" y="739" type="line"/>
-      <point x="52" y="722" type="line"/>
-      <point x="398" y="722" type="line"/>
-      <point x="391" y="731" type="line"/>
-      <point x="250" y="556" type="line" smooth="yes"/>
-      <point x="138" y="417"/>
-      <point x="61" y="321"/>
-      <point x="61" y="217" type="curve" smooth="yes"/>
-      <point x="61" y="126"/>
-      <point x="125" y="82"/>
-      <point x="230" y="36" type="curve" smooth="yes"/>
-      <point x="317" y="-2"/>
-      <point x="375" y="-30"/>
-      <point x="375" y="-83" type="curve" smooth="yes"/>
-      <point x="375" y="-122"/>
-      <point x="338" y="-169"/>
-      <point x="306" y="-207" type="curve"/>
-      <point x="319" y="-219" type="line"/>
-      <point x="357" y="-175"/>
-      <point x="396" y="-127"/>
-      <point x="396" y="-79" type="curve" smooth="yes"/>
-      <point x="396" y="-21"/>
-      <point x="337" y="11"/>
-      <point x="239" y="53" type="curve" smooth="yes"/>
-      <point x="142" y="95"/>
-      <point x="82" y="137"/>
+      <point x="93" y="221" type="curve" smooth="yes"/>
+      <point x="93" y="319"/>
+      <point x="173" y="416"/>
+      <point x="277" y="546" type="curve" smooth="yes"/>
+      <point x="420" y="724" type="line"/>
+      <point x="420" y="739" type="line"/>
+      <point x="63" y="739" type="line"/>
+      <point x="63" y="722" type="line"/>
+      <point x="409" y="722" type="line"/>
+      <point x="402" y="731" type="line"/>
+      <point x="261" y="556" type="line" smooth="yes"/>
+      <point x="149" y="417"/>
+      <point x="72" y="321"/>
+      <point x="72" y="217" type="curve" smooth="yes"/>
+      <point x="72" y="126"/>
+      <point x="136" y="82"/>
+      <point x="241" y="36" type="curve" smooth="yes"/>
+      <point x="328" y="-2"/>
+      <point x="386" y="-30"/>
+      <point x="386" y="-83" type="curve" smooth="yes"/>
+      <point x="386" y="-122"/>
+      <point x="349" y="-169"/>
+      <point x="317" y="-207" type="curve"/>
+      <point x="330" y="-219" type="line"/>
+      <point x="368" y="-175"/>
+      <point x="407" y="-127"/>
+      <point x="407" y="-79" type="curve" smooth="yes"/>
+      <point x="407" y="-21"/>
+      <point x="348" y="11"/>
+      <point x="250" y="53" type="curve" smooth="yes"/>
+      <point x="153" y="95"/>
+      <point x="93" y="137"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>=o-5</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lpha.glif b/src/Cantarell-Regular.ufo/glyphs/A_lpha.glif
index 2cde9b45..62d325a7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lpha.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lpha.glif
@@ -1,18 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alpha" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="0391"/>
   <anchor x="350" y="0" name="bottom"/>
   <anchor x="350" y="694" name="top"/>
   <anchor x="140" y="694" name="topleft"/>
-  <anchor x="633" y="10" name="ogonek"/>
   <outline>
     <component base="A"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphadasia.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphadasia.glif
index 4492df09..6cf9dfe3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphadasia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphadasia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasia" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1F09"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasia.case" xOffset="15"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaoxia.glif
index 8380cf60..15399d5f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiaoxia" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1F0D"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiaoxia.case" xOffset="-151"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaoxiaprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaoxiaprosgegrammeni.glif
index 42e83012..9078a7c8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaoxiaprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaoxiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiaoxiaprosgegrammeni" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1F8D"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiaoxia.case" xOffset="-151"/>
     <component base="prosgegrammeni" xOffset="116"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaperispomeni.glif
index df69addc..e169eb85 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiaperispomeni" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1F0F"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiaperispomeni.case" xOffset="-214" yOffset="-156"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaperispomeniprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaperispomeniprosgegrammeni.glif
index 41f72a1c..208be8d5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaperispomeniprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiaperispomeniprosgegrammeni" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1F8F"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiaperispomeni.case" xOffset="-214" yOffset="-156"/>
     <component base="prosgegrammeni" xOffset="116"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaprosgegrammeni.glif
index d35cccb0..51b7fd25 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphadasiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiaprosgegrammeni" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1F89"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasia.case" xOffset="15"/>
     <component base="prosgegrammeni" xOffset="116"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphadasiavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphadasiavaria.glif
index 96e87874..7f70201b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphadasiavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphadasiavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiavaria" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1F0B"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiavaria.case" xOffset="-132"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphadasiavariaprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphadasiavariaprosgegrammeni.glif
index f9b3e092..728a5d8e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphadasiavariaprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphadasiavariaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphadasiavariaprosgegrammeni" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1F8B"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="dasiavaria.case" xOffset="-132"/>
     <component base="prosgegrammeni" xOffset="116"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphamacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphamacron.glif
index f5d41254..3a4d2caf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphamacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphamacron.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphamacron" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1FB9"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
-    <component base="macron" xOffset="108" yOffset="212"/>
+    <component base="macron" xOffset="99" yOffset="212"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphaoxia.glif
index be41b43e..54f5fc00 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphaoxia" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1FBB"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="oxia.case" xOffset="-9"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphaprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphaprosgegrammeni.glif
index 9156f74d..eb0fdc9c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphaprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphaprosgegrammeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphaprosgegrammeni" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1FBC"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="prosgegrammeni" xOffset="116"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphapsili.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphapsili.glif
index 8992256d..ef6a16d6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphapsili.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphapsili.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsili" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1F08"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psili.case" xOffset="-8"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphapsilioxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphapsilioxia.glif
index 335c6601..70bdcd6b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphapsilioxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphapsilioxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsilioxia" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1F0C"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psilioxia.case" xOffset="-178"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphapsilioxiaprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphapsilioxiaprosgegrammeni.glif
index 1d04c02d..8f6bdcf8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphapsilioxiaprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphapsilioxiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsilioxiaprosgegrammeni" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1F8C"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psilioxia.case" xOffset="-178"/>
     <component base="prosgegrammeni" xOffset="116"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphapsiliperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphapsiliperispomeni.glif
index 0c0edc5a..6d40b5ff 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphapsiliperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphapsiliperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsiliperispomeni" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1F0E"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psiliperispomeni.case" xOffset="-199" yOffset="-156"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.5,0.09,0.79,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphapsiliperispomeniprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphapsiliperispomeniprosgegrammeni.glif
index d61d7e31..87d4ab0e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphapsiliperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphapsiliperispomeniprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsiliperispomeniprosgegrammeni" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1F8E"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psiliperispomeni.case" xOffset="-199" yOffset="-156"/>
     <component base="prosgegrammeni" xOffset="116"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphapsiliprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphapsiliprosgegrammeni.glif
index 0ba030fd..ec6e288e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphapsiliprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphapsiliprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsiliprosgegrammeni" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1F88"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psili.case" xOffset="-8"/>
     <component base="prosgegrammeni" xOffset="116"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphapsilivaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphapsilivaria.glif
index b301c076..a59a6348 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphapsilivaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphapsilivaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsilivaria" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1F0A"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psilivaria.case" xOffset="-161"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.25,0.25,0.25,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphapsilivariaprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphapsilivariaprosgegrammeni.glif
index a7b67da3..25f8ca96 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphapsilivariaprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphapsilivariaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphapsilivariaprosgegrammeni" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1F8A"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="psilivaria.case" xOffset="-161"/>
     <component base="prosgegrammeni" xOffset="116"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphatonos.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphatonos.glif
index 8f80d9bf..64290706 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphatonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphatonos.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphatonos" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="0386"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="tonos.case" xOffset="-9"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphavaria.glif
index c371120e..4c8c40be 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphavaria" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1FBA"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="varia.case" xOffset="9"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/A_lphavrachy.glif 
b/src/Cantarell-Regular.ufo/glyphs/A_lphavrachy.glif
index 00f93c72..2e8cf41c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/A_lphavrachy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/A_lphavrachy.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Alphavrachy" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="1FB8"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="633" y="10" name="ogonek"/>
-  <anchor x="350" y="694" name="top"/>
-  <anchor x="140" y="694" name="topleft"/>
   <outline>
     <component base="Alpha"/>
     <component base="vrachy.case" xOffset="141"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/B_eta.glif b/src/Cantarell-Regular.ufo/glyphs/B_eta.glif
index 7663aca5..de12ca11 100644
--- a/src/Cantarell-Regular.ufo/glyphs/B_eta.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/B_eta.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Beta" format="2">
-  <advance width="662"/>
+  <advance width="630"/>
   <unicode hex="0392"/>
-  <anchor x="328" y="0" name="bottom"/>
-  <anchor x="328" y="694" name="top"/>
   <outline>
     <component base="B"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/C_hi.glif b/src/Cantarell-Regular.ufo/glyphs/C_hi.glif
index b406dd31..bca89ed0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/C_hi.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/C_hi.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Chi" format="2">
-  <advance width="649"/>
+  <advance width="596"/>
   <unicode hex="03A7"/>
-  <anchor x="325" y="0" name="bottom"/>
-  <anchor x="325" y="694" name="top"/>
   <outline>
     <component base="X"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/D_elta.glif b/src/Cantarell-Regular.ufo/glyphs/D_elta.glif
index ab54009b..eb8c40d9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/D_elta.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/D_elta.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Delta" format="2">
-  <advance width="690"/>
+  <advance width="617"/>
   <unicode hex="0394"/>
-  <anchor x="345" y="0" name="bottom"/>
-  <anchor x="345" y="694" name="top"/>
+  <anchor x="309" y="0" name="bottom"/>
+  <anchor x="309" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="58" y="0" type="line"/>
-      <point x="125" y="0" type="line"/>
-      <point x="352" y="636" type="line"/>
-      <point x="343" y="636" type="line"/>
-      <point x="557" y="0" type="line"/>
-      <point x="631" y="0" type="line"/>
-      <point x="631" y="53" type="line"/>
-      <point x="406" y="694" type="line"/>
-      <point x="298" y="694" type="line"/>
-      <point x="58" y="53" type="line"/>
+      <point x="22" y="0" type="line"/>
+      <point x="89" y="0" type="line"/>
+      <point x="316" y="636" type="line"/>
+      <point x="307" y="636" type="line"/>
+      <point x="521" y="0" type="line"/>
+      <point x="595" y="0" type="line"/>
+      <point x="595" y="53" type="line"/>
+      <point x="370" y="694" type="line"/>
+      <point x="262" y="694" type="line"/>
+      <point x="22" y="53" type="line"/>
     </contour>
     <contour>
-      <point x="95" y="0" type="line"/>
-      <point x="587" y="0" type="line"/>
-      <point x="587" y="72" type="line"/>
-      <point x="95" y="72" type="line"/>
+      <point x="59" y="0" type="line"/>
+      <point x="551" y="0" type="line"/>
+      <point x="551" y="72" type="line"/>
+      <point x="59" y="72" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -34,8 +34,6 @@
       <string>=A+15</string>
       <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
       <string>=A+15</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_psilon.glif b/src/Cantarell-Regular.ufo/glyphs/E_psilon.glif
index 0f7378af..30908520 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_psilon.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_psilon.glif
@@ -1,18 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilon" format="2">
-  <advance width="605"/>
+  <advance width="584"/>
   <unicode hex="0395"/>
   <anchor x="315" y="0" name="bottom"/>
   <anchor x="335" y="694" name="top"/>
   <anchor x="-4" y="694" name="topleft"/>
-  <anchor x="520" y="10" name="ogonek"/>
   <outline>
     <component base="E"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_psilondasia.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_psilondasia.glif
index 6b8670d3..63d8cad9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_psilondasia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_psilondasia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilondasia" format="2">
-  <advance width="605"/>
+  <advance width="584"/>
   <unicode hex="1F19"/>
-  <anchor x="315" y="0" name="bottom"/>
-  <anchor x="520" y="10" name="ogonek"/>
-  <anchor x="335" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="dasia.case" xOffset="-129"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_psilondasiaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_psilondasiaoxia.glif
index dd685e66..5bd89bc3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_psilondasiaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_psilondasiaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilondasiaoxia" format="2">
-  <advance width="605"/>
+  <advance width="584"/>
   <unicode hex="1F1D"/>
-  <anchor x="315" y="0" name="bottom"/>
-  <anchor x="520" y="10" name="ogonek"/>
-  <anchor x="335" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="dasiaoxia.case" xOffset="-295"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_psilondasiavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_psilondasiavaria.glif
index 9a9d3823..e7c1ddff 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_psilondasiavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_psilondasiavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilondasiavaria" format="2">
-  <advance width="605"/>
+  <advance width="584"/>
   <unicode hex="1F1B"/>
-  <anchor x="315" y="0" name="bottom"/>
-  <anchor x="520" y="10" name="ogonek"/>
-  <anchor x="335" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="dasiavaria.case" xOffset="-276"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_psilonoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_psilonoxia.glif
index 300cbeae..14e490c6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_psilonoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_psilonoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilonoxia" format="2">
-  <advance width="605"/>
+  <advance width="584"/>
   <unicode hex="1FC9"/>
-  <anchor x="315" y="0" name="bottom"/>
-  <anchor x="520" y="10" name="ogonek"/>
-  <anchor x="335" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="oxia.case" xOffset="-153"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_psilonpsili.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_psilonpsili.glif
index 963e347a..4061bbb6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_psilonpsili.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_psilonpsili.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilonpsili" format="2">
-  <advance width="605"/>
+  <advance width="584"/>
   <unicode hex="1F18"/>
-  <anchor x="315" y="0" name="bottom"/>
-  <anchor x="520" y="10" name="ogonek"/>
-  <anchor x="335" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="psili.case" xOffset="-152"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_psilonpsilioxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_psilonpsilioxia.glif
index 54583473..d6260cfd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_psilonpsilioxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_psilonpsilioxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilonpsilioxia" format="2">
-  <advance width="605"/>
+  <advance width="584"/>
   <unicode hex="1F1C"/>
-  <anchor x="315" y="0" name="bottom"/>
-  <anchor x="520" y="10" name="ogonek"/>
-  <anchor x="335" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="psilioxia.case" xOffset="-322"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_psilonpsilivaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_psilonpsilivaria.glif
index 6d9f1b0e..7254e63f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_psilonpsilivaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_psilonpsilivaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilonpsilivaria" format="2">
-  <advance width="605"/>
+  <advance width="584"/>
   <unicode hex="1F1A"/>
-  <anchor x="315" y="0" name="bottom"/>
-  <anchor x="520" y="10" name="ogonek"/>
-  <anchor x="335" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="psilivaria.case" xOffset="-305"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_psilontonos.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_psilontonos.glif
index 36623ead..a0df2bf1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_psilontonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_psilontonos.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilontonos" format="2">
-  <advance width="605"/>
+  <advance width="584"/>
   <unicode hex="0388"/>
-  <anchor x="315" y="0" name="bottom"/>
-  <anchor x="520" y="10" name="ogonek"/>
-  <anchor x="335" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="tonos.case" xOffset="-153"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_psilonvaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_psilonvaria.glif
index 0aba071e..90a34dfd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_psilonvaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_psilonvaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Epsilonvaria" format="2">
-  <advance width="605"/>
+  <advance width="584"/>
   <unicode hex="1FC8"/>
-  <anchor x="315" y="0" name="bottom"/>
-  <anchor x="520" y="10" name="ogonek"/>
-  <anchor x="335" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Epsilon"/>
     <component base="varia.case" xOffset="-135"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_ta.glif b/src/Cantarell-Regular.ufo/glyphs/E_ta.glif
index 8148429b..6a73f721 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_ta.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_ta.glif
@@ -1,18 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Eta" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="0397"/>
   <anchor x="375" y="0" name="bottom"/>
   <anchor x="375" y="694" name="top"/>
   <anchor x="-4" y="694" name="topleft"/>
-  <anchor x="375" y="539" name="center"/>
   <outline>
     <component base="H"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tadasia.glif b/src/Cantarell-Regular.ufo/glyphs/E_tadasia.glif
index ec8d9727..41e7413f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tadasia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tadasia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasia" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1F29"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasia.case" xOffset="-129"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tadasiaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_tadasiaoxia.glif
index 8d1cdf8a..89aecc98 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tadasiaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tadasiaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiaoxia" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1F2D"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiaoxia.case" xOffset="-295"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tadasiaoxiaprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_tadasiaoxiaprosgegrammeni.glif
index d6c44a8f..e36c326c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tadasiaoxiaprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tadasiaoxiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiaoxiaprosgegrammeni" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1F9D"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiaoxia.case" xOffset="-295"/>
     <component base="prosgegrammeni" xOffset="141"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tadasiaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_tadasiaperispomeni.glif
index 9462caa9..c3d0ba90 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tadasiaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tadasiaperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiaperispomeni" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1F2F"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiaperispomeni.case" xOffset="-358" yOffset="-156"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tadasiaperispomeniprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_tadasiaperispomeniprosgegrammeni.glif
index 0ed19b57..cb619d24 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tadasiaperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tadasiaperispomeniprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiaperispomeniprosgegrammeni" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1F9F"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiaperispomeni.case" xOffset="-358" yOffset="-156"/>
     <component base="prosgegrammeni" xOffset="141"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tadasiaprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_tadasiaprosgegrammeni.glif
index 6f197e95..046b8463 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tadasiaprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tadasiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiaprosgegrammeni" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1F99"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasia.case" xOffset="-129"/>
     <component base="prosgegrammeni" xOffset="141"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tadasiavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_tadasiavaria.glif
index cac40fe5..95eb4934 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tadasiavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tadasiavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiavaria" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1F2B"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiavaria.case" xOffset="-276"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tadasiavariaprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_tadasiavariaprosgegrammeni.glif
index d288742a..84f449f8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tadasiavariaprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tadasiavariaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etadasiavariaprosgegrammeni" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1F9B"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="dasiavaria.case" xOffset="-276"/>
     <component base="prosgegrammeni" xOffset="141"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_taoxia.glif b/src/Cantarell-Regular.ufo/glyphs/E_taoxia.glif
index 8d8db155..ba8266dd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_taoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_taoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etaoxia" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1FCB"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="oxia.case" xOffset="-153"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_taprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_taprosgegrammeni.glif
index 972916f6..b7b21e4f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_taprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_taprosgegrammeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etaprosgegrammeni" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1FCC"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="prosgegrammeni" xOffset="141"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tapsili.glif b/src/Cantarell-Regular.ufo/glyphs/E_tapsili.glif
index 4269a5fe..3965fa97 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tapsili.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tapsili.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsili" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1F28"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psili.case" xOffset="-152"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tapsilioxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_tapsilioxia.glif
index 665af33f..8b86db08 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tapsilioxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tapsilioxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsilioxia" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1F2C"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psilioxia.case" xOffset="-322"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tapsilioxiaprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_tapsilioxiaprosgegrammeni.glif
index a10a358f..685e7c15 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tapsilioxiaprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tapsilioxiaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsilioxiaprosgegrammeni" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1F9C"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psilioxia.case" xOffset="-322"/>
     <component base="prosgegrammeni" xOffset="141"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tapsiliperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_tapsiliperispomeni.glif
index 2742fd0d..16f6e426 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tapsiliperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tapsiliperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsiliperispomeni" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1F2E"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psiliperispomeni.case" xOffset="-343" yOffset="-156"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.5,0.09,0.79,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tapsiliperispomeniprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_tapsiliperispomeniprosgegrammeni.glif
index 077b70b8..cbe8e3d5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tapsiliperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tapsiliperispomeniprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsiliperispomeniprosgegrammeni" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1F9E"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psiliperispomeni.case" xOffset="-343" yOffset="-156"/>
     <component base="prosgegrammeni" xOffset="141"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tapsiliprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_tapsiliprosgegrammeni.glif
index 127b4feb..0bb4cfc8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tapsiliprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tapsiliprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsiliprosgegrammeni" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1F98"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psili.case" xOffset="-152"/>
     <component base="prosgegrammeni" xOffset="141"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tapsilivaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_tapsilivaria.glif
index 9fecbff0..305de21b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tapsilivaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tapsilivaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsilivaria" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1F2A"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psilivaria.case" xOffset="-305"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.25,0.25,0.25,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tapsilivariaprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/E_tapsilivariaprosgegrammeni.glif
index ef60abe8..fb5e7967 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tapsilivariaprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tapsilivariaprosgegrammeni.glif
@@ -1,20 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etapsilivariaprosgegrammeni" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1F9A"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="psilivaria.case" xOffset="-305"/>
     <component base="prosgegrammeni" xOffset="141"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tatonos.glif b/src/Cantarell-Regular.ufo/glyphs/E_tatonos.glif
index 53e6e4c0..68936e5c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tatonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tatonos.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etatonos" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="0389"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="tonos.case" xOffset="-153"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/E_tavaria.glif b/src/Cantarell-Regular.ufo/glyphs/E_tavaria.glif
index 539195e6..eb7639ad 100644
--- a/src/Cantarell-Regular.ufo/glyphs/E_tavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/E_tavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Etavaria" format="2">
-  <advance width="749"/>
+  <advance width="721"/>
   <unicode hex="1FCA"/>
-  <anchor x="375" y="0" name="bottom"/>
-  <anchor x="375" y="539" name="center"/>
-  <anchor x="375" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Eta"/>
     <component base="varia.case" xOffset="-135"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/G_amma.glif b/src/Cantarell-Regular.ufo/glyphs/G_amma.glif
index 2d8915ef..f0a08521 100644
--- a/src/Cantarell-Regular.ufo/glyphs/G_amma.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/G_amma.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Gamma" format="2">
-  <advance width="554"/>
+  <advance width="542"/>
   <unicode hex="0393"/>
-  <anchor x="198" y="0" name="bottomright"/>
-  <anchor x="288" y="694" name="top"/>
   <outline>
     <component base="Ge-cy"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_ota.glif b/src/Cantarell-Regular.ufo/glyphs/I_ota.glif
index 07d53adf..ff22ee74 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_ota.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_ota.glif
@@ -1,18 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iota" format="2">
-  <advance width="295"/>
+  <advance width="267"/>
   <unicode hex="0399"/>
   <anchor x="148" y="0" name="bottom"/>
   <anchor x="148" y="694" name="top"/>
   <anchor x="-4" y="694" name="topleft"/>
-  <anchor x="167" y="10" name="ogonek"/>
   <outline>
     <component base="I"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_otadasia.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_otadasia.glif
index f637cd56..8657343b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_otadasia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_otadasia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotadasia" format="2">
-  <advance width="295"/>
+  <advance width="267"/>
   <unicode hex="1F39"/>
-  <anchor x="148" y="0" name="bottom"/>
-  <anchor x="167" y="10" name="ogonek"/>
-  <anchor x="148" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="dasia.case" xOffset="-129"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_otadasiaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_otadasiaoxia.glif
index d31737bc..823108d1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_otadasiaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_otadasiaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotadasiaoxia" format="2">
-  <advance width="295"/>
+  <advance width="267"/>
   <unicode hex="1F3D"/>
-  <anchor x="148" y="0" name="bottom"/>
-  <anchor x="167" y="10" name="ogonek"/>
-  <anchor x="148" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="dasiaoxia.case" xOffset="-295"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_otadasiaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_otadasiaperispomeni.glif
index c118d2b6..d5ec9266 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_otadasiaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_otadasiaperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotadasiaperispomeni" format="2">
-  <advance width="295"/>
+  <advance width="267"/>
   <unicode hex="1F3F"/>
-  <anchor x="148" y="0" name="bottom"/>
-  <anchor x="167" y="10" name="ogonek"/>
-  <anchor x="148" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="dasiaperispomeni.case" xOffset="-358" yOffset="-156"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_otadasiavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_otadasiavaria.glif
index 4bf38f0d..eecf7496 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_otadasiavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_otadasiavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotadasiavaria" format="2">
-  <advance width="295"/>
+  <advance width="267"/>
   <unicode hex="1F3B"/>
-  <anchor x="148" y="0" name="bottom"/>
-  <anchor x="167" y="10" name="ogonek"/>
-  <anchor x="148" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="dasiavaria.case" xOffset="-276"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_otadieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_otadieresis.glif
index f16ef93a..2abcc1fd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_otadieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_otadieresis.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotadieresis" format="2">
-  <advance width="295"/>
+  <advance width="267"/>
   <unicode hex="03AA"/>
-  <anchor x="148" y="0" name="bottom"/>
-  <anchor x="167" y="10" name="ogonek"/>
-  <anchor x="148" y="856" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="dieresiscomb.case" xOffset="-88"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_otamacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_otamacron.glif
index 96e310aa..85fccb86 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_otamacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_otamacron.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotamacron" format="2">
-  <advance width="295"/>
+  <advance width="267"/>
   <unicode hex="1FD9"/>
-  <anchor x="148" y="0" name="bottom"/>
-  <anchor x="167" y="10" name="ogonek"/>
-  <anchor x="148" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
-    <component base="macron" xOffset="-94" yOffset="212"/>
+    <component base="macron" xOffset="-103" yOffset="212"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_otaoxia.glif b/src/Cantarell-Regular.ufo/glyphs/I_otaoxia.glif
index f872b72d..05e93260 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_otaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_otaoxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotaoxia" format="2">
-  <advance width="295"/>
+  <advance width="267"/>
   <unicode hex="1FDB"/>
-  <anchor x="148" y="0" name="bottom"/>
-  <anchor x="167" y="10" name="ogonek"/>
-  <anchor x="148" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="oxia.case" xOffset="-153"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_otapsili.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_otapsili.glif
index e92a7d4d..f76301a9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_otapsili.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_otapsili.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotapsili" format="2">
-  <advance width="295"/>
+  <advance width="267"/>
   <unicode hex="1F38"/>
-  <anchor x="148" y="0" name="bottom"/>
-  <anchor x="167" y="10" name="ogonek"/>
-  <anchor x="148" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="psili.case" xOffset="-152"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_otapsilioxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_otapsilioxia.glif
index 075bc94f..02eec393 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_otapsilioxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_otapsilioxia.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotapsilioxia" format="2">
-  <advance width="295"/>
+  <advance width="267"/>
   <unicode hex="1F3C"/>
-  <anchor x="148" y="0" name="bottom"/>
-  <anchor x="167" y="10" name="ogonek"/>
-  <anchor x="148" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="psilioxia.case" xOffset="-322"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_otapsiliperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_otapsiliperispomeni.glif
index 689df808..75ec2b94 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_otapsiliperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_otapsiliperispomeni.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotapsiliperispomeni" format="2">
-  <advance width="295"/>
+  <advance width="267"/>
   <unicode hex="1F3E"/>
-  <anchor x="148" y="0" name="bottom"/>
-  <anchor x="167" y="10" name="ogonek"/>
-  <anchor x="148" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="psiliperispomeni.case" xOffset="-343" yOffset="-156"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_otapsilivaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_otapsilivaria.glif
index ce98cc03..b6fa4e9e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_otapsilivaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_otapsilivaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotapsilivaria" format="2">
-  <advance width="295"/>
+  <advance width="267"/>
   <unicode hex="1F3A"/>
-  <anchor x="148" y="0" name="bottom"/>
-  <anchor x="167" y="10" name="ogonek"/>
-  <anchor x="148" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="psilivaria.case" xOffset="-305"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_otatonos.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_otatonos.glif
index f654d102..e1eb1312 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_otatonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_otatonos.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotatonos" format="2">
-  <advance width="295"/>
+  <advance width="267"/>
   <unicode hex="038A"/>
-  <anchor x="148" y="0" name="bottom"/>
-  <anchor x="167" y="10" name="ogonek"/>
-  <anchor x="148" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="tonos.case" xOffset="-153"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_otavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_otavaria.glif
index 20288214..e0d19daf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_otavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_otavaria.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotavaria" format="2">
-  <advance width="295"/>
+  <advance width="267"/>
   <unicode hex="1FDA"/>
-  <anchor x="148" y="0" name="bottom"/>
-  <anchor x="167" y="10" name="ogonek"/>
-  <anchor x="148" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="varia.case" xOffset="-135"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/I_otavrachy.glif 
b/src/Cantarell-Regular.ufo/glyphs/I_otavrachy.glif
index ab6b1fa8..b6bfd422 100644
--- a/src/Cantarell-Regular.ufo/glyphs/I_otavrachy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/I_otavrachy.glif
@@ -1,19 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Iotavrachy" format="2">
-  <advance width="295"/>
+  <advance width="267"/>
   <unicode hex="1FD8"/>
-  <anchor x="148" y="0" name="bottom"/>
-  <anchor x="167" y="10" name="ogonek"/>
-  <anchor x="148" y="694" name="top"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Iota"/>
     <component base="vrachy.case" xOffset="-61"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/K_appa.glif b/src/Cantarell-Regular.ufo/glyphs/K_appa.glif
index f1c92930..8a1c971c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/K_appa.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/K_appa.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Kappa" format="2">
-  <advance width="631"/>
+  <advance width="608"/>
   <unicode hex="039A"/>
-  <anchor x="320" y="0" name="bottom"/>
-  <anchor x="320" y="694" name="top"/>
   <outline>
     <component base="K"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/L_ambda.glif b/src/Cantarell-Regular.ufo/glyphs/L_ambda.glif
index 6d159af7..60a3827f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/L_ambda.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/L_ambda.glif
@@ -1,19 +1,19 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Lambda" format="2">
-  <advance width="699"/>
+  <advance width="626"/>
   <unicode hex="039B"/>
-  <anchor x="350" y="0" name="bottom"/>
-  <anchor x="350" y="694" name="top"/>
+  <anchor x="314" y="0" name="bottom"/>
+  <anchor x="314" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="43" y="0" type="line"/>
-      <point x="130" y="0" type="line"/>
-      <point x="357" y="636" type="line"/>
-      <point x="348" y="636" type="line"/>
-      <point x="562" y="0" type="line"/>
-      <point x="655" y="0" type="line"/>
-      <point x="411" y="694" type="line"/>
-      <point x="303" y="694" type="line"/>
+      <point x="7" y="0" type="line"/>
+      <point x="94" y="0" type="line"/>
+      <point x="321" y="636" type="line"/>
+      <point x="312" y="636" type="line"/>
+      <point x="526" y="0" type="line"/>
+      <point x="619" y="0" type="line"/>
+      <point x="375" y="694" type="line"/>
+      <point x="267" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -22,8 +22,6 @@
       <string>=A</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=A</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/M_u.glif b/src/Cantarell-Regular.ufo/glyphs/M_u.glif
index 88d1a685..42449cc5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/M_u.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/M_u.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Mu" format="2">
-  <advance width="887"/>
+  <advance width="859"/>
   <unicode hex="039C"/>
-  <anchor x="444" y="0" name="bottom"/>
-  <anchor x="444" y="694" name="top"/>
   <outline>
     <component base="M"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/N_u.glif b/src/Cantarell-Regular.ufo/glyphs/N_u.glif
index 2d0ead5a..2253e90d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/N_u.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/N_u.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Nu" format="2">
-  <advance width="778"/>
+  <advance width="750"/>
   <unicode hex="039D"/>
-  <anchor x="389" y="0" name="bottom"/>
-  <anchor x="389" y="694" name="top"/>
   <outline>
     <component base="N"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_mega.glif b/src/Cantarell-Regular.ufo/glyphs/O_mega.glif
index 509e26ad..fc7c7d8f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_mega.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_mega.glif
@@ -1,46 +1,46 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omega" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="03A9"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
+  <anchor x="382" y="0" name="bottom"/>
+  <anchor x="377" y="694" name="top"/>
+  <anchor x="6" y="694" name="topleft"/>
   <outline>
     <contour>
-      <point x="398" y="703" type="curve" smooth="yes"/>
-      <point x="202" y="703"/>
-      <point x="71" y="557"/>
-      <point x="71" y="383" type="curve" smooth="yes"/>
-      <point x="71" y="251"/>
-      <point x="136" y="148"/>
-      <point x="240" y="64" type="curve"/>
-      <point x="240" y="72" type="line"/>
-      <point x="55" y="72" type="line"/>
-      <point x="55" y="0" type="line"/>
-      <point x="341" y="0" type="line"/>
-      <point x="341" y="62" type="line"/>
-      <point x="235" y="150"/>
-      <point x="156" y="249"/>
-      <point x="156" y="377" type="curve" smooth="yes"/>
-      <point x="156" y="515"/>
-      <point x="244" y="630"/>
-      <point x="393" y="630" type="curve" smooth="yes"/>
-      <point x="542" y="630"/>
-      <point x="636" y="515"/>
-      <point x="636" y="377" type="curve" smooth="yes"/>
-      <point x="636" y="249"/>
-      <point x="556" y="151"/>
-      <point x="451" y="62" type="curve"/>
-      <point x="451" y="0" type="line"/>
-      <point x="738" y="0" type="line"/>
-      <point x="738" y="72" type="line"/>
-      <point x="550" y="72" type="line"/>
-      <point x="550" y="65" type="line"/>
-      <point x="652" y="150"/>
-      <point x="721" y="257"/>
-      <point x="721" y="389" type="curve" smooth="yes"/>
-      <point x="721" y="562"/>
-      <point x="592" y="703"/>
+      <point x="384" y="703" type="curve" smooth="yes"/>
+      <point x="188" y="703"/>
+      <point x="57" y="557"/>
+      <point x="57" y="383" type="curve" smooth="yes"/>
+      <point x="57" y="251"/>
+      <point x="122" y="148"/>
+      <point x="226" y="64" type="curve"/>
+      <point x="226" y="72" type="line"/>
+      <point x="41" y="72" type="line"/>
+      <point x="41" y="0" type="line"/>
+      <point x="327" y="0" type="line"/>
+      <point x="327" y="62" type="line"/>
+      <point x="221" y="150"/>
+      <point x="142" y="249"/>
+      <point x="142" y="377" type="curve" smooth="yes"/>
+      <point x="142" y="515"/>
+      <point x="230" y="630"/>
+      <point x="379" y="630" type="curve" smooth="yes"/>
+      <point x="528" y="630"/>
+      <point x="622" y="515"/>
+      <point x="622" y="377" type="curve" smooth="yes"/>
+      <point x="622" y="249"/>
+      <point x="542" y="151"/>
+      <point x="437" y="62" type="curve"/>
+      <point x="437" y="0" type="line"/>
+      <point x="724" y="0" type="line"/>
+      <point x="724" y="72" type="line"/>
+      <point x="536" y="72" type="line"/>
+      <point x="536" y="65" type="line"/>
+      <point x="638" y="150"/>
+      <point x="707" y="257"/>
+      <point x="707" y="389" type="curve" smooth="yes"/>
+      <point x="707" y="562"/>
+      <point x="578" y="703"/>
     </contour>
   </outline>
   <lib>
@@ -49,8 +49,6 @@
       <string>=O-13</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=O-10</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megadasia.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megadasia.glif
index 201bdb00..ec62ed98 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megadasia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megadasia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasia" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1F69"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasia.case" xOffset="-105"/>
+    <component base="dasia.case" xOffset="-119"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megadasiaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megadasiaoxia.glif
index f989d781..dc429406 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megadasiaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megadasiaoxia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiaoxia" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1F6D"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiaoxia.case" xOffset="-271"/>
+    <component base="dasiaoxia.case" xOffset="-285"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megadasiaoxiaprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megadasiaoxiaprosgegrammeni.glif
index c3153633..3fccf7c9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megadasiaoxiaprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megadasiaoxiaprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiaoxiaprosgegrammeni" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1FAD"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiaoxia.case" xOffset="-271"/>
-    <component base="prosgegrammeni" xOffset="162"/>
+    <component base="dasiaoxia.case" xOffset="-285"/>
+    <component base="prosgegrammeni" xOffset="148"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megadasiaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megadasiaperispomeni.glif
index bf34ed15..79dcd3d6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megadasiaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megadasiaperispomeni.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiaperispomeni" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1F6F"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiaperispomeni.case" xOffset="-334" yOffset="-156"/>
+    <component base="dasiaperispomeni.case" xOffset="-348" yOffset="-156"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megadasiaperispomeniprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megadasiaperispomeniprosgegrammeni.glif
index 6957e88c..2af30f1a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megadasiaperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megadasiaperispomeniprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiaperispomeniprosgegrammeni" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1FAF"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiaperispomeni.case" xOffset="-334" yOffset="-156"/>
-    <component base="prosgegrammeni" xOffset="162"/>
+    <component base="dasiaperispomeni.case" xOffset="-348" yOffset="-156"/>
+    <component base="prosgegrammeni" xOffset="148"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megadasiaprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megadasiaprosgegrammeni.glif
index 009ee632..6849977c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megadasiaprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megadasiaprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiaprosgegrammeni" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1FA9"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasia.case" xOffset="-105"/>
-    <component base="prosgegrammeni" xOffset="162"/>
+    <component base="dasia.case" xOffset="-119"/>
+    <component base="prosgegrammeni" xOffset="148"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megadasiavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megadasiavaria.glif
index 8f887e03..1cc1241f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megadasiavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megadasiavaria.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiavaria" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1F6B"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiavaria.case" xOffset="-252"/>
+    <component base="dasiavaria.case" xOffset="-266"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megadasiavariaprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megadasiavariaprosgegrammeni.glif
index a7405326..8d4846e3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megadasiavariaprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megadasiavariaprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegadasiavariaprosgegrammeni" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1FAB"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="dasiavaria.case" xOffset="-252"/>
-    <component base="prosgegrammeni" xOffset="162"/>
+    <component base="dasiavaria.case" xOffset="-266"/>
+    <component base="prosgegrammeni" xOffset="148"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megaoxia.glif
index 41ab2e2c..4896a591 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megaoxia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegaoxia" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1FFB"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="oxia.case" xOffset="-129"/>
+    <component base="oxia.case" xOffset="-143"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megaprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megaprosgegrammeni.glif
index 4a0d8077..33dfc36e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megaprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megaprosgegrammeni.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegaprosgegrammeni" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1FFC"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="prosgegrammeni" xOffset="162"/>
+    <component base="prosgegrammeni" xOffset="148"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megapsili.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megapsili.glif
index d444a99d..a3edcc2c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megapsili.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megapsili.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsili" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1F68"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psili.case" xOffset="-128"/>
+    <component base="psili.case" xOffset="-142"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megapsilioxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megapsilioxia.glif
index c50d75e7..e5f0f7da 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megapsilioxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megapsilioxia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsilioxia" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1F6C"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psilioxia.case" xOffset="-298"/>
+    <component base="psilioxia.case" xOffset="-312"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megapsilioxiaprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megapsilioxiaprosgegrammeni.glif
index 9ddd6cf2..4c8148ee 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megapsilioxiaprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megapsilioxiaprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsilioxiaprosgegrammeni" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1FAC"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psilioxia.case" xOffset="-298"/>
-    <component base="prosgegrammeni" xOffset="162"/>
+    <component base="psilioxia.case" xOffset="-312"/>
+    <component base="prosgegrammeni" xOffset="148"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megapsiliperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megapsiliperispomeni.glif
index 9e5f9348..65be2430 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megapsiliperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megapsiliperispomeni.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsiliperispomeni" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1F6E"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psiliperispomeni.case" xOffset="-319" yOffset="-156"/>
+    <component base="psiliperispomeni.case" xOffset="-333" yOffset="-156"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.5,0.09,0.79,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megapsiliperispomeniprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megapsiliperispomeniprosgegrammeni.glif
index 9415d024..26693104 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megapsiliperispomeniprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megapsiliperispomeniprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsiliperispomeniprosgegrammeni" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1FAE"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psiliperispomeni.case" xOffset="-319" yOffset="-156"/>
-    <component base="prosgegrammeni" xOffset="162"/>
+    <component base="psiliperispomeni.case" xOffset="-333" yOffset="-156"/>
+    <component base="prosgegrammeni" xOffset="148"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.98,0.36,0.67,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megapsiliprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megapsiliprosgegrammeni.glif
index 07e7c0b2..c8e3eb47 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megapsiliprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megapsiliprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsiliprosgegrammeni" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1FA8"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psili.case" xOffset="-128"/>
-    <component base="prosgegrammeni" xOffset="162"/>
+    <component base="psili.case" xOffset="-142"/>
+    <component base="prosgegrammeni" xOffset="148"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megapsilivaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megapsilivaria.glif
index eeabfe18..571f3f2a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megapsilivaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megapsilivaria.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsilivaria" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1F6A"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psilivaria.case" xOffset="-281"/>
+    <component base="psilivaria.case" xOffset="-295"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megapsilivariaprosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megapsilivariaprosgegrammeni.glif
index f801ccbb..778c767d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megapsilivariaprosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megapsilivariaprosgegrammeni.glif
@@ -1,19 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegapsilivariaprosgegrammeni" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1FAA"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="psilivaria.case" xOffset="-281"/>
-    <component base="prosgegrammeni" xOffset="162"/>
+    <component base="psilivaria.case" xOffset="-295"/>
+    <component base="prosgegrammeni" xOffset="148"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megatonos.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megatonos.glif
index df8cead1..f9d9c48d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megatonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megatonos.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegatonos" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="038F"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="tonos.case" xOffset="-129"/>
+    <component base="tonos.case" xOffset="-143"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_megavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_megavaria.glif
index 545c7959..30636cb3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_megavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_megavaria.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omegavaria" format="2">
-  <advance width="796"/>
+  <advance width="768"/>
   <unicode hex="1FFA"/>
-  <anchor x="396" y="0" name="bottom"/>
-  <anchor x="391" y="694" name="top"/>
-  <anchor x="20" y="694" name="topleft"/>
   <outline>
     <component base="Omega"/>
-    <component base="varia.case" xOffset="-111"/>
+    <component base="varia.case" xOffset="-125"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_micron.glif b/src/Cantarell-Regular.ufo/glyphs/O_micron.glif
index 684983fc..2c67d180 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_micron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_micron.glif
@@ -1,21 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicron" format="2">
-  <advance width="788"/>
+  <advance width="760"/>
   <unicode hex="039F"/>
   <anchor x="394" y="0" name="bottom"/>
   <anchor x="394" y="694" name="top"/>
   <anchor x="23" y="694" name="topleft"/>
-  <anchor x="592" y="107" name="Qtail"/>
-  <anchor x="394" y="347" name="center"/>
-  <anchor x="475" y="10" name="ogonek"/>
-  <anchor x="709" y="694" name="topright"/>
   <outline>
     <component base="O"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_microndasia.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_microndasia.glif
index f4fe8aac..847287b5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_microndasia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_microndasia.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicrondasia" format="2">
-  <advance width="788"/>
+  <advance width="760"/>
   <unicode hex="1F49"/>
-  <anchor x="592" y="107" name="Qtail"/>
-  <anchor x="394" y="0" name="bottom"/>
-  <anchor x="394" y="347" name="center"/>
-  <anchor x="475" y="10" name="ogonek"/>
-  <anchor x="394" y="694" name="top"/>
-  <anchor x="23" y="694" name="topleft"/>
-  <anchor x="709" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="dasia.case" xOffset="-102"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_microndasiaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_microndasiaoxia.glif
index bcbd3d45..a9323b6a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_microndasiaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_microndasiaoxia.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicrondasiaoxia" format="2">
-  <advance width="788"/>
+  <advance width="760"/>
   <unicode hex="1F4D"/>
-  <anchor x="592" y="107" name="Qtail"/>
-  <anchor x="394" y="0" name="bottom"/>
-  <anchor x="394" y="347" name="center"/>
-  <anchor x="475" y="10" name="ogonek"/>
-  <anchor x="394" y="694" name="top"/>
-  <anchor x="23" y="694" name="topleft"/>
-  <anchor x="709" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="dasiaoxia.case" xOffset="-268"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_microndasiavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_microndasiavaria.glif
index 2dea99b7..2cb2fe96 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_microndasiavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_microndasiavaria.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicrondasiavaria" format="2">
-  <advance width="788"/>
+  <advance width="760"/>
   <unicode hex="1F4B"/>
-  <anchor x="592" y="107" name="Qtail"/>
-  <anchor x="394" y="0" name="bottom"/>
-  <anchor x="394" y="347" name="center"/>
-  <anchor x="475" y="10" name="ogonek"/>
-  <anchor x="394" y="694" name="top"/>
-  <anchor x="23" y="694" name="topleft"/>
-  <anchor x="709" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="dasiavaria.case" xOffset="-249"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_micronoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_micronoxia.glif
index 9aa297a8..c375dfe5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_micronoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_micronoxia.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicronoxia" format="2">
-  <advance width="788"/>
+  <advance width="760"/>
   <unicode hex="1FF9"/>
-  <anchor x="592" y="107" name="Qtail"/>
-  <anchor x="394" y="0" name="bottom"/>
-  <anchor x="394" y="347" name="center"/>
-  <anchor x="475" y="10" name="ogonek"/>
-  <anchor x="394" y="694" name="top"/>
-  <anchor x="23" y="694" name="topleft"/>
-  <anchor x="709" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="oxia.case" xOffset="-126"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_micronpsili.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_micronpsili.glif
index 63358345..f5ee99db 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_micronpsili.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_micronpsili.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicronpsili" format="2">
-  <advance width="788"/>
+  <advance width="760"/>
   <unicode hex="1F48"/>
-  <anchor x="592" y="107" name="Qtail"/>
-  <anchor x="394" y="0" name="bottom"/>
-  <anchor x="394" y="347" name="center"/>
-  <anchor x="475" y="10" name="ogonek"/>
-  <anchor x="394" y="694" name="top"/>
-  <anchor x="23" y="694" name="topleft"/>
-  <anchor x="709" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="psili.case" xOffset="-125"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_micronpsilioxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_micronpsilioxia.glif
index 36297735..e2748a29 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_micronpsilioxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_micronpsilioxia.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicronpsilioxia" format="2">
-  <advance width="788"/>
+  <advance width="760"/>
   <unicode hex="1F4C"/>
-  <anchor x="592" y="107" name="Qtail"/>
-  <anchor x="394" y="0" name="bottom"/>
-  <anchor x="394" y="347" name="center"/>
-  <anchor x="475" y="10" name="ogonek"/>
-  <anchor x="394" y="694" name="top"/>
-  <anchor x="23" y="694" name="topleft"/>
-  <anchor x="709" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="psilioxia.case" xOffset="-295"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_micronpsilivaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_micronpsilivaria.glif
index be258bc5..3d7d0504 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_micronpsilivaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_micronpsilivaria.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicronpsilivaria" format="2">
-  <advance width="788"/>
+  <advance width="760"/>
   <unicode hex="1F4A"/>
-  <anchor x="592" y="107" name="Qtail"/>
-  <anchor x="394" y="0" name="bottom"/>
-  <anchor x="394" y="347" name="center"/>
-  <anchor x="475" y="10" name="ogonek"/>
-  <anchor x="394" y="694" name="top"/>
-  <anchor x="23" y="694" name="topleft"/>
-  <anchor x="709" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="psilivaria.case" xOffset="-278"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.25,0.25,0.25,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_microntonos.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_microntonos.glif
index a7415b13..49c5c50a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_microntonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_microntonos.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicrontonos" format="2">
-  <advance width="788"/>
+  <advance width="760"/>
   <unicode hex="038C"/>
-  <anchor x="592" y="107" name="Qtail"/>
-  <anchor x="394" y="0" name="bottom"/>
-  <anchor x="394" y="347" name="center"/>
-  <anchor x="475" y="10" name="ogonek"/>
-  <anchor x="394" y="694" name="top"/>
-  <anchor x="23" y="694" name="topleft"/>
-  <anchor x="709" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="tonos.case" xOffset="-126"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/O_micronvaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/O_micronvaria.glif
index b9d1bc49..8f638398 100644
--- a/src/Cantarell-Regular.ufo/glyphs/O_micronvaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/O_micronvaria.glif
@@ -1,22 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Omicronvaria" format="2">
-  <advance width="788"/>
+  <advance width="760"/>
   <unicode hex="1FF8"/>
-  <anchor x="592" y="107" name="Qtail"/>
-  <anchor x="394" y="0" name="bottom"/>
-  <anchor x="394" y="347" name="center"/>
-  <anchor x="475" y="10" name="ogonek"/>
-  <anchor x="394" y="694" name="top"/>
-  <anchor x="23" y="694" name="topleft"/>
-  <anchor x="709" y="694" name="topright"/>
   <outline>
     <component base="Omicron"/>
     <component base="varia.case" xOffset="-108"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/P_hi.glif b/src/Cantarell-Regular.ufo/glyphs/P_hi.glif
index 26604b86..4191f620 100644
--- a/src/Cantarell-Regular.ufo/glyphs/P_hi.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/P_hi.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Phi" format="2">
-  <advance width="826"/>
+  <advance width="792"/>
   <unicode hex="03A6"/>
   <outline>
     <contour>
-      <point x="407" y="73" type="curve" smooth="yes"/>
-      <point x="628" y="73"/>
-      <point x="766" y="184"/>
-      <point x="766" y="350" type="curve" smooth="yes"/>
-      <point x="766" y="513"/>
-      <point x="627" y="623"/>
-      <point x="416" y="623" type="curve" smooth="yes"/>
-      <point x="197" y="623"/>
-      <point x="60" y="511"/>
-      <point x="60" y="343" type="curve" smooth="yes"/>
-      <point x="60" y="182"/>
-      <point x="198" y="73"/>
+      <point x="390" y="73" type="curve" smooth="yes"/>
+      <point x="611" y="73"/>
+      <point x="749" y="184"/>
+      <point x="749" y="350" type="curve" smooth="yes"/>
+      <point x="749" y="513"/>
+      <point x="610" y="623"/>
+      <point x="399" y="623" type="curve" smooth="yes"/>
+      <point x="180" y="623"/>
+      <point x="43" y="511"/>
+      <point x="43" y="343" type="curve" smooth="yes"/>
+      <point x="43" y="182"/>
+      <point x="181" y="73"/>
     </contour>
     <contour>
-      <point x="416" y="146" type="curve" smooth="yes"/>
-      <point x="251" y="146"/>
-      <point x="145" y="230"/>
-      <point x="145" y="350" type="curve" smooth="yes"/>
-      <point x="145" y="467"/>
-      <point x="249" y="550"/>
-      <point x="406" y="550" type="curve" smooth="yes"/>
-      <point x="574" y="550"/>
-      <point x="681" y="465"/>
-      <point x="681" y="343" type="curve" smooth="yes"/>
-      <point x="681" y="228"/>
-      <point x="576" y="146"/>
+      <point x="399" y="146" type="curve" smooth="yes"/>
+      <point x="234" y="146"/>
+      <point x="128" y="230"/>
+      <point x="128" y="350" type="curve" smooth="yes"/>
+      <point x="128" y="467"/>
+      <point x="232" y="550"/>
+      <point x="389" y="550" type="curve" smooth="yes"/>
+      <point x="557" y="550"/>
+      <point x="664" y="465"/>
+      <point x="664" y="343" type="curve" smooth="yes"/>
+      <point x="664" y="228"/>
+      <point x="559" y="146"/>
     </contour>
     <contour>
-      <point x="371" y="-10" type="line"/>
-      <point x="454" y="-10" type="line"/>
-      <point x="454" y="704" type="line"/>
-      <point x="371" y="704" type="line"/>
+      <point x="354" y="-10" type="line"/>
+      <point x="437" y="-10" type="line"/>
+      <point x="437" y="704" type="line"/>
+      <point x="354" y="704" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -44,8 +44,6 @@
       <string>=Ef-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=Ef-cy</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/P_i.glif b/src/Cantarell-Regular.ufo/glyphs/P_i.glif
index 7e4dd96e..f882df67 100644
--- a/src/Cantarell-Regular.ufo/glyphs/P_i.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/P_i.glif
@@ -1,15 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Pi" format="2">
-  <advance width="727"/>
+  <advance width="699"/>
   <unicode hex="03A0"/>
-  <anchor x="707" y="0" name="bottomright"/>
   <outline>
     <component base="Pe-cy"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/P_si.glif b/src/Cantarell-Regular.ufo/glyphs/P_si.glif
index db39b934..f275eef6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/P_si.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/P_si.glif
@@ -1,39 +1,39 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Psi" format="2">
-  <advance width="788"/>
+  <advance width="745"/>
   <unicode hex="03A8"/>
-  <anchor x="395" y="0" name="bottom"/>
-  <anchor x="395" y="694" name="top"/>
+  <anchor x="373" y="0" name="bottom"/>
+  <anchor x="373" y="694" name="top"/>
   <outline>
     <contour>
-      <point x="366" y="210" type="curve"/>
-      <point x="370" y="282" type="line"/>
-      <point x="242" y="282"/>
-      <point x="152" y="344"/>
-      <point x="152" y="471" type="curve" smooth="yes"/>
-      <point x="152" y="694" type="line"/>
-      <point x="69" y="694" type="line"/>
-      <point x="69" y="461" type="line" smooth="yes"/>
-      <point x="69" y="301"/>
-      <point x="200" y="210"/>
+      <point x="344" y="210" type="curve"/>
+      <point x="348" y="282" type="line"/>
+      <point x="220" y="282"/>
+      <point x="130" y="344"/>
+      <point x="130" y="471" type="curve" smooth="yes"/>
+      <point x="130" y="694" type="line"/>
+      <point x="47" y="694" type="line"/>
+      <point x="47" y="461" type="line" smooth="yes"/>
+      <point x="47" y="301"/>
+      <point x="178" y="210"/>
     </contour>
     <contour>
-      <point x="419" y="210" type="line"/>
-      <point x="592" y="210"/>
-      <point x="720" y="301"/>
-      <point x="720" y="462" type="curve" smooth="yes"/>
-      <point x="720" y="694" type="line"/>
-      <point x="637" y="694" type="line"/>
-      <point x="637" y="453" type="line" smooth="yes"/>
-      <point x="637" y="337"/>
-      <point x="549" y="282"/>
-      <point x="425" y="282" type="curve"/>
+      <point x="397" y="210" type="line"/>
+      <point x="570" y="210"/>
+      <point x="698" y="301"/>
+      <point x="698" y="462" type="curve" smooth="yes"/>
+      <point x="698" y="694" type="line"/>
+      <point x="615" y="694" type="line"/>
+      <point x="615" y="453" type="line" smooth="yes"/>
+      <point x="615" y="337"/>
+      <point x="527" y="282"/>
+      <point x="403" y="282" type="curve"/>
     </contour>
     <contour>
-      <point x="353" y="0" type="line"/>
-      <point x="436" y="0" type="line"/>
-      <point x="436" y="694" type="line"/>
-      <point x="353" y="694" type="line"/>
+      <point x="331" y="0" type="line"/>
+      <point x="414" y="0" type="line"/>
+      <point x="414" y="694" type="line"/>
+      <point x="331" y="694" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -42,8 +42,6 @@
       <string>=U-25</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=U-25</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_ho.glif b/src/Cantarell-Regular.ufo/glyphs/R_ho.glif
index c8c6320d..b65d310e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_ho.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_ho.glif
@@ -1,16 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rho" format="2">
-  <advance width="624"/>
+  <advance width="590"/>
   <unicode hex="03A1"/>
   <anchor x="-4" y="694" name="topleft"/>
-  <anchor x="307" y="0" name="bottom"/>
   <outline>
     <component base="P"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/R_hodasia.glif b/src/Cantarell-Regular.ufo/glyphs/R_hodasia.glif
index e98e1bc8..eccac9b2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/R_hodasia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/R_hodasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Rhodasia" format="2">
-  <advance width="624"/>
+  <advance width="590"/>
   <unicode hex="1FEC"/>
-  <anchor x="307" y="0" name="bottom"/>
-  <anchor x="-4" y="694" name="topleft"/>
   <outline>
     <component base="Rho"/>
     <component base="dasia.case" xOffset="-129"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/S_igma.glif b/src/Cantarell-Regular.ufo/glyphs/S_igma.glif
index d7cfb711..36587fd8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/S_igma.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/S_igma.glif
@@ -1,24 +1,24 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Sigma" format="2">
-  <advance width="639"/>
+  <advance width="613"/>
   <unicode hex="03A3"/>
   <outline>
     <contour>
-      <point x="407" y="357" type="line"/>
-      <point x="160" y="646" type="line"/>
-      <point x="160" y="622" type="line"/>
-      <point x="575" y="622" type="line"/>
-      <point x="575" y="694" type="line"/>
-      <point x="65" y="694" type="line"/>
-      <point x="65" y="641" type="line"/>
-      <point x="352" y="306" type="line"/>
-      <point x="352" y="404" type="line"/>
-      <point x="57" y="53" type="line"/>
-      <point x="57" y="0" type="line"/>
-      <point x="587" y="0" type="line"/>
-      <point x="587" y="72" type="line"/>
-      <point x="141" y="72" type="line"/>
-      <point x="141" y="40" type="line"/>
+      <point x="395" y="357" type="line"/>
+      <point x="148" y="646" type="line"/>
+      <point x="148" y="622" type="line"/>
+      <point x="563" y="622" type="line"/>
+      <point x="563" y="694" type="line"/>
+      <point x="53" y="694" type="line"/>
+      <point x="53" y="641" type="line"/>
+      <point x="340" y="306" type="line"/>
+      <point x="340" y="404" type="line"/>
+      <point x="45" y="53" type="line"/>
+      <point x="45" y="0" type="line"/>
+      <point x="575" y="0" type="line"/>
+      <point x="575" y="72" type="line"/>
+      <point x="129" y="72" type="line"/>
+      <point x="129" y="40" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -27,8 +27,6 @@
       <string>=Z+5</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=Z</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_au.glif b/src/Cantarell-Regular.ufo/glyphs/T_au.glif
index 2761b395..459f0180 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_au.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_au.glif
@@ -1,17 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Tau" format="2">
-  <advance width="634"/>
+  <advance width="566"/>
   <unicode hex="03A4"/>
-  <anchor x="317" y="0" name="bottom"/>
-  <anchor x="317" y="347" name="center"/>
-  <anchor x="317" y="694" name="top"/>
   <outline>
     <component base="T"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/T_heta.glif b/src/Cantarell-Regular.ufo/glyphs/T_heta.glif
index 804763e1..abc918b0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/T_heta.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/T_heta.glif
@@ -1,14 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Theta" format="2">
-  <advance width="788"/>
+  <advance width="760"/>
   <unicode hex="0398"/>
   <anchor x="394" y="0" name="bottom"/>
   <anchor x="394" y="694" name="top"/>
-  <anchor x="592" y="107" name="Qtail"/>
-  <anchor x="394" y="347" name="center"/>
-  <anchor x="475" y="10" name="ogonek"/>
-  <anchor x="23" y="694" name="topleft"/>
-  <anchor x="709" y="694" name="topright"/>
   <outline>
     <contour>
       <point x="231" y="318" type="line"/>
@@ -24,8 +19,6 @@
       <string>=O</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=O</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_psilon.glif b/src/Cantarell-Regular.ufo/glyphs/U_psilon.glif
index a630c357..47e46d9e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_psilon.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_psilon.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilon" format="2">
-  <advance width="610"/>
+  <advance width="580"/>
   <unicode hex="03A5"/>
   <anchor x="311" y="0" name="bottom"/>
   <anchor x="311" y="694" name="top"/>
@@ -8,10 +8,4 @@
   <outline>
     <component base="Y"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_psilondasia.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_psilondasia.glif
index d6125861..d8fcb7cd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_psilondasia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_psilondasia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilondasia" format="2">
-  <advance width="610"/>
+  <advance width="580"/>
   <unicode hex="1F59"/>
-  <anchor x="311" y="0" name="bottom"/>
-  <anchor x="311" y="694" name="top"/>
-  <anchor x="-51" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="dasia.case" xOffset="-176"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_psilondasiaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_psilondasiaoxia.glif
index 5a73e07d..7edf632f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_psilondasiaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_psilondasiaoxia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilondasiaoxia" format="2">
-  <advance width="610"/>
+  <advance width="580"/>
   <unicode hex="1F5D"/>
-  <anchor x="311" y="0" name="bottom"/>
-  <anchor x="311" y="694" name="top"/>
-  <anchor x="-51" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="dasiaoxia.case" xOffset="-342"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.75,0.75,0.75,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_psilondasiaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_psilondasiaperispomeni.glif
index 53bd8407..a1fcf19a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_psilondasiaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_psilondasiaperispomeni.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilondasiaperispomeni" format="2">
-  <advance width="610"/>
+  <advance width="580"/>
   <unicode hex="1F5F"/>
-  <anchor x="311" y="0" name="bottom"/>
-  <anchor x="311" y="694" name="top"/>
-  <anchor x="-51" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="dasiaperispomeni.case" xOffset="-405" yOffset="-156"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.5,0.09,0.79,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_psilondasiavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_psilondasiavaria.glif
index e34d20fb..9038c0c8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_psilondasiavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_psilondasiavaria.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilondasiavaria" format="2">
-  <advance width="610"/>
+  <advance width="580"/>
   <unicode hex="1F5B"/>
-  <anchor x="311" y="0" name="bottom"/>
-  <anchor x="311" y="694" name="top"/>
-  <anchor x="-51" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="dasiavaria.case" xOffset="-323"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.25,0.25,0.25,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_psilondieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_psilondieresis.glif
index 5ad9c96e..bbb88ce4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_psilondieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_psilondieresis.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilondieresis" format="2">
-  <advance width="610"/>
+  <advance width="580"/>
   <unicode hex="03AB"/>
-  <anchor x="311" y="0" name="bottom"/>
-  <anchor x="311" y="856" name="top"/>
-  <anchor x="-51" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="dieresiscomb.case" xOffset="75"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_psilonmacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_psilonmacron.glif
index d7c5a16e..812ab72c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_psilonmacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_psilonmacron.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilonmacron" format="2">
-  <advance width="610"/>
+  <advance width="580"/>
   <unicode hex="1FE9"/>
-  <anchor x="311" y="0" name="bottom"/>
-  <anchor x="311" y="694" name="top"/>
-  <anchor x="-51" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
-    <component base="macron" xOffset="69" yOffset="212"/>
+    <component base="macron" xOffset="60" yOffset="212"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_psilonoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_psilonoxia.glif
index 2c4fa6bd..3b213497 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_psilonoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_psilonoxia.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilonoxia" format="2">
-  <advance width="610"/>
+  <advance width="580"/>
   <unicode hex="1FEB"/>
-  <anchor x="311" y="0" name="bottom"/>
-  <anchor x="311" y="694" name="top"/>
-  <anchor x="-51" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="oxia.case" xOffset="-200"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_psilontonos.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_psilontonos.glif
index 09e68a24..5cdb8346 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_psilontonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_psilontonos.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilontonos" format="2">
-  <advance width="610"/>
+  <advance width="580"/>
   <unicode hex="038E"/>
-  <anchor x="311" y="0" name="bottom"/>
-  <anchor x="311" y="694" name="top"/>
-  <anchor x="-51" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="tonos.case" xOffset="-200"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_psilonvaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_psilonvaria.glif
index 451d7db6..3ee73cb7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_psilonvaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_psilonvaria.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilonvaria" format="2">
-  <advance width="610"/>
+  <advance width="580"/>
   <unicode hex="1FEA"/>
-  <anchor x="311" y="0" name="bottom"/>
-  <anchor x="311" y="694" name="top"/>
-  <anchor x="-51" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="varia.case" xOffset="-182"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/U_psilonvrachy.glif 
b/src/Cantarell-Regular.ufo/glyphs/U_psilonvrachy.glif
index d03f3600..f204ba14 100644
--- a/src/Cantarell-Regular.ufo/glyphs/U_psilonvrachy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/U_psilonvrachy.glif
@@ -1,18 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Upsilonvrachy" format="2">
-  <advance width="610"/>
+  <advance width="580"/>
   <unicode hex="1FE8"/>
-  <anchor x="311" y="0" name="bottom"/>
-  <anchor x="311" y="694" name="top"/>
-  <anchor x="-51" y="694" name="topleft"/>
   <outline>
     <component base="Upsilon"/>
     <component base="vrachy.case" xOffset="102"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/X_i.glif b/src/Cantarell-Regular.ufo/glyphs/X_i.glif
index b8f0a2a5..2312bbb2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/X_i.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/X_i.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Xi" format="2">
-  <advance width="592"/>
+  <advance width="585"/>
   <unicode hex="039E"/>
   <outline>
     <contour>
@@ -26,8 +26,6 @@
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=E</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/Z_eta.glif b/src/Cantarell-Regular.ufo/glyphs/Z_eta.glif
index 45151634..6ff7d5aa 100644
--- a/src/Cantarell-Regular.ufo/glyphs/Z_eta.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/Z_eta.glif
@@ -1,16 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="Zeta" format="2">
-  <advance width="662"/>
+  <advance width="636"/>
   <unicode hex="0396"/>
-  <anchor x="331" y="0" name="bottom"/>
-  <anchor x="331" y="694" name="top"/>
   <outline>
     <component base="Z"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alpha.glif b/src/Cantarell-Regular.ufo/glyphs/alpha.glif
index 2ab02919..a744ead7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alpha.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alpha.glif
@@ -1,57 +1,57 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alpha" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="03B1"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
+  <anchor x="251" y="0" name="bottom"/>
+  <anchor x="264" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="241" y="-10" type="curve" smooth="yes"/>
-      <point x="344" y="-10"/>
-      <point x="419" y="80"/>
-      <point x="435" y="204" type="curve"/>
-      <point x="392" y="220" type="line"/>
-      <point x="374" y="150"/>
-      <point x="328" y="60"/>
-      <point x="252" y="60" type="curve" smooth="yes"/>
-      <point x="172" y="60"/>
-      <point x="134" y="137"/>
-      <point x="134" y="243" type="curve" smooth="yes"/>
-      <point x="134" y="347"/>
-      <point x="175" y="422"/>
-      <point x="248" y="422" type="curve" smooth="yes"/>
-      <point x="322" y="422"/>
-      <point x="356" y="332"/>
-      <point x="373" y="252" type="curve" smooth="yes"/>
-      <point x="398" y="134" type="line" smooth="yes"/>
-      <point x="419" y="34"/>
-      <point x="449" y="-6"/>
-      <point x="512" y="-6" type="curve" smooth="yes"/>
-      <point x="538" y="-6"/>
-      <point x="559" y="2"/>
-      <point x="578" y="11" type="curve"/>
-      <point x="562" y="66" type="line"/>
-      <point x="551" y="61"/>
-      <point x="538" y="58"/>
-      <point x="526" y="58" type="curve" smooth="yes"/>
-      <point x="489" y="58"/>
-      <point x="478" y="97"/>
-      <point x="464" y="160" type="curve" smooth="yes"/>
-      <point x="437" y="280" type="line" smooth="yes"/>
-      <point x="415" y="381"/>
-      <point x="371" y="492"/>
-      <point x="250" y="492" type="curve" smooth="yes"/>
-      <point x="125" y="492"/>
-      <point x="54" y="383"/>
-      <point x="54" y="236" type="curve" smooth="yes"/>
-      <point x="54" y="93"/>
-      <point x="119" y="-10"/>
+      <point x="239" y="-10" type="curve" smooth="yes"/>
+      <point x="342" y="-10"/>
+      <point x="417" y="80"/>
+      <point x="433" y="204" type="curve"/>
+      <point x="390" y="220" type="line"/>
+      <point x="372" y="150"/>
+      <point x="326" y="60"/>
+      <point x="250" y="60" type="curve" smooth="yes"/>
+      <point x="170" y="60"/>
+      <point x="132" y="137"/>
+      <point x="132" y="243" type="curve" smooth="yes"/>
+      <point x="132" y="347"/>
+      <point x="173" y="422"/>
+      <point x="246" y="422" type="curve" smooth="yes"/>
+      <point x="320" y="422"/>
+      <point x="354" y="332"/>
+      <point x="371" y="252" type="curve" smooth="yes"/>
+      <point x="396" y="134" type="line" smooth="yes"/>
+      <point x="417" y="34"/>
+      <point x="447" y="-6"/>
+      <point x="510" y="-6" type="curve" smooth="yes"/>
+      <point x="536" y="-6"/>
+      <point x="557" y="2"/>
+      <point x="576" y="11" type="curve"/>
+      <point x="560" y="66" type="line"/>
+      <point x="549" y="61"/>
+      <point x="536" y="58"/>
+      <point x="524" y="58" type="curve" smooth="yes"/>
+      <point x="487" y="58"/>
+      <point x="476" y="97"/>
+      <point x="462" y="160" type="curve" smooth="yes"/>
+      <point x="435" y="280" type="line" smooth="yes"/>
+      <point x="413" y="381"/>
+      <point x="369" y="492"/>
+      <point x="248" y="492" type="curve" smooth="yes"/>
+      <point x="123" y="492"/>
+      <point x="52" y="383"/>
+      <point x="52" y="236" type="curve" smooth="yes"/>
+      <point x="52" y="93"/>
+      <point x="117" y="-10"/>
     </contour>
     <contour>
-      <point x="451" y="175" type="line"/>
-      <point x="552" y="482" type="line"/>
-      <point x="470" y="482" type="line"/>
-      <point x="400" y="196" type="line"/>
+      <point x="449" y="175" type="line"/>
+      <point x="550" y="482" type="line"/>
+      <point x="468" y="482" type="line"/>
+      <point x="398" y="196" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -59,11 +59,7 @@
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>=d</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
-      <string>=l-4</string>
-      <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
-      <string>=l-10</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
+      <string>l</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphadasia.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphadasia.glif
index 391a3828..be6c42ab 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphadasia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphadasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasia" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F01"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="694" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasia" xOffset="148"/>
+    <component base="dasia" xOffset="146"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphadasiaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphadasiaoxia.glif
index 879281fd..b104ec6c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphadasiaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphadasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiaoxia" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F05"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasiaoxia" xOffset="85"/>
+    <component base="dasiaoxia" xOffset="83"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphadasiaoxiaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphadasiaoxiaypogegrammeni.glif
index 1c24f669..98d8e912 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphadasiaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphadasiaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiaoxiaypogegrammeni" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F85"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasiaoxia" xOffset="85"/>
-    <component base="ypogegrammeni" xOffset="19"/>
+    <component base="dasiaoxia" xOffset="83"/>
+    <component base="ypogegrammeni" xOffset="17"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphadasiaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphadasiaperispomeni.glif
index 18a83444..1089b15e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphadasiaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphadasiaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiaperispomeni" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F07"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="daspsiliiaperispomeni" xOffset="40"/>
+    <component base="daspsiliiaperispomeni" xOffset="22"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphadasiaperispomeniypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphadasiaperispomeniypogegrammeni.glif
index 00166c23..9d382839 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphadasiaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphadasiaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiaperispomeniypogegrammeni" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F87"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="daspsiliiaperispomeni" xOffset="40"/>
-    <component base="ypogegrammeni" xOffset="19"/>
+    <component base="daspsiliiaperispomeni" xOffset="22"/>
+    <component base="ypogegrammeni" xOffset="17"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphadasiavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphadasiavaria.glif
index 1da3bb2e..24545ac9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphadasiavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphadasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiavaria" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F03"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasiavaria" xOffset="75"/>
+    <component base="dasiavaria" xOffset="73"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphadasiavariaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphadasiavariaypogegrammeni.glif
index 1574c32a..f22b59c6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphadasiavariaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphadasiavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiavariaypogegrammeni" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F83"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasiavaria" xOffset="75"/>
-    <component base="ypogegrammeni" xOffset="19"/>
+    <component base="dasiavaria" xOffset="73"/>
+    <component base="ypogegrammeni" xOffset="17"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphadasiaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphadasiaypogegrammeni.glif
index 6b2eeee1..33739c38 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphadasiaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphadasiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphadasiaypogegrammeni" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F81"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="694" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="dasia" xOffset="148"/>
-    <component base="ypogegrammeni" xOffset="19"/>
+    <component base="dasia" xOffset="146"/>
+    <component base="ypogegrammeni" xOffset="17"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphamacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphamacron.glif
index 90e0c846..7142d2ff 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphamacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphamacron.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphamacron" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1FB1"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="macron" xOffset="24"/>
+    <component base="macron" xOffset="13"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphaoxia.glif b/src/Cantarell-Regular.ufo/glyphs/alphaoxia.glif
index ab8a6952..dc24731a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphaoxia" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F71"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="oxia" xOffset="161"/>
+    <component base="oxia" xOffset="159"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphaoxiaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphaoxiaypogegrammeni.glif
index b664e4e3..507ee887 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphaoxiaypogegrammeni" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1FB4"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="oxia" xOffset="161"/>
-    <component base="ypogegrammeni" xOffset="19"/>
+    <component base="oxia" xOffset="159"/>
+    <component base="ypogegrammeni" xOffset="17"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphaperispomeni.glif
index 9103457e..910c8655 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphaperispomeni" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1FB6"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="641" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="perispomeni" xOffset="40"/>
+    <component base="perispomeni" xOffset="22"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphaperispomeniypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphaperispomeniypogegrammeni.glif
index 9a7d2b9b..4c325310 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphaperispomeniypogegrammeni" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1FB7"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="641" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="perispomeni" xOffset="40"/>
-    <component base="ypogegrammeni" xOffset="19"/>
+    <component base="perispomeni" xOffset="22"/>
+    <component base="ypogegrammeni" xOffset="17"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphapsili.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphapsili.glif
index f4524155..07c13cbb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphapsili.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphapsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsili" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F00"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="694" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psili" xOffset="128"/>
+    <component base="psili" xOffset="126"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphapsilioxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphapsilioxia.glif
index 50ceaeca..6670430d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphapsilioxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphapsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsilioxia" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F04"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psilioxia" xOffset="50"/>
+    <component base="psilioxia" xOffset="48"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphapsilioxiaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphapsilioxiaypogegrammeni.glif
index b0cab705..cb2aaae2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphapsilioxiaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphapsilioxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsilioxiaypogegrammeni" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F84"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psilioxia" xOffset="50"/>
-    <component base="ypogegrammeni" xOffset="19"/>
+    <component base="psilioxia" xOffset="48"/>
+    <component base="ypogegrammeni" xOffset="17"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphapsiliperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphapsiliperispomeni.glif
index a22f07bb..814523f1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphapsiliperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphapsiliperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsiliperispomeni" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F06"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psiliperispomeni" xOffset="40"/>
+    <component base="psiliperispomeni" xOffset="22"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphapsiliperispomeniypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphapsiliperispomeniypogegrammeni.glif
index edf51b7f..6846fd16 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphapsiliperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphapsiliperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsiliperispomeniypogegrammeni" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F86"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psiliperispomeni" xOffset="40"/>
-    <component base="ypogegrammeni" xOffset="19"/>
+    <component base="psiliperispomeni" xOffset="22"/>
+    <component base="ypogegrammeni" xOffset="17"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphapsilivaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphapsilivaria.glif
index cd29c576..c932c9ad 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphapsilivaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphapsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsilivaria" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F02"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psilivaria" xOffset="50"/>
+    <component base="psilivaria" xOffset="48"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphapsilivariaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphapsilivariaypogegrammeni.glif
index 48ca6f21..2a4b0b8f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphapsilivariaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphapsilivariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsilivariaypogegrammeni" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F82"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psilivaria" xOffset="50"/>
-    <component base="ypogegrammeni" xOffset="19"/>
+    <component base="psilivaria" xOffset="48"/>
+    <component base="ypogegrammeni" xOffset="17"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphapsiliypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphapsiliypogegrammeni.glif
index 43b8aea2..92ec87f5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphapsiliypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphapsiliypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphapsiliypogegrammeni" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F80"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="694" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="psili" xOffset="128"/>
-    <component base="ypogegrammeni" xOffset="19"/>
+    <component base="psili" xOffset="126"/>
+    <component base="ypogegrammeni" xOffset="17"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphatonos.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphatonos.glif
index 6a94fb44..b58b3f2a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphatonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphatonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphatonos" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="03AC"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="tonos" xOffset="161"/>
+    <component base="tonos" xOffset="159"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphavaria.glif
index 218c2a05..a58294b2 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphavaria" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1F70"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="varia" xOffset="111"/>
+    <component base="varia" xOffset="109"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphavariaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphavariaypogegrammeni.glif
index a0bcdbb6..dc8f7f9f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphavariaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphavariaypogegrammeni" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1FB2"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="varia" xOffset="111"/>
-    <component base="ypogegrammeni" xOffset="19"/>
+    <component base="varia" xOffset="109"/>
+    <component base="ypogegrammeni" xOffset="17"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphavrachy.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphavrachy.glif
index 66890708..f00f20d9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphavrachy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphavrachy.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphavrachy" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1FB0"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="681" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="vrachy" xOffset="58"/>
+    <component base="vrachy" xOffset="56"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/alphaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/alphaypogegrammeni.glif
index 6b4eaf6f..24004a81 100644
--- a/src/Cantarell-Regular.ufo/glyphs/alphaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/alphaypogegrammeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="alphaypogegrammeni" format="2">
-  <advance width="575"/>
+  <advance width="586"/>
   <unicode hex="1FB3"/>
-  <anchor x="253" y="0" name="bottom"/>
-  <anchor x="266" y="482" name="top"/>
   <outline>
     <component base="alpha"/>
-    <component base="ypogegrammeni" xOffset="19"/>
+    <component base="ypogegrammeni" xOffset="17"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/beta.glif b/src/Cantarell-Regular.ufo/glyphs/beta.glif
index 533e8355..b1b6b704 100644
--- a/src/Cantarell-Regular.ufo/glyphs/beta.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/beta.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="beta" format="2">
-  <advance width="572"/>
+  <advance width="567"/>
   <unicode hex="03B2"/>
   <outline>
     <contour>
-      <point x="323" y="60" type="curve" smooth="yes"/>
-      <point x="248" y="60"/>
-      <point x="176" y="103"/>
-      <point x="152" y="172" type="curve"/>
-      <point x="120" y="122" type="line"/>
-      <point x="150" y="43"/>
-      <point x="234" y="-10"/>
-      <point x="328" y="-10" type="curve" smooth="yes"/>
-      <point x="454" y="-10"/>
-      <point x="532" y="68"/>
-      <point x="532" y="197" type="curve" smooth="yes"/>
-      <point x="532" y="308"/>
-      <point x="440" y="394"/>
-      <point x="323" y="398" type="curve"/>
-      <point x="322" y="390" type="line"/>
-      <point x="415" y="394"/>
-      <point x="482" y="479"/>
-      <point x="482" y="570" type="curve" smooth="yes"/>
-      <point x="482" y="676"/>
-      <point x="404" y="749"/>
-      <point x="292" y="749" type="curve" smooth="yes"/>
-      <point x="163" y="749"/>
-      <point x="85" y="664"/>
-      <point x="85" y="522" type="curve" smooth="yes"/>
-      <point x="85" y="-217" type="line"/>
-      <point x="165" y="-217" type="line"/>
-      <point x="165" y="529" type="line" smooth="yes"/>
-      <point x="165" y="616"/>
-      <point x="201" y="679"/>
-      <point x="284" y="679" type="curve" smooth="yes"/>
-      <point x="352" y="679"/>
-      <point x="402" y="634"/>
-      <point x="402" y="559" type="curve" smooth="yes"/>
-      <point x="402" y="480"/>
-      <point x="350" y="422"/>
-      <point x="269" y="422" type="curve" smooth="yes"/>
-      <point x="232" y="422" type="line"/>
-      <point x="232" y="355" type="line"/>
-      <point x="274" y="355" type="line" smooth="yes"/>
-      <point x="376" y="355"/>
-      <point x="452" y="291"/>
-      <point x="452" y="191" type="curve" smooth="yes"/>
-      <point x="452" y="118"/>
-      <point x="407" y="60"/>
+      <point x="321" y="60" type="curve" smooth="yes"/>
+      <point x="246" y="60"/>
+      <point x="174" y="103"/>
+      <point x="150" y="172" type="curve"/>
+      <point x="118" y="122" type="line"/>
+      <point x="148" y="43"/>
+      <point x="232" y="-10"/>
+      <point x="326" y="-10" type="curve" smooth="yes"/>
+      <point x="452" y="-10"/>
+      <point x="530" y="68"/>
+      <point x="530" y="197" type="curve" smooth="yes"/>
+      <point x="530" y="308"/>
+      <point x="438" y="394"/>
+      <point x="321" y="398" type="curve"/>
+      <point x="320" y="390" type="line"/>
+      <point x="413" y="394"/>
+      <point x="480" y="479"/>
+      <point x="480" y="570" type="curve" smooth="yes"/>
+      <point x="480" y="676"/>
+      <point x="402" y="749"/>
+      <point x="290" y="749" type="curve" smooth="yes"/>
+      <point x="161" y="749"/>
+      <point x="83" y="664"/>
+      <point x="83" y="522" type="curve" smooth="yes"/>
+      <point x="83" y="-217" type="line"/>
+      <point x="163" y="-217" type="line"/>
+      <point x="163" y="529" type="line" smooth="yes"/>
+      <point x="163" y="616"/>
+      <point x="199" y="679"/>
+      <point x="282" y="679" type="curve" smooth="yes"/>
+      <point x="350" y="679"/>
+      <point x="400" y="634"/>
+      <point x="400" y="559" type="curve" smooth="yes"/>
+      <point x="400" y="480"/>
+      <point x="348" y="422"/>
+      <point x="267" y="422" type="curve" smooth="yes"/>
+      <point x="230" y="422" type="line"/>
+      <point x="230" y="355" type="line"/>
+      <point x="272" y="355" type="line" smooth="yes"/>
+      <point x="374" y="355"/>
+      <point x="450" y="291"/>
+      <point x="450" y="191" type="curve" smooth="yes"/>
+      <point x="450" y="118"/>
+      <point x="405" y="60"/>
     </contour>
   </outline>
   <lib>
@@ -56,8 +56,6 @@
       <string>=germandbls</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=germandbls</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/chi.glif b/src/Cantarell-Regular.ufo/glyphs/chi.glif
index 07cad10d..fb1620fd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/chi.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/chi.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="chi" format="2">
-  <advance width="528"/>
+  <advance width="499"/>
   <unicode hex="03C7"/>
   <outline>
     <contour>
-      <point x="422" y="-217" type="line"/>
-      <point x="512" y="-217" type="line"/>
-      <point x="290" y="172" type="line"/>
-      <point x="115" y="482" type="line"/>
-      <point x="25" y="482" type="line"/>
-      <point x="244" y="99" type="line"/>
+      <point x="408" y="-217" type="line"/>
+      <point x="498" y="-217" type="line"/>
+      <point x="276" y="172" type="line"/>
+      <point x="101" y="482" type="line"/>
+      <point x="11" y="482" type="line"/>
+      <point x="230" y="99" type="line"/>
     </contour>
     <contour>
-      <point x="22" y="-217" type="line"/>
-      <point x="109" y="-217" type="line"/>
-      <point x="272" y="88" type="line"/>
-      <point x="232" y="157" type="line"/>
+      <point x="8" y="-217" type="line"/>
+      <point x="95" y="-217" type="line"/>
+      <point x="258" y="88" type="line"/>
+      <point x="218" y="157" type="line"/>
     </contour>
     <contour>
-      <point x="298" y="118" type="line"/>
-      <point x="500" y="482" type="line"/>
-      <point x="413" y="482" type="line"/>
-      <point x="259" y="187" type="line"/>
+      <point x="284" y="118" type="line"/>
+      <point x="486" y="482" type="line"/>
+      <point x="399" y="482" type="line"/>
+      <point x="245" y="187" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -32,8 +32,6 @@
       <string>=x-5</string>
       <key>com.schriftgestaltung.Glyphs.layer.rightMetricsKey</key>
       <string>=x-10</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dasia.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/dasia.case.glif
index 09708807..c4384067 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dasia.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dasia.case.glif
@@ -12,8 +12,6 @@
       <string>dasia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>dasia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dasia.glif b/src/Cantarell-Regular.ufo/glyphs/dasia.glif
index 78ba1002..cb834aea 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dasia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dasia.glif
@@ -7,10 +7,4 @@
   <outline>
     <component base="psili" xScale="-1" xOffset="254"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dasiaoxia.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/dasiaoxia.case.glif
index 01865025..45cab2ff 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dasiaoxia.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dasiaoxia.case.glif
@@ -11,8 +11,6 @@
       <string>dasiaoxia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>dasiaoxia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dasiaoxia.glif b/src/Cantarell-Regular.ufo/glyphs/dasiaoxia.glif
index 89961990..1a79fb1a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dasiaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dasiaoxia.glif
@@ -33,8 +33,6 @@
       <string>dasia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>oxia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dasiaperispomeni.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/dasiaperispomeni.case.glif
index caa31a69..91ccec49 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dasiaperispomeni.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dasiaperispomeni.case.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dasiaperispomeni.case" format="2">
-  <advance width="470"/>
+  <advance width="500"/>
   <anchor x="354" y="850" name="_topleft"/>
   <outline>
     <component base="daspsiliiaperispomeni"/>
@@ -11,8 +11,6 @@
       <string>dasiaperispomeni</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>dasiaperispomeni</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dasiavaria.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/dasiavaria.case.glif
index 6750676c..3dd31ff7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dasiavaria.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dasiavaria.case.glif
@@ -11,8 +11,6 @@
       <string>dasiavaria</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>dasiavaria</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dasiavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/dasiavaria.glif
index 085063b4..71816c80 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dasiavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dasiavaria.glif
@@ -33,8 +33,6 @@
       <string>dasia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>varia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/daspsiliiaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/daspsiliiaperispomeni.glif
index be596355..b51fc1e0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/daspsiliiaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/daspsiliiaperispomeni.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="daspsiliiaperispomeni" format="2">
-  <advance width="470"/>
-  <anchor x="226" y="482" name="_top"/>
+  <advance width="500"/>
+  <anchor x="242" y="482" name="_top"/>
   <outline>
-    <component base="dasia" xOffset="108"/>
+    <component base="dasia" xOffset="124"/>
     <component base="perispomeni" yOffset="212"/>
   </outline>
   <lib>
diff --git a/src/Cantarell-Regular.ufo/glyphs/delta.glif b/src/Cantarell-Regular.ufo/glyphs/delta.glif
index 85c1e881..35868cdc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/delta.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/delta.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="delta" format="2">
-  <advance width="565"/>
+  <advance width="563"/>
   <unicode hex="03B4"/>
   <outline>
     <contour>
-      <point x="491" y="686" type="line"/>
-      <point x="425" y="720"/>
-      <point x="344" y="749"/>
-      <point x="274" y="749" type="curve" smooth="yes"/>
-      <point x="167" y="749"/>
-      <point x="98" y="695"/>
-      <point x="98" y="615" type="curve" smooth="yes"/>
-      <point x="98" y="542"/>
-      <point x="167" y="489"/>
-      <point x="263" y="427" type="curve" smooth="yes"/>
-      <point x="358" y="366"/>
-      <point x="432" y="319"/>
-      <point x="432" y="208" type="curve" smooth="yes"/>
-      <point x="432" y="128"/>
-      <point x="374" y="60"/>
-      <point x="284" y="60" type="curve" smooth="yes"/>
-      <point x="192" y="60"/>
-      <point x="133" y="128"/>
-      <point x="133" y="211" type="curve" smooth="yes"/>
-      <point x="133" y="290"/>
-      <point x="183" y="374"/>
-      <point x="302" y="435" type="curve"/>
-      <point x="268" y="484" type="line"/>
-      <point x="140" y="424"/>
-      <point x="53" y="326"/>
-      <point x="53" y="205" type="curve" smooth="yes"/>
-      <point x="53" y="75"/>
-      <point x="141" y="-10"/>
-      <point x="277" y="-10" type="curve" smooth="yes"/>
-      <point x="418" y="-10"/>
-      <point x="512" y="89"/>
-      <point x="512" y="216" type="curve" smooth="yes"/>
-      <point x="512" y="355"/>
-      <point x="412" y="416"/>
-      <point x="306" y="484" type="curve" smooth="yes"/>
-      <point x="212" y="544"/>
-      <point x="178" y="581"/>
-      <point x="178" y="619" type="curve" smooth="yes"/>
-      <point x="178" y="658"/>
-      <point x="218" y="679"/>
-      <point x="277" y="679" type="curve" smooth="yes"/>
-      <point x="332" y="679"/>
-      <point x="404" y="655"/>
-      <point x="467" y="626" type="curve"/>
+      <point x="490" y="686" type="line"/>
+      <point x="424" y="720"/>
+      <point x="343" y="749"/>
+      <point x="273" y="749" type="curve" smooth="yes"/>
+      <point x="166" y="749"/>
+      <point x="97" y="695"/>
+      <point x="97" y="615" type="curve" smooth="yes"/>
+      <point x="97" y="542"/>
+      <point x="166" y="489"/>
+      <point x="262" y="427" type="curve" smooth="yes"/>
+      <point x="357" y="366"/>
+      <point x="431" y="319"/>
+      <point x="431" y="208" type="curve" smooth="yes"/>
+      <point x="431" y="128"/>
+      <point x="373" y="60"/>
+      <point x="283" y="60" type="curve" smooth="yes"/>
+      <point x="191" y="60"/>
+      <point x="132" y="128"/>
+      <point x="132" y="211" type="curve" smooth="yes"/>
+      <point x="132" y="290"/>
+      <point x="182" y="374"/>
+      <point x="301" y="435" type="curve"/>
+      <point x="267" y="484" type="line"/>
+      <point x="139" y="424"/>
+      <point x="52" y="326"/>
+      <point x="52" y="205" type="curve" smooth="yes"/>
+      <point x="52" y="75"/>
+      <point x="140" y="-10"/>
+      <point x="276" y="-10" type="curve" smooth="yes"/>
+      <point x="417" y="-10"/>
+      <point x="511" y="89"/>
+      <point x="511" y="216" type="curve" smooth="yes"/>
+      <point x="511" y="355"/>
+      <point x="411" y="416"/>
+      <point x="305" y="484" type="curve" smooth="yes"/>
+      <point x="211" y="544"/>
+      <point x="177" y="581"/>
+      <point x="177" y="619" type="curve" smooth="yes"/>
+      <point x="177" y="658"/>
+      <point x="217" y="679"/>
+      <point x="276" y="679" type="curve" smooth="yes"/>
+      <point x="331" y="679"/>
+      <point x="403" y="655"/>
+      <point x="466" y="626" type="curve"/>
     </contour>
   </outline>
   <lib>
@@ -56,8 +56,6 @@
       <string>=o</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=o</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dialytikaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/dialytikaoxia.glif
index 8ac38752..26176b35 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dialytikaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dialytikaoxia.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dialytikaoxia" format="2">
-  <advance width="519"/>
+  <advance width="553"/>
   <unicode hex="1FEE"/>
-  <anchor x="230" y="482" name="_top"/>
+  <anchor x="250" y="482" name="_top"/>
   <outline>
-    <component base="dieresistonos" xOffset="-3"/>
+    <component base="dieresistonos" xOffset="17"/>
   </outline>
   <lib>
     <dict>
@@ -12,8 +12,6 @@
       <string>=dieresis</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=dieresis</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dialytikaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/dialytikaperispomeni.glif
index a9511e28..25b57ecc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dialytikaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dialytikaperispomeni.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dialytikaperispomeni" format="2">
-  <advance width="470"/>
+  <advance width="500"/>
   <unicode hex="1FC1"/>
-  <anchor x="219" y="482" name="_top"/>
+  <anchor x="235" y="482" name="_top"/>
   <outline>
-    <component base="dieresiscomb" xOffset="-7"/>
+    <component base="dieresiscomb" xOffset="9"/>
     <component base="perispomeni" yOffset="192"/>
   </outline>
   <lib>
@@ -13,8 +13,6 @@
       <string>=perispomeni</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=perispomeni</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dialytikavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/dialytikavaria.glif
index 6a7842e8..b601aff8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dialytikavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dialytikavaria.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="dialytikavaria" format="2">
-  <advance width="519"/>
+  <advance width="553"/>
   <unicode hex="1FED"/>
-  <anchor x="287" y="482" name="_top"/>
+  <anchor x="307" y="482" name="_top"/>
   <outline>
-    <component base="dieresistonos" xScale="-1" xOffset="516"/>
+    <component base="dieresistonos" xScale="-1" xOffset="536"/>
   </outline>
   <lib>
     <dict>
@@ -12,8 +12,6 @@
       <string>dieresis</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>dieresis</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/dieresistonos.glif 
b/src/Cantarell-Regular.ufo/glyphs/dieresistonos.glif
index bf7915b1..bdf4b2d7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/dieresistonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/dieresistonos.glif
@@ -45,8 +45,6 @@
       <string>=dieresiscomb</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=dieresiscomb</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/epsilon.glif b/src/Cantarell-Regular.ufo/glyphs/epsilon.glif
index e28e3e7f..1a653f7b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/epsilon.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/epsilon.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilon" format="2">
-  <advance width="472"/>
+  <advance width="470"/>
   <unicode hex="03B5"/>
-  <anchor x="240" y="0" name="bottom"/>
-  <anchor x="230" y="482" name="top"/>
+  <anchor x="239" y="0" name="bottom"/>
+  <anchor x="229" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="242" y="-7" type="curve" smooth="yes"/>
-      <point x="318" y="-7"/>
-      <point x="386" y="14"/>
-      <point x="444" y="40" type="curve"/>
-      <point x="426" y="99" type="line"/>
-      <point x="379" y="80"/>
-      <point x="316" y="63"/>
-      <point x="253" y="63" type="curve" smooth="yes"/>
-      <point x="177" y="63"/>
-      <point x="130" y="94"/>
-      <point x="130" y="140" type="curve" smooth="yes"/>
-      <point x="130" y="190"/>
-      <point x="184" y="214"/>
-      <point x="273" y="214" type="curve" smooth="yes"/>
-      <point x="345" y="214" type="line"/>
-      <point x="345" y="281" type="line"/>
-      <point x="277" y="281" type="line" smooth="yes"/>
-      <point x="189" y="281"/>
-      <point x="143" y="313"/>
-      <point x="143" y="356" type="curve" smooth="yes"/>
-      <point x="143" y="400"/>
-      <point x="191" y="422"/>
-      <point x="258" y="422" type="curve" smooth="yes"/>
-      <point x="304" y="422"/>
-      <point x="346" y="411"/>
-      <point x="398" y="395" type="curve"/>
-      <point x="416" y="454" type="line"/>
-      <point x="361" y="478"/>
-      <point x="308" y="492"/>
-      <point x="250" y="492" type="curve" smooth="yes"/>
-      <point x="142" y="492"/>
-      <point x="63" y="436"/>
-      <point x="63" y="358" type="curve" smooth="yes"/>
-      <point x="63" y="292"/>
-      <point x="129" y="245"/>
-      <point x="210" y="244" type="curve"/>
-      <point x="212" y="249" type="line"/>
-      <point x="117" y="250"/>
-      <point x="48" y="200"/>
-      <point x="48" y="129" type="curve" smooth="yes"/>
-      <point x="48" y="47"/>
-      <point x="135" y="-7"/>
+      <point x="241" y="-7" type="curve" smooth="yes"/>
+      <point x="317" y="-7"/>
+      <point x="385" y="14"/>
+      <point x="443" y="40" type="curve"/>
+      <point x="425" y="99" type="line"/>
+      <point x="378" y="80"/>
+      <point x="315" y="63"/>
+      <point x="252" y="63" type="curve" smooth="yes"/>
+      <point x="176" y="63"/>
+      <point x="129" y="94"/>
+      <point x="129" y="140" type="curve" smooth="yes"/>
+      <point x="129" y="190"/>
+      <point x="183" y="214"/>
+      <point x="272" y="214" type="curve" smooth="yes"/>
+      <point x="344" y="214" type="line"/>
+      <point x="344" y="281" type="line"/>
+      <point x="276" y="281" type="line" smooth="yes"/>
+      <point x="188" y="281"/>
+      <point x="142" y="313"/>
+      <point x="142" y="356" type="curve" smooth="yes"/>
+      <point x="142" y="400"/>
+      <point x="190" y="422"/>
+      <point x="257" y="422" type="curve" smooth="yes"/>
+      <point x="303" y="422"/>
+      <point x="345" y="411"/>
+      <point x="397" y="395" type="curve"/>
+      <point x="415" y="454" type="line"/>
+      <point x="360" y="478"/>
+      <point x="307" y="492"/>
+      <point x="249" y="492" type="curve" smooth="yes"/>
+      <point x="141" y="492"/>
+      <point x="62" y="436"/>
+      <point x="62" y="358" type="curve" smooth="yes"/>
+      <point x="62" y="292"/>
+      <point x="128" y="245"/>
+      <point x="209" y="244" type="curve"/>
+      <point x="211" y="249" type="line"/>
+      <point x="116" y="250"/>
+      <point x="47" y="200"/>
+      <point x="47" y="129" type="curve" smooth="yes"/>
+      <point x="47" y="47"/>
+      <point x="134" y="-7"/>
     </contour>
   </outline>
   <lib>
@@ -56,8 +56,6 @@
       <string>=o-5</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=e-25</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/epsilondasia.glif 
b/src/Cantarell-Regular.ufo/glyphs/epsilondasia.glif
index 63f43705..63b1b2fa 100644
--- a/src/Cantarell-Regular.ufo/glyphs/epsilondasia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/epsilondasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilondasia" format="2">
-  <advance width="472"/>
+  <advance width="470"/>
   <unicode hex="1F11"/>
-  <anchor x="240" y="0" name="bottom"/>
-  <anchor x="230" y="694" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="dasia" xOffset="112"/>
+    <component base="dasia" xOffset="111"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/epsilondasiaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/epsilondasiaoxia.glif
index a83a6359..807d2135 100644
--- a/src/Cantarell-Regular.ufo/glyphs/epsilondasiaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/epsilondasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilondasiaoxia" format="2">
-  <advance width="472"/>
+  <advance width="470"/>
   <unicode hex="1F15"/>
-  <anchor x="240" y="0" name="bottom"/>
-  <anchor x="230" y="482" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="dasiaoxia" xOffset="49"/>
+    <component base="dasiaoxia" xOffset="48"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/epsilondasiavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/epsilondasiavaria.glif
index dbf7d596..c2c2ca3f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/epsilondasiavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/epsilondasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilondasiavaria" format="2">
-  <advance width="472"/>
+  <advance width="470"/>
   <unicode hex="1F13"/>
-  <anchor x="240" y="0" name="bottom"/>
-  <anchor x="230" y="482" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="dasiavaria" xOffset="39"/>
+    <component base="dasiavaria" xOffset="38"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/epsilonoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/epsilonoxia.glif
index 4bdc37a7..7c29470f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/epsilonoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/epsilonoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilonoxia" format="2">
-  <advance width="472"/>
+  <advance width="470"/>
   <unicode hex="1F73"/>
-  <anchor x="240" y="0" name="bottom"/>
-  <anchor x="230" y="482" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="oxia" xOffset="125"/>
+    <component base="oxia" xOffset="124"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/epsilonpsili.glif 
b/src/Cantarell-Regular.ufo/glyphs/epsilonpsili.glif
index 697b1601..106ee1a4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/epsilonpsili.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/epsilonpsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilonpsili" format="2">
-  <advance width="472"/>
+  <advance width="470"/>
   <unicode hex="1F10"/>
-  <anchor x="240" y="0" name="bottom"/>
-  <anchor x="230" y="694" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="psili" xOffset="92"/>
+    <component base="psili" xOffset="91"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/epsilonpsilioxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/epsilonpsilioxia.glif
index c213c6cd..c63a9fba 100644
--- a/src/Cantarell-Regular.ufo/glyphs/epsilonpsilioxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/epsilonpsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilonpsilioxia" format="2">
-  <advance width="472"/>
+  <advance width="470"/>
   <unicode hex="1F14"/>
-  <anchor x="240" y="0" name="bottom"/>
-  <anchor x="230" y="482" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="psilioxia" xOffset="14"/>
+    <component base="psilioxia" xOffset="13"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/epsilonpsilivaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/epsilonpsilivaria.glif
index 53119935..0a534f3b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/epsilonpsilivaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/epsilonpsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilonpsilivaria" format="2">
-  <advance width="472"/>
+  <advance width="470"/>
   <unicode hex="1F12"/>
-  <anchor x="240" y="0" name="bottom"/>
-  <anchor x="230" y="482" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="psilivaria" xOffset="14"/>
+    <component base="psilivaria" xOffset="13"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/epsilontonos.glif 
b/src/Cantarell-Regular.ufo/glyphs/epsilontonos.glif
index 801b5cea..09d78a85 100644
--- a/src/Cantarell-Regular.ufo/glyphs/epsilontonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/epsilontonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilontonos" format="2">
-  <advance width="472"/>
+  <advance width="470"/>
   <unicode hex="03AD"/>
-  <anchor x="240" y="0" name="bottom"/>
-  <anchor x="230" y="482" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="tonos" xOffset="125"/>
+    <component base="tonos" xOffset="124"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/epsilonvaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/epsilonvaria.glif
index 073492aa..825210cd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/epsilonvaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/epsilonvaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="epsilonvaria" format="2">
-  <advance width="472"/>
+  <advance width="470"/>
   <unicode hex="1F72"/>
-  <anchor x="240" y="0" name="bottom"/>
-  <anchor x="230" y="482" name="top"/>
   <outline>
     <component base="epsilon"/>
-    <component base="varia" xOffset="75"/>
+    <component base="varia" xOffset="74"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/eta.glif b/src/Cantarell-Regular.ufo/glyphs/eta.glif
index 26537afa..1181a5c4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/eta.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/eta.glif
@@ -1,34 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="eta" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="03B7"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
+  <anchor x="123" y="0" name="bottom"/>
+  <anchor x="286" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="85" y="0" type="line"/>
-      <point x="165" y="0" type="line"/>
-      <point x="165" y="426" type="line"/>
-      <point x="141" y="482" type="line"/>
-      <point x="85" y="482" type="line"/>
+      <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="409" y="-217" type="line"/>
-      <point x="489" y="-217" type="line"/>
-      <point x="489" y="316" type="line" smooth="yes"/>
-      <point x="489" y="425"/>
-      <point x="420" y="492"/>
-      <point x="313" y="492" type="curve" smooth="yes"/>
-      <point x="245" y="492"/>
-      <point x="176" y="462"/>
-      <point x="125" y="409" type="curve"/>
-      <point x="144" y="358" type="line"/>
-      <point x="184" y="399"/>
-      <point x="237" y="422"/>
-      <point x="291" y="422" type="curve" smooth="yes"/>
-      <point x="368" y="422"/>
-      <point x="409" y="380"/>
-      <point x="409" y="302" type="curve" smooth="yes"/>
+      <point x="407" y="-217" type="line"/>
+      <point x="487" y="-217" type="line"/>
+      <point x="487" y="316" type="line" smooth="yes"/>
+      <point x="487" y="425"/>
+      <point x="418" y="492"/>
+      <point x="311" y="492" type="curve" smooth="yes"/>
+      <point x="243" y="492"/>
+      <point x="174" y="462"/>
+      <point x="123" y="409" type="curve"/>
+      <point x="142" y="358" type="line"/>
+      <point x="182" y="399"/>
+      <point x="235" y="422"/>
+      <point x="289" y="422" type="curve" smooth="yes"/>
+      <point x="366" y="422"/>
+      <point x="407" y="380"/>
+      <point x="407" y="302" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
@@ -37,8 +37,6 @@
       <string>=n</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=n</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etadasia.glif b/src/Cantarell-Regular.ufo/glyphs/etadasia.glif
index d09a9aa3..79397fec 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etadasia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etadasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasia" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F21"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="694" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasia" xOffset="170"/>
+    <component base="dasia" xOffset="168"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etadasiaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/etadasiaoxia.glif
index 87e7c1bf..ccf20521 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etadasiaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etadasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiaoxia" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F25"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasiaoxia" xOffset="107"/>
+    <component base="dasiaoxia" xOffset="105"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etadasiaoxiaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/etadasiaoxiaypogegrammeni.glif
index 0290d7b9..1bc0a77f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etadasiaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etadasiaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiaoxiaypogegrammeni" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F95"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasiaoxia" xOffset="107"/>
-    <component base="ypogegrammeni" xOffset="-109"/>
+    <component base="dasiaoxia" xOffset="105"/>
+    <component base="ypogegrammeni" xOffset="-111"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etadasiaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/etadasiaperispomeni.glif
index e7b1a18b..6cae90b6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etadasiaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etadasiaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiaperispomeni" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F27"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="daspsiliiaperispomeni" xOffset="62"/>
+    <component base="daspsiliiaperispomeni" xOffset="44"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etadasiaperispomeniypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/etadasiaperispomeniypogegrammeni.glif
index d16bdaae..df273b03 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etadasiaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etadasiaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiaperispomeniypogegrammeni" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F97"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="daspsiliiaperispomeni" xOffset="62"/>
-    <component base="ypogegrammeni" xOffset="-109"/>
+    <component base="daspsiliiaperispomeni" xOffset="44"/>
+    <component base="ypogegrammeni" xOffset="-111"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etadasiavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/etadasiavaria.glif
index 9e6b0af9..cd9b3fc9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etadasiavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etadasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiavaria" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F23"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasiavaria" xOffset="97"/>
+    <component base="dasiavaria" xOffset="95"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etadasiavariaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/etadasiavariaypogegrammeni.glif
index 8b215905..c2152665 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etadasiavariaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etadasiavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiavariaypogegrammeni" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F93"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasiavaria" xOffset="97"/>
-    <component base="ypogegrammeni" xOffset="-109"/>
+    <component base="dasiavaria" xOffset="95"/>
+    <component base="ypogegrammeni" xOffset="-111"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etadasiaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/etadasiaypogegrammeni.glif
index d4c953a8..b93536f1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etadasiaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etadasiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etadasiaypogegrammeni" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F91"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="694" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="dasia" xOffset="170"/>
-    <component base="ypogegrammeni" xOffset="-109"/>
+    <component base="dasia" xOffset="168"/>
+    <component base="ypogegrammeni" xOffset="-111"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etaoxia.glif b/src/Cantarell-Regular.ufo/glyphs/etaoxia.glif
index f73dc026..503fbe02 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etaoxia" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F75"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="oxia" xOffset="183"/>
+    <component base="oxia" xOffset="181"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etaoxiaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/etaoxiaypogegrammeni.glif
index 696d3c77..c6b12ce4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etaoxiaypogegrammeni" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1FC4"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="oxia" xOffset="183"/>
-    <component base="ypogegrammeni" xOffset="-109"/>
+    <component base="oxia" xOffset="181"/>
+    <component base="ypogegrammeni" xOffset="-111"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/etaperispomeni.glif
index c977c643..372dc46c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etaperispomeni" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1FC6"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="641" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="perispomeni" xOffset="62"/>
+    <component base="perispomeni" xOffset="44"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etaperispomeniypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/etaperispomeniypogegrammeni.glif
index 424f6edc..def6c501 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etaperispomeniypogegrammeni" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1FC7"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="641" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="perispomeni" xOffset="62"/>
-    <component base="ypogegrammeni" xOffset="-109"/>
+    <component base="perispomeni" xOffset="44"/>
+    <component base="ypogegrammeni" xOffset="-111"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etapsili.glif b/src/Cantarell-Regular.ufo/glyphs/etapsili.glif
index 1c8aa9e8..ef594f82 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etapsili.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etapsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsili" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F20"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="694" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psili" xOffset="150"/>
+    <component base="psili" xOffset="148"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etapsilioxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/etapsilioxia.glif
index 97e9c122..3349a7f7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etapsilioxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etapsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsilioxia" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F24"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psilioxia" xOffset="72"/>
+    <component base="psilioxia" xOffset="70"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etapsilioxiaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/etapsilioxiaypogegrammeni.glif
index 78a18448..8c573d24 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etapsilioxiaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etapsilioxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsilioxiaypogegrammeni" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F94"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psilioxia" xOffset="72"/>
-    <component base="ypogegrammeni" xOffset="-109"/>
+    <component base="psilioxia" xOffset="70"/>
+    <component base="ypogegrammeni" xOffset="-111"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etapsiliperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/etapsiliperispomeni.glif
index a5dd4d7d..08e3eeb3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etapsiliperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etapsiliperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsiliperispomeni" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F26"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psiliperispomeni" xOffset="62"/>
+    <component base="psiliperispomeni" xOffset="44"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etapsiliperispomeniypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/etapsiliperispomeniypogegrammeni.glif
index 0d9256f8..fc19c641 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etapsiliperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etapsiliperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsiliperispomeniypogegrammeni" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F96"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psiliperispomeni" xOffset="62"/>
-    <component base="ypogegrammeni" xOffset="-109"/>
+    <component base="psiliperispomeni" xOffset="44"/>
+    <component base="ypogegrammeni" xOffset="-111"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etapsilivaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/etapsilivaria.glif
index 0ed8b3f8..b459c108 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etapsilivaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etapsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsilivaria" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F22"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psilivaria" xOffset="72"/>
+    <component base="psilivaria" xOffset="70"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etapsilivariaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/etapsilivariaypogegrammeni.glif
index cef39c03..f40e6408 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etapsilivariaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etapsilivariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsilivariaypogegrammeni" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F92"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psilivaria" xOffset="72"/>
-    <component base="ypogegrammeni" xOffset="-109"/>
+    <component base="psilivaria" xOffset="70"/>
+    <component base="ypogegrammeni" xOffset="-111"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etapsiliypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/etapsiliypogegrammeni.glif
index 3793e506..23622303 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etapsiliypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etapsiliypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etapsiliypogegrammeni" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F90"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="694" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="psili" xOffset="150"/>
-    <component base="ypogegrammeni" xOffset="-109"/>
+    <component base="psili" xOffset="148"/>
+    <component base="ypogegrammeni" xOffset="-111"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etatonos.glif b/src/Cantarell-Regular.ufo/glyphs/etatonos.glif
index 6383bbff..a3d404e0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etatonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etatonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etatonos" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="03AE"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="tonos" xOffset="183"/>
+    <component base="tonos" xOffset="181"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etavaria.glif b/src/Cantarell-Regular.ufo/glyphs/etavaria.glif
index 5fa1919f..91cb9693 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etavaria" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1F74"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="varia" xOffset="133"/>
+    <component base="varia" xOffset="131"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etavariaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/etavariaypogegrammeni.glif
index 35d83489..fa101486 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etavariaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etavariaypogegrammeni" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1FC2"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="varia" xOffset="133"/>
-    <component base="ypogegrammeni" xOffset="-109"/>
+    <component base="varia" xOffset="131"/>
+    <component base="ypogegrammeni" xOffset="-111"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/etaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/etaypogegrammeni.glif
index 6289f528..008e3a20 100644
--- a/src/Cantarell-Regular.ufo/glyphs/etaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/etaypogegrammeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="etaypogegrammeni" format="2">
-  <advance width="565"/>
+  <advance width="562"/>
   <unicode hex="1FC3"/>
-  <anchor x="125" y="0" name="bottom"/>
-  <anchor x="288" y="482" name="top"/>
   <outline>
     <component base="eta"/>
-    <component base="ypogegrammeni" xOffset="-109"/>
+    <component base="ypogegrammeni" xOffset="-111"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/gamma.glif b/src/Cantarell-Regular.ufo/glyphs/gamma.glif
index 983d7ac0..4a914a98 100644
--- a/src/Cantarell-Regular.ufo/glyphs/gamma.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/gamma.glif
@@ -1,29 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="gamma" format="2">
-  <advance width="516"/>
+  <advance width="488"/>
   <unicode hex="03B3"/>
   <outline>
     <contour>
-      <point x="225" y="-7" type="line"/>
-      <point x="299" y="-2" type="line"/>
-      <point x="360" y="122" type="line" smooth="yes"/>
-      <point x="416" y="236"/>
-      <point x="475" y="380"/>
-      <point x="475" y="482" type="curve"/>
-      <point x="392" y="482" type="line"/>
-      <point x="392" y="385"/>
-      <point x="351" y="257"/>
-      <point x="302" y="152" type="curve" smooth="yes"/>
-      <point x="237" y="11" type="line"/>
-      <point x="288" y="11" type="line"/>
-      <point x="115" y="482" type="line"/>
-      <point x="26" y="482" type="line"/>
+      <point x="211" y="-7" type="line"/>
+      <point x="285" y="-2" type="line"/>
+      <point x="346" y="122" type="line" smooth="yes"/>
+      <point x="402" y="236"/>
+      <point x="461" y="380"/>
+      <point x="461" y="482" type="curve"/>
+      <point x="378" y="482" type="line"/>
+      <point x="378" y="385"/>
+      <point x="337" y="257"/>
+      <point x="288" y="152" type="curve" smooth="yes"/>
+      <point x="223" y="11" type="line"/>
+      <point x="274" y="11" type="line"/>
+      <point x="101" y="482" type="line"/>
+      <point x="12" y="482" type="line"/>
     </contour>
     <contour>
-      <point x="221" y="-217" type="line"/>
-      <point x="305" y="-217" type="line"/>
-      <point x="299" y="-2" type="line"/>
-      <point x="225" y="-7" type="line"/>
+      <point x="207" y="-217" type="line"/>
+      <point x="291" y="-217" type="line"/>
+      <point x="285" y="-2" type="line"/>
+      <point x="211" y="-7" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -32,8 +32,6 @@
       <string>=nu</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=nu</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iota.glif b/src/Cantarell-Regular.ufo/glyphs/iota.glif
index 91fe523e..d8e1d78b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iota.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iota.glif
@@ -1,27 +1,27 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iota" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="03B9"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="482" name="top"/>
+  <anchor x="163" y="0" name="bottom"/>
+  <anchor x="123" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="189" y="-6" type="curve" smooth="yes"/>
-      <point x="215" y="-6"/>
-      <point x="246" y="0"/>
-      <point x="265" y="10" type="curve"/>
-      <point x="247" y="66" type="line"/>
-      <point x="235" y="61"/>
-      <point x="224" y="58"/>
-      <point x="212" y="58" type="curve" smooth="yes"/>
-      <point x="178" y="58"/>
-      <point x="160" y="81"/>
-      <point x="160" y="118" type="curve" smooth="yes"/>
-      <point x="160" y="482" type="line"/>
-      <point x="80" y="482" type="line"/>
-      <point x="80" y="108" type="line" smooth="yes"/>
-      <point x="80" y="39"/>
-      <point x="123" y="-6"/>
+      <point x="192" y="-6" type="curve" smooth="yes"/>
+      <point x="218" y="-6"/>
+      <point x="249" y="0"/>
+      <point x="268" y="10" type="curve"/>
+      <point x="250" y="66" type="line"/>
+      <point x="238" y="61"/>
+      <point x="227" y="58"/>
+      <point x="215" y="58" type="curve" smooth="yes"/>
+      <point x="181" y="58"/>
+      <point x="163" y="81"/>
+      <point x="163" y="118" type="curve" smooth="yes"/>
+      <point x="163" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
+      <point x="83" y="108" type="line" smooth="yes"/>
+      <point x="83" y="39"/>
+      <point x="126" y="-6"/>
     </contour>
   </outline>
   <lib>
@@ -30,8 +30,6 @@
       <string>=l</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=l</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotadasia.glif b/src/Cantarell-Regular.ufo/glyphs/iotadasia.glif
index 2c5b9eb8..74970282 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotadasia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotadasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadasia" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="1F31"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="694" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dasia" xOffset="2"/>
+    <component base="dasia" xOffset="5"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotadasiaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/iotadasiaoxia.glif
index e2e4b037..2c3294d8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotadasiaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotadasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadasiaoxia" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="1F35"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="482" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dasiaoxia" xOffset="-61"/>
+    <component base="dasiaoxia" xOffset="-58"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotadasiaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/iotadasiaperispomeni.glif
index c1ed6cf0..129fc3f1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotadasiaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotadasiaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadasiaperispomeni" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="1F37"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="482" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="daspsiliiaperispomeni" xOffset="-106"/>
+    <component base="daspsiliiaperispomeni" xOffset="-119"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotadasiavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/iotadasiavaria.glif
index f4968f2e..772ccf23 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotadasiavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotadasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadasiavaria" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="1F33"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="482" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dasiavaria" xOffset="-71"/>
+    <component base="dasiavaria" xOffset="-68"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotadialytikaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/iotadialytikaoxia.glif
index 714cf9d5..dbca197f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotadialytikaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotadialytikaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadialytikaoxia" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="1FD3"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="482" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dialytikaoxia" xOffset="-110"/>
+    <component base="dialytikaoxia" xOffset="-127"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotadialytikaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/iotadialytikaperispomeni.glif
index 75cdaa07..0b938fb6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotadialytikaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotadialytikaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadialytikaperispomeni" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="1FD7"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="482" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dialytikaperispomeni" xOffset="-99"/>
+    <component base="dialytikaperispomeni" xOffset="-112"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotadialytikavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/iotadialytikavaria.glif
index 59a0bce8..6eb767f6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotadialytikavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotadialytikavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadialytikavaria" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="1FD2"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="482" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dialytikavaria" xOffset="-167"/>
+    <component base="dialytikavaria" xOffset="-184"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotadieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/iotadieresis.glif
index 9e359f52..aa4d08a3 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotadieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotadieresis.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadieresis" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="03CA"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="674" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dieresiscomb" xOffset="-113"/>
+    <component base="dieresiscomb" xOffset="-110"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotadieresistonos.glif 
b/src/Cantarell-Regular.ufo/glyphs/iotadieresistonos.glif
index 8220e920..6606136e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotadieresistonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotadieresistonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotadieresistonos" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="0390"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="482" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="dieresistonos" xOffset="-116"/>
+    <component base="dieresistonos" xOffset="-113"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotamacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/iotamacron.glif
index 0de8a475..24f458c4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotamacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotamacron.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotamacron" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="1FD1"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="482" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="macron" xOffset="-122"/>
+    <component base="macron" xOffset="-128"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotaoxia.glif b/src/Cantarell-Regular.ufo/glyphs/iotaoxia.glif
index 750342f0..cb03dd93 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotaoxia" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="1F77"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="482" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="oxia" xOffset="15"/>
+    <component base="oxia" xOffset="18"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/iotaperispomeni.glif
index 3135c008..b90d6087 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotaperispomeni" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="1FD6"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="641" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="perispomeni" xOffset="-106"/>
+    <component base="perispomeni" xOffset="-119"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotapsili.glif b/src/Cantarell-Regular.ufo/glyphs/iotapsili.glif
index 2c381f66..664eaeb6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotapsili.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotapsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotapsili" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="1F30"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="694" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="psili" xOffset="-18"/>
+    <component base="psili" xOffset="-15"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotapsilioxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/iotapsilioxia.glif
index 7b5a3f47..c2b3abe8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotapsilioxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotapsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotapsilioxia" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="1F34"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="482" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="psilioxia" xOffset="-96"/>
+    <component base="psilioxia" xOffset="-93"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotapsiliperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/iotapsiliperispomeni.glif
index a59e0eb9..6a31688e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotapsiliperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotapsiliperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotapsiliperispomeni" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="1F36"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="482" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="psiliperispomeni" xOffset="-106"/>
+    <component base="psiliperispomeni" xOffset="-119"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotapsilivaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/iotapsilivaria.glif
index c7e2bef7..dcc9f0fb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotapsilivaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotapsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotapsilivaria" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="1F32"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="482" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="psilivaria" xOffset="-96"/>
+    <component base="psilivaria" xOffset="-93"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotatonos.glif b/src/Cantarell-Regular.ufo/glyphs/iotatonos.glif
index c4345cb7..599bd4f4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotatonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotatonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotatonos" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="03AF"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="482" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="tonos" xOffset="15"/>
+    <component base="tonos" xOffset="18"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotavaria.glif b/src/Cantarell-Regular.ufo/glyphs/iotavaria.glif
index f2118831..fd69d4b6 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotavaria" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="1F76"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="482" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="varia" xOffset="-35"/>
+    <component base="varia" xOffset="-32"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/iotavrachy.glif 
b/src/Cantarell-Regular.ufo/glyphs/iotavrachy.glif
index 7d3004d9..21ea0900 100644
--- a/src/Cantarell-Regular.ufo/glyphs/iotavrachy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/iotavrachy.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="iotavrachy" format="2">
-  <advance width="272"/>
+  <advance width="278"/>
   <unicode hex="1FD0"/>
-  <anchor x="160" y="0" name="bottom"/>
-  <anchor x="120" y="681" name="top"/>
   <outline>
     <component base="iota"/>
-    <component base="vrachy" xOffset="-88"/>
+    <component base="vrachy" xOffset="-85"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/kaiS_ymbol.glif 
b/src/Cantarell-Regular.ufo/glyphs/kaiS_ymbol.glif
index 808d4b9e..0689d7d7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/kaiS_ymbol.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/kaiS_ymbol.glif
@@ -1,55 +1,55 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kaiSymbol" format="2">
-  <advance width="500"/>
+  <advance width="497"/>
   <unicode hex="03D7"/>
   <outline>
     <contour>
-      <point x="85" y="0" type="line"/>
-      <point x="165" y="0" type="line"/>
-      <point x="165" y="482" type="line"/>
-      <point x="85" y="482" type="line"/>
+      <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="262" y="306" type="line"/>
-      <point x="215" y="245" type="line"/>
-      <point x="412" y="-43" type="line"/>
-      <point x="510" y="-43" type="line"/>
+      <point x="260" y="306" type="line"/>
+      <point x="213" y="245" type="line"/>
+      <point x="410" y="-43" type="line"/>
+      <point x="508" y="-43" type="line"/>
     </contour>
     <contour>
-      <point x="232" y="338" type="curve" smooth="yes"/>
-      <point x="144" y="226" type="line"/>
-      <point x="144" y="118" type="line"/>
-      <point x="274" y="280" type="line" smooth="yes"/>
-      <point x="352" y="378"/>
-      <point x="391" y="420"/>
-      <point x="435" y="420" type="curve" smooth="yes"/>
-      <point x="443" y="420"/>
-      <point x="450" y="419"/>
-      <point x="459" y="417" type="curve"/>
-      <point x="476" y="482" type="line"/>
-      <point x="458" y="488"/>
-      <point x="446" y="490"/>
-      <point x="430" y="490" type="curve" smooth="yes"/>
-      <point x="369" y="490"/>
-      <point x="320" y="450"/>
+      <point x="230" y="338" type="curve" smooth="yes"/>
+      <point x="142" y="226" type="line"/>
+      <point x="142" y="118" type="line"/>
+      <point x="272" y="280" type="line" smooth="yes"/>
+      <point x="350" y="378"/>
+      <point x="389" y="420"/>
+      <point x="433" y="420" type="curve" smooth="yes"/>
+      <point x="441" y="420"/>
+      <point x="448" y="419"/>
+      <point x="457" y="417" type="curve"/>
+      <point x="474" y="482" type="line"/>
+      <point x="456" y="488"/>
+      <point x="444" y="490"/>
+      <point x="428" y="490" type="curve" smooth="yes"/>
+      <point x="367" y="490"/>
+      <point x="318" y="450"/>
     </contour>
     <contour>
-      <point x="383" y="-134" type="curve" smooth="yes"/>
-      <point x="510" y="-43" type="line"/>
-      <point x="413" y="-27" type="line"/>
-      <point x="334" y="-83" type="line" smooth="yes"/>
-      <point x="270" y="-129"/>
-      <point x="216" y="-152"/>
-      <point x="168" y="-152" type="curve" smooth="yes"/>
-      <point x="136" y="-152"/>
-      <point x="101" y="-142"/>
-      <point x="69" y="-124" type="curve"/>
-      <point x="40" y="-186" type="line"/>
-      <point x="75" y="-208"/>
-      <point x="119" y="-222"/>
-      <point x="166" y="-222" type="curve" smooth="yes"/>
-      <point x="237" y="-222"/>
-      <point x="302" y="-192"/>
+      <point x="381" y="-134" type="curve" smooth="yes"/>
+      <point x="508" y="-43" type="line"/>
+      <point x="411" y="-27" type="line"/>
+      <point x="332" y="-83" type="line" smooth="yes"/>
+      <point x="268" y="-129"/>
+      <point x="214" y="-152"/>
+      <point x="166" y="-152" type="curve" smooth="yes"/>
+      <point x="134" y="-152"/>
+      <point x="99" y="-142"/>
+      <point x="67" y="-124" type="curve"/>
+      <point x="38" y="-186" type="line"/>
+      <point x="73" y="-208"/>
+      <point x="117" y="-222"/>
+      <point x="164" y="-222" type="curve" smooth="yes"/>
+      <point x="235" y="-222"/>
+      <point x="300" y="-192"/>
     </contour>
   </outline>
   <lib>
@@ -58,8 +58,6 @@
       <string>=kappa-45</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=kappa-20</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/kappa.glif b/src/Cantarell-Regular.ufo/glyphs/kappa.glif
index 45449769..ed1e15ae 100644
--- a/src/Cantarell-Regular.ufo/glyphs/kappa.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/kappa.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="kappa" format="2">
-  <advance width="499"/>
+  <advance width="496"/>
   <unicode hex="03BA"/>
   <outline>
     <contour>
-      <point x="85" y="0" type="line"/>
-      <point x="165" y="0" type="line"/>
-      <point x="165" y="482" type="line"/>
-      <point x="85" y="482" type="line"/>
+      <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="262" y="306" type="line"/>
-      <point x="214" y="245" type="line"/>
-      <point x="389" y="0" type="line"/>
-      <point x="489" y="0" type="line"/>
+      <point x="260" y="306" type="line"/>
+      <point x="212" y="245" type="line"/>
+      <point x="387" y="0" type="line"/>
+      <point x="487" y="0" type="line"/>
     </contour>
     <contour>
-      <point x="232" y="338" type="curve" smooth="yes"/>
-      <point x="144" y="226" type="line"/>
-      <point x="144" y="118" type="line"/>
-      <point x="274" y="280" type="line" smooth="yes"/>
-      <point x="352" y="378"/>
-      <point x="391" y="420"/>
-      <point x="435" y="420" type="curve" smooth="yes"/>
-      <point x="443" y="420"/>
-      <point x="450" y="419"/>
-      <point x="458" y="417" type="curve"/>
-      <point x="476" y="483" type="line"/>
-      <point x="458" y="489"/>
-      <point x="446" y="490"/>
-      <point x="430" y="490" type="curve" smooth="yes"/>
-      <point x="369" y="490"/>
-      <point x="320" y="450"/>
+      <point x="230" y="338" type="curve" smooth="yes"/>
+      <point x="142" y="226" type="line"/>
+      <point x="142" y="118" type="line"/>
+      <point x="272" y="280" type="line" smooth="yes"/>
+      <point x="350" y="378"/>
+      <point x="389" y="420"/>
+      <point x="433" y="420" type="curve" smooth="yes"/>
+      <point x="441" y="420"/>
+      <point x="448" y="419"/>
+      <point x="456" y="417" type="curve"/>
+      <point x="474" y="483" type="line"/>
+      <point x="456" y="489"/>
+      <point x="444" y="490"/>
+      <point x="428" y="490" type="curve" smooth="yes"/>
+      <point x="367" y="490"/>
+      <point x="318" y="450"/>
     </contour>
   </outline>
   <lib>
@@ -40,8 +40,6 @@
       <string>=n</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=k+5</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/koronis.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/koronis.case.glif
index ad1add94..534634c0 100644
--- a/src/Cantarell-Regular.ufo/glyphs/koronis.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/koronis.case.glif
@@ -10,8 +10,6 @@
       <string>psili.case</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psili.case</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/koronis.glif b/src/Cantarell-Regular.ufo/glyphs/koronis.glif
index c447d431..de204383 100644
--- a/src/Cantarell-Regular.ufo/glyphs/koronis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/koronis.glif
@@ -11,8 +11,6 @@
       <string>psili</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psili</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lambda.glif b/src/Cantarell-Regular.ufo/glyphs/lambda.glif
index 09f34718..6e651f96 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lambda.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lambda.glif
@@ -27,10 +27,4 @@
       <point x="145" y="659"/>
     </contour>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/lowernumeral-greek.glif 
b/src/Cantarell-Regular.ufo/glyphs/lowernumeral-greek.glif
index b4bc8438..a1a756cc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/lowernumeral-greek.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/lowernumeral-greek.glif
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="lowernumeral-greek" format="2">
-  <advance width="270"/>
+  <advance width="237"/>
   <unicode hex="0375"/>
   <outline>
-    <component base="minute" xScale="-1" yScale="-1" xOffset="264" yOffset="694"/>
+    <component base="minute" xScale="-1" yScale="-1" xOffset="269" yOffset="694"/>
   </outline>
   <lib>
     <dict>
@@ -11,8 +11,6 @@
       <string>quotesinglbase</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>quotesinglbase</string>
-      <key>public.markColor</key>
-      <string>0,0.67,0.91,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/mu.glif b/src/Cantarell-Regular.ufo/glyphs/mu.glif
index 2cdc02ba..3a31ad38 100644
--- a/src/Cantarell-Regular.ufo/glyphs/mu.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/mu.glif
@@ -1,50 +1,50 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="mu" format="2">
-  <advance width="580"/>
+  <advance width="581"/>
   <unicode hex="03BC"/>
-  <anchor x="285" y="482" name="top"/>
+  <anchor x="283" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="501" y="-6" type="curve" smooth="yes"/>
-      <point x="528" y="-6"/>
-      <point x="553" y="1"/>
-      <point x="573" y="10" type="curve"/>
-      <point x="557" y="65" type="line"/>
-      <point x="548" y="61"/>
-      <point x="536" y="58"/>
-      <point x="524" y="58" type="curve" smooth="yes"/>
-      <point x="496" y="58"/>
-      <point x="480" y="79"/>
-      <point x="480" y="124" type="curve" smooth="yes"/>
-      <point x="480" y="482" type="line"/>
-      <point x="400" y="482" type="line"/>
-      <point x="400" y="102" type="line" smooth="yes"/>
-      <point x="400" y="34"/>
-      <point x="438" y="-6"/>
+      <point x="499" y="-6" type="curve" smooth="yes"/>
+      <point x="526" y="-6"/>
+      <point x="551" y="1"/>
+      <point x="571" y="10" type="curve"/>
+      <point x="555" y="65" type="line"/>
+      <point x="546" y="61"/>
+      <point x="534" y="58"/>
+      <point x="522" y="58" type="curve" smooth="yes"/>
+      <point x="494" y="58"/>
+      <point x="478" y="79"/>
+      <point x="478" y="124" type="curve" smooth="yes"/>
+      <point x="478" y="482" type="line"/>
+      <point x="398" y="482" type="line"/>
+      <point x="398" y="102" type="line" smooth="yes"/>
+      <point x="398" y="34"/>
+      <point x="436" y="-6"/>
     </contour>
     <contour>
-      <point x="85" y="-217" type="line" smooth="yes"/>
-      <point x="169" y="-217" type="line"/>
-      <point x="156" y="36" type="line"/>
-      <point x="165" y="36" type="line"/>
-      <point x="165" y="482" type="line"/>
-      <point x="85" y="482" type="line"/>
+      <point x="83" y="-217" type="line" smooth="yes"/>
+      <point x="167" y="-217" type="line"/>
+      <point x="154" y="36" type="line"/>
+      <point x="163" y="36" type="line"/>
+      <point x="163" y="482" type="line"/>
+      <point x="83" y="482" type="line"/>
     </contour>
     <contour>
-      <point x="279" y="-10" type="curve" smooth="yes"/>
-      <point x="335" y="-10"/>
-      <point x="397" y="26"/>
-      <point x="445" y="74" type="curve"/>
-      <point x="421" y="122" type="line"/>
-      <point x="385" y="83"/>
-      <point x="337" y="60"/>
-      <point x="287" y="60" type="curve" smooth="yes"/>
-      <point x="254" y="60"/>
-      <point x="195" y="70"/>
-      <point x="142" y="148" type="curve"/>
-      <point x="91" y="105" type="line"/>
-      <point x="159" y="4"/>
-      <point x="230" y="-10"/>
+      <point x="277" y="-10" type="curve" smooth="yes"/>
+      <point x="333" y="-10"/>
+      <point x="395" y="26"/>
+      <point x="443" y="74" type="curve"/>
+      <point x="419" y="122" type="line"/>
+      <point x="383" y="83"/>
+      <point x="335" y="60"/>
+      <point x="285" y="60" type="curve" smooth="yes"/>
+      <point x="252" y="60"/>
+      <point x="193" y="70"/>
+      <point x="140" y="148" type="curve"/>
+      <point x="89" y="105" type="line"/>
+      <point x="157" y="4"/>
+      <point x="228" y="-10"/>
     </contour>
   </outline>
   <lib>
@@ -53,8 +53,6 @@
       <string>=n</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=iota</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/nu.glif b/src/Cantarell-Regular.ufo/glyphs/nu.glif
index 98afb3dc..548a2de8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/nu.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/nu.glif
@@ -1,25 +1,25 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="nu" format="2">
-  <advance width="516"/>
+  <advance width="488"/>
   <unicode hex="03BD"/>
-  <anchor x="259" y="0" name="bottom"/>
-  <anchor x="254" y="482" name="top"/>
+  <anchor x="245" y="0" name="bottom"/>
+  <anchor x="240" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="237" y="17" type="line"/>
-      <point x="286" y="17" type="line"/>
-      <point x="115" y="482" type="line"/>
-      <point x="26" y="482" type="line"/>
-      <point x="222" y="0" type="line"/>
-      <point x="298" y="0" type="line"/>
-      <point x="361" y="124" type="line" smooth="yes"/>
-      <point x="422" y="244"/>
-      <point x="475" y="380"/>
-      <point x="475" y="482" type="curve"/>
-      <point x="392" y="482" type="line"/>
-      <point x="392" y="385"/>
-      <point x="355" y="264"/>
-      <point x="303" y="155" type="curve" smooth="yes"/>
+      <point x="223" y="17" type="line"/>
+      <point x="272" y="17" type="line"/>
+      <point x="101" y="482" type="line"/>
+      <point x="12" y="482" type="line"/>
+      <point x="208" y="0" type="line"/>
+      <point x="284" y="0" type="line"/>
+      <point x="347" y="124" type="line" smooth="yes"/>
+      <point x="408" y="244"/>
+      <point x="461" y="380"/>
+      <point x="461" y="482" type="curve"/>
+      <point x="378" y="482" type="line"/>
+      <point x="378" y="385"/>
+      <point x="341" y="264"/>
+      <point x="289" y="155" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
@@ -28,8 +28,6 @@
       <string>=v</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=v+15</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omega.glif b/src/Cantarell-Regular.ufo/glyphs/omega.glif
index c18c846a..e0c15d35 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omega.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omega.glif
@@ -1,53 +1,53 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omega" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="03C9"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
+  <anchor x="369" y="0" name="bottom"/>
+  <anchor x="369" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="330" y="352" type="line"/>
-      <point x="330" y="209" type="line" smooth="yes"/>
-      <point x="330" y="113"/>
-      <point x="293" y="60"/>
-      <point x="230" y="60" type="curve" smooth="yes"/>
-      <point x="164" y="60"/>
-      <point x="138" y="128"/>
-      <point x="138" y="205" type="curve" smooth="yes"/>
-      <point x="138" y="282"/>
-      <point x="166" y="392"/>
-      <point x="202" y="482" type="curve"/>
-      <point x="121" y="482" type="line"/>
-      <point x="87" y="392"/>
-      <point x="58" y="302"/>
-      <point x="58" y="208" type="curve" smooth="yes"/>
-      <point x="58" y="96"/>
-      <point x="102" y="-10"/>
-      <point x="220" y="-10" type="curve" smooth="yes"/>
-      <point x="310" y="-10"/>
-      <point x="377" y="62"/>
-      <point x="377" y="191" type="curve"/>
-      <point x="362" y="186" type="line"/>
-      <point x="362" y="58"/>
-      <point x="423" y="-10"/>
-      <point x="517" y="-10" type="curve" smooth="yes"/>
-      <point x="637" y="-10"/>
-      <point x="686" y="98"/>
-      <point x="686" y="212" type="curve" smooth="yes"/>
-      <point x="686" y="304"/>
-      <point x="654" y="394"/>
-      <point x="618" y="482" type="curve"/>
-      <point x="537" y="482" type="line"/>
-      <point x="573" y="394"/>
-      <point x="606" y="285"/>
-      <point x="606" y="209" type="curve" smooth="yes"/>
-      <point x="606" y="132"/>
-      <point x="584" y="60"/>
-      <point x="511" y="60" type="curve" smooth="yes"/>
-      <point x="449" y="60"/>
-      <point x="410" y="116"/>
-      <point x="410" y="211" type="curve" smooth="yes"/>
-      <point x="410" y="352" type="line"/>
+      <point x="329" y="352" type="line"/>
+      <point x="329" y="209" type="line" smooth="yes"/>
+      <point x="329" y="113"/>
+      <point x="292" y="60"/>
+      <point x="229" y="60" type="curve" smooth="yes"/>
+      <point x="163" y="60"/>
+      <point x="137" y="128"/>
+      <point x="137" y="205" type="curve" smooth="yes"/>
+      <point x="137" y="282"/>
+      <point x="165" y="392"/>
+      <point x="201" y="482" type="curve"/>
+      <point x="120" y="482" type="line"/>
+      <point x="86" y="392"/>
+      <point x="57" y="302"/>
+      <point x="57" y="208" type="curve" smooth="yes"/>
+      <point x="57" y="96"/>
+      <point x="101" y="-10"/>
+      <point x="219" y="-10" type="curve" smooth="yes"/>
+      <point x="309" y="-10"/>
+      <point x="376" y="62"/>
+      <point x="376" y="191" type="curve"/>
+      <point x="361" y="186" type="line"/>
+      <point x="361" y="58"/>
+      <point x="422" y="-10"/>
+      <point x="516" y="-10" type="curve" smooth="yes"/>
+      <point x="636" y="-10"/>
+      <point x="685" y="98"/>
+      <point x="685" y="212" type="curve" smooth="yes"/>
+      <point x="685" y="304"/>
+      <point x="653" y="394"/>
+      <point x="617" y="482" type="curve"/>
+      <point x="536" y="482" type="line"/>
+      <point x="572" y="394"/>
+      <point x="605" y="285"/>
+      <point x="605" y="209" type="curve" smooth="yes"/>
+      <point x="605" y="132"/>
+      <point x="583" y="60"/>
+      <point x="510" y="60" type="curve" smooth="yes"/>
+      <point x="448" y="60"/>
+      <point x="409" y="116"/>
+      <point x="409" y="211" type="curve" smooth="yes"/>
+      <point x="409" y="352" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -56,8 +56,6 @@
       <string>=o+5</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=o+5</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegadasia.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegadasia.glif
index cbc006a5..dc342436 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegadasia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegadasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasia" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1F61"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="694" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasia" xOffset="252"/>
+    <component base="dasia" xOffset="251"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegadasiaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegadasiaoxia.glif
index 90d431f7..e709f762 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegadasiaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegadasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiaoxia" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1F65"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasiaoxia" xOffset="189"/>
+    <component base="dasiaoxia" xOffset="188"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegadasiaoxiaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegadasiaoxiaypogegrammeni.glif
index 76c5a172..46db976d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegadasiaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegadasiaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiaoxiaypogegrammeni" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1FA5"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasiaoxia" xOffset="189"/>
-    <component base="ypogegrammeni" xOffset="136"/>
+    <component base="dasiaoxia" xOffset="188"/>
+    <component base="ypogegrammeni" xOffset="135"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegadasiaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegadasiaperispomeni.glif
index 5f88f552..359fd270 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegadasiaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegadasiaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiaperispomeni" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1F67"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="daspsiliiaperispomeni" xOffset="144"/>
+    <component base="daspsiliiaperispomeni" xOffset="127"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegadasiaperispomeniypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegadasiaperispomeniypogegrammeni.glif
index ac542b55..c68b92eb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegadasiaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegadasiaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiaperispomeniypogegrammeni" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1FA7"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="daspsiliiaperispomeni" xOffset="144"/>
-    <component base="ypogegrammeni" xOffset="136"/>
+    <component base="daspsiliiaperispomeni" xOffset="127"/>
+    <component base="ypogegrammeni" xOffset="135"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegadasiavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegadasiavaria.glif
index c0fd5751..a788d0c8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegadasiavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegadasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiavaria" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1F63"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasiavaria" xOffset="179"/>
+    <component base="dasiavaria" xOffset="178"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegadasiavariaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegadasiavariaypogegrammeni.glif
index 416e8bb3..046cc1b8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegadasiavariaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegadasiavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiavariaypogegrammeni" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1FA3"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasiavaria" xOffset="179"/>
-    <component base="ypogegrammeni" xOffset="136"/>
+    <component base="dasiavaria" xOffset="178"/>
+    <component base="ypogegrammeni" xOffset="135"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegadasiaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegadasiaypogegrammeni.glif
index 36d4054b..fe6b2494 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegadasiaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegadasiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegadasiaypogegrammeni" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1FA1"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="694" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="dasia" xOffset="252"/>
-    <component base="ypogegrammeni" xOffset="136"/>
+    <component base="dasia" xOffset="251"/>
+    <component base="ypogegrammeni" xOffset="135"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegaoxia.glif b/src/Cantarell-Regular.ufo/glyphs/omegaoxia.glif
index 1c6d0b76..799c6ec5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegaoxia" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1F7D"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="oxia" xOffset="265"/>
+    <component base="oxia" xOffset="264"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegaoxiaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegaoxiaypogegrammeni.glif
index 7d456337..52ff7dd5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegaoxiaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegaoxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegaoxiaypogegrammeni" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1FF4"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="oxia" xOffset="265"/>
-    <component base="ypogegrammeni" xOffset="136"/>
+    <component base="oxia" xOffset="264"/>
+    <component base="ypogegrammeni" xOffset="135"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegaperispomeni.glif
index d9a52e3b..76663163 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegaperispomeni" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1FF6"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="641" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="perispomeni" xOffset="144"/>
+    <component base="perispomeni" xOffset="127"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegaperispomeniypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegaperispomeniypogegrammeni.glif
index d882b2b5..db73f26c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegaperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegaperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegaperispomeniypogegrammeni" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1FF7"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="641" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="perispomeni" xOffset="144"/>
-    <component base="ypogegrammeni" xOffset="136"/>
+    <component base="perispomeni" xOffset="127"/>
+    <component base="ypogegrammeni" xOffset="135"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegapsili.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegapsili.glif
index a7a49e7f..e7633d09 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegapsili.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegapsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsili" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1F60"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="694" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psili" xOffset="232"/>
+    <component base="psili" xOffset="231"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegapsilioxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegapsilioxia.glif
index 10ed45af..bbc82868 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegapsilioxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegapsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsilioxia" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1F64"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psilioxia" xOffset="154"/>
+    <component base="psilioxia" xOffset="153"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegapsilioxiaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegapsilioxiaypogegrammeni.glif
index b73c98a2..4ff70e44 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegapsilioxiaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegapsilioxiaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsilioxiaypogegrammeni" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1FA4"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psilioxia" xOffset="154"/>
-    <component base="ypogegrammeni" xOffset="136"/>
+    <component base="psilioxia" xOffset="153"/>
+    <component base="ypogegrammeni" xOffset="135"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegapsiliperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegapsiliperispomeni.glif
index 20a2e12b..f62c4623 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegapsiliperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegapsiliperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsiliperispomeni" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1F66"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psiliperispomeni" xOffset="144"/>
+    <component base="psiliperispomeni" xOffset="127"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegapsiliperispomeniypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegapsiliperispomeniypogegrammeni.glif
index 68fa3faa..7ac54534 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegapsiliperispomeniypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegapsiliperispomeniypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsiliperispomeniypogegrammeni" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1FA6"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psiliperispomeni" xOffset="144"/>
-    <component base="ypogegrammeni" xOffset="136"/>
+    <component base="psiliperispomeni" xOffset="127"/>
+    <component base="ypogegrammeni" xOffset="135"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegapsilivaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegapsilivaria.glif
index 303f5ff1..16be2e3a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegapsilivaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegapsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsilivaria" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1F62"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psilivaria" xOffset="154"/>
+    <component base="psilivaria" xOffset="153"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegapsilivariaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegapsilivariaypogegrammeni.glif
index aa7eb2ba..68ae5610 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegapsilivariaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegapsilivariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsilivariaypogegrammeni" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1FA2"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psilivaria" xOffset="154"/>
-    <component base="ypogegrammeni" xOffset="136"/>
+    <component base="psilivaria" xOffset="153"/>
+    <component base="ypogegrammeni" xOffset="135"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegapsiliypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegapsiliypogegrammeni.glif
index 0d3de111..d09ddf26 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegapsiliypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegapsiliypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegapsiliypogegrammeni" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1FA0"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="694" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="psili" xOffset="232"/>
-    <component base="ypogegrammeni" xOffset="136"/>
+    <component base="psili" xOffset="231"/>
+    <component base="ypogegrammeni" xOffset="135"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegatonos.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegatonos.glif
index c80bf292..370254e1 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegatonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegatonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegatonos" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="03CE"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="tonos" xOffset="265"/>
+    <component base="tonos" xOffset="264"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegavaria.glif
index 72481e1a..e18d9fed 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegavaria" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1F7C"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="varia" xOffset="215"/>
+    <component base="varia" xOffset="214"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegavariaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegavariaypogegrammeni.glif
index b7257601..44d3f910 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegavariaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegavariaypogegrammeni.glif
@@ -1,18 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegavariaypogegrammeni" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1FF2"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="varia" xOffset="215"/>
-    <component base="ypogegrammeni" xOffset="136"/>
+    <component base="varia" xOffset="214"/>
+    <component base="ypogegrammeni" xOffset="135"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omegaypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/omegaypogegrammeni.glif
index 1cacfeb3..6df58ebd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omegaypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omegaypogegrammeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omegaypogegrammeni" format="2">
-  <advance width="744"/>
+  <advance width="742"/>
   <unicode hex="1FF3"/>
-  <anchor x="370" y="0" name="bottom"/>
-  <anchor x="370" y="482" name="top"/>
   <outline>
     <component base="omega"/>
-    <component base="ypogegrammeni" xOffset="136"/>
+    <component base="ypogegrammeni" xOffset="135"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omicron.glif b/src/Cantarell-Regular.ufo/glyphs/omicron.glif
index a312ddbd..e6b0c43a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omicron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omicron.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicron" format="2">
-  <advance width="561"/>
+  <advance width="559"/>
   <unicode hex="03BF"/>
-  <anchor x="281" y="0" name="bottom"/>
-  <anchor x="281" y="482" name="top"/>
+  <anchor x="280" y="0" name="bottom"/>
+  <anchor x="280" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="276" y="-10" type="curve" smooth="yes"/>
-      <point x="415" y="-10"/>
-      <point x="508" y="93"/>
-      <point x="508" y="247" type="curve" smooth="yes"/>
-      <point x="508" y="395"/>
-      <point x="418" y="492"/>
-      <point x="284" y="492" type="curve" smooth="yes"/>
-      <point x="145" y="492"/>
-      <point x="53" y="390"/>
-      <point x="53" y="236" type="curve" smooth="yes"/>
-      <point x="53" y="88"/>
-      <point x="142" y="-10"/>
+      <point x="275" y="-10" type="curve" smooth="yes"/>
+      <point x="414" y="-10"/>
+      <point x="507" y="93"/>
+      <point x="507" y="247" type="curve" smooth="yes"/>
+      <point x="507" y="395"/>
+      <point x="417" y="492"/>
+      <point x="283" y="492" type="curve" smooth="yes"/>
+      <point x="144" y="492"/>
+      <point x="52" y="390"/>
+      <point x="52" y="236" type="curve" smooth="yes"/>
+      <point x="52" y="88"/>
+      <point x="141" y="-10"/>
     </contour>
     <contour>
-      <point x="285" y="60" type="curve" smooth="yes"/>
-      <point x="195" y="60"/>
-      <point x="133" y="136"/>
-      <point x="133" y="246" type="curve" smooth="yes"/>
-      <point x="133" y="352"/>
-      <point x="189" y="422"/>
-      <point x="275" y="422" type="curve" smooth="yes"/>
-      <point x="365" y="422"/>
-      <point x="428" y="345"/>
-      <point x="428" y="236" type="curve" smooth="yes"/>
-      <point x="428" y="131"/>
-      <point x="371" y="60"/>
+      <point x="284" y="60" type="curve" smooth="yes"/>
+      <point x="194" y="60"/>
+      <point x="132" y="136"/>
+      <point x="132" y="246" type="curve" smooth="yes"/>
+      <point x="132" y="352"/>
+      <point x="188" y="422"/>
+      <point x="274" y="422" type="curve" smooth="yes"/>
+      <point x="364" y="422"/>
+      <point x="427" y="345"/>
+      <point x="427" y="236" type="curve" smooth="yes"/>
+      <point x="427" y="131"/>
+      <point x="370" y="60"/>
     </contour>
   </outline>
   <lib>
@@ -40,8 +40,6 @@
       <string>o</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>o</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omicrondasia.glif 
b/src/Cantarell-Regular.ufo/glyphs/omicrondasia.glif
index 36dca378..e477102d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omicrondasia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omicrondasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicrondasia" format="2">
-  <advance width="561"/>
+  <advance width="559"/>
   <unicode hex="1F41"/>
-  <anchor x="281" y="0" name="bottom"/>
-  <anchor x="281" y="694" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="dasia" xOffset="163"/>
+    <component base="dasia" xOffset="162"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omicrondasiaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/omicrondasiaoxia.glif
index 7ed64a16..64263121 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omicrondasiaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omicrondasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicrondasiaoxia" format="2">
-  <advance width="561"/>
+  <advance width="559"/>
   <unicode hex="1F45"/>
-  <anchor x="281" y="0" name="bottom"/>
-  <anchor x="281" y="482" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="dasiaoxia" xOffset="100"/>
+    <component base="dasiaoxia" xOffset="99"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omicrondasiavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/omicrondasiavaria.glif
index 054303dd..9e0e14c7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omicrondasiavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omicrondasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicrondasiavaria" format="2">
-  <advance width="561"/>
+  <advance width="559"/>
   <unicode hex="1F43"/>
-  <anchor x="281" y="0" name="bottom"/>
-  <anchor x="281" y="482" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="dasiavaria" xOffset="90"/>
+    <component base="dasiavaria" xOffset="89"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omicronoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/omicronoxia.glif
index 0b023e4e..c37ce687 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omicronoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omicronoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicronoxia" format="2">
-  <advance width="561"/>
+  <advance width="559"/>
   <unicode hex="1F79"/>
-  <anchor x="281" y="0" name="bottom"/>
-  <anchor x="281" y="482" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="oxia" xOffset="176"/>
+    <component base="oxia" xOffset="175"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omicronpsili.glif 
b/src/Cantarell-Regular.ufo/glyphs/omicronpsili.glif
index 503035e5..3411774e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omicronpsili.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omicronpsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicronpsili" format="2">
-  <advance width="561"/>
+  <advance width="559"/>
   <unicode hex="1F40"/>
-  <anchor x="281" y="0" name="bottom"/>
-  <anchor x="281" y="694" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="psili" xOffset="143"/>
+    <component base="psili" xOffset="142"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omicronpsilioxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/omicronpsilioxia.glif
index bde7b540..775ab288 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omicronpsilioxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omicronpsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicronpsilioxia" format="2">
-  <advance width="561"/>
+  <advance width="559"/>
   <unicode hex="1F44"/>
-  <anchor x="281" y="0" name="bottom"/>
-  <anchor x="281" y="482" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="psilioxia" xOffset="65"/>
+    <component base="psilioxia" xOffset="64"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omicronpsilivaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/omicronpsilivaria.glif
index edb68924..1c38a81a 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omicronpsilivaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omicronpsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicronpsilivaria" format="2">
-  <advance width="561"/>
+  <advance width="559"/>
   <unicode hex="1F42"/>
-  <anchor x="281" y="0" name="bottom"/>
-  <anchor x="281" y="482" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="psilivaria" xOffset="65"/>
+    <component base="psilivaria" xOffset="64"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omicrontonos.glif 
b/src/Cantarell-Regular.ufo/glyphs/omicrontonos.glif
index ba9214ab..893b8dbd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omicrontonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omicrontonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicrontonos" format="2">
-  <advance width="561"/>
+  <advance width="559"/>
   <unicode hex="03CC"/>
-  <anchor x="281" y="0" name="bottom"/>
-  <anchor x="281" y="482" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="tonos" xOffset="176"/>
+    <component base="tonos" xOffset="175"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/omicronvaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/omicronvaria.glif
index b5bfe4c7..5977bb9f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/omicronvaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/omicronvaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="omicronvaria" format="2">
-  <advance width="561"/>
+  <advance width="559"/>
   <unicode hex="1F78"/>
-  <anchor x="281" y="0" name="bottom"/>
-  <anchor x="281" y="482" name="top"/>
   <outline>
     <component base="omicron"/>
-    <component base="varia" xOffset="126"/>
+    <component base="varia" xOffset="125"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oxia.case.glif b/src/Cantarell-Regular.ufo/glyphs/oxia.case.glif
index e01122ee..b3191d87 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oxia.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oxia.case.glif
@@ -11,8 +11,6 @@
       <string>tonos.case</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>tonos.case</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/oxia.glif b/src/Cantarell-Regular.ufo/glyphs/oxia.glif
index c7a37958..0c6b98d8 100644
--- a/src/Cantarell-Regular.ufo/glyphs/oxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/oxia.glif
@@ -12,8 +12,6 @@
       <string>tonos</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>tonos</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/perispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/perispomeni.glif
index c6447694..b1c4942e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/perispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/perispomeni.glif
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="perispomeni" format="2">
-  <advance width="470"/>
+  <advance width="500"/>
   <unicode hex="1FC0"/>
-  <anchor x="226" y="482" name="_top"/>
-  <anchor x="226" y="641" name="top"/>
+  <anchor x="242" y="482" name="_top"/>
+  <anchor x="242" y="641" name="top"/>
   <outline>
-    <component base="tildecomb" xOffset="-3"/>
+    <component base="tildecomb" xOffset="13"/>
   </outline>
   <lib>
     <dict>
@@ -13,8 +13,6 @@
       <string>tilde</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>tilde</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/phi.glif b/src/Cantarell-Regular.ufo/glyphs/phi.glif
index 30839bce..8ad3090c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/phi.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/phi.glif
@@ -1,47 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="phi" format="2">
-  <advance width="710"/>
+  <advance width="707"/>
   <unicode hex="03C6"/>
   <outline>
     <contour>
-      <point x="314" y="-5" type="curve"/>
-      <point x="319" y="62" type="line"/>
-      <point x="201" y="62"/>
-      <point x="138" y="150"/>
-      <point x="138" y="252" type="curve" smooth="yes"/>
-      <point x="138" y="320"/>
-      <point x="160" y="405"/>
-      <point x="196" y="482" type="curve"/>
-      <point x="115" y="482" type="line"/>
-      <point x="82" y="410"/>
-      <point x="58" y="324"/>
-      <point x="58" y="242" type="curve" smooth="yes"/>
-      <point x="58" y="91"/>
-      <point x="168" y="-5"/>
+      <point x="313" y="-5" type="curve"/>
+      <point x="318" y="62" type="line"/>
+      <point x="200" y="62"/>
+      <point x="137" y="150"/>
+      <point x="137" y="252" type="curve" smooth="yes"/>
+      <point x="137" y="320"/>
+      <point x="159" y="405"/>
+      <point x="195" y="482" type="curve"/>
+      <point x="114" y="482" type="line"/>
+      <point x="81" y="410"/>
+      <point x="57" y="324"/>
+      <point x="57" y="242" type="curve" smooth="yes"/>
+      <point x="57" y="91"/>
+      <point x="167" y="-5"/>
     </contour>
     <contour>
-      <point x="384" y="63" type="curve"/>
-      <point x="379" y="-5" type="line"/>
-      <point x="547" y="-5"/>
-      <point x="656" y="99"/>
-      <point x="656" y="265" type="curve" smooth="yes"/>
-      <point x="656" y="392"/>
-      <point x="600" y="492"/>
-      <point x="483" y="492" type="curve" smooth="yes"/>
-      <point x="377" y="492"/>
-      <point x="309" y="432"/>
-      <point x="309" y="264" type="curve" smooth="yes"/>
-      <point x="309" y="-217" type="line"/>
-      <point x="389" y="-217" type="line"/>
-      <point x="389" y="260" type="line" smooth="yes"/>
-      <point x="389" y="384"/>
-      <point x="421" y="422"/>
-      <point x="480" y="422" type="curve" smooth="yes"/>
-      <point x="549" y="422"/>
-      <point x="576" y="350"/>
-      <point x="576" y="260" type="curve" smooth="yes"/>
-      <point x="576" y="141"/>
-      <point x="515" y="63"/>
+      <point x="383" y="63" type="curve"/>
+      <point x="378" y="-5" type="line"/>
+      <point x="546" y="-5"/>
+      <point x="655" y="99"/>
+      <point x="655" y="265" type="curve" smooth="yes"/>
+      <point x="655" y="392"/>
+      <point x="599" y="492"/>
+      <point x="482" y="492" type="curve" smooth="yes"/>
+      <point x="376" y="492"/>
+      <point x="308" y="432"/>
+      <point x="308" y="264" type="curve" smooth="yes"/>
+      <point x="308" y="-217" type="line"/>
+      <point x="388" y="-217" type="line"/>
+      <point x="388" y="260" type="line" smooth="yes"/>
+      <point x="388" y="384"/>
+      <point x="420" y="422"/>
+      <point x="479" y="422" type="curve" smooth="yes"/>
+      <point x="548" y="422"/>
+      <point x="575" y="350"/>
+      <point x="575" y="260" type="curve" smooth="yes"/>
+      <point x="575" y="141"/>
+      <point x="514" y="63"/>
     </contour>
   </outline>
   <lib>
@@ -50,8 +50,6 @@
       <string>=omega</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=p</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/pi.glif b/src/Cantarell-Regular.ufo/glyphs/pi.glif
index 60784fc9..357d46ac 100644
--- a/src/Cantarell-Regular.ufo/glyphs/pi.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/pi.glif
@@ -1,37 +1,37 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="pi" format="2">
-  <advance width="611"/>
+  <advance width="607"/>
   <unicode hex="03C0"/>
   <outline>
     <contour>
-      <point x="496" y="-6" type="curve" smooth="yes"/>
-      <point x="524" y="-6"/>
-      <point x="553" y="2"/>
-      <point x="572" y="11" type="curve"/>
-      <point x="554" y="67" type="line"/>
-      <point x="544" y="63"/>
-      <point x="532" y="58"/>
-      <point x="515" y="58" type="curve" smooth="yes"/>
-      <point x="485" y="58"/>
-      <point x="469" y="78"/>
-      <point x="469" y="121" type="curve" smooth="yes"/>
-      <point x="469" y="424" type="line"/>
-      <point x="389" y="424" type="line"/>
-      <point x="389" y="110" type="line" smooth="yes"/>
-      <point x="389" y="33"/>
-      <point x="433" y="-6"/>
+      <point x="502" y="-6" type="curve" smooth="yes"/>
+      <point x="530" y="-6"/>
+      <point x="559" y="2"/>
+      <point x="578" y="11" type="curve"/>
+      <point x="560" y="67" type="line"/>
+      <point x="550" y="63"/>
+      <point x="538" y="58"/>
+      <point x="521" y="58" type="curve" smooth="yes"/>
+      <point x="491" y="58"/>
+      <point x="475" y="78"/>
+      <point x="475" y="121" type="curve" smooth="yes"/>
+      <point x="475" y="424" type="line"/>
+      <point x="395" y="424" type="line"/>
+      <point x="395" y="110" type="line" smooth="yes"/>
+      <point x="395" y="33"/>
+      <point x="439" y="-6"/>
     </contour>
     <contour>
-      <point x="111" y="0" type="line"/>
-      <point x="191" y="0" type="line"/>
-      <point x="191" y="425" type="line"/>
-      <point x="111" y="425" type="line"/>
+      <point x="117" y="0" type="line"/>
+      <point x="197" y="0" type="line"/>
+      <point x="197" y="425" type="line"/>
+      <point x="117" y="425" type="line"/>
     </contour>
     <contour>
-      <point x="31" y="415" type="line"/>
-      <point x="566" y="415" type="line"/>
-      <point x="566" y="482" type="line"/>
-      <point x="31" y="482" type="line"/>
+      <point x="37" y="415" type="line"/>
+      <point x="572" y="415" type="line"/>
+      <point x="572" y="482" type="line"/>
+      <point x="37" y="482" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -40,8 +40,6 @@
       <string>t</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=t+5</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/prosgegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/prosgegrammeni.glif
index fcc40ec5..66c659c5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/prosgegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/prosgegrammeni.glif
@@ -5,10 +5,4 @@
   <outline>
     <component base="ypogegrammeni"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/psi.glif b/src/Cantarell-Regular.ufo/glyphs/psi.glif
index 35fbc255..441433f4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/psi.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/psi.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="psi" format="2">
-  <advance width="708"/>
+  <advance width="706"/>
   <unicode hex="03C8"/>
   <outline>
     <contour>
-      <point x="314" y="-217" type="line"/>
-      <point x="394" y="-217" type="line"/>
-      <point x="394" y="644" type="line"/>
-      <point x="314" y="644" type="line"/>
+      <point x="313" y="-217" type="line"/>
+      <point x="393" y="-217" type="line"/>
+      <point x="393" y="644" type="line"/>
+      <point x="313" y="644" type="line"/>
     </contour>
     <contour>
-      <point x="324" y="63" type="line"/>
-      <point x="233" y="63"/>
-      <point x="151" y="113"/>
-      <point x="151" y="246" type="curve" smooth="yes"/>
-      <point x="151" y="482" type="line"/>
-      <point x="71" y="482" type="line"/>
-      <point x="71" y="228" type="line" smooth="yes"/>
-      <point x="71" y="73"/>
-      <point x="193" y="-5"/>
-      <point x="319" y="-5" type="curve"/>
+      <point x="323" y="63" type="line"/>
+      <point x="232" y="63"/>
+      <point x="150" y="113"/>
+      <point x="150" y="246" type="curve" smooth="yes"/>
+      <point x="150" y="482" type="line"/>
+      <point x="70" y="482" type="line"/>
+      <point x="70" y="228" type="line" smooth="yes"/>
+      <point x="70" y="73"/>
+      <point x="192" y="-5"/>
+      <point x="318" y="-5" type="curve"/>
     </contour>
     <contour>
-      <point x="384" y="-5" type="line"/>
-      <point x="538" y="-5"/>
-      <point x="650" y="96"/>
-      <point x="650" y="250" type="curve" smooth="yes"/>
-      <point x="650" y="342"/>
-      <point x="631" y="403"/>
-      <point x="601" y="482" type="curve"/>
-      <point x="520" y="482" type="line"/>
-      <point x="550" y="407"/>
-      <point x="570" y="329"/>
-      <point x="570" y="253" type="curve" smooth="yes"/>
-      <point x="570" y="143"/>
-      <point x="496" y="64"/>
-      <point x="389" y="64" type="curve"/>
+      <point x="383" y="-5" type="line"/>
+      <point x="537" y="-5"/>
+      <point x="649" y="96"/>
+      <point x="649" y="250" type="curve" smooth="yes"/>
+      <point x="649" y="342"/>
+      <point x="630" y="403"/>
+      <point x="600" y="482" type="curve"/>
+      <point x="519" y="482" type="line"/>
+      <point x="549" y="407"/>
+      <point x="569" y="329"/>
+      <point x="569" y="253" type="curve" smooth="yes"/>
+      <point x="569" y="143"/>
+      <point x="495" y="64"/>
+      <point x="388" y="64" type="curve"/>
     </contour>
   </outline>
   <lib>
@@ -44,8 +44,6 @@
       <string>=upsilon</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=omega</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/psili.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/psili.case.glif
index a07e3fad..f2158248 100644
--- a/src/Cantarell-Regular.ufo/glyphs/psili.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/psili.case.glif
@@ -12,8 +12,6 @@
       <string>psili</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psili</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/psili.glif b/src/Cantarell-Regular.ufo/glyphs/psili.glif
index 0a54dede..919d5d47 100644
--- a/src/Cantarell-Regular.ufo/glyphs/psili.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/psili.glif
@@ -22,10 +22,4 @@
       <point x="123" y="590"/>
     </contour>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/psilioxia.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/psilioxia.case.glif
index 66b9de26..b21fb327 100644
--- a/src/Cantarell-Regular.ufo/glyphs/psilioxia.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/psilioxia.case.glif
@@ -11,8 +11,6 @@
       <string>psilioxia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psilioxia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/psilioxia.glif b/src/Cantarell-Regular.ufo/glyphs/psilioxia.glif
index ba668d23..ffdc8b93 100644
--- a/src/Cantarell-Regular.ufo/glyphs/psilioxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/psilioxia.glif
@@ -33,8 +33,6 @@
       <string>psili</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>oxia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/psiliperispomeni.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/psiliperispomeni.case.glif
index 837d487d..8edf2840 100644
--- a/src/Cantarell-Regular.ufo/glyphs/psiliperispomeni.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/psiliperispomeni.case.glif
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="psiliperispomeni.case" format="2">
-  <advance width="470"/>
+  <advance width="500"/>
   <anchor x="339" y="850" name="_topleft"/>
   <outline>
     <component base="psiliperispomeni" yOffset="-45"/>
@@ -11,8 +11,6 @@
       <string>psiliperispomeni</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psiliperispomeni</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/psiliperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/psiliperispomeni.glif
index b5993825..846996fb 100644
--- a/src/Cantarell-Regular.ufo/glyphs/psiliperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/psiliperispomeni.glif
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="psiliperispomeni" format="2">
-  <advance width="470"/>
+  <advance width="500"/>
   <unicode hex="1FCF"/>
-  <anchor x="226" y="482" name="_top"/>
+  <anchor x="242" y="482" name="_top"/>
   <outline>
-    <component base="psili" xOffset="88"/>
+    <component base="psili" xOffset="104"/>
     <component base="perispomeni" yOffset="212"/>
   </outline>
   <lib>
@@ -13,8 +13,6 @@
       <string>perispomeni</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>perispomeni</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/psilivaria.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/psilivaria.case.glif
index 67dde900..c0bf47e7 100644
--- a/src/Cantarell-Regular.ufo/glyphs/psilivaria.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/psilivaria.case.glif
@@ -11,8 +11,6 @@
       <string>psilivaria</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>psilivaria</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/psilivaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/psilivaria.glif
index 01a6ccf8..ef472720 100644
--- a/src/Cantarell-Regular.ufo/glyphs/psilivaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/psilivaria.glif
@@ -33,8 +33,6 @@
       <string>psili</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>varia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/rho.glif b/src/Cantarell-Regular.ufo/glyphs/rho.glif
index d18e5cbc..2ba9b6bd 100644
--- a/src/Cantarell-Regular.ufo/glyphs/rho.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/rho.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rho" format="2">
-  <advance width="562"/>
+  <advance width="559"/>
   <unicode hex="03C1"/>
-  <anchor x="273" y="0" name="bottom"/>
-  <anchor x="273" y="482" name="top"/>
+  <anchor x="271" y="0" name="bottom"/>
+  <anchor x="271" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="65" y="254" type="curve" smooth="yes"/>
-      <point x="65" y="-217" type="line"/>
-      <point x="149" y="-217" type="line"/>
-      <point x="142" y="49" type="line"/>
-      <point x="145" y="49" type="line"/>
-      <point x="145" y="251" type="line" smooth="yes"/>
-      <point x="145" y="371"/>
-      <point x="205" y="422"/>
-      <point x="282" y="422" type="curve" smooth="yes"/>
-      <point x="361" y="422"/>
-      <point x="429" y="361"/>
-      <point x="429" y="239" type="curve" smooth="yes"/>
-      <point x="429" y="130"/>
-      <point x="372" y="60"/>
-      <point x="284" y="60" type="curve" smooth="yes"/>
-      <point x="211" y="60"/>
-      <point x="149" y="107"/>
-      <point x="132" y="178" type="curve"/>
-      <point x="99" y="123" type="line"/>
-      <point x="121" y="40"/>
-      <point x="195" y="-10"/>
-      <point x="280" y="-10" type="curve" smooth="yes"/>
-      <point x="415" y="-10"/>
-      <point x="509" y="92"/>
-      <point x="509" y="249" type="curve" smooth="yes"/>
-      <point x="509" y="400"/>
-      <point x="427" y="492"/>
-      <point x="287" y="492" type="curve" smooth="yes"/>
-      <point x="166" y="492"/>
-      <point x="65" y="412"/>
+      <point x="63" y="254" type="curve" smooth="yes"/>
+      <point x="63" y="-217" type="line"/>
+      <point x="147" y="-217" type="line"/>
+      <point x="140" y="49" type="line"/>
+      <point x="143" y="49" type="line"/>
+      <point x="143" y="251" type="line" smooth="yes"/>
+      <point x="143" y="371"/>
+      <point x="203" y="422"/>
+      <point x="280" y="422" type="curve" smooth="yes"/>
+      <point x="359" y="422"/>
+      <point x="427" y="361"/>
+      <point x="427" y="239" type="curve" smooth="yes"/>
+      <point x="427" y="130"/>
+      <point x="370" y="60"/>
+      <point x="282" y="60" type="curve" smooth="yes"/>
+      <point x="209" y="60"/>
+      <point x="147" y="107"/>
+      <point x="130" y="178" type="curve"/>
+      <point x="97" y="123" type="line"/>
+      <point x="119" y="40"/>
+      <point x="193" y="-10"/>
+      <point x="278" y="-10" type="curve" smooth="yes"/>
+      <point x="413" y="-10"/>
+      <point x="507" y="92"/>
+      <point x="507" y="249" type="curve" smooth="yes"/>
+      <point x="507" y="400"/>
+      <point x="425" y="492"/>
+      <point x="285" y="492" type="curve" smooth="yes"/>
+      <point x="164" y="492"/>
+      <point x="63" y="412"/>
     </contour>
   </outline>
   <lib>
@@ -44,8 +44,6 @@
       <string>=p-20</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=o</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/rhodasia.glif b/src/Cantarell-Regular.ufo/glyphs/rhodasia.glif
index 564bbfb6..a007b8f9 100644
--- a/src/Cantarell-Regular.ufo/glyphs/rhodasia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/rhodasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rhodasia" format="2">
-  <advance width="562"/>
+  <advance width="559"/>
   <unicode hex="1FE5"/>
-  <anchor x="273" y="0" name="bottom"/>
-  <anchor x="273" y="694" name="top"/>
   <outline>
     <component base="rho"/>
-    <component base="dasia" xOffset="155"/>
+    <component base="dasia" xOffset="153"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/rhopsili.glif b/src/Cantarell-Regular.ufo/glyphs/rhopsili.glif
index 4c4de500..509f7a65 100644
--- a/src/Cantarell-Regular.ufo/glyphs/rhopsili.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/rhopsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="rhopsili" format="2">
-  <advance width="562"/>
+  <advance width="559"/>
   <unicode hex="1FE4"/>
-  <anchor x="273" y="0" name="bottom"/>
-  <anchor x="273" y="694" name="top"/>
   <outline>
     <component base="rho"/>
-    <component base="psili" xOffset="135"/>
+    <component base="psili" xOffset="133"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/sigma.glif b/src/Cantarell-Regular.ufo/glyphs/sigma.glif
index 81de8197..e318d87d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/sigma.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/sigma.glif
@@ -1,45 +1,43 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sigma" format="2">
-  <advance width="584"/>
+  <advance width="583"/>
   <unicode hex="03C3"/>
   <outline>
     <contour>
-      <point x="336" y="444" type="line"/>
-      <point x="392" y="373"/>
-      <point x="430" y="306"/>
-      <point x="430" y="215" type="curve" smooth="yes"/>
-      <point x="430" y="128"/>
-      <point x="373" y="60"/>
-      <point x="287" y="60" type="curve" smooth="yes"/>
-      <point x="195" y="60"/>
-      <point x="133" y="133"/>
-      <point x="133" y="241" type="curve" smooth="yes"/>
-      <point x="133" y="343"/>
-      <point x="206" y="411"/>
-      <point x="313" y="412" type="curve" smooth="yes"/>
-      <point x="579" y="415" type="line"/>
-      <point x="579" y="482" type="line"/>
-      <point x="310" y="482" type="line" smooth="yes"/>
-      <point x="155" y="482"/>
-      <point x="53" y="377"/>
-      <point x="53" y="231" type="curve" smooth="yes"/>
-      <point x="53" y="85"/>
-      <point x="142" y="-10"/>
-      <point x="276" y="-10" type="curve" smooth="yes"/>
-      <point x="417" y="-10"/>
-      <point x="510" y="86"/>
-      <point x="510" y="222" type="curve" smooth="yes"/>
-      <point x="510" y="315"/>
-      <point x="456" y="406"/>
-      <point x="393" y="474" type="curve"/>
+      <point x="335" y="444" type="line"/>
+      <point x="391" y="373"/>
+      <point x="429" y="306"/>
+      <point x="429" y="215" type="curve" smooth="yes"/>
+      <point x="429" y="128"/>
+      <point x="372" y="60"/>
+      <point x="286" y="60" type="curve" smooth="yes"/>
+      <point x="194" y="60"/>
+      <point x="132" y="133"/>
+      <point x="132" y="241" type="curve" smooth="yes"/>
+      <point x="132" y="343"/>
+      <point x="205" y="411"/>
+      <point x="312" y="412" type="curve" smooth="yes"/>
+      <point x="578" y="415" type="line"/>
+      <point x="578" y="482" type="line"/>
+      <point x="309" y="482" type="line" smooth="yes"/>
+      <point x="154" y="482"/>
+      <point x="52" y="377"/>
+      <point x="52" y="231" type="curve" smooth="yes"/>
+      <point x="52" y="85"/>
+      <point x="141" y="-10"/>
+      <point x="275" y="-10" type="curve" smooth="yes"/>
+      <point x="416" y="-10"/>
+      <point x="509" y="86"/>
+      <point x="509" y="222" type="curve" smooth="yes"/>
+      <point x="509" y="315"/>
+      <point x="455" y="406"/>
+      <point x="392" y="474" type="curve"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>=o</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/sigmafinal.glif 
b/src/Cantarell-Regular.ufo/glyphs/sigmafinal.glif
index 0dfc2e17..a71c45cf 100644
--- a/src/Cantarell-Regular.ufo/glyphs/sigmafinal.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/sigmafinal.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="sigmafinal" format="2">
-  <advance width="466"/>
+  <advance width="467"/>
   <unicode hex="03C2"/>
   <outline>
     <contour>
-      <point x="135" y="254" type="curve"/>
-      <point x="135" y="360"/>
-      <point x="192" y="422"/>
-      <point x="291" y="422" type="curve" smooth="yes"/>
-      <point x="329" y="422"/>
-      <point x="372" y="413"/>
-      <point x="412" y="395" type="curve"/>
-      <point x="431" y="460" type="line"/>
-      <point x="387" y="481"/>
-      <point x="340" y="492"/>
-      <point x="292" y="492" type="curve" smooth="yes"/>
-      <point x="152" y="492"/>
-      <point x="53" y="387"/>
-      <point x="53" y="241" type="curve" smooth="yes"/>
-      <point x="53" y="104"/>
-      <point x="138" y="45"/>
-      <point x="251" y="3" type="curve" smooth="yes"/>
-      <point x="331" y="-27"/>
-      <point x="356" y="-44"/>
-      <point x="356" y="-80" type="curve" smooth="yes"/>
-      <point x="356" y="-118"/>
-      <point x="328" y="-149"/>
-      <point x="294" y="-187" type="curve"/>
-      <point x="342" y="-227" type="line"/>
-      <point x="396" y="-171"/>
-      <point x="431" y="-119"/>
-      <point x="431" y="-67" type="curve" smooth="yes"/>
-      <point x="431" y="4"/>
-      <point x="379" y="34"/>
-      <point x="280" y="70" type="curve" smooth="yes"/>
-      <point x="193" y="102"/>
-      <point x="135" y="151"/>
+      <point x="134" y="254" type="curve"/>
+      <point x="134" y="360"/>
+      <point x="191" y="422"/>
+      <point x="290" y="422" type="curve" smooth="yes"/>
+      <point x="328" y="422"/>
+      <point x="371" y="413"/>
+      <point x="411" y="395" type="curve"/>
+      <point x="430" y="460" type="line"/>
+      <point x="386" y="481"/>
+      <point x="339" y="492"/>
+      <point x="291" y="492" type="curve" smooth="yes"/>
+      <point x="151" y="492"/>
+      <point x="52" y="387"/>
+      <point x="52" y="241" type="curve" smooth="yes"/>
+      <point x="52" y="104"/>
+      <point x="137" y="45"/>
+      <point x="250" y="3" type="curve" smooth="yes"/>
+      <point x="330" y="-27"/>
+      <point x="355" y="-44"/>
+      <point x="355" y="-80" type="curve" smooth="yes"/>
+      <point x="355" y="-118"/>
+      <point x="327" y="-149"/>
+      <point x="293" y="-187" type="curve"/>
+      <point x="341" y="-227" type="line"/>
+      <point x="395" y="-171"/>
+      <point x="430" y="-119"/>
+      <point x="430" y="-67" type="curve" smooth="yes"/>
+      <point x="430" y="4"/>
+      <point x="378" y="34"/>
+      <point x="279" y="70" type="curve" smooth="yes"/>
+      <point x="192" y="102"/>
+      <point x="134" y="151"/>
     </contour>
   </outline>
   <lib>
@@ -44,8 +44,6 @@
       <string>=c</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=c</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tau.glif b/src/Cantarell-Regular.ufo/glyphs/tau.glif
index a001596b..125a56e5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tau.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tau.glif
@@ -1,31 +1,31 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="tau" format="2">
-  <advance width="476"/>
+  <advance width="482"/>
   <unicode hex="03C4"/>
   <outline>
     <contour>
-      <point x="18" y="415" type="line"/>
-      <point x="453" y="415" type="line"/>
-      <point x="453" y="482" type="line"/>
-      <point x="18" y="482" type="line"/>
+      <point x="21" y="415" type="line"/>
+      <point x="456" y="415" type="line"/>
+      <point x="456" y="482" type="line"/>
+      <point x="21" y="482" type="line"/>
     </contour>
     <contour>
-      <point x="325" y="-5" type="curve" smooth="yes"/>
-      <point x="360" y="-5"/>
-      <point x="388" y="4"/>
-      <point x="413" y="15" type="curve"/>
-      <point x="395" y="73" type="line"/>
-      <point x="379" y="66"/>
-      <point x="359" y="60"/>
-      <point x="338" y="60" type="curve" smooth="yes"/>
-      <point x="293" y="60"/>
-      <point x="263" y="90"/>
-      <point x="263" y="154" type="curve" smooth="yes"/>
-      <point x="263" y="482" type="line"/>
-      <point x="183" y="482" type="line"/>
-      <point x="183" y="141" type="line" smooth="yes"/>
-      <point x="183" y="48"/>
-      <point x="239" y="-5"/>
+      <point x="328" y="-5" type="curve" smooth="yes"/>
+      <point x="363" y="-5"/>
+      <point x="391" y="4"/>
+      <point x="416" y="15" type="curve"/>
+      <point x="398" y="73" type="line"/>
+      <point x="382" y="66"/>
+      <point x="362" y="60"/>
+      <point x="341" y="60" type="curve" smooth="yes"/>
+      <point x="296" y="60"/>
+      <point x="266" y="90"/>
+      <point x="266" y="154" type="curve" smooth="yes"/>
+      <point x="266" y="482" type="line"/>
+      <point x="186" y="482" type="line"/>
+      <point x="186" y="141" type="line" smooth="yes"/>
+      <point x="186" y="48"/>
+      <point x="242" y="-5"/>
     </contour>
   </outline>
   <lib>
@@ -34,8 +34,6 @@
       <string>=te-cy</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=te-cy+5</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/theta.glif b/src/Cantarell-Regular.ufo/glyphs/theta.glif
index c19ae499..f33b9768 100644
--- a/src/Cantarell-Regular.ufo/glyphs/theta.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/theta.glif
@@ -1,41 +1,41 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="theta" format="2">
-  <advance width="585"/>
+  <advance width="583"/>
   <unicode hex="03B8"/>
   <outline>
     <contour>
-      <point x="286" y="-10" type="curve" smooth="yes"/>
-      <point x="446" y="-10"/>
-      <point x="527" y="127"/>
-      <point x="527" y="375" type="curve" smooth="yes"/>
-      <point x="527" y="613"/>
-      <point x="453" y="749"/>
-      <point x="298" y="749" type="curve" smooth="yes"/>
-      <point x="138" y="749"/>
-      <point x="58" y="614"/>
-      <point x="58" y="366" type="curve" smooth="yes"/>
-      <point x="58" y="128"/>
-      <point x="131" y="-10"/>
+      <point x="285" y="-10" type="curve" smooth="yes"/>
+      <point x="445" y="-10"/>
+      <point x="526" y="127"/>
+      <point x="526" y="375" type="curve" smooth="yes"/>
+      <point x="526" y="613"/>
+      <point x="452" y="749"/>
+      <point x="297" y="749" type="curve" smooth="yes"/>
+      <point x="137" y="749"/>
+      <point x="57" y="614"/>
+      <point x="57" y="366" type="curve" smooth="yes"/>
+      <point x="57" y="128"/>
+      <point x="130" y="-10"/>
     </contour>
     <contour>
-      <point x="297" y="60" type="curve" smooth="yes"/>
-      <point x="186" y="60"/>
-      <point x="138" y="175"/>
-      <point x="138" y="374" type="curve" smooth="yes"/>
-      <point x="138" y="570"/>
-      <point x="179" y="679"/>
-      <point x="287" y="679" type="curve" smooth="yes"/>
-      <point x="398" y="679"/>
-      <point x="447" y="564"/>
-      <point x="447" y="366" type="curve" smooth="yes"/>
-      <point x="447" y="171"/>
-      <point x="405" y="60"/>
+      <point x="296" y="60" type="curve" smooth="yes"/>
+      <point x="185" y="60"/>
+      <point x="137" y="175"/>
+      <point x="137" y="374" type="curve" smooth="yes"/>
+      <point x="137" y="570"/>
+      <point x="178" y="679"/>
+      <point x="286" y="679" type="curve" smooth="yes"/>
+      <point x="397" y="679"/>
+      <point x="446" y="564"/>
+      <point x="446" y="366" type="curve" smooth="yes"/>
+      <point x="446" y="171"/>
+      <point x="404" y="60"/>
     </contour>
     <contour>
-      <point x="98" y="342" type="line"/>
-      <point x="487" y="342" type="line"/>
-      <point x="487" y="409" type="line"/>
-      <point x="98" y="409" type="line"/>
+      <point x="97" y="342" type="line"/>
+      <point x="486" y="342" type="line"/>
+      <point x="486" y="409" type="line"/>
+      <point x="97" y="409" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -44,8 +44,6 @@
       <string>=o+5</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=o+5</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tonos.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/tonos.case.glif
index a727f136..540533cc 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tonos.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tonos.case.glif
@@ -11,8 +11,6 @@
       <string>tonos</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>tonos</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/tonos.glif b/src/Cantarell-Regular.ufo/glyphs/tonos.glif
index 57a13b7e..4a016067 100644
--- a/src/Cantarell-Regular.ufo/glyphs/tonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/tonos.glif
@@ -11,10 +11,4 @@
       <point x="83" y="567" type="line"/>
     </contour>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilon.glif b/src/Cantarell-Regular.ufo/glyphs/upsilon.glif
index 9917753c..984cd713 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilon.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilon.glif
@@ -1,33 +1,33 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilon" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="03C5"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="482" name="top"/>
+  <anchor x="250" y="0" name="bottom"/>
+  <anchor x="250" y="482" name="top"/>
   <outline>
     <contour>
-      <point x="272" y="-10" type="curve" smooth="yes"/>
-      <point x="414" y="-10"/>
-      <point x="489" y="82"/>
-      <point x="489" y="236" type="curve" smooth="yes"/>
-      <point x="489" y="333"/>
-      <point x="470" y="403"/>
-      <point x="440" y="482" type="curve"/>
-      <point x="359" y="482" type="line"/>
-      <point x="389" y="407"/>
-      <point x="409" y="320"/>
-      <point x="409" y="238" type="curve" smooth="yes"/>
-      <point x="409" y="121"/>
-      <point x="367" y="60"/>
-      <point x="276" y="60" type="curve" smooth="yes"/>
-      <point x="200" y="60"/>
-      <point x="151" y="106"/>
-      <point x="151" y="212" type="curve" smooth="yes"/>
-      <point x="151" y="482" type="line"/>
-      <point x="71" y="482" type="line"/>
-      <point x="71" y="196" type="line" smooth="yes"/>
-      <point x="71" y="63"/>
-      <point x="145" y="-10"/>
+      <point x="271" y="-10" type="curve" smooth="yes"/>
+      <point x="413" y="-10"/>
+      <point x="488" y="82"/>
+      <point x="488" y="236" type="curve" smooth="yes"/>
+      <point x="488" y="333"/>
+      <point x="469" y="403"/>
+      <point x="439" y="482" type="curve"/>
+      <point x="358" y="482" type="line"/>
+      <point x="388" y="407"/>
+      <point x="408" y="320"/>
+      <point x="408" y="238" type="curve" smooth="yes"/>
+      <point x="408" y="121"/>
+      <point x="366" y="60"/>
+      <point x="275" y="60" type="curve" smooth="yes"/>
+      <point x="199" y="60"/>
+      <point x="150" y="106"/>
+      <point x="150" y="212" type="curve" smooth="yes"/>
+      <point x="150" y="482" type="line"/>
+      <point x="70" y="482" type="line"/>
+      <point x="70" y="196" type="line" smooth="yes"/>
+      <point x="70" y="63"/>
+      <point x="144" y="-10"/>
     </contour>
   </outline>
   <lib>
@@ -36,8 +36,6 @@
       <string>=u-5</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>=omega</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilondasia.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilondasia.glif
index f8321d98..5b1de945 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilondasia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilondasia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondasia" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="1F51"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="694" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dasia" xOffset="133"/>
+    <component base="dasia" xOffset="132"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilondasiaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilondasiaoxia.glif
index 7506de42..f94966a4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilondasiaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilondasiaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondasiaoxia" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="1F55"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="482" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dasiaoxia" xOffset="70"/>
+    <component base="dasiaoxia" xOffset="69"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilondasiaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilondasiaperispomeni.glif
index f3ce3b44..dcefb290 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilondasiaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilondasiaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondasiaperispomeni" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="1F57"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="482" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="daspsiliiaperispomeni" xOffset="25"/>
+    <component base="daspsiliiaperispomeni" xOffset="8"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilondasiavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilondasiavaria.glif
index 5a792173..b12fb54d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilondasiavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilondasiavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondasiavaria" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="1F53"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="482" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dasiavaria" xOffset="60"/>
+    <component base="dasiavaria" xOffset="59"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilondialytikaoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilondialytikaoxia.glif
index aa81d7e8..e2f7b3de 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilondialytikaoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilondialytikaoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondialytikaoxia" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="1FE3"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="482" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dialytikaoxia" xOffset="21"/>
+    <component base="dialytikaoxia"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilondialytikaperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilondialytikaperispomeni.glif
index 5a947646..fd8b42b5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilondialytikaperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilondialytikaperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondialytikaperispomeni" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="1FE7"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="482" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dialytikaperispomeni" xOffset="32"/>
+    <component base="dialytikaperispomeni" xOffset="15"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilondialytikavaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilondialytikavaria.glif
index fa8dab42..1a40d318 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilondialytikavaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilondialytikavaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondialytikavaria" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="1FE2"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="482" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dialytikavaria" xOffset="-36"/>
+    <component base="dialytikavaria" xOffset="-57"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilondieresis.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilondieresis.glif
index 470ee818..e10a8c48 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilondieresis.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilondieresis.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondieresis" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="03CB"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="674" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dieresiscomb" xOffset="18"/>
+    <component base="dieresiscomb" xOffset="17"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilondieresistonos.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilondieresistonos.glif
index 178bbadc..738a4734 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilondieresistonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilondieresistonos.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilondieresistonos" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="03B0"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="482" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="dieresistonos" xOffset="15"/>
+    <component base="dieresistonos" xOffset="14"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilonmacron.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilonmacron.glif
index c1160b6b..81e4fada 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilonmacron.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilonmacron.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonmacron" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="1FE1"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="482" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="macron" xOffset="9"/>
+    <component base="macron" xOffset="-1"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilonoxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilonoxia.glif
index f9202d22..83cccc5c 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilonoxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilonoxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonoxia" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="1F7B"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="482" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="oxia" xOffset="146"/>
+    <component base="oxia" xOffset="145"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilonperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilonperispomeni.glif
index 61fc2369..a1a6d131 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilonperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilonperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonperispomeni" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="1FE6"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="641" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="perispomeni" xOffset="25"/>
+    <component base="perispomeni" xOffset="8"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilonpsili.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilonpsili.glif
index 94c967a6..99b1fc02 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilonpsili.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilonpsili.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonpsili" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="1F50"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="694" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="psili" xOffset="113"/>
+    <component base="psili" xOffset="112"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilonpsilioxia.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilonpsilioxia.glif
index dee6d04b..56b7b48b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilonpsilioxia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilonpsilioxia.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonpsilioxia" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="1F54"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="482" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="psilioxia" xOffset="35"/>
+    <component base="psilioxia" xOffset="34"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilonpsiliperispomeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilonpsiliperispomeni.glif
index 16094aa3..62c4d512 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilonpsiliperispomeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilonpsiliperispomeni.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonpsiliperispomeni" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="1F56"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="482" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="psiliperispomeni" xOffset="25"/>
+    <component base="psiliperispomeni" xOffset="8"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilonpsilivaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilonpsilivaria.glif
index 33fd4aec..e2076a4b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilonpsilivaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilonpsilivaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonpsilivaria" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="1F52"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="482" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="psilivaria" xOffset="35"/>
+    <component base="psilivaria" xOffset="34"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilontonos.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilontonos.glif
index 25051643..438e098b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilontonos.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilontonos.glif
@@ -1,12 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilontonos" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="03CD"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="482" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="tonos" xOffset="146"/>
+    <component base="tonos" xOffset="145"/>
   </outline>
   <lib>
     <dict>
@@ -14,8 +12,6 @@
       <string>upsilon</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>upsilon</string>
-      <key>public.markColor</key>
-      <string>0.67,0.95,0.38,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilonvaria.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilonvaria.glif
index 8b849127..93f1e58f 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilonvaria.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilonvaria.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonvaria" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="1F7A"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="482" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="varia" xOffset="96"/>
+    <component base="varia" xOffset="95"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/upsilonvrachy.glif 
b/src/Cantarell-Regular.ufo/glyphs/upsilonvrachy.glif
index eec8e8f6..4792f23b 100644
--- a/src/Cantarell-Regular.ufo/glyphs/upsilonvrachy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/upsilonvrachy.glif
@@ -1,17 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="upsilonvrachy" format="2">
-  <advance width="547"/>
+  <advance width="545"/>
   <unicode hex="1FE0"/>
-  <anchor x="251" y="0" name="bottom"/>
-  <anchor x="251" y="681" name="top"/>
   <outline>
     <component base="upsilon"/>
-    <component base="vrachy" xOffset="43"/>
+    <component base="vrachy" xOffset="42"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.85,0.26,0.06,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/varia.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/varia.case.glif
index bb395ec7..4a08c0c5 100644
--- a/src/Cantarell-Regular.ufo/glyphs/varia.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/varia.case.glif
@@ -11,8 +11,6 @@
       <string>varia</string>
       <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
       <string>varia</string>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/varia.glif b/src/Cantarell-Regular.ufo/glyphs/varia.glif
index 73d5a795..1c8c451e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/varia.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/varia.glif
@@ -6,10 +6,4 @@
   <outline>
     <component base="tonos" xScale="-1" xOffset="257"/>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/vrachy.case.glif 
b/src/Cantarell-Regular.ufo/glyphs/vrachy.case.glif
index 0997fdc7..c2565b08 100644
--- a/src/Cantarell-Regular.ufo/glyphs/vrachy.case.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/vrachy.case.glif
@@ -11,8 +11,6 @@
       <string>brevecomb.case</string>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>416</integer>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/vrachy.glif b/src/Cantarell-Regular.ufo/glyphs/vrachy.glif
index 9dd37e1b..9c3d520d 100644
--- a/src/Cantarell-Regular.ufo/glyphs/vrachy.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/vrachy.glif
@@ -13,8 +13,6 @@
       <string>brevecomb</string>
       <key>com.schriftgestaltung.Glyphs.originalWidth</key>
       <integer>414</integer>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/xi.glif b/src/Cantarell-Regular.ufo/glyphs/xi.glif
index a509df45..dc93f7b4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/xi.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/xi.glif
@@ -1,65 +1,63 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="xi" format="2">
-  <advance width="438"/>
+  <advance width="437"/>
   <unicode hex="03BE"/>
   <outline>
     <contour>
-      <point x="62" y="739" type="line"/>
-      <point x="62" y="672" type="line"/>
-      <point x="364" y="672" type="line"/>
-      <point x="345" y="691" type="line"/>
-      <point x="305" y="676" type="line" smooth="yes"/>
-      <point x="176" y="627"/>
-      <point x="84" y="564"/>
-      <point x="84" y="486" type="curve" smooth="yes"/>
-      <point x="84" y="417"/>
-      <point x="155" y="369"/>
-      <point x="235" y="368" type="curve"/>
-      <point x="237" y="374" type="line"/>
-      <point x="133" y="372"/>
-      <point x="48" y="292"/>
-      <point x="48" y="198" type="curve" smooth="yes"/>
-      <point x="48" y="90"/>
-      <point x="131" y="36"/>
-      <point x="239" y="4" type="curve" smooth="yes"/>
-      <point x="326" y="-22"/>
-      <point x="347" y="-42"/>
-      <point x="347" y="-83" type="curve" smooth="yes"/>
-      <point x="347" y="-119"/>
-      <point x="322" y="-148"/>
-      <point x="288" y="-187" type="curve"/>
-      <point x="336" y="-227" type="line"/>
-      <point x="390" y="-170"/>
-      <point x="424" y="-125"/>
-      <point x="424" y="-70" type="curve" smooth="yes"/>
-      <point x="424" y="7"/>
-      <point x="374" y="42"/>
-      <point x="273" y="71" type="curve" smooth="yes"/>
-      <point x="185" y="96"/>
-      <point x="128" y="135"/>
-      <point x="128" y="211" type="curve" smooth="yes"/>
-      <point x="128" y="286"/>
-      <point x="204" y="339"/>
-      <point x="293" y="339" type="curve" smooth="yes"/>
-      <point x="405" y="339" type="line"/>
-      <point x="405" y="406" type="line"/>
-      <point x="298" y="406" type="line" smooth="yes"/>
-      <point x="215" y="406"/>
-      <point x="164" y="445"/>
-      <point x="164" y="492" type="curve" smooth="yes"/>
-      <point x="164" y="547"/>
-      <point x="239" y="590"/>
-      <point x="354" y="644" type="curve" smooth="yes"/>
-      <point x="443" y="686" type="line"/>
-      <point x="443" y="739" type="line"/>
+      <point x="61" y="739" type="line"/>
+      <point x="61" y="672" type="line"/>
+      <point x="363" y="672" type="line"/>
+      <point x="344" y="691" type="line"/>
+      <point x="304" y="676" type="line" smooth="yes"/>
+      <point x="175" y="627"/>
+      <point x="83" y="564"/>
+      <point x="83" y="486" type="curve" smooth="yes"/>
+      <point x="83" y="417"/>
+      <point x="154" y="369"/>
+      <point x="234" y="368" type="curve"/>
+      <point x="236" y="374" type="line"/>
+      <point x="132" y="372"/>
+      <point x="47" y="292"/>
+      <point x="47" y="198" type="curve" smooth="yes"/>
+      <point x="47" y="90"/>
+      <point x="130" y="36"/>
+      <point x="238" y="4" type="curve" smooth="yes"/>
+      <point x="325" y="-22"/>
+      <point x="346" y="-42"/>
+      <point x="346" y="-83" type="curve" smooth="yes"/>
+      <point x="346" y="-119"/>
+      <point x="321" y="-148"/>
+      <point x="287" y="-187" type="curve"/>
+      <point x="335" y="-227" type="line"/>
+      <point x="389" y="-170"/>
+      <point x="423" y="-125"/>
+      <point x="423" y="-70" type="curve" smooth="yes"/>
+      <point x="423" y="7"/>
+      <point x="373" y="42"/>
+      <point x="272" y="71" type="curve" smooth="yes"/>
+      <point x="184" y="96"/>
+      <point x="127" y="135"/>
+      <point x="127" y="211" type="curve" smooth="yes"/>
+      <point x="127" y="286"/>
+      <point x="203" y="339"/>
+      <point x="292" y="339" type="curve" smooth="yes"/>
+      <point x="404" y="339" type="line"/>
+      <point x="404" y="406" type="line"/>
+      <point x="297" y="406" type="line" smooth="yes"/>
+      <point x="214" y="406"/>
+      <point x="163" y="445"/>
+      <point x="163" y="492" type="curve" smooth="yes"/>
+      <point x="163" y="547"/>
+      <point x="238" y="590"/>
+      <point x="353" y="644" type="curve" smooth="yes"/>
+      <point x="442" y="686" type="line"/>
+      <point x="442" y="739" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>=o-5</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/ypogegrammeni.glif 
b/src/Cantarell-Regular.ufo/glyphs/ypogegrammeni.glif
index 1c6fd2c2..ffd5fc8e 100644
--- a/src/Cantarell-Regular.ufo/glyphs/ypogegrammeni.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/ypogegrammeni.glif
@@ -23,10 +23,4 @@
       <point x="268" y="-74" type="line"/>
     </contour>
   </outline>
-  <lib>
-    <dict>
-      <key>public.markColor</key>
-      <string>0.97,1,0,1</string>
-    </dict>
-  </lib>
 </glyph>
diff --git a/src/Cantarell-Regular.ufo/glyphs/zeta.glif b/src/Cantarell-Regular.ufo/glyphs/zeta.glif
index 8f3f20a1..440295a4 100644
--- a/src/Cantarell-Regular.ufo/glyphs/zeta.glif
+++ b/src/Cantarell-Regular.ufo/glyphs/zeta.glif
@@ -1,49 +1,47 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <glyph name="zeta" format="2">
-  <advance width="437"/>
+  <advance width="436"/>
   <unicode hex="03B6"/>
   <outline>
     <contour>
-      <point x="128" y="235" type="curve" smooth="yes"/>
-      <point x="128" y="341"/>
-      <point x="220" y="435"/>
-      <point x="323" y="556" type="curve" smooth="yes"/>
-      <point x="437" y="690" type="line"/>
-      <point x="437" y="739" type="line"/>
-      <point x="50" y="739" type="line"/>
-      <point x="50" y="672" type="line"/>
-      <point x="358" y="672" type="line"/>
-      <point x="348" y="691" type="line"/>
-      <point x="254" y="585" type="line" smooth="yes"/>
-      <point x="146" y="464"/>
-      <point x="48" y="347"/>
-      <point x="48" y="225" type="curve" smooth="yes"/>
-      <point x="48" y="110"/>
-      <point x="123" y="57"/>
-      <point x="240" y="9" type="curve" smooth="yes"/>
-      <point x="327" y="-27"/>
-      <point x="350" y="-50"/>
-      <point x="350" y="-86" type="curve" smooth="yes"/>
-      <point x="350" y="-121"/>
-      <point x="326" y="-148"/>
-      <point x="292" y="-187" type="curve"/>
-      <point x="340" y="-227" type="line"/>
-      <point x="394" y="-170"/>
-      <point x="427" y="-125"/>
-      <point x="427" y="-72" type="curve" smooth="yes"/>
-      <point x="427" y="0"/>
-      <point x="375" y="29"/>
-      <point x="271" y="75" type="curve" smooth="yes"/>
-      <point x="177" y="117"/>
-      <point x="128" y="153"/>
+      <point x="127" y="235" type="curve" smooth="yes"/>
+      <point x="127" y="341"/>
+      <point x="219" y="435"/>
+      <point x="322" y="556" type="curve" smooth="yes"/>
+      <point x="436" y="690" type="line"/>
+      <point x="436" y="739" type="line"/>
+      <point x="49" y="739" type="line"/>
+      <point x="49" y="672" type="line"/>
+      <point x="357" y="672" type="line"/>
+      <point x="347" y="691" type="line"/>
+      <point x="253" y="585" type="line" smooth="yes"/>
+      <point x="145" y="464"/>
+      <point x="47" y="347"/>
+      <point x="47" y="225" type="curve" smooth="yes"/>
+      <point x="47" y="110"/>
+      <point x="122" y="57"/>
+      <point x="239" y="9" type="curve" smooth="yes"/>
+      <point x="326" y="-27"/>
+      <point x="349" y="-50"/>
+      <point x="349" y="-86" type="curve" smooth="yes"/>
+      <point x="349" y="-121"/>
+      <point x="325" y="-148"/>
+      <point x="291" y="-187" type="curve"/>
+      <point x="339" y="-227" type="line"/>
+      <point x="393" y="-170"/>
+      <point x="426" y="-125"/>
+      <point x="426" y="-72" type="curve" smooth="yes"/>
+      <point x="426" y="0"/>
+      <point x="374" y="29"/>
+      <point x="270" y="75" type="curve" smooth="yes"/>
+      <point x="176" y="117"/>
+      <point x="127" y="153"/>
     </contour>
   </outline>
   <lib>
     <dict>
       <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
       <string>=o-5</string>
-      <key>public.markColor</key>
-      <string>0.04,0.57,0.04,1</string>
     </dict>
   </lib>
 </glyph>


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