WIP of major overhaul of diacritics and general pre-release cleanup

1120 files changed, 13132 insertions, 15671 deletions

diff --git a/src/Inter-Italic.glyphspackage/fontinfo.plist b/src/Inter-Italic.glyphspackage/fontinfo.plist
index 2406c5908..a37627279 100644
--- a/src/Inter-Italic.glyphspackage/fontinfo.plist
+++ b/src/Inter-Italic.glyphspackage/fontinfo.plist
@@ -82,7 +82,7 @@ name = Lowercase;
 },
 {
 automatic = 1;
-code = "A Adieresis Atilde Agrave Aacute Acircumflex Aring Aringacute Aringogonek Amacron Abreve Aogonek Acaron Adieresismacron Adotmacron Adblgrave Ainvertedbreve uni0226 Aringbelow Adotbelow Ahookabove Acircumflexacute Acircumflexgrave Acircumflexhookabove Acircumflextilde Acircumflexdotbelow Abreveacute Abrevegrave Abrevehookabove Abrevetilde Abrevedotbelow Alpha Alphatonos uni1F08 uni1F09 uni1F0A uni1F0B uni1F0C uni1F0D uni1F0E uni1F0F uni1FB8 uni1FB9 uni1FBA uni023A uni1FBB afii10017 Abrevecyrillic Adieresiscyrillic uni1F88 uni1F89 uni1F8A uni1F8B uni1F8C uni1F8D uni1F8E uni1F8F uni1FBC Lambda AE AEmacron AEacute Aiecyrillic B Bdotaccent Bdotbelow Blinebelow uni0243 Bhook afii10019 Beta C Chook Ccedilla Cacute Ccircumflex Cdotaccent Ccaron Ccedillaacute uni023B Oopen uni03F9 D Dhook Dcaron Ddotaccent Ddotbelow Dlinebelow Dcedilla Dcircumflexbelow Dbar1 Dz Dzcaron_ E Egrave Eacute Ecircumflex Edieresis Emacron Ebreve Edotaccent Eogonek Ecaron Edblgrave Einvertedbreve uni0228 Emacrongrave Emacronacute Ecircumflexbelow Etildebelow Ecedillabreve Edotbelow Ehookabove Etilde Ecircumflexacute Ecircumflexgrave Ecircumflexhookabove Ecircumflextilde Ecircumflexdotbelow uni0246 Eturn Epsilon Epsilontonos uni1F18 uni1F19 uni1F1A uni1F1B uni1F1C uni1F1D uni1FC8 uni1FC9 afii10022 uni0400 afii10023 Iebrevecyrillic F Fhook Fdotaccent Fturn G Gbar Ghook Gcircumflex Gbreve Gdotaccent Gcommaaccent Gcaron Gacute Gmacron G.1 Gbar.1 Ghook.1 Gcircumflex.1 Gbreve.1 Gdotaccent.1 Gcommaaccent.1 Gcaron.1 Gacute.1 Gmacron.1 H Hcedilla Hcircumflex uni021E Hdotaccent Hdotbelow Hdieresis Hbrevebelow Hbar Enhookcyrillic Endescendercyrillic Entail-cy Enghecyrillic uni01F6 Eta Etatonos uni1F28 uni1F29 uni1F2A uni1F2B uni1F2C uni1F2D uni1F2E uni1F2F uni1FCA uni1FCB afii10031 uni1F98 uni1F99 uni1F9A uni1F9B uni1F9C uni1F9D uni1F9E uni1F9F uni1FCC I I.double Idieresis Idieresisacute Idieresis.double Istroke Itildebelow Igrave Iacute Icircumflex Itilde Imacron Ibreve Iogonek Idotaccent Icaron Idblgrave Iinvertedbreve Ihookabove Idotbelow Iota IotaGreek Iotatonos Iotadieresis uni1F38 uni1F39 uni1F3A uni1F3B uni1F3C uni1F3D uni1F3E uni1F3F uni1FD8 uni1FD9 uni1FDA uni1FDB afii10055 Yi-cy I.1 Idieresis.1 Idieresisacute.1 Istroke.1 Itildebelow.1 Igrave.1 Iacute.1 Icircumflex.1 Itilde.1 Imacron.1 Ibreve.1 Iogonek.1 Idotaccent.1 Icaron.1 Idblgrave.1 Iinvertedbreve.1 Ihookabove.1 Idotbelow.1 uni1F38.1 uni1F39.1 uni1F3A.1 uni1F3B.1 uni1F3C.1 uni1F3D.1 uni1F3E.1 uni1F3F.1 uni1FD8.1 uni1FD9.1 uni1FDA.1 uni1FDB.1 afii10055.1 Yi-cy.1 J Jcircumflex uni0248 uni037F afii10057 K Kcommaaccent Kcaron Kacute Kdotbelow Klinebelow Kabashkircyrillic Kadescendercyrillic Khook Kappa L Lacute Lcommaaccent Lcaron Ldotbelow Ldotbelowmacron Llinebelow Lcircumflexbelow Lslash Lbar Lj M Macute Mdotaccent Mdotbelow uni04CD Mu uni03FA afii10030 N Ntilde Nacute Ncommaaccent Ncaron uni01F8 Ndotaccent Ndotbelow Nlinebelow Ncircumflexbelow Nhook Eng Ii-cy uni040D afii10027 Imacroncyrillic Idieresiscyrillic uni048A uni0376 Nu Nj O Odieresis Otilde Oslash Ohorn Ograve Oacute Ocircumflex Omacron Obreve Ohungarumlaut Ocaron Oogonek Oogonekmacron Odblgrave Oinvertedbreve uni022A uni022C uni022E uni0230 Otildeacute Otildedieresis Omacrongrave Omacronacute Odotbelow Ohookabove Ocircumflexacute Ocircumflexgrave Ocircumflexhookabove Ocircumflextilde Ocircumflexdotbelow Ohornacute Ohorngrave Ohornhookabove Ohorntilde Ohorndotbelow Oslashacute Omicron Omicrontonos uni1F48 uni1F49 uni1F4A uni1F4B uni1F4C uni1F4D uni1FF8 uni03F4 uni1FF9 afii10032 Odieresiscyrillic Obar Obarredcyrillic Obarreddieresiscyrillic OE P Pacute Pdotaccent uni048E Phook Rho uni1FEC Q Q_rthook R Racute Rcommaaccent Rcaron Rdblgrave Rinvertedbreve Rdotaccent Rdotbelow Rdotbelowmacron Rlinebelow response Rx uni024C S Sacute Scircumflex Scedilla Scaron Scommaaccent Sdotaccent Sdotbelow Sacutedotaccent Scarondotaccent Sdotbelowdotaccent afii10054 Tonetwo Germandbls T Tcommaaccent Tcaron uni021A Tdotaccent Tdotbelow Tlinebelow Tcircumflexbelow Thook Thook.base Trthook uni023E Tau U Uhorn Ugrave Uacute Ucircumflex Udieresis Utilde Umacron Ubreve Uring Uhungarumlaut Uogonek Ucaron Udieresismacron Udieresisacute Udieresiscaron Udieresisgrave Udblgrave Uinvertedbreve Udieresisbelow Utildebelow Ucircumflexbelow Utildeacute Umacrondieresis Udotbelow Uhookabove Uhornacute Uhorngrave Uhornhookabove Uhorntilde Uhorndotbelow uni0244 V Vtilde Vdotbelow W Wcircumflex Wgrave Wacute Wdieresis Wdotaccent Wdotbelow X Xdotaccent Xdieresis Hadescendercyrillic uni04FC Chi Y Yhook Yacute Ycircumflex Ydieresis uni0232 Ydotaccent Ygrave Ydotbelow Yhookabove Ytilde uni024E Upsilon Upsilontonos Upsilondieresis uni1F59 uni1F5B uni1F5D uni1F5F uni1FE8 uni1FE9 uni1FEA uni1FEB Yogonek Z Zacute Zdotaccent Zcaron Zcircumflex Zdotbelow Zlinebelow Zhook Zbar Zeta uni2C7F a aacute abreve abreveacute abrevedotbelow abrevegrave abrevehookabove abrevetilde acaron acircumflex acircumflexacute acircumflexdotbelow acircumflexgrave acircumflexhookabove acircumflextilde adblgrave adieresis adieresismacron uni0227 adotbelow adotmacron agrave ahookabove ainvertedbreve amacron aogonek arighthalfring aring aringacute aringogonek aringbelow atilde aturn acyrillic abrevecyrillic adieresiscyrillic ae aemacron aeacute aiecyrillic a.1 aacute.1 abreve.1 abreveacute.1 abrevedotbelow.1 abrevegrave.1 abrevehookabove.1 abrevetilde.1 acaron.1 acircumflex.1 acircumflexacute.1 acircumflexdotbelow.1 acircumflexgrave.1 acircumflexhookabove.1 acircumflextilde.1 adblgrave.1 adieresis.1 adieresismacron.1 uni0227.1 adotbelow.1 adotmacron.1 agrave.1 ahookabove.1 ainvertedbreve.1 amacron.1 aogonek.1 arighthalfring.1 aring.1 aringacute.1 aringbelow.1 atilde.1 areversed.1 b bbar btopbar bhook bdotaccent bdotbelow blinebelow thorn c uni023C chook ccedilla cacute ccircumflex cdotaccent ccaron ccedillaacute sigmalunatesymbolgreek escyrillic d dcroat drthook dhook dtopbar dcurl dcaron ddotaccent ddotbelow dlinebelow dcedilla dcircumflexbelow dz dzaltone dzcaron dyogh dong e edieresis uni0247 egrave eacute ecircumflex emacron ebreve edotaccent eogonek ecaron edblgrave einvertedbreve uni0229 emacrongrave emacronacute ecircumflexbelow etildebelow ecedillabreve edotbelow ehookabove etilde ecircumflexacute ecircumflexgrave ecircumflexhookabove ecircumflextilde ecircumflexdotbelow iecyrillic uni0450 iocyrillic iebrevecyrillic eturn f longs slongstroke slongdotaccent fdotaccent feng g ghook gbar gcircumflex gbreve gdotaccent gcommaaccent gcaron gacute gmacron g.sc ghook.sc h hcedilla tshecyrillic djecyrillic hhook henghook hv hturn hturnlthook hturnhook2 hbar hcircumflex uni021F hdotaccent hdotbelow hdieresis hbrevebelow hlinebelow shhacyrillic i idotless idotless.double idieresis idieresisacute idieresis.double itilde itildebelow uni1E2D.ccmp ibar igrave iacute icircumflex imacron ibreve uni012F.ccmp iogonek icaron idblgrave iinvertedbreve ihookabove idotbelow uni1ECB.ccmp jdotless jdotlessbar uni0249 uni0249.ccmp icyrillic yi-cy ij i.sc j jcrosstail.ccmp jcrosstail jcircumflex jcaron yotgreek jecyrillic lj k khook kcommaaccent kcaron kacute kdotbelow klinebelow kturn k.base l lslash lbar lmidtilde lrthook lbelt lcurl ldot lacute lcommaaccent lcaron ldotbelow ldotbelowmacron llinebelow lcircumflexbelow l.ss02 lslash.ss02 lbar.ss02 lmidtilde.ss02 lbelt.ss02 ldot.ss02 lacute.ss02 lcommaaccent.ss02 lcaron.ss02 ldotbelow.ss02 ldotbelowmacron.ss02 llinebelow.ss02 lcircumflexbelow.ss02 uni04CF l.sc m mhook mturn mturndescend macute mdotaccent mdotbelow n ntilde nrthook eng ncurl nlfthook nlegrightlong nacute ncommaaccent ncaron uni01F9 ndotaccent ndotbelow nlinebelow ncircumflexbelow nj n.sc o odieresis otilde oslash ohorn ograve oacute ocircumflex omacron obreve ohungarumlaut ocaron oogonek oogonekmacron odblgrave oinvertedbreve uni022B uni022D uni022F uni0231 otildeacute otildedieresis omacrongrave omacronacute odotbelow ohookabove ocircumflexacute ocircumflexgrave ocircumflexhookabove ocircumflextilde ocircumflexdotbelow ohornacute ohorngrave ohornhookabove ohorntilde ohorndotbelow oslashacute omicron omicrontonos uni1F40 uni1F41 uni1F42 uni1F43 uni1F44 uni1F45 uni1F78 fitacyrillic obar ocyrillic odieresiscyrillic oe oe.sc ukcyrillic p uni048F phook pacute pdotaccent ercyrillic q qhook qrthook r rrthook uni024D rturn rturnrthook rfishhookrev rfishhook rdescend racute rcommaaccent rcaron rdblgrave rinvertedbreve rdotaccent rdotbelow rdotbelowmacron rlinebelow r.sc rinv.sc s srthook uni023F sacute scircumflex scedilla scaron scommaaccent sdotaccent sdotbelow sacutedotaccent scarondotaccent sdotbelowdotaccent dzecyrillic tonetwo germandbls germandbls.1 _part.t_base t t.1 tpalatalhook trthook _part.tcurl_base tcurl tccurl tturn tbar tcedilla tcaron tcommaaccent tdotaccent tdotbelow tlinebelow tcircumflexbelow tdieresis u udieresis utilde uhorn micro ubar ugrave uacute ucircumflex umacron ubreve uring uhungarumlaut uogonek ucaron udieresismacron udieresisacute udieresiscaron udieresisgrave udblgrave uinvertedbreve udieresisbelow utildebelow ucircumflexbelow utildeacute umacrondieresis udotbelow uhookabove uhornacute uhorngrave uhornhookabove uhorntilde uhorndotbelow v vturn vtilde vdotbelow w wdieresis wturn wcircumflex wgrave wacute wdotaccent wdotbelow wring x xdotaccent xdieresis khacyrillic chi y ydieresis yhook uni024F yacute ycircumflex uni0233 ydotaccent yring ygrave ydotbelow yhookabove ytilde ucyrillic ushortcyrillic umacroncyrillic udieresiscyrillic uhungarumlautcyrillic yturn Umacroncyrillic Udieresiscyrillic Uhungarumlautcyrillic yogonek y.sc z zbar zhook uni0240 zrthook zacute zdotaccent zcaron zcircumflex zdotbelow zlinebelow Thorn Gamma Delta Theta Xi Pi Sigma Phi Psi Omega uni1FFB Omegatonos uni1F68 uni1F69 uni1F6A uni1F6B uni1F6C uni1F6D uni1F6E uni1F6F uni1FFA uni1FA8 uni1FA9 uni1FAA uni1FAB uni1FAC uni1FAD uni1FAE uni1FAF uni1FFC Upsilon2 Upsilonhooksymbol Upsilonacutehooksymbolgreek Upsilondieresishooksymbolgreek Gamma1 afii10018 afii10050 uni04FA afii10021 afii10024 Zhedescendercyrillic afii10025 Kacyr Kaverticalstrokecyrillic Kahookcyrillic afii10029 afii10147 afii10145 afii10037 afii10038 afii10040 Tetsecyrillic Che-cy Chedescendercyrillic Cheverticalstrokecyrillic Shhacyrillic Sha-cy Shcha-cy afii10044 afii10045 Softsign-cy afii10058 afii10059 afii10047 afii10048 afii10049 Ghemiddlehookcyrillic Pemiddlehookcyrillic afii10053 Haabkhasiancyrillic Cheabkhasiancyrillic Schwacyrillic Dzeabkhasiancyrillic afii10148 afii10051 eth alpha alphatonos uni1F00 uni1F01 uni1F02 uni1F03 uni1F04 uni1F05 uni1F06 uni1F07 uni1F70 uni1F80 uni1F81 uni1F82 uni1F83 uni1F84 uni1F85 uni1F86 uni1F87 uni1FB0 uni1FB1 uni1FB2 uni1FB3 uni1FB4 uni1FB6 uni1FB7 beta gamma delta epsilon epsilontonos epsilonclosed epsilon1 epsilon1rev epsilon1revclosed epsilon1revhook uni1F10 uni1F11 uni1F12 uni1F13 uni1F14 uni1F15 uni1F72 zeta eta etatonos uni1F20 uni1F21 uni1F22 uni1F23 uni1F24 uni1F25 uni1F26 uni1F27 uni1F74 uni1F90 uni1F91 uni1F92 uni1F93 uni1F94 uni1F95 uni1F96 uni1F97 uni1FC2 uni1FC3 uni1FC4 uni1FC6 uni1FC7 theta iota iotadieresistonos iotatonos iotadieresis uni1F30 uni1F31 uni1F32 uni1F33 uni1F34 uni1F35 uni1F36 uni1F37 uni1F76 uni1FD0 uni1FD1 uni1FD2 uni1FD6 uni1FD7 lambda xi pi rho uni1FE4 uni1FE5 uni03FC sigma1 sigma tau upsilon upsilondieresistonos upsilondieresis upsilontonos uni1F50 uni1F51 uni1F52 uni1F53 uni1F54 uni1F55 uni1F56 uni1F57 uni1F7A uni1FE0 uni1FE1 uni1FE2 uni1FE6 uni1FE7 phi phigreek psi omega omegatonos uni1F60 uni1F61 uni1F62 uni1F63 uni1F64 uni1F65 uni1F66 uni1F67 uni1F7C uni1FA0 uni1FA1 uni1FA2 uni1FA3 uni1FA4 uni1FA5 uni1FA6 uni1FA7 uni1FF2 uni1FF3 uni1FF4 uni1FF6 uni1FF7 gamma1 becyrillic vecyrillic ge-cy gheupturncyrillic uni04FB decyrillic zhecyrillic zhedescendercyrillic zecyrillic iicyrillic uni048B kacyrillic kahookcyrillic kadescendercyrillic kaverticalstrokecyrillic kabashkircyrillic elcyrillic uni04C6 eldescender-cy emcyrillic uni04CE encyrillic endescendercyrillic enghecyrillic enhookcyrillic uni04CA pecyrillic tecyrillic efcyrillic hahook-cy hadescendercyrillic tsecyrillic dzhecyrillic checyrillic chedescendercyrillic cheverticalstrokecyrillic shacyrillic shchacyrillic softsigncyrillic hardsigncyrillic yericyrillic semisoftsign-cy yatcyrillic ljecyrillic njecyrillic ereversedcyrillic iucyrillic iacyrillic ghemiddlehookcyrillic pemiddlehookcyrillic ecyrillic haabkhasiancyrillic tetsecyrillic cheabkhasiancyrillic dzeabkhasiancyrillic izhitsacyrillic dollar cent yen sterling florin uni20BA uni20BD euro uni20B9 tenge peseta peso kip won lira austral hryvnia naira guarani coloncurrency cedi cruzeiro tugrik uni20AF mill afii57636 manat rupee lari franc baht bitcoin zero one two twostroke three four five Tonefive six seven eight nine zero.slash one.ss01 three.1 four.ss01 six.ss01 nine.ss01 zero.tf one.tf two.tf three.tf four.tf five.tf six.tf seven.tf eight.tf nine.tf zero.tf.slash one.tf.ss01 three.1.tf four.tf.ss01 six.tf.ss01 nine.tf.ss01 ampersand etTironian exclam exclamdbl exclamdown uni2049 question uni2047 uni2048 questiondown interrobang invertedinterrobang parenleft parenright bracketleft bracketleft_quill bracketright bracketright_quill braceleft braceright at parenleft.case parenright.case bracketleft.case bracketright.case braceleft.case braceright.case at.case numbersign currency slash bar brokenbar backslash hyphen softhyphen endash figuredash emdash horizontalbar bullet openbullet hyphenbullet trianglebullet blackleftbullet blackrightbullet blackSmallSquare hyphen.case endash.case figuredash.case emdash.case bullet.case openbullet.case hyphenbullet.case trianglebullet.case blackleftbullet.case blackrightbullet.case blackSmallSquare.case quoteleft quoteright quotesingle quotedbl quotedblleft quotedblright quotedblbase quotesinglbase quotereversed quotedblreversed prime doubleprime tripleprime quadrupleprime primerev doubleprimerev tripleprimerev primemod doubleprimemod comma period ellipsis twodotleader colon colon.case ratio semicolon comma.tf period.tf colon.tf semicolon.tf periodcentered anoteleia questiongreek guilsinglleft guilsinglright guillemetleft guillemetright less greater lessequal greaterequal equal notequal plus minus multiply divide plusminus approxequal asciitilde less.case greater.case lessequal.case greaterequal.case equal.case notequal.case plus.case minus.case multiply.case divide.case plusminus.case approxequal.case asciitilde.case logicalnot underscore dagger daggerdbl asciicircum asterisk asterisk.case registered copyright copyleft published trademark servicemark tel uni213B uni1F16B uni1F16A degree ordfeminine ordmasculine i.numr n.numr paragraph paragraphreversed section infinity partialdiff summation product integral radical emptyset lozenge a.sups b.sups c.sups d.sups e.sups f.sups g.sups h.sups i.sups j.sups k.sups l.sups m.sups n.sups o.sups p.sups q.sups r.sups s.sups t.sups u.sups v.sups w.sups x.sups y.sups z.sups zero.sups one.sups two.sups three.sups four.sups five.sups six.sups seven.sups eight.sups nine.sups parenleft.sups parenright.sups bracketleft.sups bracketright.sups plus.sups minus.sups equal.sups a.subs b.subs c.subs d.subs e.subs f.subs g.subs h.subs i.subs j.subs k.subs l.subs m.subs n.subs o.subs p.subs q.subs r.subs s.subs t.subs u.subs v.subs w.subs x.subs y.subs z.subs zero.subs one.subs two.subs three.subs four.subs five.subs six.subs seven.subs eight.subs nine.subs parenleft.subs parenright.subs bracketleft.subs bracketright.subs plus.subs minus.subs equal.subs fraction zero.dnom one.dnom two.dnom three.dnom four.dnom five.dnom six.dnom seven.dnom eight.dnom nine.dnom plus.dnom minus.dnom equal.dnom parenleft.dnom parenright.dnom zero.numr one.numr two.numr three.numr four.numr five.numr six.numr seven.numr eight.numr nine.numr plus.numr minus.numr equal.numr parenleft.numr parenright.numr onefraction onehalf zerothird onethird twothirds onequarter threequarters onefifth twofifths threefifths fourfifths onesixth fivesixths oneseventh oneeighth threeeighths fiveeighths seveneighths oneninth onetenth percent perthousand pertenthousand uni214D cadauna careof accountof addresssubject acute hungarumlaut grave tonos dieresis dieresis.three circumflex tilde casetilde.cn macron breve cyrillicbreve dotaccent ring ring.uc caron dieresistonos cedilla ogonek commaaccent acutecomb acutedblnosp gravecomb dblgravecmb macroncomb dieresisnosp brevenosp breveinvnosp hookabovecmb circumflexnosp caroncmb tildecomb dotnosp ringnosp hornnosp ogoneknosp cedillanosp circumflexsubnosp brevesubnosp dotbelow commabelowcmb dotdblsubnosp ringsubnosp underscorenosp tildesubnosp space nbspace narrownbspace mediumspace-math enquad emquad enspace emspace thirdemspace quarteremspace sixthemspace figurespace punctuationspace thinspace hairspace zerowidthspace numero degreecentigrade degreefarenheit degreekelvin angstrom bullseye estimated leftArrow leftLongArrow leftLongArrow2 leftDoubleArrow leftLongDoubleArrow rightArrow rightLongArrow rightLongArrow2 rightDoubleArrow rightLongDoubleArrow northWestArrow northEastArrow southEastArrow southWestArrow leftRightArrow leftRightLongArrow leftRightDoubleArrow leftRightLongDoubleArrow upArrow downArrow upDownArrow leftHookArrow rightHookArrow leftArrow.case leftLongArrow.case leftLongArrow2.case leftDoubleArrow.case leftLongDoubleArrow.case rightArrow.case rightLongArrow.case rightLongArrow2.case rightDoubleArrow.case rightLongDoubleArrow.case leftRightArrow.case leftRightLongArrow.case leftRightDoubleArrow.case leftRightLongDoubleArrow.case dngb_check dngb_ballotx triagdn triagup blackleftpointingtriangle triagrt downWhiteTriangle upWhiteTriangle leftWhiteTriangle rightWhiteTriangle warningSign circleblack circlewhite blackSquare whiteSquare whiteRoundedCornersSquare lowerHalfWhiteSquare topHalfWhiteSquare diamondblack diamondblack_x diamondwhite diamondwhite_x sunWithRays blackSunWithRays heartWhiteSuit heartBlackSuit heavyBlackHeart blackstar whitestar upBlackArrow upWhiteArrow capslock placeofinterestsign control projective insertionsymbol option alternativekeysymbol brokenCircleNorthWestArrow anticlockwiseOpenCircleArrow clockwiseOpenCircleArrow deleteleft deleteright clear ejectsymbol returnsymbol carriagereturn downTipRightArrow upTipLeftArrow upTipRightArrow rightCornerDownArrow arrowtableft arrowtabright pageup pagedown largeCircle whiteLargeSquare enclosingcirclecomb enclosingsquarecomb A.circled B.circled C.circled D.circled E.circled F.circled G.circled H.circled I.circled J.circled K.circled L.circled M.circled N.circled O.circled P.circled Q.circled R.circled S.circled T.circled U.circled V.circled W.circled X.circled Y.circled Z.circled zero.circled one.circled two.circled three.circled four.circled five.circled six.circled seven.circled eight.circled nine.circled zero.slash.circled one.ss01.circled three.1.circled four.ss01.circled six.ss01.circled nine.ss01.circled exclam.circled question.circled numbersign.circled hyphen.circled less.circled greater.circled equal.circled plus.circled minus.circled fraction.circled multiply.circled divide.circled upArrow.circled downArrow.circled leftArrow.circled rightArrow.circled dngb_check.circled dngb_ballotx.circled A.squared B.squared C.squared D.squared E.squared F.squared G.squared G.1.squared H.squared I.squared J.squared K.squared L.squared M.squared N.squared O.squared P.squared Q.squared R.squared S.squared T.squared U.squared V.squared W.squared X.squared Y.squared Z.squared zero.squared one.squared two.squared three.squared four.squared five.squared six.squared seven.squared eight.squared nine.squared zero.slash.squared one.ss01.squared three.1.squared four.ss01.squared six.ss01.squared nine.ss01.squared exclam.squared question.squared numbersign.squared hyphen.squared less.squared greater.squared equal.squared plus.squared minus.squared fraction.squared multiply.squared divide.squared upArrow.squared downArrow.squared leftArrow.squared rightArrow.squared dngb_check.squared dngb_ballotx.squared Btopbar DZ Eth Dcroat Dtopbar Epsilon1 Esh Schwa Ezh Ezhcaron Ezhreversed uni021C IJ LJ Ldot NJ OI Tbar Tonesix Vcursive YR mcapturn uni01F7 uni0220 uni0222 uni0241 uni0245 uni1EFA uni1EFC uni1EFE ascript ascriptturn babygamma cstretch deltaturn erev esh eshcurl eshlooprev schwa schwahook ezh ezhcaron ezhcurl ezhreversed ezhtail finalkaf finalmem gcursive glottalstop glottalstopbar glottalstopbarinv glottalstopbarrev glottalstopinv glottalstoprevinv uni021D jhookdblbar kgreenlandic lambdabar lyogh oi omegaclosed oopen philatin rturnascend tesh thook tonefive tonesix ts uni0223 uni0238 uni0239 uni0242 uni0299 uni02AB uni02AC uni1E9D uni1E9F uni1EFB uni1EFD uni1EFF uni2184 upsilonlatin vscript wynn h.sc m.sc t.sc uni2094 Rturnsuper finaltsadi hhooksuper rturnsuper exclam1 pipe pipedbl pipedblbar uniA7FF Ge-cy afii10052 uni04F6 Ghestrokecyrillic afii10061 Pe-cy afii10034 afii10035 Te-cy afii10062 afii10039 Tshe-cy Omegacyrillic afii10146 Eiotifiedcyrillic Yuslittlecyrillic Yuslittleiotifiedcyrillic Yusbigcyrillic Yusbigiotifiedcyrillic Ksicyrillic Psicyrillic Izhitsadblgravecyrillic Ukcyrillic Zedescendercyrillic Esdescendercyrillic Tedescendercyrillic Ustraightcyrillic Ustraightstrokecyrillic Chedescenderabkhasiancyrillic palochkacyrillic Zhebrevecyrillic Eltail-cy Chekhakassiancyrillic Schwadieresiscyrillic Zhedieresiscyrillic Zedieresiscyrillic uni04EC Chedieresiscyrillic Yerudieresiscyrillic uni04FE Koppacyrillic uni048C Pe-cy.turn gjecyrillic gedescender-cy ghestrokecyrillic iishortcyrillic uni045D kjecyrillic omegacyrillic eiotifiedcyrillic yuslittlecyrillic yuslittleiotifiedcyrillic yusbigcyrillic yusbigiotifiedcyrillic ksicyrillic psicyrillic izhitsadblgravecyrillic zedescendercyrillic esdescendercyrillic tedescendercyrillic ustraightcyrillic ustraightstrokecyrillic chedescenderabkhasiancyrillic zhebrevecyrillic chekhakassiancyrillic schwacyrillic schwadieresiscyrillic zhedieresiscyrillic zedieresiscyrillic imacroncyrillic idieresiscyrillic obarredcyrillic obarreddieresiscyrillic edieresis-cy chedieresiscyrillic yerudieresiscyrillic uni04FF koppacyrillic uni0370 uni0372 uni03D8 Stigma Digamma Koppa Sampi uni03CF uni03F7 uni03FD uni03FE uni03FF kappa mugreek nu uni0371 uni0373 uni0377 uni037B uni037C uni037D uni03D9 stigma digamma koppa sampi uni03D7 beta1 thetasymbolgreek pisymbolgreek kappa1 rho1 uni03F5 uni03F8 uni03FB uni1F71 uni1F73 uni1F75 uni1F77 uni1FD3 uni1F79 uni1F7B uni1FE3 uni1F7D uni1FBE ypogegrammeni uni1DBF romanone romantwo romanthree romanfour romanfive romansix romanseven romaneight romannine romanten romaneleven romantwelve romanfifty romanhundred romanfivehundred romanthousand oneroman tworoman threeroman fourroman fiveroman sixroman sevenroman eightroman nineroman tenroman elevenroman twelveroman uni217C uni217D uni217E uni217F uni2180 uni2181 uni2182 uni2183 uni2185 uni2186 uni2187 uni2188 zerowidthjoiner uniA92E uni27EF asterism caretSign caretinsertionpoint charactertie hyphendot onedotleader overline referencemark reversedsemicolon undertie uni204E uni2050 uni2051 uni2053 uni2054 uni2055 uni2056 uni2058 uni2059 uni205A uni205B uni205C uni205D uni205E verticalbardbl hyphen__ hyphennobreak underscoredbl gammasuper thousandcyrillic numeralgreek numeralgreeksub uni03F6 arrowheaddownmod arrowheadleftmod arrowheadrightmod arrowheadupmod dblapostrophe downtackmod lowdownarrowheadmod minusmod plusmod ringhalfleftcentered ringhalfrightcentered uni02EC uni02ED uni02F0 uni02F1 uni02F2 uni02F3 uni02F4 uni02F5 uni02F6 uni02F7 uni02F8 uni02F9 uni02FA uni02FB uni02FC uni02FD uni02FE uni02FF uptackmod tonebarextrahighmod.cn tonebarextralowmod.cn tonebarhighmod.cn tonebarlowmod.cn tonebarmidmod.cn qofdagesh rhotichookmod glottalstopreversed.numr lsquare spaceopenbox uni214F versicle eurocurrency uni20B0 uni20B6 uni20B7 uni20BB commercialMinusSign uni0363 uni0364 uni0365 uni0366 uni0367 uni0368 uni0369 uni036A uni036B uni036C uni036D uni036E uni036F uni1DCA uni1DD3 uni1DD4 uni1DD5 uni1DD6 uni1DD7 uni1DD8 uni1DD9 uni1DDA uni1DDB uni1DDC uni1DDD uni1DDE uni1DDF uni1DE0 uni1DE1 uni1DE2 uni1DE3 uni1DE4 uni1DE5 uni1DE6 uni1DE7 uni1DE9 uni0488 uni0489 titlocyrilliccmb palatalizationcyrilliccmb dasiapneumatacyrilliccmb psilipneumatacyrilliccmb uni0487 uniA69F perispomenigreekcmb koroniscmb diaeresistonosnosp iotasubnosp uni1FBF uni1FBD uni1FFE uni1FCD uni1FDD uni1FCE uni1FDE uni1FCF uni1FDF uni1FED uni1FEE uni1FC1 uni1FEF uni1FFD uni1FC0 uniFE20 uniFE21 uniFE27 uniFE28 overscorenosp linevertnosp linevertdblnosp candrabindunosp commaturnsupnosp commaabovecmb commasuprevnosp commaaboverightcmb gravesubnosp acutesubnosp tackleftsubnosp tackrightsubnosp anglesupnosp ringlefthalfsubnosp tackupsubnosp tackdownsubnosp hooksubpalatnosp hooksubretronosp linevertsubnosp bridgesubnosp archdblsubnosp caronbelowcmb breveinvsubnosp macronsubnosp underscoredblnosp tildemidnosp barmidshortnosp barmidlongnosp slashshortnosp slashshortcomb slashlongnosp ringrighthalfsubnosp bridgeinvsubnosp squaresubnosp seagullsubnosp xsupnosp tildevertsupnosp overscoredblnosp graveleftnosp acuterightnosp uni0346 equalbelowcomb uni0348 uni0349 uni034A uni034B uni034C uni034D uni034E uni034F arrowheadrightabovecomb uni0351 uni0352 uni0353 uni0354 uni0355 uni0356 uni0357 uni0358 uni0359 uni035A uni035B uni035C uni035D uni035E uni035F tildedoublecmb breveinverteddoublecmb uni0362 uni1DC0 uni1DC1 uni1DC2 uni1DC3 uni1DC4 uni1DC5 uni1DC6 uni1DC7 uni1DC8 uni1DC9 uni1DCB uni1DCC uni1DCD uni1DCE uni1DCF uni1DD0 uni1DD1 uni1DD2 uni1DE8 uni1DEA uni1DEB uni1DEC uni1DED uni1DEE uni1DEF uni1DF0 uni1DF1 uni1DF2 uni1DF3 uni1DF4 uni1DF5 uni1DFC uni1DFD uni1DFE uni1DFF uni20DB uni20DC uni20E8 uni20F0 uniFE22 uniFE23 uniFE24 uniFE25 uniFE26 uniFE29 uniFE2A uniFE2B uniFE2C uniFE2D slashshortcomb.uc firsttonechinese secondtonechinese fourthtonechinese uni02EA uni02EB ogonek.A ogonek.O ogonek.U ogonek.a ogonek.e ogonek.o ogonek.y acutelowmod colontriangularhalfmod colontriangularmod commareversedmod commaturnedmod glottalstopmod glottalstopreversedmod gravelowmod linevert macronsub ringhalfleft ringhalfright verticallinelowmod uni2DFF uni0268.ccmp uni2071.ccmp uni02B2.ccmp macronacutecomb.cn macrongravecomb.cn macronacutecomb.lc macrongravecomb.lc uni1FFE.tonos uni1FCD.tonos uni1FDD.tonos uni1FCE.tonos uni1FDE.tonos uni1FCF.tonos uni1FDF.tonos uni1FEF.tonos uni1FFD.tonos crossbar acutedotcomb.lc tildedieresiscomb.lc dieresisacutecomb.lc carondotcomb.lc caronnosp caronsubnosp ascript_uni02DE dotmacroncomb.lc dieresismacroncomb.lc dieresisgravecomb.lc largerighthook tildemacroncomb.lc macrondieresiscomb.lc tildeacutecomb dieresiscaroncomb.lc _part.cyrtic_hook ringacute.cn circumflexgravecomb.cn dieresiscaroncomb.cn dieresismacroncomb.cn carondotcomb.cn breveacutecomb.cn acutedotcomb.cn brevegravecomb.cn tildedieresiscomb.cn circumflexhookcomb.cn brevetildecomb.cn dieresisacutecomb.cn dotmacroncomb.cn macrondieresiscomb.cn dieresisgravecomb.cn tildemacroncomb.cn circumflextildecomb.cn brevehookcomb.cn commaaccentrotate.cn tonostop tildeacutecomb.uc circumflexacutecomb.cn pecyrillicturn _part.crossbar_compact _part.crossbar_compact_rext _part.crossbar_vert _part.cyrtail _part.cyrtic _part.cyrtic_center _tildecross.cn commaaccentright.cn koronisaccentleft.cn";
+code = "A Adieresis Atilde Agrave Aacute Acircumflex Aring Aringacute Aringogonek Amacron Abreve Aogonek Acaron Adieresismacron Adotmacron Adblgrave Ainvertedbreve uni0226 Aringbelow Adotbelow Ahookabove Acircumflexacute Acircumflexgrave Acircumflexhookabove Acircumflextilde Acircumflexdotbelow Abreveacute Abrevegrave Abrevehookabove Abrevetilde Abrevedotbelow Alpha Alphatonos uni1F08 uni1F09 uni1F0A uni1F0B uni1F0C uni1F0D uni1F0E uni1F0F uni1FB8 uni1FB9 uni1FBA uni023A uni1FBB afii10017 Abrevecyrillic Adieresiscyrillic uni1F88 uni1F89 uni1F8A uni1F8B uni1F8C uni1F8D uni1F8E uni1F8F uni1FBC Lambda AE AEmacron AEacute Aiecyrillic B Bdotaccent Bdotbelow Blinebelow uni0243 Bhook afii10019 Beta C Chook Ccedilla Cacute Ccircumflex Cdotaccent Ccaron Ccedillaacute uni023B Oopen uni03F9 D Dhook Dcaron Ddotaccent Ddotbelow Dlinebelow Dcedilla Dcircumflexbelow Dbar1 Dz Dzcaron_ E Egrave Eacute Ecircumflex Edieresis Emacron Ebreve Edotaccent Eogonek Ecaron Edblgrave Einvertedbreve uni0228 Emacrongrave Emacronacute Ecircumflexbelow Etildebelow Ecedillabreve Edotbelow Ehookabove Etilde Ecircumflexacute Ecircumflexgrave Ecircumflexhookabove Ecircumflextilde Ecircumflexdotbelow uni0246 Eturn Epsilon Epsilontonos uni1F18 uni1F19 uni1F1A uni1F1B uni1F1C uni1F1D uni1FC8 uni1FC9 afii10022 uni0400 afii10023 Iebrevecyrillic F Fhook Fdotaccent Fturn G Gbar Ghook Gcircumflex Gbreve Gdotaccent Gcommaaccent Gcaron Gacute Gmacron G.1 Gbar.1 Ghook.1 Gcircumflex.1 Gbreve.1 Gdotaccent.1 Gcommaaccent.1 Gcaron.1 Gacute.1 Gmacron.1 H Hcedilla Hcircumflex uni021E Hdotaccent Hdotbelow Hdieresis Hbrevebelow Hbar Enhookcyrillic Endescendercyrillic Entail-cy Enghecyrillic uni01F6 Eta Etatonos uni1F28 uni1F29 uni1F2A uni1F2B uni1F2C uni1F2D uni1F2E uni1F2F uni1FCA uni1FCB afii10031 uni1F98 uni1F99 uni1F9A uni1F9B uni1F9C uni1F9D uni1F9E uni1F9F uni1FCC I I.double Idieresis Idieresisacute Idieresis.double Istroke Itildebelow Igrave Iacute Icircumflex Itilde Imacron Ibreve Iogonek Idotaccent Icaron Idblgrave Iinvertedbreve Ihookabove Idotbelow Iota IotaGreek Iotatonos Iotadieresis uni1F38 uni1F39 uni1F3A uni1F3B uni1F3C uni1F3D uni1F3E uni1F3F uni1FD8 uni1FD9 uni1FDA uni1FDB afii10055 Yi-cy I.1 Idieresis.1 Idieresisacute.1 Istroke.1 Itildebelow.1 Igrave.1 Iacute.1 Icircumflex.1 Itilde.1 Imacron.1 Ibreve.1 Iogonek.1 Idotaccent.1 Icaron.1 Idblgrave.1 Iinvertedbreve.1 Ihookabove.1 Idotbelow.1 uni1F38.1 uni1F39.1 uni1F3A.1 uni1F3B.1 uni1F3C.1 uni1F3D.1 uni1F3E.1 uni1F3F.1 uni1FD8.1 uni1FD9.1 uni1FDA.1 uni1FDB.1 afii10055.1 Yi-cy.1 J Jcircumflex uni0248 uni037F afii10057 K Kcommaaccent Kcaron Kacute Kdotbelow Klinebelow Kabashkircyrillic Kadescendercyrillic Khook Kappa L Lacute Lcommaaccent Lcaron Ldotbelow Ldotbelowmacron Llinebelow Lcircumflexbelow Lslash Lbar Lj M Macute Mdotaccent Mdotbelow uni04CD Mu uni03FA afii10030 N Ntilde Nacute Ncommaaccent Ncaron uni01F8 Ndotaccent Ndotbelow Nlinebelow Ncircumflexbelow Nhook Eng Ii-cy uni040D afii10027 Imacroncyrillic Idieresiscyrillic uni048A uni0376 Nu Nj O Odieresis Otilde Oslash Ohorn Ograve Oacute Ocircumflex Omacron Obreve Ohungarumlaut Ocaron Oogonek Oogonekmacron Odblgrave Oinvertedbreve uni022A uni022C uni022E uni0230 Otildeacute Otildedieresis Omacrongrave Omacronacute Odotbelow Ohookabove Ocircumflexacute Ocircumflexgrave Ocircumflexhookabove Ocircumflextilde Ocircumflexdotbelow Ohornacute Ohorngrave Ohornhookabove Ohorntilde Ohorndotbelow Oslashacute Omicron Omicrontonos uni1F48 uni1F49 uni1F4A uni1F4B uni1F4C uni1F4D uni1FF8 uni03F4 uni1FF9 afii10032 Odieresiscyrillic Obar Obarredcyrillic Obarreddieresiscyrillic OE P Pacute Pdotaccent uni048E Phook Rho uni1FEC Q Q_rthook R Racute Rcommaaccent Rcaron Rdblgrave Rinvertedbreve Rdotaccent Rdotbelow Rdotbelowmacron Rlinebelow response Rx uni024C S Sacute Scircumflex Scedilla Scaron Scommaaccent Sdotaccent Sdotbelow Sacutedotaccent Scarondotaccent Sdotbelowdotaccent afii10054 Tonetwo Germandbls T Tcommaaccent Tcaron uni021A Tdotaccent Tdotbelow Tlinebelow Tcircumflexbelow Thook Thook.base Trthook uni023E Tau U Uhorn Ugrave Uacute Ucircumflex Udieresis Utilde Umacron Ubreve Uring Uhungarumlaut Uogonek Ucaron Udieresismacron Udieresisacute Udieresiscaron Udieresisgrave Udblgrave Uinvertedbreve Udieresisbelow Utildebelow Ucircumflexbelow Utildeacute Umacrondieresis Udotbelow Uhookabove Uhornacute Uhorngrave Uhornhookabove Uhorntilde Uhorndotbelow uni0244 V Vtilde Vdotbelow W Wcircumflex Wgrave Wacute Wdieresis Wdotaccent Wdotbelow X Xdotaccent Xdieresis Hadescendercyrillic uni04FC Chi Y Yhook Yacute Ycircumflex Ydieresis uni0232 Ydotaccent Ygrave Ydotbelow Yhookabove Ytilde uni024E Upsilon Upsilontonos Upsilondieresis uni1F59 uni1F5B uni1F5D uni1F5F uni1FE8 uni1FE9 uni1FEA uni1FEB Yogonek Z Zacute Zdotaccent Zcaron Zcircumflex Zdotbelow Zlinebelow Zhook Zbar Zeta uni2C7F a aacute abreve abreveacute abrevedotbelow abrevegrave abrevehookabove abrevetilde acaron acircumflex acircumflexacute acircumflexdotbelow acircumflexgrave acircumflexhookabove acircumflextilde adblgrave adieresis adieresismacron uni0227 adotbelow adotmacron agrave ahookabove ainvertedbreve amacron aogonek arighthalfring aring aringacute aringogonek aringbelow atilde aturn acyrillic abrevecyrillic adieresiscyrillic ae aemacron aeacute aiecyrillic a.1 aacute.1 abreve.1 abreveacute.1 abrevedotbelow.1 abrevegrave.1 abrevehookabove.1 abrevetilde.1 acaron.1 acircumflex.1 acircumflexacute.1 acircumflexdotbelow.1 acircumflexgrave.1 acircumflexhookabove.1 acircumflextilde.1 adblgrave.1 adieresis.1 adieresismacron.1 uni0227.1 adotbelow.1 adotmacron.1 agrave.1 ahookabove.1 ainvertedbreve.1 amacron.1 aogonek.1 arighthalfring.1 aring.1 aringacute.1 aringbelow.1 atilde.1 areversed.1 b bbar btopbar bhook bdotaccent bdotbelow blinebelow thorn c uni023C chook ccedilla cacute ccircumflex cdotaccent ccaron ccedillaacute sigmalunatesymbolgreek escyrillic d dcroat drthook dhook dtopbar dcurl dcaron ddotaccent ddotbelow dlinebelow dcedilla dcircumflexbelow dz dzaltone dzcaron dyogh dong e edieresis uni0247 egrave eacute ecircumflex emacron ebreve edotaccent eogonek ecaron edblgrave einvertedbreve uni0229 emacrongrave emacronacute ecircumflexbelow etildebelow ecedillabreve edotbelow ehookabove etilde ecircumflexacute ecircumflexgrave ecircumflexhookabove ecircumflextilde ecircumflexdotbelow iecyrillic uni0450 iocyrillic iebrevecyrillic eturn f longs slongstroke slongdotaccent fdotaccent feng g ghook gbar gcircumflex gbreve gdotaccent gcommaaccent gcaron gacute gmacron g.sc ghook.sc h hcedilla tshecyrillic djecyrillic hhook henghook hv hturn hturnlthook hturnhook2 hbar hcircumflex uni021F hdotaccent hdotbelow hdieresis hbrevebelow hlinebelow shhacyrillic i idotless idotless.double idieresis idieresisacute idieresis.double itilde itildebelow uni1E2D.ccmp ibar igrave iacute icircumflex imacron ibreve uni012F.ccmp iogonek icaron idblgrave iinvertedbreve ihookabove idotbelow uni1ECB.ccmp jdotless jdotlessbar uni0249 uni0249.ccmp icyrillic yi-cy ij i.sc j jcrosstail.ccmp jcrosstail jcircumflex jcaron yotgreek jecyrillic lj k khook kcommaaccent kcaron kacute kdotbelow klinebelow kturn k.base l lslash lbar lmidtilde lrthook lbelt lcurl ldot lacute lcommaaccent lcaron ldotbelow ldotbelowmacron llinebelow lcircumflexbelow l.ss02 lslash.ss02 lbar.ss02 lmidtilde.ss02 lbelt.ss02 ldot.ss02 lacute.ss02 lcommaaccent.ss02 lcaron.ss02 ldotbelow.ss02 ldotbelowmacron.ss02 llinebelow.ss02 lcircumflexbelow.ss02 uni04CF l.sc m mhook mturn mturndescend macute mdotaccent mdotbelow n ntilde nrthook eng ncurl nlfthook nlegrightlong nacute ncommaaccent ncaron uni01F9 ndotaccent ndotbelow nlinebelow ncircumflexbelow nj n.sc o odieresis otilde oslash ohorn ograve oacute ocircumflex omacron obreve ohungarumlaut ocaron oogonek oogonekmacron odblgrave oinvertedbreve uni022B uni022D uni022F uni0231 otildeacute otildedieresis omacrongrave omacronacute odotbelow ohookabove ocircumflexacute ocircumflexgrave ocircumflexhookabove ocircumflextilde ocircumflexdotbelow ohornacute ohorngrave ohornhookabove ohorntilde ohorndotbelow oslashacute omicron omicrontonos uni1F40 uni1F41 uni1F42 uni1F43 uni1F44 uni1F45 uni1F78 fitacyrillic obar ocyrillic odieresiscyrillic oe oe.sc ukcyrillic p uni048F phook pacute pdotaccent ercyrillic q qhook qrthook r rrthook uni024D rturn rturnrthook rfishhookrev rfishhook rdescend racute rcommaaccent rcaron rdblgrave rinvertedbreve rdotaccent rdotbelow rdotbelowmacron rlinebelow r.sc rinv.sc s srthook uni023F sacute scircumflex scedilla scaron scommaaccent sdotaccent sdotbelow sacutedotaccent scarondotaccent sdotbelowdotaccent dzecyrillic tonetwo germandbls germandbls.1 _part.t_base t t.1 tpalatalhook trthook _part.tcurl_base tcurl tccurl tturn tbar tcedilla tcaron tcommaaccent tdotaccent tdotbelow tlinebelow tcircumflexbelow tdieresis u udieresis utilde uhorn micro ubar ugrave uacute ucircumflex umacron ubreve uring uhungarumlaut uogonek ucaron udieresismacron udieresisacute udieresiscaron udieresisgrave udblgrave uinvertedbreve udieresisbelow utildebelow ucircumflexbelow utildeacute umacrondieresis udotbelow uhookabove uhornacute uhorngrave uhornhookabove uhorntilde uhorndotbelow v vturn vtilde vdotbelow w wdieresis wturn wcircumflex wgrave wacute wdotaccent wdotbelow wring x xdotaccent xdieresis khacyrillic chi y ydieresis yhook uni024F yacute ycircumflex uni0233 ydotaccent yring ygrave ydotbelow yhookabove ytilde ucyrillic ushortcyrillic umacroncyrillic udieresiscyrillic uhungarumlautcyrillic yturn Umacroncyrillic Udieresiscyrillic Uhungarumlautcyrillic yogonek y.sc z zbar zhook uni0240 zrthook zacute zdotaccent zcaron zcircumflex zdotbelow zlinebelow Thorn Gamma Delta Theta Xi Pi Sigma Phi Psi Omega uni1FFB Omegatonos uni1F68 uni1F69 uni1F6A uni1F6B uni1F6C uni1F6D uni1F6E uni1F6F uni1FFA uni1FA8 uni1FA9 uni1FAA uni1FAB uni1FAC uni1FAD uni1FAE uni1FAF uni1FFC Upsilon2 Upsilonhooksymbol Upsilonacutehooksymbolgreek Upsilondieresishooksymbolgreek Gamma1 afii10018 afii10050 uni04FA afii10021 afii10024 Zhedescendercyrillic afii10025 Kacyr Kaverticalstrokecyrillic Kahookcyrillic afii10029 afii10147 afii10145 afii10037 afii10038 afii10040 Tetsecyrillic Che-cy Chedescendercyrillic Cheverticalstrokecyrillic Shhacyrillic Sha-cy Shcha-cy afii10044 afii10045 Softsign-cy afii10058 afii10059 afii10047 afii10048 afii10049 Ghemiddlehookcyrillic Pemiddlehookcyrillic afii10053 Haabkhasiancyrillic Cheabkhasiancyrillic Schwacyrillic Dzeabkhasiancyrillic afii10148 afii10051 eth alpha alphatonos uni1F00 uni1F01 uni1F02 uni1F03 uni1F04 uni1F05 uni1F06 uni1F07 uni1F70 uni1F80 uni1F81 uni1F82 uni1F83 uni1F84 uni1F85 uni1F86 uni1F87 uni1FB0 uni1FB1 uni1FB2 uni1FB3 uni1FB4 uni1FB6 uni1FB7 beta gamma delta epsilon epsilontonos epsilonclosed epsilon1 epsilon1rev epsilon1revclosed epsilon1revhook uni1F10 uni1F11 uni1F12 uni1F13 uni1F14 uni1F15 uni1F72 zeta eta etatonos uni1F20 uni1F21 uni1F22 uni1F23 uni1F24 uni1F25 uni1F26 uni1F27 uni1F74 uni1F90 uni1F91 uni1F92 uni1F93 uni1F94 uni1F95 uni1F96 uni1F97 uni1FC2 uni1FC3 uni1FC4 uni1FC6 uni1FC7 theta iota iotadieresistonos iotatonos iotadieresis uni1F30 uni1F31 uni1F32 uni1F33 uni1F34 uni1F35 uni1F36 uni1F37 uni1F76 uni1FD0 uni1FD1 uni1FD2 uni1FD6 uni1FD7 lambda xi pi rho uni1FE4 uni1FE5 uni03FC sigma1 sigma tau upsilon upsilondieresistonos upsilondieresis upsilontonos uni1F50 uni1F51 uni1F52 uni1F53 uni1F54 uni1F55 uni1F56 uni1F57 uni1F7A uni1FE0 uni1FE1 uni1FE2 uni1FE6 uni1FE7 phi phigreek psi omega omegatonos uni1F60 uni1F61 uni1F62 uni1F63 uni1F64 uni1F65 uni1F66 uni1F67 uni1F7C uni1FA0 uni1FA1 uni1FA2 uni1FA3 uni1FA4 uni1FA5 uni1FA6 uni1FA7 uni1FF2 uni1FF3 uni1FF4 uni1FF6 uni1FF7 gamma1 becyrillic vecyrillic ge-cy gheupturncyrillic uni04FB decyrillic zhecyrillic zhedescendercyrillic zecyrillic iicyrillic uni048B kacyrillic kahookcyrillic kadescendercyrillic kaverticalstrokecyrillic kabashkircyrillic elcyrillic uni04C6 eldescender-cy emcyrillic uni04CE encyrillic endescendercyrillic enghecyrillic enhookcyrillic uni04CA pecyrillic tecyrillic efcyrillic hahook-cy hadescendercyrillic tsecyrillic dzhecyrillic checyrillic chedescendercyrillic cheverticalstrokecyrillic shacyrillic shchacyrillic softsigncyrillic hardsigncyrillic yericyrillic semisoftsign-cy yatcyrillic ljecyrillic njecyrillic ereversedcyrillic iucyrillic iacyrillic ghemiddlehookcyrillic pemiddlehookcyrillic ecyrillic haabkhasiancyrillic tetsecyrillic cheabkhasiancyrillic dzeabkhasiancyrillic izhitsacyrillic dollar cent yen sterling florin uni20BA uni20BD euro uni20B9 tenge peseta peso kip won lira austral hryvnia naira guarani coloncurrency cedi cruzeiro tugrik uni20AF mill afii57636 manat rupee lari franc baht bitcoin zero one two twostroke three four five Tonefive six seven eight nine zero.slash one.ss01 three.1 four.ss01 six.ss01 nine.ss01 zero.tf one.tf two.tf three.tf four.tf five.tf six.tf seven.tf eight.tf nine.tf zero.tf.slash one.tf.ss01 three.1.tf four.tf.ss01 six.tf.ss01 nine.tf.ss01 ampersand etTironian exclam exclamdbl exclamdown uni2049 question uni2047 uni2048 questiondown interrobang invertedinterrobang parenleft parenright bracketleft bracketleft_quill bracketright bracketright_quill braceleft braceright at parenleft.case parenright.case bracketleft.case bracketright.case braceleft.case braceright.case at.case numbersign currency slash bar brokenbar backslash hyphen softhyphen endash figuredash emdash horizontalbar bullet openbullet hyphenbullet trianglebullet blackleftbullet blackrightbullet blackSmallSquare hyphen.case endash.case figuredash.case emdash.case bullet.case openbullet.case hyphenbullet.case trianglebullet.case blackleftbullet.case blackrightbullet.case blackSmallSquare.case quoteleft quoteright quotesingle quotedbl quotedblleft quotedblright quotedblbase quotesinglbase quotereversed quotedblreversed prime doubleprime tripleprime quadrupleprime primerev doubleprimerev tripleprimerev primemod doubleprimemod comma period ellipsis twodotleader colon colon.case ratio semicolon comma.tf period.tf colon.tf semicolon.tf periodcentered anoteleia questiongreek guilsinglleft guilsinglright guillemetleft guillemetright less greater lessequal greaterequal equal notequal plus minus multiply divide plusminus approxequal asciitilde less.case greater.case lessequal.case greaterequal.case equal.case notequal.case plus.case minus.case multiply.case divide.case plusminus.case approxequal.case asciitilde.case logicalnot underscore dagger daggerdbl asciicircum asterisk asterisk.case registered copyright copyleft published trademark servicemark tel uni213B uni1F16B uni1F16A degree ordfeminine ordmasculine i.numr n.numr paragraph paragraphreversed section infinity partialdiff summation product integral radical emptyset lozenge a.sups b.sups c.sups d.sups e.sups f.sups g.sups h.sups i.sups j.sups k.sups l.sups m.sups n.sups o.sups p.sups q.sups r.sups s.sups t.sups u.sups v.sups w.sups x.sups y.sups z.sups zero.sups one.sups two.sups three.sups four.sups five.sups six.sups seven.sups eight.sups nine.sups parenleft.sups parenright.sups bracketleft.sups bracketright.sups plus.sups minus.sups equal.sups a.subs b.subs c.subs d.subs e.subs f.subs g.subs h.subs i.subs j.subs k.subs l.subs m.subs n.subs o.subs p.subs q.subs r.subs s.subs t.subs u.subs v.subs w.subs x.subs y.subs z.subs zero.subs one.subs two.subs three.subs four.subs five.subs six.subs seven.subs eight.subs nine.subs parenleft.subs parenright.subs bracketleft.subs bracketright.subs plus.subs minus.subs equal.subs fraction zero.dnom one.dnom two.dnom three.dnom four.dnom five.dnom six.dnom seven.dnom eight.dnom nine.dnom plus.dnom minus.dnom equal.dnom parenleft.dnom parenright.dnom zero.numr one.numr two.numr three.numr four.numr five.numr six.numr seven.numr eight.numr nine.numr plus.numr minus.numr equal.numr parenleft.numr parenright.numr onefraction onehalf zerothird onethird twothirds onequarter threequarters onefifth twofifths threefifths fourfifths onesixth fivesixths oneseventh oneeighth threeeighths fiveeighths seveneighths oneninth onetenth percent perthousand pertenthousand uni214D cadauna careof accountof addresssubject acute hungarumlaut grave tonos dieresis dieresis.three circumflex tilde macron breve cyrillicbreve dotaccent ring ring.uc caron dieresistonos cedilla ogonek commaaccent acutecomb acutedblnosp gravecomb dblgravecmb macroncomb dieresisnosp brevenosp breveinvnosp hookabovecmb circumflexnosp caroncmb tildecomb dotnosp ringnosp hornnosp ogoneknosp cedillanosp circumflexsubnosp brevesubnosp dotbelow commabelowcmb dotdblsubnosp ringsubnosp underscorenosp tildesubnosp space nbspace narrownbspace mediumspace-math enquad emquad enspace emspace thirdemspace quarteremspace sixthemspace figurespace punctuationspace thinspace hairspace zerowidthspace numero degreecentigrade degreefarenheit degreekelvin angstrom bullseye estimated leftArrow leftLongArrow leftLongArrow2 leftDoubleArrow leftLongDoubleArrow rightArrow rightLongArrow rightLongArrow2 rightDoubleArrow rightLongDoubleArrow northWestArrow northEastArrow southEastArrow southWestArrow leftRightArrow leftRightLongArrow leftRightDoubleArrow leftRightLongDoubleArrow upArrow downArrow upDownArrow leftHookArrow rightHookArrow leftArrow.case leftLongArrow.case leftLongArrow2.case leftDoubleArrow.case leftLongDoubleArrow.case rightArrow.case rightLongArrow.case rightLongArrow2.case rightDoubleArrow.case rightLongDoubleArrow.case leftRightArrow.case leftRightLongArrow.case leftRightDoubleArrow.case leftRightLongDoubleArrow.case dngb_check dngb_ballotx triagdn triagup blackleftpointingtriangle triagrt downWhiteTriangle upWhiteTriangle leftWhiteTriangle rightWhiteTriangle warningSign circleblack circlewhite blackSquare whiteSquare whiteRoundedCornersSquare lowerHalfWhiteSquare topHalfWhiteSquare diamondblack diamondblack_x diamondwhite diamondwhite_x sunWithRays blackSunWithRays heartWhiteSuit heartBlackSuit heavyBlackHeart blackstar whitestar upBlackArrow upWhiteArrow capslock placeofinterestsign control projective insertionsymbol option alternativekeysymbol brokenCircleNorthWestArrow anticlockwiseOpenCircleArrow clockwiseOpenCircleArrow deleteleft deleteright clear ejectsymbol returnsymbol carriagereturn downTipRightArrow upTipLeftArrow upTipRightArrow rightCornerDownArrow arrowtableft arrowtabright pageup pagedown largeCircle whiteLargeSquare enclosingcirclecomb enclosingsquarecomb A.circled B.circled C.circled D.circled E.circled F.circled G.circled H.circled I.circled J.circled K.circled L.circled M.circled N.circled O.circled P.circled Q.circled R.circled S.circled T.circled U.circled V.circled W.circled X.circled Y.circled Z.circled zero.circled one.circled two.circled three.circled four.circled five.circled six.circled seven.circled eight.circled nine.circled zero.slash.circled one.ss01.circled three.1.circled four.ss01.circled six.ss01.circled nine.ss01.circled exclam.circled question.circled numbersign.circled hyphen.circled less.circled greater.circled equal.circled plus.circled minus.circled fraction.circled multiply.circled divide.circled upArrow.circled downArrow.circled leftArrow.circled rightArrow.circled dngb_check.circled dngb_ballotx.circled A.squared B.squared C.squared D.squared E.squared F.squared G.squared G.1.squared H.squared I.squared J.squared K.squared L.squared M.squared N.squared O.squared P.squared Q.squared R.squared S.squared T.squared U.squared V.squared W.squared X.squared Y.squared Z.squared zero.squared one.squared two.squared three.squared four.squared five.squared six.squared seven.squared eight.squared nine.squared zero.slash.squared one.ss01.squared three.1.squared four.ss01.squared six.ss01.squared nine.ss01.squared exclam.squared question.squared numbersign.squared hyphen.squared less.squared greater.squared equal.squared plus.squared minus.squared fraction.squared multiply.squared divide.squared upArrow.squared downArrow.squared leftArrow.squared rightArrow.squared dngb_check.squared dngb_ballotx.squared Btopbar DZ Eth Dcroat Dtopbar Epsilon1 Esh Schwa Ezh Ezhcaron Ezhreversed uni021C IJ LJ Ldot NJ OI Tbar Tonesix Vcursive YR mcapturn uni01F7 uni0220 uni0222 uni0241 uni0245 uni1EFA uni1EFC uni1EFE ascript ascriptturn babygamma cstretch deltaturn erev esh eshcurl eshlooprev schwa schwahook ezh ezhcaron ezhcurl ezhreversed ezhtail finalkaf finalmem gcursive glottalstop glottalstopbar glottalstopbarinv glottalstopbarrev glottalstopinv glottalstoprevinv uni021D jhookdblbar kgreenlandic lambdabar lyogh oi omegaclosed oopen philatin rturnascend tesh thook tonefive tonesix ts uni0223 uni0238 uni0239 uni0242 uni0299 uni02AB uni02AC uni1E9D uni1E9F uni1EFB uni1EFD uni1EFF uni2184 upsilonlatin vscript wynn h.sc m.sc t.sc uni2094 Rturnsuper finaltsadi hhooksuper rturnsuper exclam1 pipe pipedbl pipedblbar uniA7FF Ge-cy afii10052 uni04F6 Ghestrokecyrillic afii10061 Pe-cy afii10034 afii10035 Te-cy afii10062 afii10039 Tshe-cy Omegacyrillic afii10146 Eiotifiedcyrillic Yuslittlecyrillic Yuslittleiotifiedcyrillic Yusbigcyrillic Yusbigiotifiedcyrillic Ksicyrillic Psicyrillic Izhitsadblgravecyrillic Ukcyrillic Zedescendercyrillic Esdescendercyrillic Tedescendercyrillic Ustraightcyrillic Ustraightstrokecyrillic Chedescenderabkhasiancyrillic palochkacyrillic Zhebrevecyrillic Eltail-cy Chekhakassiancyrillic Schwadieresiscyrillic Zhedieresiscyrillic Zedieresiscyrillic uni04EC Chedieresiscyrillic Yerudieresiscyrillic uni04FE Koppacyrillic uni048C Pe-cy.turn gjecyrillic gedescender-cy ghestrokecyrillic iishortcyrillic uni045D kjecyrillic omegacyrillic eiotifiedcyrillic yuslittlecyrillic yuslittleiotifiedcyrillic yusbigcyrillic yusbigiotifiedcyrillic ksicyrillic psicyrillic izhitsadblgravecyrillic zedescendercyrillic esdescendercyrillic tedescendercyrillic ustraightcyrillic ustraightstrokecyrillic chedescenderabkhasiancyrillic zhebrevecyrillic chekhakassiancyrillic schwacyrillic schwadieresiscyrillic zhedieresiscyrillic zedieresiscyrillic imacroncyrillic idieresiscyrillic obarredcyrillic obarreddieresiscyrillic edieresis-cy chedieresiscyrillic yerudieresiscyrillic uni04FF koppacyrillic uni0370 uni0372 uni03D8 Stigma Digamma Koppa Sampi uni03CF uni03F7 uni03FD uni03FE uni03FF kappa mugreek nu uni0371 uni0373 uni0377 uni037B uni037C uni037D uni03D9 stigma digamma koppa sampi uni03D7 beta1 thetasymbolgreek pisymbolgreek kappa1 rho1 uni03F5 uni03F8 uni03FB uni1F71 uni1F73 uni1F75 uni1F77 uni1FD3 uni1F79 uni1F7B uni1FE3 uni1F7D uni1FBE ypogegrammeni uni1DBF romanone romantwo romanthree romanfour romanfive romansix romanseven romaneight romannine romanten romaneleven romantwelve romanfifty romanhundred romanfivehundred romanthousand oneroman tworoman threeroman fourroman fiveroman sixroman sevenroman eightroman nineroman tenroman elevenroman twelveroman uni217C uni217D uni217E uni217F uni2180 uni2181 uni2182 uni2183 uni2185 uni2186 uni2187 uni2188 zerowidthjoiner uniA92E uni27EF asterism caretSign caretinsertionpoint charactertie hyphendot onedotleader overline referencemark reversedsemicolon undertie uni204E uni2050 uni2051 uni2053 uni2054 uni2055 uni2056 uni2058 uni2059 uni205A uni205B uni205C uni205D uni205E verticalbardbl hyphen__ hyphennobreak underscoredbl gammasuper thousandcyrillic numeralgreek numeralgreeksub uni03F6 arrowheaddownmod arrowheadleftmod arrowheadrightmod arrowheadupmod dblapostrophe downtackmod lowdownarrowheadmod minusmod plusmod ringhalfleftcentered ringhalfrightcentered uni02EC uni02ED uni02F0 uni02F1 uni02F2 uni02F3 uni02F4 uni02F5 uni02F6 uni02F7 uni02F8 uni02F9 uni02FA uni02FB uni02FC uni02FD uni02FE uni02FF uptackmod tonebarextrahighmod.cn tonebarextralowmod.cn tonebarhighmod.cn tonebarlowmod.cn tonebarmidmod.cn qofdagesh rhotichookmod glottalstopreversed.numr lsquare spaceopenbox uni214F versicle eurocurrency uni20B0 uni20B6 uni20B7 uni20BB commercialMinusSign uni0363 uni0364 uni0365 uni0366 uni0367 uni0368 uni0369 uni036A uni036B uni036C uni036D uni036E uni036F uni1DCA uni1DD3 uni1DD4 uni1DD5 uni1DD6 uni1DD7 uni1DD8 uni1DD9 uni1DDA uni1DDB uni1DDC uni1DDD uni1DDE uni1DDF uni1DE0 uni1DE1 uni1DE2 uni1DE3 uni1DE4 uni1DE5 uni1DE6 uni1DE7 uni1DE9 uni0488 uni0489 titlocyrilliccmb palatalizationcyrilliccmb dasiapneumatacyrilliccmb psilipneumatacyrilliccmb uni0487 uniA69F perispomenigreekcmb koroniscmb diaeresistonosnosp iotasubnosp uni1FBF uni1FBD uni1FFE uni1FCD uni1FDD uni1FCE uni1FDE uni1FCF uni1FDF uni1FED uni1FEE uni1FC1 uni1FEF uni1FFD uni1FC0 uniFE20 uniFE21 uniFE27 uniFE28 overscorenosp linevertnosp linevertdblnosp candrabindunosp commaturnsupnosp commaabovecmb commasuprevnosp commaaboverightcmb gravesubnosp acutesubnosp tackleftsubnosp tackrightsubnosp anglesupnosp ringlefthalfsubnosp tackupsubnosp tackdownsubnosp hooksubpalatnosp hooksubretronosp linevertsubnosp bridgesubnosp archdblsubnosp caronbelowcmb breveinvsubnosp macronsubnosp underscoredblnosp tildemidnosp barmidshortnosp barmidlongnosp slashshortnosp slashshortcomb slashlongnosp ringrighthalfsubnosp bridgeinvsubnosp squaresubnosp seagullsubnosp xsupnosp tildevertsupnosp overscoredblnosp graveleftnosp acuterightnosp uni0346 equalbelowcomb uni0348 uni0349 uni034A uni034B uni034C uni034D uni034E uni034F arrowheadrightabovecomb uni0351 uni0352 uni0353 uni0354 uni0355 uni0356 uni0357 uni0358 uni0359 uni035A uni035B uni035C uni035D uni035E uni035F tildedoublecmb breveinverteddoublecmb uni0362 uni1DC0 uni1DC1 uni1DC2 uni1DC3 uni1DC4 uni1DC5 uni1DC6 uni1DC7 uni1DC8 uni1DC9 uni1DCB uni1DCC uni1DCD uni1DCE uni1DCF uni1DD0 uni1DD1 uni1DD2 uni1DE8 uni1DEA uni1DEB uni1DEC uni1DED uni1DEE uni1DEF uni1DF0 uni1DF1 uni1DF2 uni1DF3 uni1DF4 uni1DF5 uni1DFC uni1DFD uni1DFE uni1DFF uni20DB uni20DC uni20E8 uni20F0 uniFE22 uniFE23 uniFE24 uniFE25 uniFE26 uniFE29 uniFE2A uniFE2B uniFE2C uniFE2D slashshortcomb.uc firsttonechinese secondtonechinese fourthtonechinese uni02EA uni02EB ogonek.A ogonek.O ogonek.U ogonek.a ogonek.e ogonek.o ogonek.y acutelowmod colontriangularhalfmod colontriangularmod commareversedmod commaturnedmod glottalstopmod glottalstopreversedmod gravelowmod linevert macronsub ringhalfleft ringhalfright verticallinelowmod uni2DFF uni0268.ccmp uni2071.ccmp uni02B2.ccmp macronacutecomb.cn macrongravecomb.cn macronacutecomb.lc macrongravecomb.lc uni1FFE.tonos uni1FCD.tonos uni1FDD.tonos uni1FCE.tonos uni1FDE.tonos uni1FCF.tonos uni1FDF.tonos uni1FEF.tonos uni1FFD.tonos acutedotcomb.lc tildedieresiscomb.lc dieresisacutecomb.lc carondotcomb.lc caronnosp caronsubnosp ascript_uni02DE dotmacroncomb.lc dieresismacroncomb.lc dieresisgravecomb.lc largerighthook tildemacroncomb.lc macrondieresiscomb.lc tildeacute.lc dieresiscaroncomb.lc _part.cyrtic_hook ringacute.cn circumflexgravecomb.cn dieresiscaroncomb.uc dieresismacroncomb.uc carondotcomb.cn breveacutecomb.cn acutedotcomb.cn brevegravecomb.cn tildedieresiscomb.cn circumflexhookcomb.cn brevetildecomb.cn dieresisacutecomb.uc dotmacroncomb.uc macrondieresiscomb.cn dieresisgravecomb.uc tildemacroncomb.cn circumflextildecomb.cn brevehookcomb.cn commaaccentrotate.cn tonostop tildeacutecomb.uc circumflexacutecomb.cn pecyrillicturn crossbar crossbar_left_long _part.crossbar_compact _part.crossbar_compact_rext _part.crossbar_vert _part.cyrtail _part.cyrtic _part.cyrtic_center _tildecross.cn breveinv.cn commaaccentright.cn koronisaccentleft.cn";
 name = All;
 }
 );
@@ -2656,9 +2656,6 @@ Location = 14;
 );
 guides = (
 {
-pos = (0,2758);
-},
-{
 locked = 1;
 name = "Cap height";
 pos = (0,1490);
@@ -2806,9 +2803,6 @@ Location = 32;
 );
 guides = (
 {
-pos = (0,2758);
-},
-{
 locked = 1;
 name = "Cap height";
 pos = (0,1490);
@@ -2950,9 +2944,6 @@ Location = 14;
 );
 guides = (
 {
-pos = (0,2758);
-},
-{
 locked = 1;
 name = "Cap center";
 pos = (0,745);
@@ -3098,9 +3089,6 @@ Location = 32;
 );
 guides = (
 {
-pos = (0,2758);
-},
-{
 locked = 1;
 name = "Top anchors";
 pos = (0,1262);
@@ -9398,7 +9386,6 @@ underscore = -69;
 "@MMK_R_Dcroat" = 69;
 "@MMK_R_idblgrave" = 200;
 "@MMK_R_idieresis" = 170;
-"@MMK_R_idotless" = 30;
 Dcroat = 69;
 Istroke = 69;
 };
@@ -12818,7 +12805,6 @@ underscore = -69;
 "@MMK_R_f" = 10;
 "@MMK_R_idblgrave" = 69;
 "@MMK_R_idieresis" = 151;
-"@MMK_R_idotless" = 140;
 "@MMK_R_parenright" = 69;
 "@MMK_R_t" = 10;
 Dcroat = 69;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_dieresismacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_dieresismacron.glyph
index 263f1f7fc..a718ff278 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_dieresismacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_dieresismacron.glyph
@@ -11,7 +11,7 @@ ref = A;
 },
 {
 pos = (1290,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1386;
@@ -24,7 +24,7 @@ ref = A;
 },
 {
 pos = (1489,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1630;
@@ -37,7 +37,7 @@ ref = A;
 },
 {
 pos = (1203,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1262;
@@ -50,7 +50,7 @@ ref = A;
 },
 {
 pos = (1291,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1338;
@@ -63,7 +63,7 @@ ref = A;
 },
 {
 pos = (1456,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1536;
@@ -76,7 +76,7 @@ ref = A;
 },
 {
 pos = (1203,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_dotmacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_dotmacron.glyph
index 5d392d313..b5f5effa1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_dotmacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_dotmacron.glyph
@@ -11,7 +11,7 @@ ref = A;
 },
 {
 pos = (1310,0);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 1386;
@@ -24,7 +24,7 @@ ref = A;
 },
 {
 pos = (1510,0);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 1630;
@@ -37,7 +37,7 @@ ref = A;
 },
 {
 pos = (1201,0);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 1262;
@@ -50,7 +50,7 @@ ref = A;
 },
 {
 pos = (1311,0);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 1338;
@@ -63,7 +63,7 @@ ref = A;
 },
 {
 pos = (1478,0);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 1536;
@@ -76,7 +76,7 @@ ref = A;
 },
 {
 pos = (1199,0);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_invertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_invertedbreve.glyph
index 5d4d62cbb..6c23315de 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_invertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1411,372);
+pos = (1382,558);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1517,372);
+pos = (1570,558);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1287,372);
+pos = (1308,558);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1392,414);
+pos = (1333,620);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1476,414);
+pos = (1521,620);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1314,466);
+pos = (1199,620);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_tilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_tilde.glyph
index 68a1b179f..2a1882127 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_tilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (234,0);
-ref = casetilde.cn;
+pos = (243,372);
+ref = tilde;
 }
 );
 width = 1386;
@@ -23,8 +23,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (300,0);
-ref = casetilde.cn;
+pos = (365,372);
+ref = tilde;
 }
 );
 width = 1630;
@@ -36,8 +36,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (208,0);
-ref = casetilde.cn;
+pos = (184,372);
+ref = tilde;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (246,0);
-ref = casetilde.cn;
+pos = (257,414);
+ref = tilde;
 }
 );
 width = 1338;
@@ -62,8 +62,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (274,0);
-ref = casetilde.cn;
+pos = (324,414);
+ref = tilde;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (212,0);
-ref = casetilde.cn;
+pos = (193,414);
+ref = tilde;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_.circled.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_.circled.glyph
index 4563c6bf9..023d74325 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_.circled.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_.circled.glyph
@@ -9,7 +9,7 @@ alignment = 1;
 ref = largeCircle;
 },
 {
-pos = (692,0);
+pos = (693,0);
 ref = D;
 }
 );
@@ -65,7 +65,7 @@ alignment = 1;
 ref = largeCircle;
 },
 {
-pos = (672,0);
+pos = (674,0);
 ref = D;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_.glyph
index e5115fb92..9b9c3e5f6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_.glyph
@@ -8,19 +8,19 @@ layers = (
 anchors = (
 {
 name = _center;
-pos = (765.792,745);
+pos = (766,745);
 },
 {
 name = bottom;
-pos = (436,0);
+pos = (529,0);
 },
 {
 name = cross;
-pos = (340,768);
+pos = (304,768);
 },
 {
 name = top;
-pos = (990,1676);
+pos = (770,1490);
 },
 {
 name = topl;
@@ -28,41 +28,42 @@ pos = (334,1490);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(1007,0,o),
-(1303,276,o),
-(1378,736,cs),
-(1457,1204,o),
-(1242,1490,o),
-(808,1490,cs),
+(1033,0,o),
+(1304,282,o),
+(1381,748,cs),
+(1457,1210,o),
+(1224,1490,o),
+(790,1490,cs),
 (428,1490,l),
-(402,1330,l),
-(782,1330,ls),
-(1132,1330,o),
-(1268,1114,o),
-(1208,760,cs),
-(1146,390,o),
-(928,160,o),
-(558,160,cs),
-(216,160,l),
-(190,0,l),
-(552,0,ls)
+(401,1330,l),
+(775,1330,ls),
+(1125,1330,o),
+(1266,1108,o),
+(1207,748,cs),
+(1147,384,o),
+(931,160,o),
+(561,160,cs),
+(215,160,l),
+(189,0,l),
+(579,0,ls)
 );
 },
 {
 closed = 1;
 nodes = (
 (334,1490,l),
-(88,0,l),
-(268,0,l),
+(87,0,l),
+(267,0,l),
 (514,1490,l)
 );
 }
 );
-width = 1471;
+width = 1472;
 },
 {
 anchors = (
@@ -134,84 +135,62 @@ width = 1472;
 anchors = (
 {
 name = _center;
-pos = (782,745);
+pos = (780,745);
 },
 {
 name = bottom;
-pos = (583,0);
+pos = (581,0);
 },
 {
 name = cross;
-pos = (335,788);
+pos = (326,745);
 },
 {
 name = top;
-pos = (781,1676);
+pos = (748,1490);
 },
 {
 name = topl;
-pos = (251,1490);
-}
-);
-guides = (
-{
-pos = (2177,1024);
-},
-{
-pos = (9,764);
-},
-{
-pos = (789,1548);
-},
-{
-pos = (2805,1696);
-},
-{
-pos = (1469,348);
-},
-{
-pos = (2125,1480);
-},
-{
-pos = (1277,560);
+pos = (250,1490);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(1040,0,o),
-(1362,268,o),
-(1439,724,c),
-(1517,1199,o),
-(1269,1489,o),
-(809,1490,c),
-(411,1490,l),
+(1078,0,o),
+(1363,279,o),
+(1440,744,cs),
+(1517,1210,o),
+(1261,1490,o),
+(802,1490,cs),
+(410,1490,l),
 (353,1146,l),
-(749,1146,l),
+(747,1146,ls),
 (981,1146,o),
-(1089,1068,o),
-(1039,766,c),
-(987,445,o),
-(833,343,o),
-(611,344,c),
-(227,344,l),
+(1086,1056,o),
+(1034,744,cs),
+(983,433,o),
+(840,344,o),
+(618,344,cs),
+(226,344,l),
 (169,0,l),
-(585,0,l)
+(625,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(251,1490,l),
+(250,1490,l),
 (3,0,l),
-(409,0,l),
-(655,1490,l)
+(407,0,l),
+(654,1490,l)
 );
 }
 );
-width = 1502;
+width = 1499;
 },
 {
 anchors = (
@@ -306,11 +285,11 @@ width = 1484;
 anchors = (
 {
 name = _center;
-pos = (761.792,745);
+pos = (761,745);
 },
 {
 name = bottom;
-pos = (498,0);
+pos = (497,0);
 },
 {
 name = cross;
@@ -318,7 +297,7 @@ pos = (288,756);
 },
 {
 name = top;
-pos = (818,1676);
+pos = (786,1490);
 },
 {
 name = topl;
@@ -326,63 +305,64 @@ pos = (386,1490);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(966,0,o),
-(1265,276,o),
-(1346,750,cs),
-(1425,1213,o),
+(967,0,o),
+(1267,275,o),
+(1345,750,cs),
+(1422,1214,o),
 (1225,1490,o),
 (814,1490,cs),
 (410,1490,l),
-(402,1442,l),
-(806,1442,ls),
-(1201,1442,o),
-(1372,1193,o),
-(1300,750,cs),
-(1231,317,o),
+(402,1444,l),
+(814,1444,ls),
+(1201,1444,o),
+(1371,1185,o),
+(1299,750,cs),
+(1226,309,o),
 (943,46,o),
-(538,46,cs),
-(172,46,l),
-(162,0,l),
-(530,0,ls)
+(529,46,cs),
+(171,46,l),
+(163,0,l),
+(529,0,ls)
 );
 },
 {
 closed = 1;
 nodes = (
 (386,1490,l),
-(140,0,l),
-(186,0,l),
-(434,1490,l)
+(139,0,l),
+(185,0,l),
+(432,1490,l)
 );
 }
 );
-width = 1462;
+width = 1461;
 },
 {
 anchors = (
 {
 name = _center;
-pos = (741.924,745);
+pos = (742,745);
 },
 {
 name = bottom;
-pos = (502.59,0);
+pos = (503,0);
 },
 {
 name = cross;
-pos = (277.732,768);
+pos = (278,768);
 },
 {
 name = top;
-pos = (774.05,1676);
+pos = (744,1490);
 },
 {
 name = topl;
-pos = (307,1490);
+pos = (308,1490);
 }
 );
 layerId = m008;
@@ -391,37 +371,37 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(974.59,0,o),
-(1281.275,282,o),
-(1358.421,748,cs),
-(1434.904,1210,o),
-(1221.258,1490,o),
-(787.258,1490,cs),
-(401.258,1490,l),
-(374.77,1330,l),
-(748.77,1330,ls),
-(1098.77,1330,o),
-(1238.018,1108,o),
-(1178.421,748,cs),
-(1118.161,384,o),
-(905.078,160,o),
-(535.078,160,cs),
-(189.078,160,l),
-(162.59,0,l),
-(520.59,0,ls)
+(999,0,o),
+(1282,282,o),
+(1359,748,cs),
+(1435,1210,o),
+(1214,1490,o),
+(780,1490,cs),
+(402,1490,l),
+(375,1330,l),
+(789,1330,ls),
+(1139,1330,o),
+(1238,1108,o),
+(1179,748,cs),
+(1119,384,o),
+(905,160,o),
+(535,160,cs),
+(189,160,l),
+(163,0,l),
+(545,0,ls)
 );
 },
 {
 closed = 1;
 nodes = (
-(307.258,1490,l),
-(60.59,0,l),
-(240.59,0,l),
-(487.258,1490,l)
+(308,1490,l),
+(61,0,l),
+(241,0,l),
+(488,1490,l)
 );
 }
 );
-width = 1412;
+width = 1413;
 },
 {
 anchors = (
@@ -493,29 +473,29 @@ width = 1472;
 anchors = (
 {
 name = _center;
-pos = (763.924,745);
+pos = (764,745);
 },
 {
 name = bottom;
-pos = (578.59,0);
+pos = (579,0);
 },
 {
 name = cross;
-pos = (331.043,788);
+pos = (324,745);
 },
 {
 name = top;
-pos = (776.05,1676);
+pos = (746,1490);
 },
 {
 name = topl;
-pos = (239,1490);
+pos = (240,1490);
 }
 );
 background = {
 shapes = (
 {
-pos = (-106,0);
+pos = (-105,0);
 ref = O;
 }
 );
@@ -526,33 +506,33 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1033.59,0,o),
-(1376.93,292,o),
-(1451.759,744,cs),
-(1526.752,1197,o),
-(1275.258,1490,o),
-(815.258,1490,cs),
-(407.258,1490,l),
-(350.309,1146,l),
-(732.309,1146,ls),
-(983.309,1146,o),
-(1076.953,1017,o),
-(1031.759,744,cs),
-(986.895,473,o),
-(854.539,344,o),
-(611.539,344,cs),
-(223.539,344,l),
-(166.59,0,l),
-(574.59,0,l)
+(1114,0,o),
+(1377,292,o),
+(1452,744,cs),
+(1527,1197,o),
+(1252,1490,o),
+(792,1490,cs),
+(408,1490,l),
+(351,1146,l),
+(733,1146,ls),
+(984,1146,o),
+(1077,1017,o),
+(1032,744,cs),
+(987,473,o),
+(855,344,o),
+(612,344,cs),
+(224,344,l),
+(167,0,l),
+(655,0,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(239.258,1490,l),
-(-7.41,0,l),
-(408.59,0,l),
-(655.258,1490,l)
+(240,1490,l),
+(-7,0,l),
+(409,0,l),
+(656,1490,l)
 );
 }
 );
@@ -663,11 +643,11 @@ pos = (224,756);
 },
 {
 name = top;
-pos = (752,1676);
+pos = (722,1490);
 },
 {
 name = topl;
-pos = (321,1490);
+pos = (322,1490);
 }
 );
 layerId = m012;
@@ -676,33 +656,33 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(903,0,o),
-(1202,275,o),
+(911,0,o),
+(1203,275,o),
 (1281,750,cs),
 (1358,1214,o),
-(1160,1490,o),
-(749,1490,cs),
-(345,1490,l),
-(337,1442,l),
-(741,1442,ls),
-(1128,1442,o),
+(1161,1490,o),
+(750,1490,cs),
+(346,1490,l),
+(338,1444,l),
+(750,1444,ls),
+(1137,1444,o),
 (1307,1185,o),
 (1235,750,cs),
 (1162,309,o),
-(886,46,o),
-(472,46,cs),
-(106,46,l),
+(887,46,o),
+(473,46,cs),
+(107,46,l),
 (99,0,l),
-(465,0,ls)
+(473,0,ls)
 );
 },
 {
 closed = 1;
 nodes = (
-(321,1490,l),
+(322,1490,l),
 (75,0,l),
-(123,0,l),
-(369,1490,l)
+(121,0,l),
+(368,1490,l)
 );
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_.squared.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_.squared.glyph
index b25da4a22..2f6f9105d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_.squared.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_.squared.glyph
@@ -9,7 +9,7 @@ alignment = 1;
 ref = whiteLargeSquare;
 },
 {
-pos = (683,0);
+pos = (684,0);
 ref = D;
 }
 );
@@ -65,7 +65,7 @@ alignment = 1;
 ref = whiteLargeSquare;
 },
 {
-pos = (663,0);
+pos = (665,0);
 ref = D;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_Z_.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_Z_.glyph
index 86f8a46cc..55fdfd82b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_Z_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_Z_.glyph
@@ -8,11 +8,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (1471,0);
+pos = (1472,0);
 ref = Z;
 }
 );
-width = 2752;
+width = 2753;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -21,11 +21,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (1502,0);
+pos = (1499,0);
 ref = Z;
 }
 );
-width = 2925;
+width = 2922;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_bar1.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_bar1.glyph
index f5fcbf264..94276a92f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_bar1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_bar1.glyph
@@ -11,11 +11,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (-147,47);
+pos = (-187,23);
 ref = crossbar;
 }
 );
-width = 1471;
+width = 1472;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -25,11 +25,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (-212,67);
+pos = (-225,0);
 ref = crossbar;
 }
 );
-width = 1502;
+width = 1499;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_caron.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_caron.glyph
index 78eb3e4f7..c1380dd54 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_caron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_caron.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (400,372);
+pos = (180,186);
 ref = caron;
 }
 );
-width = 1471;
+width = 1472;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -23,11 +23,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (12,372);
+pos = (-21,186);
 ref = caron;
 }
 );
-width = 1502;
+width = 1499;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_cedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_cedilla.glyph
index dbf26efc0..295608f70 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_cedilla.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_cedilla.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (250,0);
+pos = (343,0);
 ref = commaaccent;
 }
 );
-width = 1471;
+width = 1472;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -23,11 +23,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (397,0);
+pos = (395,0);
 ref = commaaccent;
 }
 );
-width = 1502;
+width = 1499;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_circumflexbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_circumflexbelow.glyph
index d3050a632..0f732468c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_circumflexbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_circumflexbelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (1110,0);
+pos = (1203,0);
 ref = circumflexsubnosp;
 }
 );
-width = 1471;
+width = 1472;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -23,11 +23,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (1349,0);
+pos = (1347,0);
 ref = circumflexsubnosp;
 }
 );
-width = 1502;
+width = 1499;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_croat.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_croat.glyph
index b37478dc8..e4d2f4305 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_croat.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_croat.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = Dbar1;
 }
 );
-width = 1471;
+width = 1472;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -17,7 +17,7 @@ shapes = (
 ref = Dbar1;
 }
 );
-width = 1502;
+width = 1499;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_dotaccent.glyph
index 69538bad2..155b8dd2d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_dotaccent.glyph
@@ -11,11 +11,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (622,372);
+pos = (402,186);
 ref = dotaccent;
 }
 );
-width = 1471;
+width = 1472;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -25,11 +25,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (323,372);
+pos = (290,186);
 ref = dotaccent;
 }
 );
-width = 1502;
+width = 1499;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_dotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_dotbelow.glyph
index 8fe579df1..18dc4c041 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_dotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_dotbelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (1132,0);
+pos = (1225,0);
 ref = dotbelow;
 }
 );
-width = 1471;
+width = 1472;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -23,11 +23,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (1213,0);
+pos = (1211,0);
 ref = dotbelow;
 }
 );
-width = 1502;
+width = 1499;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_hook.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_hook.glyph
index 6f95ecca9..efdc3cb9b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_hook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_hook.glyph
@@ -17,7 +17,7 @@ pos = (-63,0);
 ref = _part.top_left_hook;
 }
 );
-width = 1751;
+width = 1752;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -29,11 +29,11 @@ pos = (480,0);
 ref = D;
 },
 {
-pos = (-86,0);
+pos = (-87,0);
 ref = _part.top_left_hook;
 }
 );
-width = 1982;
+width = 1979;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_linebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_linebelow.glyph
index ddbdbbe76..52e26e0c4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_linebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_linebelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (1134,0);
+pos = (1227,0);
 ref = macronsubnosp;
 }
 );
-width = 1471;
+width = 1472;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -23,11 +23,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (1303,0);
+pos = (1301,0);
 ref = macronsubnosp;
 }
 );
-width = 1502;
+width = 1499;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_z.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_z.glyph
index f9b6c3724..c84738fff 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_z.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_z.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (1471,0);
+pos = (1472,0);
 ref = z;
 }
 );
-width = 2597;
+width = 2598;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -23,11 +23,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (1502,0);
+pos = (1499,0);
 ref = z;
 }
 );
-width = 2710;
+width = 2707;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_zcaron_.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_zcaron_.glyph
index e141894d1..a7c532a7a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_zcaron_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_zcaron_.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (1471,0);
+pos = (1472,0);
 ref = zcaron;
 }
 );
-width = 2597;
+width = 2598;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -23,11 +23,11 @@ shapes = (
 ref = D;
 },
 {
-pos = (1502,0);
+pos = (1499,0);
 ref = zcaron;
 }
 );
-width = 2710;
+width = 2707;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_invertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_invertedbreve.glyph
index f9f528646..d0f46c3f4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_invertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1347,372);
+pos = (1318,558);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1342,372);
+pos = (1395,558);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1287,372);
+pos = (1308,558);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1320,414);
+pos = (1261,620);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1338,414);
+pos = (1383,620);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1310,466);
+pos = (1195,620);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_th.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_th.glyph
index 627446447..60359cfc0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_th.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_th.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Dbar1;
 }
 );
-width = 1471;
+width = 1472;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -19,7 +19,7 @@ shapes = (
 ref = Dbar1;
 }
 );
-width = 1502;
+width = 1499;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_tilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_tilde.glyph
index c5a7efbb5..c479bc569 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_tilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (170,0);
-ref = casetilde.cn;
+pos = (179,372);
+ref = tilde;
 }
 );
 width = 1224;
@@ -23,8 +23,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (125,0);
-ref = casetilde.cn;
+pos = (190,372);
+ref = tilde;
 }
 );
 width = 1275;
@@ -36,8 +36,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (208,0);
-ref = casetilde.cn;
+pos = (184,372);
+ref = tilde;
 }
 );
 width = 1196;
@@ -49,8 +49,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (174,0);
-ref = casetilde.cn;
+pos = (185,414);
+ref = tilde;
 }
 );
 width = 1160;
@@ -62,8 +62,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (136,0);
-ref = casetilde.cn;
+pos = (186,414);
+ref = tilde;
 }
 );
 width = 1260;
@@ -75,8 +75,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (208,0);
-ref = casetilde.cn;
+pos = (189,414);
+ref = tilde;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/G_hestrokecyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/G_hestrokecyrillic.glyph
index a69e148a8..e706734f9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/G_hestrokecyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/G_hestrokecyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (-183,47);
+pos = (-187,23);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_dieresisacute.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_dieresisacute.1.glyph
index 84f1c5958..97a291154 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_dieresisacute.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_dieresisacute.1.glyph
@@ -12,7 +12,7 @@ ref = I.1;
 {
 alignment = 1;
 pos = (832,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 907;
@@ -27,7 +27,7 @@ ref = I.1;
 {
 alignment = 1;
 pos = (944,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 1037;
@@ -42,7 +42,7 @@ ref = I.1;
 {
 alignment = 1;
 pos = (735,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 723;
@@ -57,7 +57,7 @@ ref = I.1;
 {
 alignment = 1;
 pos = (832,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 842;
@@ -72,7 +72,7 @@ ref = I.1;
 {
 alignment = 1;
 pos = (943,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 1002;
@@ -87,7 +87,7 @@ ref = I.1;
 {
 alignment = 1;
 pos = (723,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 584;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_dieresisacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_dieresisacute.glyph
index 8aa9b3f8b..430220717 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_dieresisacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_dieresisacute.glyph
@@ -12,7 +12,7 @@ ref = I;
 {
 alignment = 1;
 pos = (648,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 541;
@@ -26,7 +26,7 @@ ref = I;
 {
 alignment = 1;
 pos = (724,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 598;
@@ -40,7 +40,7 @@ ref = I;
 {
 alignment = 1;
 pos = (630,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 512;
@@ -54,7 +54,7 @@ ref = I;
 {
 alignment = 1;
 pos = (648,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 476;
@@ -68,7 +68,7 @@ ref = I;
 {
 alignment = 1;
 pos = (725,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 576;
@@ -82,7 +82,7 @@ ref = I;
 {
 alignment = 1;
 pos = (628,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_invertedbreve.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_invertedbreve.1.glyph
index 6967c5a69..161699131 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_invertedbreve.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_invertedbreve.1.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (1171,372);
+pos = (1142,558);
 ref = breveinvnosp;
 }
 );
@@ -22,7 +22,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (1224,372);
+pos = (1277,558);
 ref = breveinvnosp;
 }
 );
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (1016,372);
+pos = (1037,558);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_invertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_invertedbreve.glyph
index 05c198012..4c08f6e5c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_invertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (987,372);
+pos = (958,558);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (1004,372);
+pos = (1057,558);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (911,372);
+pos = (932,558);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (962,414);
+pos = (903,620);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (996,414);
+pos = (1041,620);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (932,466);
+pos = (817,620);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_stroke.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_stroke.1.glyph
index a5b7da94a..8046bd0c1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_stroke.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_stroke.1.glyph
@@ -12,7 +12,7 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (3,47);
+pos = (-1,23);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_stroke.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_stroke.glyph
index c2f4cfde1..b83284dc5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_stroke.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_stroke.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-181,47);
+pos = (-185,23);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_tilde.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_tilde.1.glyph
index 5a4a25bb0..61731a1fa 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_tilde.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_tilde.1.glyph
@@ -10,8 +10,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-6,0);
-ref = casetilde.cn;
+pos = (3,372);
+ref = tilde;
 }
 );
 width = 907;
@@ -24,8 +24,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (7,0);
-ref = casetilde.cn;
+pos = (72,372);
+ref = tilde;
 }
 );
 width = 1037;
@@ -38,8 +38,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-63,0);
-ref = casetilde.cn;
+pos = (-87,372);
+ref = tilde;
 }
 );
 width = 723;
@@ -52,7 +52,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-ref = casetilde.cn;
+pos = (11,414);
+ref = tilde;
 }
 );
 width = 842;
@@ -65,8 +66,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (12,0);
-ref = casetilde.cn;
+pos = (62,414);
+ref = tilde;
 }
 );
 width = 1002;
@@ -79,8 +80,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-75,0);
-ref = casetilde.cn;
+pos = (-94,414);
+ref = tilde;
 }
 );
 width = 584;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_tilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_tilde.glyph
index 11ddc9f3c..6f71a77fc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_tilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-190,0);
-ref = casetilde.cn;
+pos = (-181,372);
+ref = tilde;
 }
 );
 width = 541;
@@ -23,8 +23,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-213,0);
-ref = casetilde.cn;
+pos = (-148,372);
+ref = tilde;
 }
 );
 width = 598;
@@ -36,8 +36,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-168,0);
-ref = casetilde.cn;
+pos = (-192,372);
+ref = tilde;
 }
 );
 width = 512;
@@ -49,8 +49,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-184,0);
-ref = casetilde.cn;
+pos = (-173,414);
+ref = tilde;
 }
 );
 width = 476;
@@ -62,8 +62,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-206,0);
-ref = casetilde.cn;
+pos = (-156,414);
+ref = tilde;
 }
 );
 width = 576;
@@ -75,8 +75,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-170,0);
-ref = casetilde.cn;
+pos = (-189,414);
+ref = tilde;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/L_bar.glyph b/src/Inter-Italic.glyphspackage/glyphs/L_bar.glyph
index 4d160e053..5787c7a93 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/L_bar.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/L_bar.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-181,47);
+pos = (-185,23);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/N_tilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/N_tilde.glyph
index a4769a1f1..f308a76b0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/N_tilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/N_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (310,0);
-ref = casetilde.cn;
+pos = (319,372);
+ref = tilde;
 }
 );
 width = 1544;
@@ -23,8 +23,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (226,0);
-ref = casetilde.cn;
+pos = (291,372);
+ref = tilde;
 }
 );
 width = 1480;
@@ -36,8 +36,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (364,0);
-ref = casetilde.cn;
+pos = (340,372);
+ref = tilde;
 }
 );
 width = 1580;
@@ -49,8 +49,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (321,0);
-ref = casetilde.cn;
+pos = (332,414);
+ref = tilde;
 }
 );
 width = 1473;
@@ -62,8 +62,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (265,0);
-ref = casetilde.cn;
+pos = (315,414);
+ref = tilde;
 }
 );
 width = 1513;
@@ -75,8 +75,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (364,0);
-ref = casetilde.cn;
+pos = (345,414);
+ref = tilde;
 }
 );
 width = 1452;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_horn.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_horn.glyph
index 019a28384..93fa89785 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_horn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_horn.glyph
@@ -1,97 +1,193 @@
 {
 glyphname = Ohorn;
 kernLeft = C;
-kernRight = D;
+kernRight = Ohorn;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
-pos = (234,378);
-ref = _part.rtophorn.o;
+closed = 1;
+nodes = (
+(1259,1386,o),
+(1295,1346,o),
+(1398,1346,cs),
+(1512,1346,o),
+(1577,1402,o),
+(1596,1516,cs),
+(1626,1698,l),
+(1456,1698,l),
+(1425,1508,ls),
+(1423,1497,o),
+(1415,1490,o),
+(1404,1490,cs),
+(1064,1490,o),
+(1094,1510,o),
+(937,1510,c),
+(916,1386,l)
+);
 }
 );
 width = 1560;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (1288,1568);
-}
-);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
-pos = (238,378);
-ref = _part.rtophorn.o;
+closed = 1;
+nodes = (
+(1086,1270,o),
+(1242,1266,o),
+(1397,1266,cs),
+(1541,1266,o),
+(1664,1324,o),
+(1692,1490,cs),
+(1726,1698,l),
+(1378,1698,l),
+(1349,1522,ls),
+(1345,1501,o),
+(1333,1490,o),
+(1312,1490,cs),
+(1141,1490,o),
+(1086,1510,o),
+(971,1510,c),
+(931,1270,l)
+);
 }
 );
 width = 1628;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
-pos = (234,376);
-ref = _part.rtophorn.o;
+closed = 1;
+nodes = (
+(1076,1470,o),
+(1288,1444,o),
+(1405,1444,cs),
+(1484,1444,o),
+(1535,1488,o),
+(1548,1567,cs),
+(1570,1698,l),
+(1524,1698,l),
+(1502,1567,ls),
+(1493,1513,o),
+(1467,1490,o),
+(1413,1490,cs),
+(1100,1490,o),
+(1083,1510,o),
+(922,1510,c),
+(916,1472,l)
+);
 }
 );
 width = 1530;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
-pos = (277,434);
-ref = _part.rtophorn.o;
+closed = 1;
+nodes = (
+(1266,1366,o),
+(1295,1350,o),
+(1409,1350,cs),
+(1523,1350,o),
+(1589,1406,o),
+(1608,1520,cs),
+(1642,1730,l),
+(1472,1730,l),
+(1436,1508,ls),
+(1434,1497,o),
+(1426,1490,o),
+(1415,1490,cs),
+(1116,1490,o),
+(1093,1514,o),
+(930,1514,c),
+(905,1366,l)
+);
 }
 );
 width = 1534;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (1256,1568);
-}
-);
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
-pos = (214,434);
-ref = _part.rtophorn.o;
+closed = 1;
+nodes = (
+(1043,1282,o),
+(1195,1258,o),
+(1350,1258,cs),
+(1494,1258,o),
+(1619,1320,o),
+(1643,1470,cs),
+(1686,1730,l),
+(1338,1730,l),
+(1304,1522,ls),
+(1300,1501,o),
+(1288,1490,o),
+(1267,1490,cs),
+(1101,1490,o),
+(1042,1514,o),
+(927,1514,c),
+(888,1282,l)
+);
 }
 );
 width = 1528;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
-pos = (234,376);
-ref = _part.rtophorn.o;
+closed = 1;
+nodes = (
+(1021,1469,o),
+(1029,1444,o),
+(1346,1444,cs),
+(1425,1444,o),
+(1476,1488,o),
+(1489,1567,cs),
+(1516,1730,l),
+(1470,1730,l),
+(1443,1567,ls),
+(1434,1513,o),
+(1408,1490,o),
+(1354,1490,cs),
+(1037,1490,o),
+(1028,1510,o),
+(863,1510,c),
+(856,1469,l)
+);
 }
 );
-width = 1402;
+width = 1401;
 }
 );
 metricLeft = O;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_hornacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_hornacute.glyph
index aa7698813..355f50915 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_hornacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_hornacute.glyph
@@ -79,7 +79,7 @@ pos = (490,414);
 ref = acute;
 }
 );
-width = 1402;
+width = 1401;
 }
 );
 unicode = 7898;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_horndotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_horndotbelow.glyph
index b8c8b10f2..2a7d950cc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_horndotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_horndotbelow.glyph
@@ -79,7 +79,7 @@ pos = (1326,0);
 ref = dotbelow;
 }
 );
-width = 1402;
+width = 1401;
 }
 );
 unicode = 7906;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_horngrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_horngrave.glyph
index 49a305bc0..d3c14b994 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_horngrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_horngrave.glyph
@@ -79,7 +79,7 @@ pos = (267,414);
 ref = grave;
 }
 );
-width = 1402;
+width = 1401;
 }
 );
 unicode = 7900;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_hornhookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_hornhookabove.glyph
index 0adfdddc8..7d8bb02a3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_hornhookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_hornhookabove.glyph
@@ -79,7 +79,7 @@ pos = (1331,416);
 ref = hookabovecmb;
 }
 );
-width = 1402;
+width = 1401;
 }
 );
 unicode = 7902;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_horntilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_horntilde.glyph
index f76aedafe..d7efcdbcf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_horntilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_horntilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (322,0);
-ref = casetilde.cn;
+pos = (331,372);
+ref = tilde;
 }
 );
 width = 1560;
@@ -23,8 +23,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (299,0);
-ref = casetilde.cn;
+pos = (364,372);
+ref = tilde;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (341,0);
-ref = casetilde.cn;
+pos = (317,372);
+ref = tilde;
 }
 );
 width = 1530;
@@ -49,8 +49,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (346,0);
-ref = casetilde.cn;
+pos = (357,414);
+ref = tilde;
 }
 );
 width = 1534;
@@ -62,8 +62,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (271,0);
-ref = casetilde.cn;
+pos = (321,414);
+ref = tilde;
 }
 );
 width = 1528;
@@ -75,11 +75,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (341,0);
-ref = casetilde.cn;
+pos = (322,414);
+ref = tilde;
 }
 );
-width = 1402;
+width = 1401;
 }
 );
 unicode = 7904;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_invertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_invertedbreve.glyph
index 00bf53e78..24fd15512 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_invertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1499,372);
+pos = (1470,558);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1516,372);
+pos = (1569,558);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1420,372);
+pos = (1441,558);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1492,414);
+pos = (1433,620);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1473,414);
+pos = (1518,620);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1443,466);
+pos = (1328,620);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_tilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_tilde.glyph
index 68fe86c43..0e1036d60 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_tilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (322,0);
-ref = casetilde.cn;
+pos = (331,372);
+ref = tilde;
 }
 );
 width = 1560;
@@ -23,8 +23,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (299,0);
-ref = casetilde.cn;
+pos = (364,372);
+ref = tilde;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (341,0);
-ref = casetilde.cn;
+pos = (317,372);
+ref = tilde;
 }
 );
 width = 1530;
@@ -49,8 +49,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (346,0);
-ref = casetilde.cn;
+pos = (357,414);
+ref = tilde;
 }
 );
 width = 1534;
@@ -62,8 +62,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (271,0);
-ref = casetilde.cn;
+pos = (321,414);
+ref = tilde;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (341,0);
-ref = casetilde.cn;
+pos = (322,414);
+ref = tilde;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/R_invertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/R_invertedbreve.glyph
index 5d883b457..77111601d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/R_invertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/R_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1363,372);
+pos = (1334,558);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1375,372);
+pos = (1428,558);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1279,372);
+pos = (1300,558);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1339,414);
+pos = (1280,620);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1375,414);
+pos = (1420,620);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1302,466);
+pos = (1187,620);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/T_bar.glyph b/src/Inter-Italic.glyphspackage/glyphs/T_bar.glyph
index 2a1d6ba55..8aeb673af 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/T_bar.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/T_bar.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (206,47);
+pos = (202,23);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_dieresisacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_dieresisacute.glyph
index 238ebf8a0..b9b1e27e2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_dieresisacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_dieresisacute.glyph
@@ -12,7 +12,7 @@ ref = U;
 {
 alignment = 1;
 pos = (1138,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 1518;
@@ -26,7 +26,7 @@ ref = U;
 {
 alignment = 1;
 pos = (1159,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 1478;
@@ -40,7 +40,7 @@ ref = U;
 {
 alignment = 1;
 pos = (1141,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 1537;
@@ -54,7 +54,7 @@ ref = U;
 {
 alignment = 1;
 pos = (1130,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 1438;
@@ -68,7 +68,7 @@ ref = U;
 {
 alignment = 1;
 pos = (1159,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 1444;
@@ -82,7 +82,7 @@ ref = U;
 {
 alignment = 1;
 pos = (1119,0);
-ref = dieresisacutecomb.cn;
+ref = dieresisacutecomb.uc;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_dieresiscaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_dieresiscaron.glyph
index 7fd9fa8e4..3ff222ac5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_dieresiscaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_dieresiscaron.glyph
@@ -11,7 +11,7 @@ ref = U;
 },
 {
 pos = (1416,414);
-ref = dieresiscaroncomb.cn;
+ref = dieresiscaroncomb.uc;
 }
 );
 width = 1518;
@@ -24,7 +24,7 @@ ref = U;
 },
 {
 pos = (1512,414);
-ref = dieresiscaroncomb.cn;
+ref = dieresiscaroncomb.uc;
 }
 );
 width = 1478;
@@ -37,7 +37,7 @@ ref = U;
 },
 {
 pos = (1355,414);
-ref = dieresiscaroncomb.cn;
+ref = dieresiscaroncomb.uc;
 }
 );
 width = 1537;
@@ -50,7 +50,7 @@ ref = U;
 },
 {
 pos = (1414,414);
-ref = dieresiscaroncomb.cn;
+ref = dieresiscaroncomb.uc;
 }
 );
 width = 1438;
@@ -63,7 +63,7 @@ ref = U;
 },
 {
 pos = (1518,414);
-ref = dieresiscaroncomb.cn;
+ref = dieresiscaroncomb.uc;
 }
 );
 width = 1444;
@@ -76,7 +76,7 @@ ref = U;
 },
 {
 pos = (1333,414);
-ref = dieresiscaroncomb.cn;
+ref = dieresiscaroncomb.uc;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_dieresisgrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_dieresisgrave.glyph
index 34c4f1bee..2d499e903 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_dieresisgrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_dieresisgrave.glyph
@@ -11,7 +11,7 @@ ref = U;
 },
 {
 pos = (1416,414);
-ref = dieresisgravecomb.cn;
+ref = dieresisgravecomb.uc;
 }
 );
 width = 1518;
@@ -24,7 +24,7 @@ ref = U;
 },
 {
 pos = (1504,414);
-ref = dieresisgravecomb.cn;
+ref = dieresisgravecomb.uc;
 }
 );
 width = 1478;
@@ -37,7 +37,7 @@ ref = U;
 },
 {
 pos = (1357,414);
-ref = dieresisgravecomb.cn;
+ref = dieresisgravecomb.uc;
 }
 );
 width = 1537;
@@ -50,7 +50,7 @@ ref = U;
 },
 {
 pos = (1414,414);
-ref = dieresisgravecomb.cn;
+ref = dieresisgravecomb.uc;
 }
 );
 width = 1438;
@@ -63,7 +63,7 @@ ref = U;
 },
 {
 pos = (1510,414);
-ref = dieresisgravecomb.cn;
+ref = dieresisgravecomb.uc;
 }
 );
 width = 1444;
@@ -76,7 +76,7 @@ ref = U;
 },
 {
 pos = (1335,414);
-ref = dieresisgravecomb.cn;
+ref = dieresisgravecomb.uc;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_dieresismacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_dieresismacron.glyph
index 275820b30..75fbacd55 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_dieresismacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_dieresismacron.glyph
@@ -11,7 +11,7 @@ ref = U;
 },
 {
 pos = (1356,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1518;
@@ -24,7 +24,7 @@ ref = U;
 },
 {
 pos = (1411,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1478;
@@ -37,7 +37,7 @@ ref = U;
 },
 {
 pos = (1338,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1537;
@@ -50,7 +50,7 @@ ref = U;
 },
 {
 pos = (1343,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1438;
@@ -63,7 +63,7 @@ ref = U;
 },
 {
 pos = (1410,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1444;
@@ -76,7 +76,7 @@ ref = U;
 },
 {
 pos = (1312,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_horn.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_horn.glyph
index 230d1663f..bc6e38485 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_horn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_horn.glyph
@@ -1,102 +1,172 @@
 {
 glyphname = Uhorn;
 kernLeft = U;
-kernRight = U;
+kernRight = Uhorn;
 layers = (
 {
-guides = (
-{
-angle = 90;
-pos = (1408,244);
-}
-);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
-pos = (1030,0);
-ref = _part.rtophorn;
+closed = 1;
+nodes = (
+(1486,1346,ls),
+(1600,1346,o),
+(1665,1402,o),
+(1684,1516,cs),
+(1714,1698,l),
+(1544,1698,l),
+(1513,1508,ls),
+(1511,1497,o),
+(1503,1490,o),
+(1492,1490,cs),
+(1312,1490,l),
+(1288,1346,l)
+);
 }
 );
 width = 1518;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
-pos = (876,0);
-ref = _part.rtophorn;
+closed = 1;
+nodes = (
+(1404,1250,ls),
+(1548,1250,o),
+(1674,1324,o),
+(1702,1490,cs),
+(1736,1698,l),
+(1388,1698,l),
+(1359,1522,ls),
+(1355,1501,o),
+(1343,1490,o),
+(1322,1490,cs),
+(1132,1490,l),
+(1092,1250,l)
+);
 }
 );
 width = 1478;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
-pos = (1059,0);
-ref = _part.rtophorn;
+closed = 1;
+nodes = (
+(1521,1444,ls),
+(1600,1444,o),
+(1651,1488,o),
+(1664,1567,cs),
+(1686,1698,l),
+(1640,1698,l),
+(1618,1567,ls),
+(1609,1513,o),
+(1583,1490,o),
+(1529,1490,cs),
+(1412,1490,l),
+(1404,1444,l)
+);
 }
 );
-width = 1537;
+width = 1535;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (1360,244);
-}
-);
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
-pos = (989,0);
-ref = _part.rtophorn;
+closed = 1;
+nodes = (
+(1447,1350,ls),
+(1561,1350,o),
+(1627,1406,o),
+(1646,1520,cs),
+(1680,1730,l),
+(1510,1730,l),
+(1474,1508,ls),
+(1472,1497,o),
+(1464,1490,o),
+(1453,1490,cs),
+(1279,1490,l),
+(1255,1350,l)
+);
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
-pos = (873,0);
-ref = _part.rtophorn;
+closed = 1;
+nodes = (
+(1381,1258,ls),
+(1525,1258,o),
+(1650,1320,o),
+(1674,1470,cs),
+(1717,1730,l),
+(1369,1730,l),
+(1335,1522,ls),
+(1331,1501,o),
+(1319,1490,o),
+(1298,1490,cs),
+(1119,1490,l),
+(1080,1258,l)
+);
 }
 );
-width = 1444;
+width = 1443;
 },
 {
 layerId = m012;
-name = "Thin Italic Display";
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
-pos = (1035,0);
-ref = _part.rtophorn;
+closed = 1;
+nodes = (
+(1426,1444,ls),
+(1505,1444,o),
+(1556,1488,o),
+(1569,1567,cs),
+(1596,1730,l),
+(1550,1730,l),
+(1523,1567,ls),
+(1514,1513,o),
+(1488,1490,o),
+(1434,1490,cs),
+(1325,1490,l),
+(1317,1444,l)
+);
 }
 );
-width = 1353;
+width = 1351;
 }
 );
 metricLeft = U;
-metricRight = T;
 unicode = 431;
 userData = {
 com.typemytype.robofont.guideline.magnetic.w9xhz5LEo8 = 5;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_hornacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_hornacute.glyph
index 1efa10217..5d50a4771 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_hornacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_hornacute.glyph
@@ -40,7 +40,7 @@ pos = (550,372);
 ref = acute;
 }
 );
-width = 1537;
+width = 1535;
 },
 {
 layerId = m008;
@@ -79,7 +79,7 @@ pos = (470,414);
 ref = acute;
 }
 );
-width = 1353;
+width = 1351;
 }
 );
 unicode = 7912;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_horndotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_horndotbelow.glyph
index 471848ca7..d04def294 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_horndotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_horndotbelow.glyph
@@ -40,7 +40,7 @@ pos = (1328,0);
 ref = dotbelow;
 }
 );
-width = 1537;
+width = 1535;
 },
 {
 layerId = m008;
@@ -79,7 +79,7 @@ pos = (1305,0);
 ref = dotbelow;
 }
 );
-width = 1353;
+width = 1351;
 }
 );
 unicode = 7920;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_horngrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_horngrave.glyph
index 73788c80b..dbda123c9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_horngrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_horngrave.glyph
@@ -40,7 +40,7 @@ pos = (336,372);
 ref = grave;
 }
 );
-width = 1537;
+width = 1535;
 },
 {
 layerId = m008;
@@ -79,7 +79,7 @@ pos = (247,414);
 ref = grave;
 }
 );
-width = 1353;
+width = 1351;
 }
 );
 unicode = 7914;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_hornhookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_hornhookabove.glyph
index 9c90d3a21..8b255eeb1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_hornhookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_hornhookabove.glyph
@@ -40,7 +40,7 @@ pos = (1333,416);
 ref = hookabovecmb;
 }
 );
-width = 1537;
+width = 1535;
 },
 {
 layerId = m008;
@@ -79,7 +79,7 @@ pos = (1311,416);
 ref = hookabovecmb;
 }
 );
-width = 1353;
+width = 1351;
 }
 );
 unicode = 7916;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_horntilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_horntilde.glyph
index ae48e73e8..c72abe396 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_horntilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_horntilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (300,0);
-ref = casetilde.cn;
+pos = (309,372);
+ref = tilde;
 }
 );
 width = 1518;
@@ -23,8 +23,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (222,0);
-ref = casetilde.cn;
+pos = (287,372);
+ref = tilde;
 }
 );
 width = 1478;
@@ -36,11 +36,11 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (343,0);
-ref = casetilde.cn;
+pos = (319,372);
+ref = tilde;
 }
 );
-width = 1537;
+width = 1535;
 },
 {
 layerId = m008;
@@ -49,8 +49,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (298,0);
-ref = casetilde.cn;
+pos = (309,414);
+ref = tilde;
 }
 );
 width = 1438;
@@ -62,8 +62,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (228,0);
-ref = casetilde.cn;
+pos = (278,414);
+ref = tilde;
 }
 );
 width = 1444;
@@ -75,11 +75,11 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (321,0);
-ref = casetilde.cn;
+pos = (302,414);
+ref = tilde;
 }
 );
-width = 1353;
+width = 1351;
 }
 );
 unicode = 7918;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_invertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_invertedbreve.glyph
index f7ecf9f92..18bc2257e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_invertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1477,372);
+pos = (1448,558);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1439,372);
+pos = (1492,558);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1422,372);
+pos = (1443,558);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1444,414);
+pos = (1385,620);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1430,414);
+pos = (1475,620);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1423,466);
+pos = (1308,620);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_straightstrokecyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_straightstrokecyrillic.glyph
index da0b27eec..fa30aa589 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_straightstrokecyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_straightstrokecyrillic.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (199,-127);
+pos = (195,-151);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_tilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_tilde.glyph
index ad88cd683..121610708 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_tilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (300,0);
-ref = casetilde.cn;
+pos = (309,372);
+ref = tilde;
 }
 );
 width = 1518;
@@ -23,8 +23,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (222,0);
-ref = casetilde.cn;
+pos = (287,372);
+ref = tilde;
 }
 );
 width = 1478;
@@ -36,8 +36,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (343,0);
-ref = casetilde.cn;
+pos = (319,372);
+ref = tilde;
 }
 );
 width = 1537;
@@ -49,8 +49,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (298,0);
-ref = casetilde.cn;
+pos = (309,414);
+ref = tilde;
 }
 );
 width = 1438;
@@ -62,8 +62,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (228,0);
-ref = casetilde.cn;
+pos = (278,414);
+ref = tilde;
 }
 );
 width = 1444;
@@ -75,8 +75,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (321,0);
-ref = casetilde.cn;
+pos = (302,414);
+ref = tilde;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/V_tilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/V_tilde.glyph
index 5001bd0ca..1223a8c1a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/V_tilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/V_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (235,0);
-ref = casetilde.cn;
+pos = (244,372);
+ref = tilde;
 }
 );
 width = 1386;
@@ -23,8 +23,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (301,0);
-ref = casetilde.cn;
+pos = (366,372);
+ref = tilde;
 }
 );
 width = 1630;
@@ -36,8 +36,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (203,0);
-ref = casetilde.cn;
+pos = (179,372);
+ref = tilde;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (247,0);
-ref = casetilde.cn;
+pos = (258,414);
+ref = tilde;
 }
 );
 width = 1338;
@@ -62,8 +62,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (274,0);
-ref = casetilde.cn;
+pos = (324,414);
+ref = tilde;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (212,0);
-ref = casetilde.cn;
+pos = (193,414);
+ref = tilde;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Y_tilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/Y_tilde.glyph
index e3bec4dd2..feb1153bc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Y_tilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Y_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (222,0);
-ref = casetilde.cn;
+pos = (231,372);
+ref = tilde;
 }
 );
 width = 1362;
@@ -23,8 +23,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (268,0);
-ref = casetilde.cn;
+pos = (333,372);
+ref = tilde;
 }
 );
 width = 1566;
@@ -36,8 +36,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (204,0);
-ref = casetilde.cn;
+pos = (180,372);
+ref = tilde;
 }
 );
 width = 1256;
@@ -49,8 +49,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (226,0);
-ref = casetilde.cn;
+pos = (237,414);
+ref = tilde;
 }
 );
 width = 1298;
@@ -62,8 +62,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (272,0);
-ref = casetilde.cn;
+pos = (322,414);
+ref = tilde;
 }
 );
 width = 1534;
@@ -75,8 +75,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (208,0);
-ref = casetilde.cn;
+pos = (189,414);
+ref = tilde;
 }
 );
 width = 1128;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Z_bar.glyph b/src/Inter-Italic.glyphspackage/glyphs/Z_bar.glyph
index 89806b181..0a8b56781 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Z_bar.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Z_bar.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (202,47);
+pos = (198,23);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.rtophorn.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.rtophorn.glyph
deleted file mode 100644
index 831d58ca9..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/_part.rtophorn.glyph
+++ /dev/null
@@ -1,162 +0,0 @@
-{
-export = 0;
-glyphname = _part.rtophorn;
-layers = (
-{
-anchors = (
-{
-name = _rtophorn;
-pos = (352,1490);
-}
-);
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(539,1446,o),
-(638,1546,o),
-(673,1756,c),
-(627,1756,l),
-(596,1569,o),
-(518,1490,o),
-(352,1490,c),
-(345,1446,l)
-);
-}
-);
-width = 666;
-},
-{
-anchors = (
-{
-name = _rtophorn;
-pos = (282,1490);
-}
-);
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(538,1395,o),
-(686,1538,o),
-(725,1776,c),
-(565,1776,l),
-(532,1579,o),
-(445,1490,o),
-(282,1490,c),
-(331,1395,l)
-);
-}
-);
-width = 720;
-},
-{
-anchors = (
-{
-name = _rtophorn;
-pos = (288,1490);
-}
-);
-layerId = m008;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(525,1367,o),
-(693,1502,o),
-(738,1776,c),
-(571,1776,l),
-(538,1579,o),
-(451,1490,o),
-(288,1490,c),
-(267,1367,l)
-);
-}
-);
-width = 720;
-},
-{
-anchors = (
-{
-name = _rtophorn;
-pos = (256,1490);
-}
-);
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(635,1304,o),
-(842,1451,o),
-(901,1756,c),
-(602,1756,l),
-(560,1550,o),
-(473,1490,o),
-(256,1490,c),
-(316,1304,l)
-);
-}
-);
-width = 809;
-},
-{
-anchors = (
-{
-name = _rtophorn;
-pos = (246,1490);
-}
-);
-layerId = m010;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(571,1288,o),
-(871,1393,o),
-(934,1778,c),
-(595,1778,l),
-(561,1572,o),
-(463,1490,o),
-(246,1490,c),
-(212,1288,l)
-);
-}
-);
-width = 777;
-},
-{
-anchors = (
-{
-name = _rtophorn;
-pos = (289,1490);
-}
-);
-layerId = m012;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(475,1446,o),
-(575,1546,o),
-(610,1756,c),
-(564,1756,l),
-(533,1569,o),
-(455,1490,o),
-(289,1490,c),
-(281,1446,l)
-);
-}
-);
-width = 539;
-}
-);
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.rtophorn.o.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.rtophorn.o.glyph
deleted file mode 100644
index 3aeae8011..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/_part.rtophorn.o.glyph
+++ /dev/null
@@ -1,215 +0,0 @@
-{
-export = 0;
-glyphname = _part.rtophorn.o;
-layers = (
-{
-anchors = (
-{
-name = _tophorn;
-pos = (690,1134);
-}
-);
-background = {
-shapes = (
-{
-pos = (1,0);
-ref = o;
-}
-);
-};
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(980,1090,o),
-(1158,1171,o),
-(1196,1400,c),
-(1150,1400,l),
-(1116,1197,o),
-(960,1134,o),
-(690,1134,c),
-(682,1090,l)
-);
-}
-);
-width = 1187;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (626,1134);
-}
-);
-background = {
-shapes = (
-{
-pos = (1,0);
-ref = o;
-}
-);
-};
-layerId = m012;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(916,1090,o),
-(1094,1171,o),
-(1132,1400,c),
-(1086,1400,l),
-(1052,1197,o),
-(896,1134,o),
-(626,1134,c),
-(618,1090,l)
-);
-}
-);
-width = 1059;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (705,1132);
-}
-);
-background = {
-shapes = (
-{
-pos = (1,0);
-ref = o;
-}
-);
-};
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(997,1013,o),
-(1195,1142,o),
-(1238,1404,c),
-(1073,1404,l),
-(1046,1236,o),
-(909,1132,o),
-(705,1132,c),
-(686,1013,l)
-);
-}
-);
-width = 1222;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (654,1080);
-}
-);
-background = {
-shapes = (
-{
-pos = (1,0);
-ref = o;
-}
-);
-};
-guides = (
-{
-pos = (915,1342);
-}
-);
-layerId = m008;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(944,957,o),
-(1142,1068,o),
-(1187,1342,c),
-(1020,1342,l),
-(990,1162,o),
-(866,1080,o),
-(654,1080,c),
-(633,957,l)
-);
-}
-);
-width = 1124;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (734,1132);
-}
-);
-background = {
-shapes = (
-{
-ref = o;
-}
-);
-};
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(1035,946,o),
-(1299,1063,o),
-(1358,1384,c),
-(1059,1384,l),
-(1017,1178,o),
-(952,1132,o),
-(735,1132,c),
-(704,946,l)
-);
-}
-);
-width = 1279;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (714,1080);
-}
-);
-background = {
-shapes = (
-{
-pos = (1,0);
-ref = o;
-}
-);
-};
-layerId = m010;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(1039,878,o),
-(1280,959,o),
-(1344,1344,c),
-(1005,1344,l),
-(970,1138,o),
-(923,1080,o),
-(714,1080,c),
-(680,878,l)
-);
-}
-);
-width = 1245;
-}
-);
-note = "Custom italic design";
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/a.glyph b/src/Inter-Italic.glyphspackage/glyphs/a.glyph
index 074ded24f..a7611cd0a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/a.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/a.glyph
@@ -19,10 +19,6 @@ name = ogonek;
 pos = (998,0);
 },
 {
-name = rhalfring;
-pos = (738,1304);
-},
-{
 name = top;
 pos = (750,1304);
 },
@@ -31,12 +27,6 @@ name = topr;
 pos = (1183,1118);
 }
 );
-guides = (
-{
-angle = -99.4;
-pos = (1000,1160);
-}
-);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
@@ -98,10 +88,6 @@ name = ogonek;
 pos = (1128,0);
 },
 {
-name = rhalfring;
-pos = (804,1304);
-},
-{
 name = top;
 pos = (794,1304);
 },
@@ -110,20 +96,6 @@ name = topr;
 pos = (1313,1118);
 }
 );
-guides = (
-{
-pos = (4992,2280);
-},
-{
-orientation = center;
-angle = 90;
-pos = (2092,1164);
-},
-{
-angle = -99.4;
-pos = (664,520);
-}
-);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
@@ -185,10 +157,6 @@ name = ogonek;
 pos = (900,0);
 },
 {
-name = rhalfring;
-pos = (708,1304);
-},
-{
 name = top;
 pos = (706,1304);
 },
@@ -258,10 +226,6 @@ name = ogonek;
 pos = (945,0);
 },
 {
-name = rhalfring;
-pos = (687,1262);
-},
-{
 name = top;
 pos = (690,1262);
 },
@@ -270,16 +234,6 @@ name = topr;
 pos = (1120,1056);
 }
 );
-guides = (
-{
-angle = 80.6;
-pos = (280,1092);
-},
-{
-angle = -9.4;
-pos = (252,0);
-}
-);
 layerId = m008;
 name = ital_gen;
 shapes = (
@@ -342,10 +296,6 @@ name = ogonek;
 pos = (1100,0);
 },
 {
-name = rhalfring;
-pos = (785,1262);
-},
-{
 name = top;
 pos = (775,1262);
 },
@@ -354,16 +304,6 @@ name = topr;
 pos = (1275,1056);
 }
 );
-guides = (
-{
-angle = -9.4;
-pos = (27,2280);
-},
-{
-angle = 80.6;
-pos = (655,1159);
-}
-);
 layerId = m010;
 name = ital_gen;
 shapes = (
@@ -426,10 +366,6 @@ name = ogonek;
 pos = (892,0);
 },
 {
-name = rhalfring;
-pos = (647,1262);
-},
-{
 name = top;
 pos = (647,1262);
 },
@@ -438,12 +374,6 @@ name = topr;
 pos = (1067,1056);
 }
 );
-guides = (
-{
-angle = 80.6;
-pos = (528,1616);
-}
-);
 layerId = m012;
 name = ital_gen;
 shapes = (
diff --git a/src/Inter-Italic.glyphspackage/glyphs/afii10146.glyph b/src/Inter-Italic.glyphspackage/glyphs/afii10146.glyph
index 3b460ae12..26086a7b5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/afii10146.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/afii10146.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = "Softsign-cy";
 },
 {
-pos = (-99,455);
+pos = (-103,431);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.1.glyph
index 159619fcb..ac750abb3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.1.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1175,0);
+pos = (1196,186);
 ref = breveinvnosp;
 }
 );
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1283,0);
+pos = (1254,186);
 ref = breveinvnosp;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1311,0);
+pos = (1364,186);
 ref = breveinvnosp;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1224,0);
+pos = (1165,206);
 ref = breveinvnosp;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1293,0);
+pos = (1338,206);
 ref = breveinvnosp;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1203,52);
+pos = (1088,206);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.glyph
index f72f80484..e1ac9fa02 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1283,0);
+pos = (1254,186);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1311,0);
+pos = (1364,186);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1175,0);
+pos = (1196,186);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1224,0);
+pos = (1165,206);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1293,0);
+pos = (1338,206);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1203,52);
+pos = (1088,206);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.1.glyph
index 2106c11bf..93d458149 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.1.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (478,118);
+pos = (458,186);
 ref = ringhalfright;
 }
 );
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (480,152);
+pos = (511,186);
 ref = ringhalfright;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (566,164);
+pos = (546,186);
 ref = ringhalfright;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (461,110);
+pos = (453,206);
 ref = ringhalfright;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (563,122);
+pos = (538,206);
 ref = ringhalfright;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (481,76);
+pos = (404,206);
 ref = ringhalfright;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.glyph b/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.glyph
index 8a35b9c96..1ebe4aebf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (480,152);
+pos = (511,186);
 ref = ringhalfright;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (566,164);
+pos = (546,186);
 ref = ringhalfright;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (478,118);
+pos = (458,186);
 ref = ringhalfright;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (461,110);
+pos = (453,206);
 ref = ringhalfright;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (563,122);
+pos = (538,206);
 ref = ringhalfright;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (481,76);
+pos = (404,206);
 ref = ringhalfright;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/bbar.glyph b/src/Inter-Italic.glyphspackage/glyphs/bbar.glyph
index 384118bfb..a36653da8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/bbar.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/bbar.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (-33,583);
+pos = (-37,559);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/breveinv.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/breveinv.cn.glyph
new file mode 100644
index 000000000..a06435723
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/breveinv.cn.glyph
@@ -0,0 +1,223 @@
+{
+case = lower;
+color = (250,227,227,1);
+glyphname = breveinv.cn;
+layers = (
+{
+anchors = (
+{
+name = _top;
+pos = (502,1118);
+},
+{
+name = top;
+pos = (574,1550);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(368,1258,l),
+(385,1357,o),
+(461,1426,o),
+(553,1426,cs),
+(645,1426,o),
+(699,1357,o),
+(682,1258,c),
+(834,1258,l),
+(862,1426,o),
+(748,1558,o),
+(575,1558,cs),
+(402,1558,o),
+(244,1426,o),
+(216,1258,c)
+);
+}
+);
+width = 818;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (592,1118);
+},
+{
+name = top;
+pos = (669,1582);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(467,1256,l),
+(480,1332,o),
+(554,1391,o),
+(637,1391,cs),
+(719,1391,o),
+(774,1332,o),
+(761,1256,c),
+(1015,1256,l),
+(1046,1443,o),
+(894,1590,o),
+(670,1590,cs),
+(446,1590,o),
+(246,1443,o),
+(215,1256,c)
+);
+}
+);
+width = 1000;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (454,1118);
+},
+{
+name = top;
+pos = (519,1512);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(265,1280,l),
+(283,1389,o),
+(392,1475,o),
+(513,1475,cs),
+(634,1475,o),
+(715,1389,o),
+(697,1280,c),
+(743,1280,l),
+(765,1415,o),
+(667,1520,o),
+(521,1520,cs),
+(375,1520,o),
+(241,1415,o),
+(219,1280,c)
+);
+}
+);
+width = 724;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (489,1056);
+},
+{
+name = top;
+pos = (559,1480);
+}
+);
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(366,1216,l),
+(381,1302,o),
+(453,1363,o),
+(540,1363,cs),
+(627,1363,o),
+(679,1302,o),
+(664,1216,c),
+(816,1216,l),
+(841,1368,o),
+(729,1488,o),
+(560,1488,cs),
+(391,1488,o),
+(239,1368,o),
+(214,1216,c)
+);
+}
+);
+width = 802;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (587,1056);
+},
+{
+name = top;
+pos = (659,1490);
+}
+);
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(457,1164,l),
+(469,1240,o),
+(544,1299,o),
+(627,1299,cs),
+(709,1299,o),
+(763,1240,o),
+(751,1164,c),
+(1005,1164,l),
+(1036,1351,o),
+(883.992,1498,o),
+(659.992,1498,cs),
+(435.992,1498,o),
+(236,1351,o),
+(205,1164,c)
+);
+}
+);
+width = 1000;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (450,1056);
+},
+{
+name = top;
+pos = (515,1448);
+}
+);
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(260,1216,l),
+(278,1325,o),
+(388,1411,o),
+(509,1411,cs),
+(630,1411,o),
+(710,1325,o),
+(692,1216,c),
+(738,1216,l),
+(761,1351,o),
+(662,1456,o),
+(516,1456,cs),
+(370,1456,o),
+(237,1351,o),
+(214,1216,c)
+);
+}
+);
+width = 724;
+}
+);
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/breveinvnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/breveinvnosp.glyph
index 2cad98cf3..3480361f5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/breveinvnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/breveinvnosp.glyph
@@ -3,193 +3,121 @@ color = (250,227,227,1);
 glyphname = breveinvnosp;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (-533,1304);
-}
-);
-guides = (
+background = {
+shapes = (
 {
-angle = -99.4;
-pos = (-716,1332);
+pos = (-1063,0);
+ref = circumflex;
 }
 );
+};
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-681,1258,l),
-(-667,1345,o),
-(-600,1405,o),
-(-516,1405,cs),
-(-432,1405,o),
-(-385,1345,o),
-(-399,1258,c),
-(-239,1258,l),
-(-212,1420,o),
-(-316,1530,o),
-(-495,1530,cs),
-(-674,1530,o),
-(-814,1420,o),
-(-841,1258,c)
-);
+alignment = -1;
+pos = (-1006,0);
+ref = breveinv.cn;
 }
 );
 width = 0;
 },
 {
-anchors = (
+background = {
+shapes = (
 {
-name = _top;
-pos = (-517,1304);
+pos = (-1304,0);
+ref = circumflex;
 }
 );
+};
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-673,1256,l),
-(-659,1336,o),
-(-596,1384,o),
-(-503,1384,cs),
-(-412,1384,o),
-(-365,1336,o),
-(-379,1256,c),
-(-125,1256,l),
-(-93,1449,o),
-(-233,1580,o),
-(-471,1580,cs),
-(-709,1580,o),
-(-893,1449,o),
-(-925,1256,c)
-);
+alignment = -1;
+pos = (-1162,0);
+ref = breveinv.cn;
 }
 );
-width = 30;
+width = 0;
 },
 {
-anchors = (
+background = {
+shapes = (
 {
-name = _top;
-pos = (-469,1304);
+pos = (-1011,0);
+ref = circumflex;
 }
 );
+};
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-589,1286,l),
-(-576,1361,o),
-(-524,1408,o),
-(-451,1408,cs),
-(-378,1408,o),
-(-342,1361,o),
-(-355,1286,c),
-(-309,1286,l),
-(-292,1386,o),
-(-345,1452,o),
-(-444,1452,cs),
-(-543,1452,o),
-(-618,1386,o),
-(-635,1286,c)
-);
+alignment = -1;
+pos = (-944,0);
+ref = breveinv.cn;
 }
 );
 width = 0;
 },
 {
-anchors = (
+background = {
+shapes = (
 {
-name = _top;
-pos = (-534,1262);
+pos = (-996,0);
+ref = circumflex;
 }
 );
+};
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-683,1216,l),
-(-669,1303,o),
-(-602,1363,o),
-(-518,1363,cs),
-(-434,1363,o),
-(-387,1303,o),
-(-401,1216,c),
-(-241,1216,l),
-(-214,1378,o),
-(-318,1488,o),
-(-497,1488,cs),
-(-676,1488,o),
-(-816,1378,o),
-(-843,1216,c)
-);
+alignment = -1;
+pos = (-964,0);
+ref = breveinv.cn;
 }
 );
 width = 0;
 },
 {
-anchors = (
+background = {
+shapes = (
 {
-name = _top;
-pos = (-518,1262);
+pos = (-1272,0);
+ref = circumflex;
 }
 );
+};
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-683,1164,l),
-(-669,1244,o),
-(-594,1307,o),
-(-511,1307,cs),
-(-429,1307,o),
-(-375,1244,o),
-(-389,1164,c),
-(-135,1164,l),
-(-103,1356,o),
-(-253,1506,o),
-(-478,1506,cs),
-(-703,1506,o),
-(-903,1356,o),
-(-935,1164,c)
-);
+alignment = -1;
+pos = (-1150,0);
+ref = breveinv.cn;
 }
 );
 width = 0;
 },
 {
-anchors = (
+background = {
+shapes = (
 {
-name = _top;
-pos = (-556,1210);
+pos = (-895,0);
+ref = circumflex;
 }
 );
+};
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-656,1286,l),
-(-642,1363,o),
-(-595,1405,o),
-(-518,1406,cs),
-(-443,1405,o),
-(-410,1363,o),
-(-422,1286,c),
-(-376,1286,l),
-(-359,1388,o),
-(-409,1452,o),
-(-510,1452,cs),
-(-613,1452,o),
-(-685,1388,o),
-(-702,1286,c)
-);
+alignment = -1;
+pos = (-891,0);
+ref = breveinv.cn;
 }
 );
 width = 0;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/casetilde.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/casetilde.cn.glyph
deleted file mode 100644
index 41768622d..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/casetilde.cn.glyph
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-color = (205,246,203,1);
-glyphname = casetilde.cn;
-layers = (
-{
-anchors = (
-{
-name = _top;
-pos = (644,1676);
-}
-);
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-alignment = -1;
-pos = (12,386);
-ref = tilde;
-}
-);
-width = 920;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (700,1676);
-}
-);
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-alignment = -1;
-pos = (66,378);
-ref = tilde;
-}
-);
-width = 1030;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (610,1676);
-}
-);
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-alignment = -1;
-pos = (-18,392);
-ref = tilde;
-}
-);
-width = 854;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (612,1676);
-}
-);
-layerId = m008;
-shapes = (
-{
-alignment = -1;
-pos = (12,386);
-ref = tilde;
-}
-);
-width = 856;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (684,1676);
-}
-);
-layerId = m010;
-shapes = (
-{
-alignment = -1;
-pos = (66,378);
-ref = tilde;
-}
-);
-width = 998;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (546,1676);
-}
-);
-layerId = m012;
-shapes = (
-{
-alignment = -1;
-pos = (-18,392);
-ref = tilde;
-}
-);
-width = 726;
-}
-);
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/crossbar.glyph b/src/Inter-Italic.glyphspackage/glyphs/crossbar.glyph
index 6ea28a021..ae4e5c758 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/crossbar.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/crossbar.glyph
@@ -5,18 +5,7 @@ layers = (
 anchors = (
 {
 name = _cross;
-pos = (487,721);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 80.6;
-pos = (449,1168);
-},
-{
-orientation = center;
-pos = (117,992);
+pos = (491,745);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -25,10 +14,10 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(796,654,l),
-(818,788,l),
-(178,788,l),
-(156,654,l)
+(800,678,l),
+(822,812,l),
+(182,812,l),
+(160,678,l)
 );
 }
 );
@@ -38,7 +27,7 @@ width = 920;
 anchors = (
 {
 name = _cross;
-pos = (547,721);
+pos = (551,745);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -47,10 +36,10 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(919,613,l),
-(955,829,l),
-(173,829,l),
-(137,613,l)
+(923,637,l),
+(959,853,l),
+(177,853,l),
+(141,637,l)
 );
 }
 );
@@ -60,7 +49,7 @@ width = 1038;
 anchors = (
 {
 name = _cross;
-pos = (451,722);
+pos = (455,745);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -69,10 +58,10 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(726,698,l),
-(733,744,l),
-(179,744,l),
-(172,698,l)
+(730,722,l),
+(737,768,l),
+(183,768,l),
+(176,722,l)
 );
 }
 );
@@ -82,18 +71,7 @@ width = 851;
 anchors = (
 {
 name = _cross;
-pos = (480,720);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 80.6;
-pos = (-4233,1168);
-},
-{
-orientation = center;
-pos = (-4565,992);
+pos = (484,745);
 }
 );
 layerId = m008;
@@ -102,10 +80,10 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(788,647,l),
-(812,793,l),
-(172,793,l),
-(148,647,l)
+(792,672,l),
+(816,818,l),
+(176,818,l),
+(152,672,l)
 );
 }
 );
@@ -115,7 +93,7 @@ width = 896;
 anchors = (
 {
 name = _cross;
-pos = (552,721);
+pos = (532,745);
 }
 );
 layerId = m010;
@@ -124,20 +102,20 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(924,613,l),
-(960,829,l),
-(178,829,l),
-(142,613,l)
+(944,637,l),
+(980,853,l),
+(118,853,l),
+(82,637,l)
 );
 }
 );
-width = 1006;
+width = 990;
 },
 {
 anchors = (
 {
 name = _cross;
-pos = (387,722);
+pos = (396,745);
 }
 );
 layerId = m012;
@@ -146,17 +124,16 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(662,698,l),
-(669,744,l),
-(115,744,l),
-(108,698,l)
+(671,722,l),
+(678,768,l),
+(124,768,l),
+(117,722,l)
 );
 }
 );
 width = 723;
 }
 );
-unicode = 57603;
 userData = {
 "interface.width-adjustments" = (
 -16
diff --git a/src/Inter-Italic.glyphspackage/glyphs/crossbar_left_long.glyph b/src/Inter-Italic.glyphspackage/glyphs/crossbar_left_long.glyph
new file mode 100644
index 000000000..559dfeca0
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/crossbar_left_long.glyph
@@ -0,0 +1,142 @@
+{
+glyphname = crossbar_left_long;
+layers = (
+{
+anchors = (
+{
+name = _cross;
+pos = (491,745);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1056,678,l),
+(1078,812,l),
+(182,812,l),
+(160,678,l)
+);
+}
+);
+width = 1176;
+},
+{
+anchors = (
+{
+name = _cross;
+pos = (551,745);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1051,637,l),
+(1087,853,l),
+(177,853,l),
+(141,637,l)
+);
+}
+);
+width = 1166;
+},
+{
+anchors = (
+{
+name = _cross;
+pos = (455,745);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1042,722,l),
+(1049,768,l),
+(183,768,l),
+(176,722,l)
+);
+}
+);
+width = 1163;
+},
+{
+anchors = (
+{
+name = _cross;
+pos = (484,745);
+}
+);
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1088,672,l),
+(1112,818,l),
+(176,818,l),
+(152,672,l)
+);
+}
+);
+width = 1192;
+},
+{
+anchors = (
+{
+name = _cross;
+pos = (532,745);
+}
+);
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1072,637,l),
+(1108,853,l),
+(118,853,l),
+(82,637,l)
+);
+}
+);
+width = 1118;
+},
+{
+anchors = (
+{
+name = _cross;
+pos = (396,745);
+}
+);
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1023,722,l),
+(1030,768,l),
+(124,768,l),
+(117,722,l)
+);
+}
+);
+width = 1075;
+}
+);
+userData = {
+"interface.width-adjustments" = (
+-16
+);
+};
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dcroat.glyph b/src/Inter-Italic.glyphspackage/glyphs/dcroat.glyph
index 1f05aba81..8e83fe7ed 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dcroat.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dcroat.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (559,583);
+pos = (555,559);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dieresisacutecomb.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/dieresisacutecomb.uc.glyph
index f1077756f..41876f26e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dieresisacutecomb.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dieresisacutecomb.uc.glyph
@@ -1,5 +1,5 @@
 {
-glyphname = dieresisacutecomb.cn;
+glyphname = dieresisacutecomb.uc;
 layers = (
 {
 anchors = (
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dieresiscaroncomb.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/dieresiscaroncomb.uc.glyph
index a8a1d5eb8..1cdd45fa1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dieresiscaroncomb.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dieresiscaroncomb.uc.glyph
@@ -1,6 +1,6 @@
 {
 color = 4;
-glyphname = dieresiscaroncomb.cn;
+glyphname = dieresiscaroncomb.uc;
 layers = (
 {
 anchors = (
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dieresisgravecomb.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/dieresisgravecomb.uc.glyph
index 2d6a6b3b8..dc2d534ef 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dieresisgravecomb.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dieresisgravecomb.uc.glyph
@@ -1,5 +1,5 @@
 {
-glyphname = dieresisgravecomb.cn;
+glyphname = dieresisgravecomb.uc;
 layers = (
 {
 anchors = (
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dieresismacroncomb.lc.glyph b/src/Inter-Italic.glyphspackage/glyphs/dieresismacroncomb.lc.glyph
index e810e7f57..253ab8a55 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dieresismacroncomb.lc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dieresismacroncomb.lc.glyph
@@ -13,7 +13,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-58,-354);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 0;
@@ -24,7 +24,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-56,-340);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 0;
@@ -41,7 +41,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-54,-326);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 0;
@@ -58,7 +58,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-58,-354);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 0;
@@ -69,7 +69,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-56,-340);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 0;
@@ -86,7 +86,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-54,-326);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 0;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dieresismacroncomb.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/dieresismacroncomb.uc.glyph
index e20ed6309..7d17a721b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dieresismacroncomb.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dieresismacroncomb.uc.glyph
@@ -1,5 +1,5 @@
 {
-glyphname = dieresismacroncomb.cn;
+glyphname = dieresismacroncomb.uc;
 layers = (
 {
 anchors = (
@@ -99,15 +99,6 @@ name = _top;
 pos = (-433,1676);
 }
 );
-guides = (
-{
-pos = (987,2472);
-},
-{
-angle = 80.6;
-pos = (-1107,2548);
-}
-);
 layerId = m008;
 name = ital_gen;
 shapes = (
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dong.glyph b/src/Inter-Italic.glyphspackage/glyphs/dong.glyph
index 919b3556a..570b3c58e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dong.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dong.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (559,583);
+pos = (555,559);
 ref = crossbar;
 },
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dotmacroncomb.lc.glyph b/src/Inter-Italic.glyphspackage/glyphs/dotmacroncomb.lc.glyph
index f5f6fc70b..d39fe510a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dotmacroncomb.lc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dotmacroncomb.lc.glyph
@@ -14,7 +14,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-62,-376);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 0;
@@ -32,7 +32,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-69,-380);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 2;
@@ -50,7 +50,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-186,-350);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 1;
@@ -68,7 +68,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-68,-414);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 0;
@@ -86,7 +86,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-80,-449);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 3;
@@ -104,7 +104,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-200,-414);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 0;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dotmacroncomb.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/dotmacroncomb.uc.glyph
index 3e7014715..5200cd527 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dotmacroncomb.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dotmacroncomb.uc.glyph
@@ -1,5 +1,5 @@
 {
-glyphname = dotmacroncomb.cn;
+glyphname = dotmacroncomb.uc;
 layers = (
 {
 anchors = (
diff --git a/src/Inter-Italic.glyphspackage/glyphs/einvertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/einvertedbreve.glyph
index d89c866c5..8e01b7ff3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/einvertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/einvertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1259,0);
+pos = (1230,186);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1263,0);
+pos = (1316,186);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1185,0);
+pos = (1206,186);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1227,0);
+pos = (1168,206);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1239,0);
+pos = (1284,206);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1206,94);
+pos = (1091,248);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/franc.glyph b/src/Inter-Italic.glyphspackage/glyphs/franc.glyph
index bb7e93009..a657c5504 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/franc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/franc.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = F;
 },
 {
-pos = (-252,-371);
+pos = (-256,-395);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ghestrokecyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/ghestrokecyrillic.glyph
index 26a6cc9b7..8f4467f13 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ghestrokecyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ghestrokecyrillic.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (-243,-163);
+pos = (-247,-187);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/glottalstopbarrev.glyph b/src/Inter-Italic.glyphspackage/glyphs/glottalstopbarrev.glyph
index 58500ce0d..0f93a5168 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/glottalstopbarrev.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/glottalstopbarrev.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = glottalstoprevinv;
 },
 {
-pos = (25,-511);
+pos = (21,-535);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hbar.glyph b/src/Inter-Italic.glyphspackage/glyphs/hbar.glyph
index 540bf1cee..94a5979f8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hbar.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/hbar.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-36,583);
+pos = (-40,559);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ibar.glyph b/src/Inter-Italic.glyphspackage/glyphs/ibar.glyph
index a294cf0fb..e2875bb7e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ibar.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ibar.glyph
@@ -17,7 +17,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (-237,-127);
+pos = (-241,-151);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/iinvertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/iinvertedbreve.glyph
index d5d46472b..48edccd07 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/iinvertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/iinvertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (901,0);
+pos = (872,186);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (943,0);
+pos = (996,186);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (813,0);
+pos = (834,186);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (869,0);
+pos = (810,206);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (926,0);
+pos = (971,206);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (835,52);
+pos = (720,206);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/jdotlessbar.glyph b/src/Inter-Italic.glyphspackage/glyphs/jdotlessbar.glyph
index e303c1e95..67de4f2ed 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/jdotlessbar.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/jdotlessbar.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-231,-73);
+pos = (-235,-97);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/jhookdblbar.glyph b/src/Inter-Italic.glyphspackage/glyphs/jhookdblbar.glyph
index dba7c991d..e2f6e040d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/jhookdblbar.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/jhookdblbar.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-251,-654);
+pos = (-255,-678);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/lbar.glyph b/src/Inter-Italic.glyphspackage/glyphs/lbar.glyph
index becf597b0..2ede415d7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/lbar.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/lbar.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-210,47);
+pos = (-214,23);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/lbar.ss02.glyph b/src/Inter-Italic.glyphspackage/glyphs/lbar.ss02.glyph
index e6a19bc0d..3e54b2d2a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/lbar.ss02.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/lbar.ss02.glyph
@@ -14,7 +14,7 @@ ref = l.ss02;
 },
 {
 alignment = 1;
-pos = (-205,47);
+pos = (-209,23);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/macute.glyph b/src/Inter-Italic.glyphspackage/glyphs/macute.glyph
index efe9899eb..1f1a4590a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/macute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/macute.glyph
@@ -75,11 +75,11 @@ shapes = (
 ref = m;
 },
 {
-pos = (524,42);
+pos = (548,0);
 ref = acute;
 }
 );
-width = 1582;
+width = 1647;
 }
 );
 unicode = 7743;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/mdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/mdotaccent.glyph
index 46fe95017..404bfc183 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/mdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/mdotaccent.glyph
@@ -81,11 +81,11 @@ shapes = (
 ref = m;
 },
 {
-pos = (683,42);
+pos = (707,0);
 ref = dotaccent;
 }
 );
-width = 1582;
+width = 1647;
 }
 );
 unicode = 7745;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/o.glyph b/src/Inter-Italic.glyphspackage/glyphs/o.glyph
index 021990272..a9b40f7bf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/o.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/o.glyph
@@ -16,7 +16,7 @@ pos = (1056,556);
 },
 {
 name = top;
-pos = (718,1304);
+pos = (687,1118);
 },
 {
 name = tophorn;
@@ -46,18 +46,18 @@ nodes = (
 {
 closed = 1;
 nodes = (
-(268,22,o),
+(260,22,o),
 (126,252,o),
 (176,556,cs),
 (226,857,o),
-(446,1088,o),
-(682,1088,cs),
-(918,1088,o),
+(454,1088,o),
+(690,1088,cs),
+(926,1088,o),
 (1060,858,o),
 (1010,556,cs),
 (960,252,o),
-(743,22,o),
-(506,22,cs)
+(735,22,o),
+(498,22,cs)
 );
 }
 );
@@ -75,20 +75,13 @@ pos = (1117,552);
 },
 {
 name = top;
-pos = (734,1304);
+pos = (703,1118);
 },
 {
 name = tophorn;
 pos = (705,1132);
 }
 );
-guides = (
-{
-orientation = center;
-angle = 80.6;
-pos = (223,1208);
-}
-);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 name = ital_gen;
 shapes = (
@@ -112,18 +105,18 @@ nodes = (
 {
 closed = 1;
 nodes = (
-(311,130,o),
+(303,130,o),
 (238,329,o),
 (275,552,cs),
 (313,777,o),
-(451,978,o),
-(680,978,cs),
-(911,978,o),
+(459,978,o),
+(688,978,cs),
+(919,978,o),
 (983,777,o),
 (945,552,cs),
 (908,329,o),
-(771,130,o),
-(540,130,cs)
+(763,130,o),
+(532,130,cs)
 );
 }
 );
@@ -257,7 +250,7 @@ pos = (1052,526);
 },
 {
 name = top;
-pos = (684,1262);
+pos = (650,1056);
 },
 {
 name = tophorn;
@@ -298,18 +291,18 @@ nodes = (
 {
 closed = 1;
 nodes = (
-(297,130,o),
+(289,130,o),
 (204,286,o),
 (244,526,cs),
 (284,768,o),
-(429,926,o),
-(628,926,cs),
-(827,926,o),
+(437,926,o),
+(636,926,cs),
+(835,926,o),
 (920,767,o),
 (880,526,cs),
 (841,287,o),
-(697,130,o),
-(497,130,cs)
+(689,130,o),
+(489,130,cs)
 );
 }
 );
@@ -327,36 +320,31 @@ pos = (1218,556);
 },
 {
 name = top;
-pos = (764,1304);
+pos = (733,1118);
 },
 {
 name = tophorn;
 pos = (735,1132);
 }
 );
-guides = (
-{
-pos = (-39,2860);
-}
-);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(909,-20,o),
+(917,-20,o),
 (1161,212,o),
 (1218,556,cs),
 (1275,899,o),
-(1099,1132,o),
-(735,1132,cs),
-(371,1132,o),
+(1091,1132,o),
+(727,1132,cs),
+(363,1132,o),
 (119,899,o),
 (62,556,cs),
 (5,212,o),
-(181,-20,o),
-(545,-20,cs)
+(189,-20,o),
+(553,-20,cs)
 );
 },
 {
@@ -391,50 +379,20 @@ pos = (1199,528);
 },
 {
 name = top;
-pos = (744,1262);
+pos = (710,1056);
 },
 {
 name = tophorn;
 pos = (714,1080);
 }
 );
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(513,290,o),
-(451,384,o),
-(451,530,cs),
-(451,675,o),
-(513,768,o),
-(622,768,cs),
-(731,768,o),
-(809,675,o),
-(809,530,cs),
-(809,384,o),
-(731,290,o),
-(622,290,cs)
-);
-}
-);
-};
-guides = (
-{
-pos = (-161,2860);
-},
-{
-angle = 80.6;
-pos = (623,1155);
-}
-);
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(875,-24,o),
+(883,-24,o),
 (1142,190,o),
 (1198,528,cs),
 (1254,865,o),
@@ -444,8 +402,8 @@ nodes = (
 (102,865,o),
 (46,528,cs),
 (-10,189,o),
-(188,-24,o),
-(531,-24,cs)
+(196,-24,o),
+(539,-24,cs)
 );
 },
 {
@@ -455,9 +413,9 @@ nodes = (
 (424,369,o),
 (450,528,cs),
 (477,687,o),
-(567,768,o),
-(662,768,cs),
-(757,768,o),
+(575,768,o),
+(670,768,cs),
+(765,768,o),
 (821,687,o),
 (794,528,cs),
 (768,369,o),
@@ -472,19 +430,19 @@ width = 1244;
 anchors = (
 {
 name = bottom;
-pos = (438,0);
+pos = (443,0);
 },
 {
 name = ogonek;
-pos = (992,556);
+pos = (993,528);
 },
 {
 name = top;
-pos = (654,1304);
+pos = (618,1056);
 },
 {
 name = tophorn;
-pos = (626,1134);
+pos = (621,1072);
 }
 );
 layerId = m012;
@@ -493,39 +451,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(697,-24,o),
-(937,226,o),
-(992,556,cs),
-(1046,884,o),
-(888,1134,o),
-(626,1134,cs),
-(362,1134,o),
-(121,885,o),
-(66,556,cs),
-(11,226,o),
-(170,-24,o),
-(434,-24,cs)
+(716,-16,o),
+(939,211,o),
+(992,528,cs),
+(1045,843,o),
+(892,1072,o),
+(620,1072,cs),
+(347,1072,o),
+(119,843,o),
+(66,528,cs),
+(14,213,o),
+(167,-16,o),
+(440,-16,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(204,22,o),
-(62,252,o),
-(112,556,cs),
-(162,857,o),
-(382,1088,o),
-(618,1088,cs),
-(854,1088,o),
-(996,858,o),
-(946,556,cs),
-(896,252,o),
-(679,22,o),
-(442,22,cs)
+(195,30,o),
+(64,236,o),
+(112,528,cs),
+(161,820,o),
+(376,1026,o),
+(621,1026,cs),
+(865,1026,o),
+(995,820,o),
+(946,528,cs),
+(898,236,o),
+(684,30,o),
+(440,30,cs)
 );
 }
 );
-width = 1048;
+width = 1058;
 }
 );
 metricRight = "=|o";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/oacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/oacute.glyph
index 7eeb20cbc..c7e653dc6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/oacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/oacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (258,0);
+pos = (227,-186);
 ref = acute;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/obarreddieresiscyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/obarreddieresiscyrillic.glyph
index 5e7382044..14e4949c4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/obarreddieresiscyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/obarreddieresiscyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = fitacyrillic;
 },
 {
-pos = (4,0);
+pos = (-27,-186);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/obreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/obreve.glyph
index e9ec30fb9..a65431c2b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/obreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/obreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (151,0);
+pos = (120,-186);
 ref = breve;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ocaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/ocaron.glyph
index 3137e6964..7a4f8e0a7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ocaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ocaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (144,0);
+pos = (113,-186);
 ref = caron;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ocircumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/ocircumflex.glyph
index df645d1c4..51b7f9cd3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ocircumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ocircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (146,0);
+pos = (115,-186);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ocircumflexacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/ocircumflexacute.glyph
index 46fb5eb2d..f79783b77 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ocircumflexacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ocircumflexacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (198,4);
+pos = (167,-182);
 ref = circumflexacutecomb.cn;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ocircumflexdotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/ocircumflexdotbelow.glyph
index 7bfb6e11b..5ef2ce4a9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ocircumflexdotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ocircumflexdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (146,0);
+pos = (115,-186);
 ref = circumflex;
 },
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ocircumflexgrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/ocircumflexgrave.glyph
index 684b2d369..a1dd34c39 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ocircumflexgrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ocircumflexgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-78,22);
+pos = (-109,-164);
 ref = circumflexgravecomb.cn;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ocircumflexhookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/ocircumflexhookabove.glyph
index 74e106767..335abcfed 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ocircumflexhookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ocircumflexhookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (134,-16);
+pos = (103,-202);
 ref = circumflexhookcomb.cn;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ocircumflextilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/ocircumflextilde.glyph
index 52490f287..04ceed7be 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ocircumflextilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ocircumflextilde.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (48,-38);
+pos = (17,-224);
 ref = circumflextildecomb.cn;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ocyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/ocyrillic.glyph
index 80184bf22..38b9fc440 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ocyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ocyrillic.glyph
@@ -55,7 +55,7 @@ shapes = (
 ref = o;
 }
 );
-width = 1048;
+width = 1058;
 }
 );
 unicode = 1086;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/odblgrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/odblgrave.glyph
index bbf1d7863..ba3c571e7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/odblgrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/odblgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1083,0);
+pos = (1052,-186);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/odieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/odieresis.glyph
index e09c88fc1..93536789d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/odieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/odieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (4,0);
+pos = (-27,-186);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/odotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/odotbelow.glyph
index 72373ebdc..cb65338c0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/odotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/odotbelow.glyph
@@ -75,11 +75,11 @@ shapes = (
 ref = o;
 },
 {
-pos = (1154,0);
+pos = (1159,0);
 ref = dotbelow;
 }
 );
-width = 1048;
+width = 1058;
 }
 );
 unicode = 7885;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ograve.glyph b/src/Inter-Italic.glyphspackage/glyphs/ograve.glyph
index df4a3751c..60e1e4355 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ograve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ograve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (73,0);
+pos = (42,-186);
 ref = grave;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ohookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/ohookabove.glyph
index cd6bb7ef1..c8cae55da 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ohookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ohookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1208,26);
+pos = (1177,-160);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ohorn.glyph b/src/Inter-Italic.glyphspackage/glyphs/ohorn.glyph
index f08843960..039416c38 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ohorn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ohorn.glyph
@@ -8,10 +8,28 @@ layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 name = ital_gen;
 shapes = (
 {
-ref = o;
+closed = 1;
+nodes = (
+(805,1014,o),
+(937,998,o),
+(1056,998,cs),
+(1170,998,o),
+(1235,1054,o),
+(1254,1168,cs),
+(1281,1326,l),
+(1121,1326,l),
+(1089,1136,ls),
+(1087,1125,o),
+(1079,1118,o),
+(1068,1118,cs),
+(952,1118,o),
+(821,1127,o),
+(705,1132,c),
+(686,1014,l)
+);
 },
 {
-ref = _part.rtophorn.o;
+ref = o;
 }
 );
 width = 1222;
@@ -21,11 +39,28 @@ layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 name = ital_gen;
 shapes = (
 {
-ref = o;
+closed = 1;
+nodes = (
+(806,902,o),
+(916,902,o),
+(1026,902,cs),
+(1170,902,o),
+(1310,960,o),
+(1336,1118,cs),
+(1371,1326,l),
+(1031,1326,l),
+(1001,1150,ls),
+(998,1129,o),
+(983,1118,o),
+(956,1118,cs),
+(903,1118,o),
+(803,1132,o),
+(734,1132,c),
+(696,902,l)
+);
 },
 {
-pos = (1,0);
-ref = _part.rtophorn.o;
+ref = o;
 }
 );
 width = 1280;
@@ -35,10 +70,28 @@ layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 name = ital_gen;
 shapes = (
 {
-ref = o;
+closed = 1;
+nodes = (
+(794,1088,o),
+(905,1076,o),
+(1018,1073,cs),
+(1096,1071,o),
+(1148,1116,o),
+(1161,1195,cs),
+(1183,1326,l),
+(1137,1326,l),
+(1115,1195,ls),
+(1106,1141,o),
+(1079,1118,o),
+(1025,1118,cs),
+(912,1118,o),
+(800,1129,o),
+(688,1134,c),
+(681,1096,l)
+);
 },
 {
-ref = _part.rtophorn.o;
+ref = o;
 }
 );
 width = 1186;
@@ -48,10 +101,28 @@ layerId = m008;
 name = ital_gen;
 shapes = (
 {
-ref = o;
+closed = 1;
+nodes = (
+(744,944,o),
+(851,944,o),
+(965,944,cs),
+(1079,944,o),
+(1143,992,o),
+(1162,1106,cs),
+(1194,1296,l),
+(1034,1296,l),
+(998,1082,ls),
+(996,1071,o),
+(988,1064,o),
+(977,1064,cs),
+(751,1064,o),
+(783,1080,o),
+(653,1080,c),
+(630,944,l)
+);
 },
 {
-ref = _part.rtophorn.o;
+ref = o;
 }
 );
 width = 1124;
@@ -61,10 +132,28 @@ layerId = m010;
 name = ital_gen;
 shapes = (
 {
-ref = o;
+closed = 1;
+nodes = (
+(781,824,o),
+(893,824,o),
+(1004,824,cs),
+(1148,824,o),
+(1297,886,o),
+(1322,1036,cs),
+(1365,1296,l),
+(1025,1296,l),
+(990,1088,ls),
+(987,1067,o),
+(974,1057,o),
+(953,1057,cs),
+(891,1057,o),
+(835,1080,o),
+(713,1080,c),
+(670,824,l)
+);
 },
 {
-ref = _part.rtophorn.o;
+ref = o;
 }
 );
 width = 1244;
@@ -74,13 +163,31 @@ layerId = m012;
 name = ital_gen;
 shapes = (
 {
-ref = o;
+closed = 1;
+nodes = (
+(726,1024,o),
+(840,1011,o),
+(956,1011,cs),
+(1035,1011,o),
+(1086,1054,o),
+(1100,1133,cs),
+(1127,1296,l),
+(1081,1296,l),
+(1054,1133,ls),
+(1045,1079,o),
+(1018,1056,o),
+(964,1056,cs),
+(848,1056,o),
+(734,1067,o),
+(618,1072,c),
+(612,1030,l)
+);
 },
 {
-ref = _part.rtophorn.o;
+ref = o;
 }
 );
-width = 1048;
+width = 1058;
 }
 );
 metricLeft = o;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ohornacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/ohornacute.glyph
index a3e3801f4..f22c098cf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ohornacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ohornacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (258,0);
+pos = (227,-186);
 ref = acute;
 }
 );
@@ -75,11 +75,11 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (257,42);
+pos = (221,-206);
 ref = acute;
 }
 );
-width = 1048;
+width = 1058;
 }
 );
 unicode = 7899;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ohorndotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/ohorndotbelow.glyph
index 199ed4f79..75cd6d755 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ohorndotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ohorndotbelow.glyph
@@ -75,11 +75,11 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1154,0);
+pos = (1159,0);
 ref = dotbelow;
 }
 );
-width = 1048;
+width = 1058;
 }
 );
 unicode = 7907;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ohorngrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/ohorngrave.glyph
index 0f5463a5d..0a1a185d8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ohorngrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ohorngrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (73,0);
+pos = (42,-186);
 ref = grave;
 }
 );
@@ -75,11 +75,11 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (34,42);
+pos = (-2,-206);
 ref = grave;
 }
 );
-width = 1048;
+width = 1058;
 }
 );
 unicode = 7901;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ohornhookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/ohornhookabove.glyph
index a1d974d8b..0806c71e8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ohornhookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ohornhookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1208,26);
+pos = (1177,-160);
 ref = hookabovecmb;
 }
 );
@@ -75,11 +75,11 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1098,44);
+pos = (1062,-204);
 ref = hookabovecmb;
 }
 );
-width = 1048;
+width = 1058;
 }
 );
 unicode = 7903;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ohorntilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/ohorntilde.glyph
index 7c2167106..39ce6c3e8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ohorntilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ohorntilde.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (99,0);
+pos = (68,-186);
 ref = tilde;
 }
 );
@@ -75,11 +75,11 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (89,42);
+pos = (53,-206);
 ref = tilde;
 }
 );
-width = 1048;
+width = 1058;
 }
 );
 unicode = 7905;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ohungarumlaut.glyph b/src/Inter-Italic.glyphspackage/glyphs/ohungarumlaut.glyph
index 50f8ee355..214b42fb8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ohungarumlaut.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ohungarumlaut.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (260,12);
+pos = (229,-174);
 ref = hungarumlaut;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/oinvertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/oinvertedbreve.glyph
index 3e1e8dadb..671a9e95f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/oinvertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/oinvertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1267,0);
+pos = (1207,0);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1281,0);
+pos = (1334,186);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1187,0);
+pos = (1208,186);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1218,0);
+pos = (1159,206);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1262,0);
+pos = (1307,206);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1210,94);
+pos = (1095,248);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/omacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/omacron.glyph
index 8927a8ead..92eb2b000 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/omacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/omacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (152,0);
+pos = (121,-186);
 ref = macron;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/omacronacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/omacronacute.glyph
index a3d13415e..6a3842115 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/omacronacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/omacronacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (990,0);
+pos = (959,-186);
 ref = macronacutecomb.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/omacrongrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/omacrongrave.glyph
index b23d88e18..d37b400d8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/omacrongrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/omacrongrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1206,22);
+pos = (1175,-164);
 ref = macrongravecomb.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/omicron.glyph b/src/Inter-Italic.glyphspackage/glyphs/omicron.glyph
index 2083cb78b..54b80bacd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/omicron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/omicron.glyph
@@ -55,7 +55,7 @@ shapes = (
 ref = o;
 }
 );
-width = 1048;
+width = 1058;
 }
 );
 unicode = 959;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/omicrontonos.glyph b/src/Inter-Italic.glyphspackage/glyphs/omicrontonos.glyph
index b8905471d..9681c8701 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/omicrontonos.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/omicrontonos.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (382,0);
+pos = (351,-186);
 ref = tonostop;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/oogonek.glyph b/src/Inter-Italic.glyphspackage/glyphs/oogonek.glyph
index 916710e2f..ca3d26100 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/oogonek.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/oogonek.glyph
@@ -81,11 +81,11 @@ shapes = (
 ref = o;
 },
 {
-pos = (579,0);
+pos = (580,-28);
 ref = ogonek.o;
 }
 );
-width = 1048;
+width = 1058;
 }
 );
 unicode = 491;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/oogonekmacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/oogonekmacron.glyph
index 6ebbbd558..704368888 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/oogonekmacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/oogonekmacron.glyph
@@ -11,7 +11,7 @@ ref = oogonek;
 },
 {
 alignment = 1;
-pos = (152,0);
+pos = (121,-186);
 ref = macron;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/oslashacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/oslashacute.glyph
index 2a24f9abf..964139ab1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/oslashacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/oslashacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = oslash;
 },
 {
-pos = (258,0);
+pos = (227,-186);
 ref = acute;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/otilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/otilde.glyph
index 39a788859..e53fc9013 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/otilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/otilde.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (99,0);
+pos = (68,-186);
 ref = tilde;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/otildeacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/otildeacute.glyph
index 0a487dd1a..6f9879ea0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/otildeacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/otildeacute.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (937,0);
-ref = tildeacutecomb;
+pos = (906,-186);
+ref = tildeacute.lc;
 }
 );
 width = 1222;
@@ -24,7 +24,7 @@ ref = o;
 },
 {
 pos = (967,0);
-ref = tildeacutecomb;
+ref = tildeacute.lc;
 }
 );
 width = 1280;
@@ -37,7 +37,7 @@ ref = o;
 },
 {
 pos = (922,0);
-ref = tildeacutecomb;
+ref = tildeacute.lc;
 }
 );
 width = 1186;
@@ -50,7 +50,7 @@ ref = o;
 },
 {
 pos = (921,0);
-ref = tildeacutecomb;
+ref = tildeacute.lc;
 }
 );
 width = 1124;
@@ -63,7 +63,7 @@ ref = o;
 },
 {
 pos = (948,0);
-ref = tildeacutecomb;
+ref = tildeacute.lc;
 }
 );
 width = 1244;
@@ -76,7 +76,7 @@ ref = o;
 },
 {
 pos = (927,42);
-ref = tildeacutecomb;
+ref = tildeacute.lc;
 }
 );
 width = 1048;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/otildedieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/otildedieresis.glyph
index 5dc67aea3..596e5fa0a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/otildedieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/otildedieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1202,16);
+pos = (1171,-170);
 ref = tildedieresiscomb.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ringhalfright.glyph b/src/Inter-Italic.glyphspackage/glyphs/ringhalfright.glyph
index cefffad2e..86772a23c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ringhalfright.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ringhalfright.glyph
@@ -4,91 +4,94 @@ layers = (
 {
 anchors = (
 {
-name = _rhalfring;
-pos = (258,1152);
+name = _top;
+pos = (239,1118);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(282,1111,o),
-(390,1190,o),
-(410,1306,cs),
-(428,1425,o),
-(349,1510,o),
-(236,1510,c),
-(222,1416,l),
-(276,1417,o),
-(314,1370,o),
-(306,1306,cs),
-(294,1248,o),
-(241,1201,o),
-(186,1202,c),
-(168,1112,l)
+(288,1220,o),
+(395,1298,o),
+(414,1414,cs),
+(434,1533,o),
+(354,1618,o),
+(240,1618,c),
+(224,1524,l),
+(280,1524,o),
+(319,1478,o),
+(308,1414,cs),
+(298,1356,o),
+(245,1310,o),
+(189,1310,c),
+(174,1220,l)
 );
 }
 );
-width = 360;
+width = 336;
 },
 {
 anchors = (
 {
-name = _rhalfring;
-pos = (238,1140);
+name = _top;
+pos = (248,1118);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(252,1108,o),
-(358,1187,o),
-(376,1304,cs),
-(396,1423,o),
-(317,1507,o),
-(204,1506,c),
-(180,1366,l),
-(218,1366,o),
-(243,1340,o),
-(238,1304,cs),
-(231,1270,o),
-(199,1245,o),
-(160,1246,c),
-(138,1108,l)
+(287,1217,o),
+(395,1299,o),
+(414,1416,cs),
+(434,1535,o),
+(353,1615,o),
+(239,1615,c),
+(216,1475,l),
+(255,1475,o),
+(280,1452,o),
+(274,1416,cs),
+(269,1382,o),
+(235,1355,o),
+(196,1355,c),
+(173,1217,l)
 );
 }
 );
-width = 332;
+width = 336;
 },
 {
 anchors = (
 {
-name = _rhalfring;
-pos = (230,1186);
+name = _top;
+pos = (248,1118);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(239,1111,o),
-(335,1191,o),
-(354,1310,cs),
-(374,1423,o),
-(297,1510,o),
-(180,1510,c),
-(174,1464,l),
-(271,1463,o),
-(324,1404,o),
-(308,1310,cs),
-(294,1223,o),
-(214,1158,o),
-(122,1158,c),
-(114,1112,l)
+(326,1586,o),
+(378,1523,o),
+(363,1432,cs),
+(348,1341,o),
+(275,1278,o),
+(184,1278,c),
+(176,1232,l),
+(286,1232,o),
+(391,1322,o),
+(409,1432,cs),
+(427,1542,o),
+(352,1632,o),
+(242,1632,c),
+(235,1586,l)
 );
 }
 );
@@ -97,95 +100,98 @@ width = 308;
 {
 anchors = (
 {
-name = _rhalfring;
-pos = (226,1152);
+name = _top;
+pos = (237,1056);
 }
 );
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(250,1111,o),
-(358,1190,o),
-(378,1306,cs),
-(396,1425,o),
-(317,1510,o),
-(204,1510,c),
-(190,1416,l),
-(244,1417,o),
-(282,1370,o),
-(274,1306,cs),
-(262,1248,o),
-(209,1201,o),
-(154,1202,c),
-(136,1112,l)
+(282,1178,o),
+(387,1268,o),
+(405,1378,cs),
+(423,1488,o),
+(348,1578,o),
+(238,1578,c),
+(222,1482,l),
+(286,1482,o),
+(320,1442,o),
+(309,1378,cs),
+(299,1314,o),
+(252,1274,o),
+(188,1274,c),
+(172,1178,l)
 );
 }
 );
-width = 296;
+width = 328;
 },
 {
 anchors = (
 {
-name = _rhalfring;
-pos = (222,1140);
+name = _top;
+pos = (237,1056);
 }
 );
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(236,1108,o),
-(342,1187,o),
-(360,1304,cs),
-(380,1423,o),
-(301,1507,o),
-(188,1506,c),
-(164,1366,l),
-(202,1366,o),
-(227,1340,o),
-(222,1304,cs),
-(215,1270,o),
-(183,1245,o),
-(144,1246,c),
-(122,1108,l)
+(260,1444,o),
+(278,1422,o),
+(271,1378,cs),
+(264,1334,o),
+(238,1312,o),
+(194,1312,c),
+(172,1178,l),
+(295,1178,o),
+(385,1255,o),
+(405,1378,cs),
+(425,1501,o),
+(361,1578,o),
+(238,1578,c),
+(216,1444,l)
 );
 }
 );
-width = 300;
+width = 328;
 },
 {
 anchors = (
 {
-name = _rhalfring;
-pos = (166,1186);
+name = _top;
+pos = (243,1056);
 }
 );
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(175,1111,o),
-(271,1191,o),
-(290,1310,cs),
-(310,1423,o),
-(233,1510,o),
-(116,1510,c),
-(110,1464,l),
-(207,1463,o),
-(260,1404,o),
-(244,1310,cs),
-(230,1223,o),
-(150,1158,o),
-(58,1158,c),
-(50,1112,l)
+(322,1532,o),
+(374,1469,o),
+(359,1378,cs),
+(344,1287,o),
+(271,1224,o),
+(180,1224,c),
+(172,1178,l),
+(282,1178,o),
+(387,1268,o),
+(405,1378,cs),
+(423,1488,o),
+(348,1578,o),
+(238,1578,c),
+(231,1532,l)
 );
 }
 );
-width = 180;
+width = 328;
 }
 );
 unicode = 702;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ringhalfrightcentered.glyph b/src/Inter-Italic.glyphspackage/glyphs/ringhalfrightcentered.glyph
index 7c9fcd294..4191e29d8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ringhalfrightcentered.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ringhalfrightcentered.glyph
@@ -14,7 +14,7 @@ pos = (-94,-566);
 ref = ringhalfright;
 }
 );
-width = 360;
+width = 336;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -25,7 +25,7 @@ pos = (-93,-563);
 ref = ringhalfright;
 }
 );
-width = 332;
+width = 336;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -47,7 +47,7 @@ pos = (-94,-566);
 ref = ringhalfright;
 }
 );
-width = 296;
+width = 328;
 },
 {
 layerId = m010;
@@ -58,7 +58,7 @@ pos = (-93,-563);
 ref = ringhalfright;
 }
 );
-width = 300;
+width = 328;
 },
 {
 layerId = m012;
@@ -69,7 +69,7 @@ pos = (-94,-566);
 ref = ringhalfright;
 }
 );
-width = 180;
+width = 328;
 }
 );
 metricLeft = ringhalfright;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rinvertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/rinvertedbreve.glyph
index b6502ceaf..ff90f4703 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rinvertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rinvertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (1079,0);
+pos = (1050,186);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (1123,0);
+pos = (1176,186);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (1021,0);
+pos = (1042,186);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (1023,0);
+pos = (964,206);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (1112,42);
+pos = (1157,248);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (1049,94);
+pos = (934,248);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romanfivehundred.glyph b/src/Inter-Italic.glyphspackage/glyphs/romanfivehundred.glyph
index 5e9910718..2dee9e358 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romanfivehundred.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romanfivehundred.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = D;
 }
 );
-width = 1471;
+width = 1472;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -18,7 +18,7 @@ shapes = (
 ref = D;
 }
 );
-width = 1502;
+width = 1499;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tildeacutecomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/tildeacute.lc.glyph
index e7b7bb688..938b3bba6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tildeacutecomb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tildeacute.lc.glyph
@@ -1,5 +1,5 @@
 {
-glyphname = tildeacutecomb;
+glyphname = tildeacute.lc;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/u.glyph b/src/Inter-Italic.glyphspackage/glyphs/u.glyph
index 14b2d8e81..104f24e7c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/u.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/u.glyph
@@ -8,118 +8,113 @@ layers = (
 anchors = (
 {
 name = bottom;
-pos = (507,0);
+pos = (504,0);
 },
 {
 name = ogonek;
-pos = (943,0);
+pos = (940,0);
 },
 {
 name = rtophorn;
-pos = (957,1118);
+pos = (955,1118);
 },
 {
 name = top;
-pos = (721,1304);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (-24,1476);
+pos = (689,1118);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(812,247,o),
-(637,151,o),
-(509,152,cs),
-(367,151,o),
-(282,256,o),
-(309,418,cs),
-(425,1118,l),
-(253,1118,l),
-(133,408,ls),
-(85,122,o),
-(215,-15,o),
-(425,-14,cs),
-(594,-15,o),
-(722,76,o),
-(791,190,c),
-(803,190,l),
-(771,0,l),
-(943,0,l),
-(1129,1118,l),
-(957,1118,l),
-(847,456,ls)
+(811,247,o),
+(634,152,o),
+(507,152,cs),
+(364,152,o),
+(278,256,o),
+(305,418,cs),
+(421,1118,l),
+(251,1118,l),
+(134,408,ls),
+(86,122,o),
+(214,-14,o),
+(424,-14,cs),
+(593,-14,o),
+(718,76,o),
+(789,190,c),
+(801,190,l),
+(770,0,l),
+(940,0,l),
+(1125,1118,l),
+(955,1118,l),
+(845,456,ls)
 );
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (621,0);
+pos = (650,0);
 },
 {
 name = ogonek;
-pos = (1135,0);
+pos = (1136,0);
 },
 {
 name = rtophorn;
-pos = (921,1118);
+pos = (919,1118);
 },
 {
 name = top;
-pos = (789,1304);
+pos = (759,1118);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
 (797,378,o),
-(723,311,o),
-(623,312,cs),
-(522,311,o),
+(722,311,o),
+(624,312,cs),
+(521,311,o),
 (475,378,o),
 (493,488,cs),
 (597,1118,l),
 (195,1118,l),
 (77,404,ls),
-(37,160,o),
-(162,-15,o),
-(397,-14,cs),
-(563,-15,o),
-(709,70,o),
+(36,160,o),
+(163,-15,o),
+(398,-14,cs),
+(564,-15,o),
+(706,70,o),
 (777,212,c),
 (789,212,l),
-(755,0,l),
-(1135,0,l),
+(754,0,l),
+(1136,0,l),
 (1321,1118,l),
-(921,1118,l),
+(919,1118,l),
 (815,488,ls)
 );
 }
 );
-width = 1330;
+width = 1331;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (489,0);
+pos = (490,0);
 },
 {
 name = ogonek;
-pos = (873,0);
+pos = (874,0);
 },
 {
 name = rtophorn;
@@ -127,68 +122,65 @@ pos = (1013,1118);
 },
 {
 name = top;
-pos = (705,1304);
+pos = (675,1118);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(857,172,o),
+(856,172,o),
 (690,32,o),
-(493,32,cs),
-(295,32,o),
+(491,32,cs),
+(294,32,o),
 (180,169,o),
 (213,366,cs),
-(339,1118,l),
+(337,1118,l),
 (291,1118,l),
 (167,366,ls),
 (130,143,o),
-(260,-15,o),
-(483,-14,cs),
-(638,-15,o),
-(781,61,o),
+(261,-15,o),
+(484,-14,cs),
+(639,-15,o),
+(779,61,o),
 (851,178,c),
 (857,178,l),
-(827,0,l),
-(873,0,l),
+(828,0,l),
+(874,0,l),
 (1059,1118,l),
 (1013,1118,l),
 (889,366,ls)
 );
 }
 );
-width = 1164;
+width = 1165;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (482.59,0);
+pos = (483,0);
 },
 {
 name = ogonek;
-pos = (924.59,0);
+pos = (925,0);
 },
 {
 name = rtophorn;
-pos = (929.41,1056);
+pos = (930,1056);
 },
 {
 name = top;
-pos = (691.513,1262);
+pos = (658,1056);
 }
 );
 guides = (
 {
 orientation = center;
 angle = 80.6;
-pos = (-5881,1476);
-},
-{
-angle = 80.6;
-pos = (310,1058);
+pos = (-6450,1476);
 }
 );
 layerId = m008;
@@ -197,49 +189,49 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(791.839,225,o),
-(649.105,136,o),
-(495.105,136,cs),
-(337.105,136,o),
-(248.501,229,o),
-(278.796,412,cs),
-(385.41,1056,l),
-(215.41,1056,l),
-(106.81,400,ls),
-(60.29,119,o),
-(224.279,-20,o),
-(437.279,-20,cs),
-(604.279,-20,o),
-(719.847,68,o),
-(782.733,170,c),
-(786.733,170,l),
-(758.59,0,l),
-(924.59,0,l),
-(1099.41,1056,l),
-(929.41,1056,l),
-(827.101,438,ls)
+(792,225,o),
+(650,136,o),
+(496,136,cs),
+(338,136,o),
+(249,229,o),
+(279,412,cs),
+(386,1056,l),
+(216,1056,l),
+(107,400,ls),
+(61,119,o),
+(225,-20,o),
+(438,-20,cs),
+(605,-20,o),
+(720,68,o),
+(783,170,c),
+(787,170,l),
+(759,0,l),
+(925,0,l),
+(1100,1056,l),
+(930,1056,l),
+(828,438,ls)
 );
 }
 );
-width = 1140;
+width = 1141;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (638.59,0);
+pos = (638,0);
 },
 {
 name = ogonek;
-pos = (1124.59,0);
+pos = (1124,0);
 },
 {
 name = rtophorn;
-pos = (899.41,1056);
+pos = (899,1056);
 },
 {
 name = top;
-pos = (778.466,1304);
+pos = (737,1056);
 }
 );
 layerId = m010;
@@ -248,27 +240,27 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(784.85,364,o),
-(707.924,298,o),
-(610.924,298,cs),
-(509.924,298,o),
-(458.85,364,o),
-(476.729,472,cs),
-(573.41,1056,l),
-(173.41,1056,l),
-(63.154,390,ls),
-(23.423,150,o),
-(152.617,-24,o),
-(387.617,-24,cs),
-(548.617,-24,o),
-(684.523,60,o),
-(757.7,200,c),
-(759.7,200,l),
-(726.59,0,l),
-(1124.59,0,l),
-(1299.41,1056,l),
-(899.41,1056,l),
-(802.729,472,ls)
+(784,364,o),
+(707,298,o),
+(610,298,cs),
+(509,298,o),
+(458,364,o),
+(476,472,cs),
+(573,1056,l),
+(173,1056,l),
+(63,390,ls),
+(23,150,o),
+(152,-24,o),
+(387,-24,cs),
+(548,-24,o),
+(684,60,o),
+(757,200,c),
+(759,200,l),
+(726,0,l),
+(1124,0,l),
+(1299,1056,l),
+(899,1056,l),
+(802,472,ls)
 );
 }
 );
@@ -278,19 +270,19 @@ width = 1298;
 anchors = (
 {
 name = bottom;
-pos = (431,0);
+pos = (441,0);
 },
 {
 name = ogonek;
-pos = (815,0);
+pos = (847,0);
 },
 {
 name = rtophorn;
-pos = (954,1118);
+pos = (976,1056);
 },
 {
 name = top;
-pos = (646,1304);
+pos = (622,1056);
 }
 );
 layerId = m012;
@@ -299,31 +291,31 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(797,172,o),
-(631,32,o),
-(432,32,cs),
-(235,32,o),
-(121,169,o),
-(153,366,cs),
-(278,1118,l),
-(232,1118,l),
-(107,366,ls),
-(70,143,o),
-(201,-15,o),
-(424,-14,cs),
-(579,-15,o),
-(720,61,o),
-(792,178,c),
-(798,178,l),
-(769,0,l),
-(815,0,l),
-(1000,1118,l),
-(954,1118,l),
-(829,366,ls)
+(829,172,o),
+(650,30,o),
+(442,30,cs),
+(239,30,o),
+(120,165,o),
+(154,368,cs),
+(268,1056,l),
+(222,1056,l),
+(108,368,ls),
+(70,139,o),
+(205,-16,o),
+(434,-16,cs),
+(604,-16,o),
+(765,74,o),
+(831,195,c),
+(833,195,l),
+(801,0,l),
+(847,0,l),
+(1022,1056,l),
+(976,1056,l),
+(862,368,ls)
 );
 }
 );
-width = 1036;
+width = 1069;
 }
 );
 metricLeft = l;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/uacute.glyph
index 6e3ebf1d8..fc9ccdf41 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uacute.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (245,0);
+pos = (213,-186);
 ref = acute;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ubreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/ubreve.glyph
index 4468160a0..41f9b8147 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ubreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ubreve.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (138,0);
+pos = (106,-186);
 ref = breve;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ucaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/ucaron.glyph
index e62a0c4c4..c558d04cc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ucaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ucaron.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (131,0);
+pos = (99,-186);
 ref = caron;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ucircumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/ucircumflex.glyph
index f7d5c90eb..8be83c62d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ucircumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ucircumflex.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (133,0);
+pos = (101,-186);
 ref = circumflex;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ucircumflexbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/ucircumflexbelow.glyph
index fd502bef4..744cdebe8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ucircumflexbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ucircumflexbelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (1181,0);
+pos = (1178,0);
 ref = circumflexsubnosp;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/udblgrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/udblgrave.glyph
index b7e60233c..c7d5321dd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/udblgrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/udblgrave.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (1070,0);
+pos = (1038,-186);
 ref = dblgravecmb;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/udieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/udieresis.glyph
index 08a137154..418188a21 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/udieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/udieresis.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (-9,0);
+pos = (-41,-186);
 ref = dieresis;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/udieresisacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/udieresisacute.glyph
index f3a540d24..784e91159 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/udieresisacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/udieresisacute.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (1191,0);
+pos = (1159,-186);
 ref = dieresisacutecomb.lc;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/udieresisbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/udieresisbelow.glyph
index 1d99e03ea..9866aab72 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/udieresisbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/udieresisbelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (1293,0);
+pos = (1290,0);
 ref = dotdblsubnosp;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 guides = (
diff --git a/src/Inter-Italic.glyphspackage/glyphs/udieresiscaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/udieresiscaron.glyph
index 8f49bd9fd..73f87f752 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/udieresiscaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/udieresiscaron.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (1189,12);
+pos = (1157,-174);
 ref = dieresiscaroncomb.lc;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/udieresisgrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/udieresisgrave.glyph
index 61f7b6076..b4f0903d4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/udieresisgrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/udieresisgrave.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (1189,12);
+pos = (1157,-174);
 ref = dieresisgravecomb.lc;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/udieresismacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/udieresismacron.glyph
index f3c834be6..171caccb1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/udieresismacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/udieresismacron.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (1191,-18);
+pos = (1159,-204);
 ref = dieresismacroncomb.lc;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/udotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/udotbelow.glyph
index 025fd04b1..ed449d272 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/udotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/udotbelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (1203,0);
+pos = (1200,0);
 ref = dotbelow;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ugrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/ugrave.glyph
index 16753ac93..91986d2e0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ugrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ugrave.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (60,0);
+pos = (28,-186);
 ref = grave;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uhookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/uhookabove.glyph
index ad62dd7f7..504bdf8d3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uhookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uhookabove.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (1195,26);
+pos = (1163,-160);
 ref = hookabovecmb;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uhorn.glyph b/src/Inter-Italic.glyphspackage/glyphs/uhorn.glyph
index e7540678b..4d46f62bb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uhorn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uhorn.glyph
@@ -1,85 +1,310 @@
 {
 glyphname = uhorn;
 kernLeft = u;
-kernRight = u;
+kernRight = uhorn;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = u;
 },
 {
-pos = (675,-372);
-ref = _part.rtophorn;
+closed = 1;
+nodes = (
+(1120,998,ls),
+(1234,998,o),
+(1299,1054,o),
+(1318,1168,cs),
+(1345,1326,l),
+(1185,1326,l),
+(1153,1136,ls),
+(1151,1125,o),
+(1143,1118,o),
+(1132,1118,cs),
+(954,1118,l),
+(934,998,l)
+);
 }
 );
-width = 1194;
+width = 1248;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-ref = u;
+closed = 1;
+nodes = (
+(1190,878,ls),
+(1334,878,o),
+(1461,952,o),
+(1488,1118,cs),
+(1523,1326,l),
+(1175,1326,l),
+(1145,1150,ls),
+(1142,1129,o),
+(1129,1118,o),
+(1108,1118,cs),
+(918,1118,l),
+(878,878,l)
+);
 },
 {
-pos = (665,-372);
-ref = _part.rtophorn;
+ref = u;
 }
 );
-width = 1330;
+width = 1426;
 },
 {
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(862,247,o),
+(701,152,o),
+(574,152,cs),
+(431,152,o),
+(328,256,o),
+(328,418,cs),
+(328,1118,l),
+(158,1118,l),
+(158,408,ls),
+(158,122,o),
+(308,-14,o),
+(518,-14,cs),
+(687,-14,o),
+(797,76,o),
+(850,190,c),
+(862,190,l),
+(862,0,l),
+(1032,0,l),
+(1032,1118,l),
+(862,1118,l),
+(862,456,ls)
+);
+},
+{
+closed = 1;
+nodes = (
+(1074,1138,ls),
+(1074,1125,o),
+(1067,1118,o),
+(1054,1118,cs),
+(949,1118,l),
+(949,998,l),
+(1094,998,ls),
+(1180,998,o),
+(1234,1052,o),
+(1234,1138,cs),
+(1234,1326,l),
+(1074,1326,l)
+);
+}
+);
+};
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-ref = u;
+closed = 1;
+nodes = (
+(1121,1072,ls),
+(1200,1072,o),
+(1252,1116,o),
+(1265,1195,cs),
+(1287,1326,l),
+(1241,1326,l),
+(1219,1195,ls),
+(1210,1141,o),
+(1183,1118,o),
+(1129,1118,cs),
+(1012,1118,l),
+(1004,1072,l)
+);
 },
 {
-pos = (661,-372);
-ref = _part.rtophorn;
+ref = u;
 }
 );
-width = 1164;
+width = 1200;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-ref = u;
+closed = 1;
+nodes = (
+(1083,936,ls),
+(1197,936,o),
+(1262,992,o),
+(1281,1106,cs),
+(1313,1296,l),
+(1153,1296,l),
+(1116,1074,ls),
+(1114,1063,o),
+(1106,1056,o),
+(1095,1056,cs),
+(929,1056,l),
+(909,936,l)
+);
 },
 {
-pos = (641,-434);
-ref = _part.rtophorn;
+ref = u;
 }
 );
-width = 1140;
+width = 1206;
 },
 {
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(925,225,o),
+(797,136,o),
+(643,136,cs),
+(485,136,o),
+(381,229,o),
+(381,412,cs),
+(381,1056,l),
+(211,1056,l),
+(211,400,ls),
+(211,119,o),
+(398,-20,o),
+(611,-20,cs),
+(778,-20,o),
+(879,68,o),
+(925,170,c),
+(929,170,l),
+(929,0,l),
+(1095,0,l),
+(1095,1056,l),
+(925,1056,l),
+(925,438,ls)
+);
+},
+{
+closed = 1;
+nodes = (
+(1133,1074,ls),
+(1133,1063,o),
+(1126,1056,o),
+(1115,1056,cs),
+(1008,1056,l),
+(1008,936,l),
+(1123,936,ls),
+(1237,936,o),
+(1293,992,o),
+(1293,1106,cs),
+(1293,1296,l),
+(1133,1296,l)
+);
+}
+);
+};
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
-ref = u;
+closed = 1;
+nodes = (
+(1161,824,ls),
+(1305,824,o),
+(1430,886,o),
+(1455,1036,cs),
+(1498,1296,l),
+(1150,1296,l),
+(1115,1088,ls),
+(1112,1067,o),
+(1099,1056,o),
+(1078,1056,cs),
+(899,1056,l),
+(860,824,l)
+);
 },
 {
-pos = (653,-434);
-ref = _part.rtophorn;
+ref = u;
 }
 );
-width = 1298;
+width = 1391;
 },
 {
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(826,225,o),
+(698,136,o),
+(544,136,cs),
+(386,136,o),
+(282,229,o),
+(282,412,cs),
+(282,1056,l),
+(112,1056,l),
+(112,400,ls),
+(112,119,o),
+(299,-20,o),
+(512,-20,cs),
+(679,-20,o),
+(780,68,o),
+(826,170,c),
+(830,170,l),
+(830,0,l),
+(996,0,l),
+(996,1056,l),
+(826,1056,l),
+(826,438,ls)
+);
+},
+{
+closed = 1;
+nodes = (
+(1034,1074,ls),
+(1034,1063,o),
+(1027,1056,o),
+(1016,1056,cs),
+(909,1056,l),
+(909,936,l),
+(1024,936,ls),
+(1138,936,o),
+(1194,992,o),
+(1194,1106,cs),
+(1194,1296,l),
+(1034,1296,l)
+);
+}
+);
+};
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
-ref = u;
+closed = 1;
+nodes = (
+(1076,1010,ls),
+(1155,1010,o),
+(1206,1054,o),
+(1220,1133,cs),
+(1247,1296,l),
+(1201,1296,l),
+(1174,1133,ls),
+(1165,1079,o),
+(1138,1056,o),
+(1084,1056,cs),
+(975,1056,l),
+(967,1010,l)
+);
 },
 {
-pos = (665,-372);
-ref = _part.rtophorn;
+ref = u;
 }
 );
-width = 1036;
+width = 1150;
 }
 );
 unicode = 432;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uhornacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/uhornacute.glyph
index 19867c30a..8a76a2545 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uhornacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uhornacute.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (245,0);
+pos = (213,-186);
 ref = acute;
 }
 );
-width = 1194;
+width = 1248;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -75,11 +75,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (249,42);
+pos = (225,-206);
 ref = acute;
 }
 );
-width = 1036;
+width = 1150;
 }
 );
 unicode = 7913;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uhorndotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/uhorndotbelow.glyph
index 561e05cc1..1da7208f9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uhorndotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uhorndotbelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1203,0);
+pos = (1200,0);
 ref = dotbelow;
 }
 );
-width = 1194;
+width = 1248;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -75,11 +75,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1147,0);
+pos = (1157,0);
 ref = dotbelow;
 }
 );
-width = 1036;
+width = 1150;
 }
 );
 unicode = 7921;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uhorngrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/uhorngrave.glyph
index 0eabc8e3a..5da35b48a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uhorngrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uhorngrave.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (60,0);
+pos = (28,-186);
 ref = grave;
 }
 );
-width = 1194;
+width = 1248;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -75,11 +75,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (26,42);
+pos = (2,-206);
 ref = grave;
 }
 );
-width = 1036;
+width = 1150;
 }
 );
 unicode = 7915;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uhornhookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/uhornhookabove.glyph
index a945cfab1..d94ec0ec6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uhornhookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uhornhookabove.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1195,26);
+pos = (1163,-160);
 ref = hookabovecmb;
 }
 );
-width = 1194;
+width = 1248;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -75,11 +75,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1090,44);
+pos = (1066,-204);
 ref = hookabovecmb;
 }
 );
-width = 1036;
+width = 1150;
 }
 );
 unicode = 7917;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uhorntilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/uhorntilde.glyph
index 5ce793afa..7de7bfda7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uhorntilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uhorntilde.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (86,0);
+pos = (54,-186);
 ref = tilde;
 }
 );
-width = 1194;
+width = 1248;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -75,11 +75,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (81,42);
+pos = (57,-206);
 ref = tilde;
 }
 );
-width = 1036;
+width = 1150;
 }
 );
 unicode = 7919;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uhungarumlaut.glyph b/src/Inter-Italic.glyphspackage/glyphs/uhungarumlaut.glyph
index 4d6c38ed1..9a7422514 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uhungarumlaut.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uhungarumlaut.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (247,12);
+pos = (215,-174);
 ref = hungarumlaut;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uinvertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/uinvertedbreve.glyph
index 0d040aaa4..5c2293b27 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uinvertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uinvertedbreve.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (1254,0);
+pos = (1193,0);
 ref = breveinvnosp;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1306,0);
+pos = (1359,186);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1174,0);
+pos = (1195,186);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1226,0);
+pos = (1167,206);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1296,42);
+pos = (1341,248);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1202,94);
+pos = (1087,248);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ukcyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/ukcyrillic.glyph
index c605050a8..54a2ae1c6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ukcyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ukcyrillic.glyph
@@ -75,11 +75,11 @@ shapes = (
 ref = o;
 },
 {
-pos = (1008,0);
+pos = (1018,0);
 ref = ucyrillic;
 }
 );
-width = 1984;
+width = 1994;
 }
 );
 unicode = 1145;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/umacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/umacron.glyph
index c95115eda..0203aa2e7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/umacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/umacron.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (139,0);
+pos = (107,-186);
 ref = macron;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/umacrondieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/umacrondieresis.glyph
index 49ece4f94..0e32317fa 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/umacrondieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/umacrondieresis.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (1193,22);
+pos = (1161,-164);
 ref = macrondieresiscomb.lc;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni022A_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni022A_.glyph
index 1e3622b98..b9fd7c4b4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni022A_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni022A_.glyph
@@ -11,7 +11,7 @@ ref = O;
 },
 {
 pos = (1378,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1560;
@@ -24,7 +24,7 @@ ref = O;
 },
 {
 pos = (1488,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1628;
@@ -37,7 +37,7 @@ ref = O;
 },
 {
 pos = (1336,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1530;
@@ -50,7 +50,7 @@ ref = O;
 },
 {
 pos = (1391,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1534;
@@ -63,7 +63,7 @@ ref = O;
 },
 {
 pos = (1453,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1528;
@@ -76,7 +76,7 @@ ref = O;
 },
 {
 pos = (1332,0);
-ref = dieresismacroncomb.cn;
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni022B_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni022B_.glyph
index 1bbb7f1c2..5f33e86cb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni022B_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni022B_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1204,-18);
+pos = (1173,-204);
 ref = dieresismacroncomb.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni022D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni022D_.glyph
index 8221cbc3f..d03507b09 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni022D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni022D_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1202,16);
+pos = (1171,-170);
 ref = tildemacroncomb.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni022F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni022F_.glyph
index ef646a7e8..8efe70be1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni022F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni022F_.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (366,0);
+pos = (335,-186);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0230.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0230.glyph
index 1a8808484..e0d496b4b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0230.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0230.glyph
@@ -11,7 +11,7 @@ ref = O;
 },
 {
 pos = (1398,0);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 1560;
@@ -24,7 +24,7 @@ ref = O;
 },
 {
 pos = (1509,0);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 1628;
@@ -37,7 +37,7 @@ ref = O;
 },
 {
 pos = (1334,0);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 1530;
@@ -50,7 +50,7 @@ ref = O;
 },
 {
 pos = (1411,0);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 1534;
@@ -63,7 +63,7 @@ ref = O;
 },
 {
 pos = (1475,0);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 1528;
@@ -76,7 +76,7 @@ ref = O;
 },
 {
 pos = (1328,0);
-ref = dotmacroncomb.cn;
+ref = dotmacroncomb.uc;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0231.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0231.glyph
index 71b5bd024..7e7a8ff6a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0231.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0231.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1200,0);
+pos = (1169,-186);
 ref = dotmacroncomb.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0248.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0248.glyph
index 7e91adfe5..04c1f45ca 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0248.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0248.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (407,163);
+pos = (403,139);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0249.ccmp.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0249.ccmp.glyph
index a8655bd8e..aae66bef1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0249.ccmp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0249.ccmp.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-231,-73);
+pos = (-235,-97);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni024D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni024D_.glyph
index cdac4b1fa..51c238747 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni024D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni024D_.glyph
@@ -12,7 +12,7 @@ ref = r;
 },
 {
 alignment = 1;
-pos = (-246,-185);
+pos = (-250,-209);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0268.ccmp.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0268.ccmp.glyph
index c6518994c..063332737 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0268.ccmp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0268.ccmp.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-237,-127);
+pos = (-241,-151);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni03F_C_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni03F_C_.glyph
index fb4a5435a..c8922604b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni03F_C_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni03F_C_.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (-379,-907);
+pos = (-383,-931);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni04F_A_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni04F_A_.glyph
index 47f74c51c..fef69661f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni04F_A_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni04F_A_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (-183,47);
+pos = (-187,23);
 ref = crossbar;
 },
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni04F_B_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni04F_B_.glyph
index a2abc04c8..c6f22f23e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni04F_B_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni04F_B_.glyph
@@ -12,7 +12,7 @@ ref = "ge-cy";
 },
 {
 alignment = 1;
-pos = (-243,-163);
+pos = (-247,-187);
 ref = crossbar;
 },
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_40.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_40.glyph
index dbf7843de..168ebcd41 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_40.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_40.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (394,122);
+pos = (363,-64);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_41.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_41.glyph
index 8f82ebd64..f40437248 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_41.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_41.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (358,128);
+pos = (327,-58);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_42.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_42.glyph
index 2af859049..3928f8996 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_42.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_42.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (172,122);
+pos = (141,-64);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_43.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_43.glyph
index 0939d69f7..71d60b98e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_43.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_43.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (134,128);
+pos = (103,-58);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_44.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_44.glyph
index 89e31dff5..757f792f9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_44.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_44.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (248,128);
+pos = (217,-58);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_45.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_45.glyph
index fd37f34b0..85b826fc9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_45.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_45.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (204,128);
+pos = (173,-58);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_78.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_78.glyph
index 3433b5a2d..97b4b4239 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_78.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_78.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (278,108);
+pos = (247,-78);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_79.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_79.glyph
index 697f96f64..6897ec2fd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_79.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_79.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (336,0);
+pos = (305,-186);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uogonek.glyph b/src/Inter-Italic.glyphspackage/glyphs/uogonek.glyph
index 66faa3a85..f732cfbd5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uogonek.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uogonek.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (600,0);
+pos = (597,0);
 ref = ogonek;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uring.glyph b/src/Inter-Italic.glyphspackage/glyphs/uring.glyph
index 02a7cf3e0..0ae7c984b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uring.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uring.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (279,0);
+pos = (247,-186);
 ref = ring;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ustraightstrokecyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/ustraightstrokecyrillic.glyph
index acd783280..5b4a3a2fc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ustraightstrokecyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ustraightstrokecyrillic.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = gamma;
 },
 {
-pos = (-20,-788);
+pos = (-24,-812);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/utilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/utilde.glyph
index 5070e118e..ec920e464 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/utilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/utilde.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (86,0);
+pos = (54,-186);
 ref = tilde;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/utildeacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/utildeacute.glyph
index 9723589e1..d260c2923 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/utildeacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/utildeacute.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (924,0);
-ref = tildeacutecomb;
+pos = (892,-186);
+ref = tildeacute.lc;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -24,7 +24,7 @@ ref = u;
 },
 {
 pos = (992,0);
-ref = tildeacutecomb;
+ref = tildeacute.lc;
 }
 );
 width = 1330;
@@ -37,7 +37,7 @@ ref = u;
 },
 {
 pos = (909,0);
-ref = tildeacutecomb;
+ref = tildeacute.lc;
 }
 );
 width = 1164;
@@ -50,7 +50,7 @@ ref = u;
 },
 {
 pos = (929,0);
-ref = tildeacutecomb;
+ref = tildeacute.lc;
 }
 );
 width = 1140;
@@ -63,7 +63,7 @@ ref = u;
 },
 {
 pos = (982,42);
-ref = tildeacutecomb;
+ref = tildeacute.lc;
 }
 );
 width = 1298;
@@ -76,7 +76,7 @@ ref = u;
 },
 {
 pos = (919,42);
-ref = tildeacutecomb;
+ref = tildeacute.lc;
 }
 );
 width = 1036;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/utildebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/utildebelow.glyph
index fa4eb0745..da3a07dd9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/utildebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/utildebelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = u;
 },
 {
-pos = (1223,0);
+pos = (1220,0);
 ref = tildesubnosp;
 }
 );
-width = 1194;
+width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/order.plist b/src/Inter-Italic.glyphspackage/order.plist
index 87e5c7910..cc7d1ebe7 100644
--- a/src/Inter-Italic.glyphspackage/order.plist
+++ b/src/Inter-Italic.glyphspackage/order.plist
@@ -1639,7 +1639,6 @@ dieresis,
 dieresis.three,
 circumflex,
 tilde,
-casetilde.cn,
 macron,
 breve,
 cyrillicbreve,
@@ -2493,7 +2492,6 @@ uni1FCF.tonos,
 uni1FDF.tonos,
 uni1FEF.tonos,
 uni1FFD.tonos,
-crossbar,
 acutedotcomb.lc,
 tildedieresiscomb.lc,
 dieresisacutecomb.lc,
@@ -2507,13 +2505,13 @@ dieresisgravecomb.lc,
 largerighthook,
 tildemacroncomb.lc,
 macrondieresiscomb.lc,
-tildeacutecomb,
+tildeacute.lc,
 dieresiscaroncomb.lc,
 _part.cyrtic_hook,
 ringacute.cn,
 circumflexgravecomb.cn,
-dieresiscaroncomb.cn,
-dieresismacroncomb.cn,
+dieresiscaroncomb.uc,
+dieresismacroncomb.uc,
 carondotcomb.cn,
 breveacutecomb.cn,
 acutedotcomb.cn,
@@ -2521,10 +2519,10 @@ brevegravecomb.cn,
 tildedieresiscomb.cn,
 circumflexhookcomb.cn,
 brevetildecomb.cn,
-dieresisacutecomb.cn,
-dotmacroncomb.cn,
+dieresisacutecomb.uc,
+dotmacroncomb.uc,
 macrondieresiscomb.cn,
-dieresisgravecomb.cn,
+dieresisgravecomb.uc,
 tildemacroncomb.cn,
 circumflextildecomb.cn,
 brevehookcomb.cn,
@@ -2532,8 +2530,9 @@ commaaccentrotate.cn,
 tonostop,
 tildeacutecomb.uc,
 circumflexacutecomb.cn,
-_part.bottomr_descend,
 pecyrillicturn,
+crossbar,
+crossbar_left_long,
 _part.crossbar_compact,
 _part.crossbar_compact_rext,
 _part.crossbar_vert,
@@ -2541,6 +2540,7 @@ _part.cyrtail,
 _part.cyrtic,
 _part.cyrtic_center,
 _tildecross.cn,
+breveinv.cn,
 commaaccentright.cn,
 koronisaccentleft.cn,
 _part.bottom_lfthook,
@@ -2554,13 +2554,13 @@ _part.bottom_rthook_left_uc,
 _part.bottom_rthook_r,
 _part.bottom_rthook_s,
 _part.bottom_rthook_uc,
+_part.bottomr_descend,
 _part.brackquill_left,
 _part.brackquill_right,
 _part.curl_sw,
 _part.divfrac,
 _part.q_big,
 _part.rtopbar,
-_part.rtophorn,
 _part.top_left_hook,
 _part.top_r_hook,
 _part.top_r_hook_C,
@@ -2568,6 +2568,5 @@ _part.top_r_hook_G,
 _part.top_r_hook_c,
 _part.top_r_hook_g_sc,
 _part.topbar,
-_part.zeroslash,
-_part.rtophorn.o
+_part.zeroslash
 )
\ No newline at end of file
diff --git a/src/Inter-Roman.glyphspackage/fontinfo.plist b/src/Inter-Roman.glyphspackage/fontinfo.plist
index ebd2d3605..0824da812 100644
--- a/src/Inter-Roman.glyphspackage/fontinfo.plist
+++ b/src/Inter-Roman.glyphspackage/fontinfo.plist
@@ -82,7 +82,7 @@ name = Lowercase;
 },
 {
 automatic = 1;
-code = "A Adieresis Atilde Agrave Aacute Acircumflex Aring Aringacute Aringogonek Amacron Abreve Aogonek Acaron Adieresismacron Adotmacron Adblgrave Ainvertedbreve uni0226 Aringbelow Adotbelow Ahookabove Acircumflexacute Acircumflexgrave Acircumflexhookabove Acircumflextilde Acircumflexdotbelow Abreveacute Abrevegrave Abrevehookabove Abrevetilde Abrevedotbelow Alpha Alphatonos uni1F08 uni1F09 uni1F0A uni1F0B uni1F0C uni1F0D uni1F0E uni1F0F uni1FB8 uni1FB9 uni1FBA uni023A uni1FBB afii10017 Abrevecyrillic Adieresiscyrillic uni1F88 uni1F89 uni1F8A uni1F8B uni1F8C uni1F8D uni1F8E uni1F8F uni1FBC Lambda AE AEmacron AEacute Aiecyrillic B Bdotaccent Bdotbelow Blinebelow uni0243 Bhook afii10019 Beta C Chook Ccedilla Cacute Ccircumflex Cdotaccent Ccaron Ccedillaacute uni023B Oopen uni03F9 D Dhook Dcaron Ddotaccent Ddotbelow Dlinebelow Dcedilla Dcircumflexbelow Dbar1 Dz Dzcaron_ E Egrave Eacute Ecircumflex Edieresis Emacron Ebreve Edotaccent Eogonek Ecaron Edblgrave Einvertedbreve uni0228 Emacrongrave Emacronacute Ecircumflexbelow Etildebelow Ecedillabreve Edotbelow Ehookabove Etilde Ecircumflexacute Ecircumflexgrave Ecircumflexhookabove Ecircumflextilde Ecircumflexdotbelow uni0246 Eturn Epsilon Epsilontonos uni1F18 uni1F19 uni1F1A uni1F1B uni1F1C uni1F1D uni1FC8 uni1FC9 afii10022 uni0400 afii10023 Iebrevecyrillic F Fhook Fdotaccent Fturn G Gbar Ghook Gcircumflex Gbreve Gdotaccent Gcommaaccent Gcaron Gacute Gmacron G.1 Gbar.1 Ghook.1 Gcircumflex.1 Gbreve.1 Gdotaccent.1 Gcommaaccent.1 Gcaron.1 Gacute.1 Gmacron.1 H Hcedilla Hcircumflex uni021E Hdotaccent Hdotbelow Hdieresis Hbrevebelow Hbar Enhookcyrillic Endescendercyrillic Entail-cy Enghecyrillic uni01F6 Eta Etatonos uni1F28 uni1F29 uni1F2A uni1F2B uni1F2C uni1F2D uni1F2E uni1F2F uni1FCA uni1FCB afii10031 uni1F98 uni1F99 uni1F9A uni1F9B uni1F9C uni1F9D uni1F9E uni1F9F uni1FCC I I.double Idieresis Idieresisacute Idieresis.double Istroke Itildebelow Igrave Iacute Icircumflex Itilde Imacron Ibreve Iogonek Idotaccent Icaron Idblgrave Iinvertedbreve Ihookabove Idotbelow Iota IotaGreek Iotatonos Iotadieresis uni1F38 uni1F39 uni1F3A uni1F3B uni1F3C uni1F3D uni1F3E uni1F3F uni1FD8 uni1FD9 uni1FDA uni1FDB afii10055 Yi-cy I.1 Idieresis.1 Idieresisacute.1 Istroke.1 Itildebelow.1 Igrave.1 Iacute.1 Icircumflex.1 Itilde.1 Imacron.1 Ibreve.1 Iogonek.1 Idotaccent.1 Icaron.1 Idblgrave.1 Iinvertedbreve.1 Ihookabove.1 Idotbelow.1 uni1F38.1 uni1F39.1 uni1F3A.1 uni1F3B.1 uni1F3C.1 uni1F3D.1 uni1F3E.1 uni1F3F.1 uni1FD8.1 uni1FD9.1 uni1FDA.1 uni1FDB.1 afii10055.1 Yi-cy.1 J Jcircumflex uni0248 uni037F afii10057 K Kcommaaccent Kcaron Kacute Kdotbelow Klinebelow Kabashkircyrillic Kadescendercyrillic Khook Kappa L Lacute Lcommaaccent Lcaron Ldotbelow Ldotbelowmacron Llinebelow Lcircumflexbelow Lslash Lbar Lj M Macute Mdotaccent Mdotbelow uni04CD Mu uni03FA afii10030 N Ntilde Nacute Ncommaaccent Ncaron uni01F8 Ndotaccent Ndotbelow Nlinebelow Ncircumflexbelow Nhook Eng Ii-cy uni040D afii10027 Imacroncyrillic Idieresiscyrillic uni048A uni0376 Nu Nj O Odieresis Otilde Oslash Ohorn Ograve Oacute Ocircumflex Omacron Obreve Ohungarumlaut Ocaron Oogonek Oogonekmacron Odblgrave Oinvertedbreve uni022A uni022C uni022E uni0230 Otildeacute Otildedieresis Omacrongrave Omacronacute Odotbelow Ohookabove Ocircumflexacute Ocircumflexgrave Ocircumflexhookabove Ocircumflextilde Ocircumflexdotbelow Ohornacute Ohorngrave Ohornhookabove Ohorntilde Ohorndotbelow Oslashacute Omicron Omicrontonos uni1F48 uni1F49 uni1F4A uni1F4B uni1F4C uni1F4D uni1FF8 uni03F4 uni1FF9 afii10032 Odieresiscyrillic Obar Obarredcyrillic Obarreddieresiscyrillic OE P Pacute Pdotaccent uni048E Phook Rho uni1FEC Q Q_rthook R Racute Rcommaaccent Rcaron Rdblgrave Rinvertedbreve Rdotaccent Rdotbelow Rdotbelowmacron Rlinebelow response Rx uni024C S Sacute Scircumflex Scedilla Scaron Scommaaccent Sdotaccent Sdotbelow Sacutedotaccent Scarondotaccent Sdotbelowdotaccent afii10054 Tonetwo Germandbls T Tcommaaccent Tcaron uni021A Tdotaccent Tdotbelow Tlinebelow Tcircumflexbelow Thook Thook.base Trthook uni023E Tau U Uhorn Ugrave Uacute Ucircumflex Udieresis Utilde Umacron Ubreve Uring Uhungarumlaut Uogonek Ucaron Udieresismacron Udieresisacute Udieresiscaron Udieresisgrave Udblgrave Uinvertedbreve Udieresisbelow Utildebelow Ucircumflexbelow Utildeacute Umacrondieresis Udotbelow Uhookabove Uhornacute Uhorngrave Uhornhookabove Uhorntilde Uhorndotbelow uni0244 V Vtilde Vdotbelow W Wcircumflex Wgrave Wacute Wdieresis Wdotaccent Wdotbelow X Xdotaccent Xdieresis Hadescendercyrillic uni04FC Chi Y Yhook Yacute Ycircumflex Ydieresis uni0232 Ydotaccent Ygrave Ydotbelow Yhookabove Ytilde uni024E Upsilon Upsilontonos Upsilondieresis uni1F59 uni1F5B uni1F5D uni1F5F uni1FE8 uni1FE9 uni1FEA uni1FEB Yogonek Z Zacute Zdotaccent Zcaron Zcircumflex Zdotbelow Zlinebelow Zhook Zbar Zeta uni2C7F a aacute abreve abreveacute abrevedotbelow abrevegrave abrevehookabove abrevetilde acaron acircumflex acircumflexacute acircumflexdotbelow acircumflexgrave acircumflexhookabove acircumflextilde adblgrave adieresis adieresismacron uni0227 adotbelow adotmacron agrave ahookabove ainvertedbreve amacron aogonek arighthalfring aring aringacute aringogonek aringbelow atilde aturn acyrillic abrevecyrillic adieresiscyrillic ae aemacron aeacute aiecyrillic a.1 aacute.1 abreve.1 abreveacute.1 abrevedotbelow.1 abrevegrave.1 abrevehookabove.1 abrevetilde.1 acaron.1 acircumflex.1 acircumflexacute.1 acircumflexdotbelow.1 acircumflexgrave.1 acircumflexhookabove.1 acircumflextilde.1 adblgrave.1 adieresis.1 adieresismacron.1 uni0227.1 adotbelow.1 adotmacron.1 agrave.1 ahookabove.1 ainvertedbreve.1 amacron.1 aogonek.1 arighthalfring.1 aring.1 aringacute.1 aringbelow.1 atilde.1 areversed.1 b bbar btopbar bhook bdotaccent bdotbelow blinebelow thorn c uni023C chook ccedilla cacute ccircumflex cdotaccent ccaron ccedillaacute sigmalunatesymbolgreek escyrillic d dcroat drthook dhook dtopbar dcurl dcaron ddotaccent ddotbelow dlinebelow dcedilla dcircumflexbelow dz dzaltone dzcaron dyogh dong e edieresis uni0247 egrave eacute ecircumflex emacron ebreve edotaccent eogonek ecaron edblgrave einvertedbreve uni0229 emacrongrave emacronacute ecircumflexbelow etildebelow ecedillabreve edotbelow ehookabove etilde ecircumflexacute ecircumflexgrave ecircumflexhookabove ecircumflextilde ecircumflexdotbelow iecyrillic uni0450 iocyrillic iebrevecyrillic eturn f longs slongstroke slongdotaccent fdotaccent feng g ghook gbar gcircumflex gbreve gdotaccent gcommaaccent gcaron gacute gmacron g.sc ghook.sc h hcedilla tshecyrillic djecyrillic hhook henghook hv hturn hturnlthook hturnhook2 hbar hcircumflex uni021F hdotaccent hdotbelow hdieresis hbrevebelow hlinebelow shhacyrillic i idotless idotless.double idieresis idieresisacute idieresis.double itilde itildebelow uni1E2D.ccmp ibar igrave iacute icircumflex imacron ibreve uni012F.ccmp iogonek icaron idblgrave iinvertedbreve ihookabove idotbelow uni1ECB.ccmp jdotless jdotlessbar uni0249 uni0249.ccmp icyrillic yi-cy ij i.sc j jcrosstail.ccmp jcrosstail jcircumflex jcaron yotgreek jecyrillic lj k khook kcommaaccent kcaron kacute kdotbelow klinebelow kturn k.base l lslash lbar lmidtilde lrthook lbelt lcurl ldot lacute lcommaaccent lcaron ldotbelow ldotbelowmacron llinebelow lcircumflexbelow l.ss02 lslash.ss02 lbar.ss02 lmidtilde.ss02 lbelt.ss02 ldot.ss02 lacute.ss02 lcommaaccent.ss02 lcaron.ss02 ldotbelow.ss02 ldotbelowmacron.ss02 llinebelow.ss02 lcircumflexbelow.ss02 uni04CF l.sc m mhook mturn mturndescend macute mdotaccent mdotbelow n ntilde nrthook eng ncurl nlfthook nlegrightlong nacute ncommaaccent ncaron uni01F9 ndotaccent ndotbelow nlinebelow ncircumflexbelow nj n.sc o odieresis otilde oslash ohorn ograve oacute ocircumflex omacron obreve ohungarumlaut ocaron oogonek oogonekmacron odblgrave oinvertedbreve uni022B uni022D uni022F uni0231 otildeacute otildedieresis omacrongrave omacronacute odotbelow ohookabove ocircumflexacute ocircumflexgrave ocircumflexhookabove ocircumflextilde ocircumflexdotbelow ohornacute ohorngrave ohornhookabove ohorntilde ohorndotbelow oslashacute omicron omicrontonos uni1F40 uni1F41 uni1F42 uni1F43 uni1F44 uni1F45 uni1F78 fitacyrillic obar ocyrillic odieresiscyrillic oe oe.sc ukcyrillic p uni048F phook pacute pdotaccent ercyrillic q qhook qrthook r rrthook uni024D rturn rturnrthook rfishhookrev rfishhook rdescend racute rcommaaccent rcaron rdblgrave rinvertedbreve rdotaccent rdotbelow rdotbelowmacron rlinebelow r.sc rinv.sc s srthook uni023F sacute scircumflex scedilla scaron scommaaccent sdotaccent sdotbelow sacutedotaccent scarondotaccent sdotbelowdotaccent dzecyrillic tonetwo germandbls germandbls.1 _part.t_base t t.1 tpalatalhook trthook _part.tcurl_base tcurl tccurl tturn tbar tcedilla tcaron tcommaaccent tdotaccent tdotbelow tlinebelow tcircumflexbelow tdieresis u udieresis utilde uhorn micro ubar ugrave uacute ucircumflex umacron ubreve uring uhungarumlaut uogonek ucaron udieresismacron udieresisacute udieresiscaron udieresisgrave udblgrave uinvertedbreve udieresisbelow utildebelow ucircumflexbelow utildeacute umacrondieresis udotbelow uhookabove uhornacute uhorngrave uhornhookabove uhorntilde uhorndotbelow v vturn vtilde vdotbelow w wdieresis wturn wcircumflex wgrave wacute wdotaccent wdotbelow wring x xdotaccent xdieresis khacyrillic chi y ydieresis yhook uni024F yacute ycircumflex uni0233 ydotaccent yring ygrave ydotbelow yhookabove ytilde ucyrillic ushortcyrillic umacroncyrillic udieresiscyrillic uhungarumlautcyrillic yturn Umacroncyrillic Udieresiscyrillic Uhungarumlautcyrillic yogonek y.sc z zbar zhook uni0240 zrthook zacute zdotaccent zcaron zcircumflex zdotbelow zlinebelow Thorn Gamma Delta Theta Xi Pi Sigma Phi Psi Omega uni1FFB Omegatonos uni1F68 uni1F69 uni1F6A uni1F6B uni1F6C uni1F6D uni1F6E uni1F6F uni1FFA uni1FA8 uni1FA9 uni1FAA uni1FAB uni1FAC uni1FAD uni1FAE uni1FAF uni1FFC Upsilon2 Upsilonhooksymbol Upsilonacutehooksymbolgreek Upsilondieresishooksymbolgreek Gamma1 afii10018 afii10050 uni04FA afii10021 afii10024 Zhedescendercyrillic afii10025 Kacyr Kaverticalstrokecyrillic Kahookcyrillic afii10029 afii10147 afii10145 afii10037 afii10038 afii10040 Tetsecyrillic Che-cy Chedescendercyrillic Cheverticalstrokecyrillic Shhacyrillic Sha-cy Shcha-cy afii10044 afii10045 Softsign-cy afii10058 afii10059 afii10047 afii10048 afii10049 Ghemiddlehookcyrillic Pemiddlehookcyrillic afii10053 Haabkhasiancyrillic Cheabkhasiancyrillic Schwacyrillic Dzeabkhasiancyrillic afii10148 afii10051 eth alpha alphatonos uni1F00 uni1F01 uni1F02 uni1F03 uni1F04 uni1F05 uni1F06 uni1F07 uni1F70 uni1F80 uni1F81 uni1F82 uni1F83 uni1F84 uni1F85 uni1F86 uni1F87 uni1FB0 uni1FB1 uni1FB2 uni1FB3 uni1FB4 uni1FB6 uni1FB7 beta gamma delta epsilon epsilontonos epsilonclosed epsilon1 epsilon1rev epsilon1revclosed epsilon1revhook uni1F10 uni1F11 uni1F12 uni1F13 uni1F14 uni1F15 uni1F72 zeta eta etatonos uni1F20 uni1F21 uni1F22 uni1F23 uni1F24 uni1F25 uni1F26 uni1F27 uni1F74 uni1F90 uni1F91 uni1F92 uni1F93 uni1F94 uni1F95 uni1F96 uni1F97 uni1FC2 uni1FC3 uni1FC4 uni1FC6 uni1FC7 theta iota iotadieresistonos iotatonos iotadieresis uni1F30 uni1F31 uni1F32 uni1F33 uni1F34 uni1F35 uni1F36 uni1F37 uni1F76 uni1FD0 uni1FD1 uni1FD2 uni1FD6 uni1FD7 lambda xi pi rho uni1FE4 uni1FE5 uni03FC sigma1 sigma tau upsilon upsilondieresistonos upsilondieresis upsilontonos uni1F50 uni1F51 uni1F52 uni1F53 uni1F54 uni1F55 uni1F56 uni1F57 uni1F7A uni1FE0 uni1FE1 uni1FE2 uni1FE6 uni1FE7 phi phigreek psi omega omegatonos uni1F60 uni1F61 uni1F62 uni1F63 uni1F64 uni1F65 uni1F66 uni1F67 uni1F7C uni1FA0 uni1FA1 uni1FA2 uni1FA3 uni1FA4 uni1FA5 uni1FA6 uni1FA7 uni1FF2 uni1FF3 uni1FF4 uni1FF6 uni1FF7 gamma1 becyrillic vecyrillic ge-cy gheupturncyrillic uni04FB decyrillic zhecyrillic zhedescendercyrillic zecyrillic iicyrillic uni048B kacyrillic kahookcyrillic kadescendercyrillic kaverticalstrokecyrillic kabashkircyrillic elcyrillic uni04C6 eldescender-cy emcyrillic uni04CE encyrillic endescendercyrillic enghecyrillic enhookcyrillic uni04CA pecyrillic tecyrillic efcyrillic hahook-cy hadescendercyrillic tsecyrillic dzhecyrillic checyrillic chedescendercyrillic cheverticalstrokecyrillic shacyrillic shchacyrillic softsigncyrillic hardsigncyrillic yericyrillic semisoftsign-cy yatcyrillic ljecyrillic njecyrillic ereversedcyrillic iucyrillic iacyrillic ghemiddlehookcyrillic pemiddlehookcyrillic ecyrillic haabkhasiancyrillic tetsecyrillic cheabkhasiancyrillic dzeabkhasiancyrillic izhitsacyrillic dollar cent yen sterling florin uni20BA uni20BD euro uni20B9 tenge peseta peso kip won lira austral hryvnia naira guarani coloncurrency cedi cruzeiro tugrik uni20AF mill afii57636 manat rupee lari franc baht bitcoin zero one two twostroke three four five Tonefive six seven eight nine zero.slash one.ss01 three.1 four.ss01 six.ss01 nine.ss01 zero.tf one.tf two.tf three.tf four.tf five.tf six.tf seven.tf eight.tf nine.tf zero.tf.slash one.tf.ss01 three.1.tf four.tf.ss01 six.tf.ss01 nine.tf.ss01 ampersand etTironian exclam exclamdbl exclamdown uni2049 question uni2047 uni2048 questiondown interrobang invertedinterrobang parenleft parenright bracketleft bracketleft_quill bracketright bracketright_quill braceleft braceright at parenleft.case parenright.case bracketleft.case bracketright.case braceleft.case braceright.case at.case numbersign currency slash bar brokenbar backslash hyphen softhyphen endash figuredash emdash horizontalbar bullet openbullet hyphenbullet trianglebullet blackleftbullet blackrightbullet blackSmallSquare hyphen.case endash.case figuredash.case emdash.case bullet.case openbullet.case hyphenbullet.case trianglebullet.case blackleftbullet.case blackrightbullet.case blackSmallSquare.case quoteleft quoteright quotesingle quotedbl quotedblleft quotedblright quotedblbase quotesinglbase quotereversed quotedblreversed prime doubleprime tripleprime quadrupleprime primerev doubleprimerev tripleprimerev primemod doubleprimemod comma period ellipsis twodotleader colon colon.case ratio semicolon comma.tf period.tf colon.tf semicolon.tf periodcentered anoteleia questiongreek guilsinglleft guilsinglright guillemetleft guillemetright less greater lessequal greaterequal equal notequal plus minus multiply divide plusminus approxequal asciitilde less.case greater.case lessequal.case greaterequal.case equal.case notequal.case plus.case minus.case multiply.case divide.case plusminus.case approxequal.case asciitilde.case logicalnot underscore dagger daggerdbl asciicircum asterisk asterisk.case registered copyright copyleft published trademark servicemark tel uni213B uni1F16B uni1F16A degree ordfeminine ordmasculine i.numr n.numr paragraph paragraphreversed section infinity partialdiff summation product integral radical emptyset lozenge a.sups b.sups c.sups d.sups e.sups f.sups g.sups h.sups i.sups j.sups k.sups l.sups m.sups n.sups o.sups p.sups q.sups r.sups s.sups t.sups u.sups v.sups w.sups x.sups y.sups z.sups zero.sups one.sups two.sups three.sups four.sups five.sups six.sups seven.sups eight.sups nine.sups parenleft.sups parenright.sups bracketleft.sups bracketright.sups plus.sups minus.sups equal.sups a.subs b.subs c.subs d.subs e.subs f.subs g.subs h.subs i.subs j.subs k.subs l.subs m.subs n.subs o.subs p.subs q.subs r.subs s.subs t.subs u.subs v.subs w.subs x.subs y.subs z.subs zero.subs one.subs two.subs three.subs four.subs five.subs six.subs seven.subs eight.subs nine.subs parenleft.subs parenright.subs bracketleft.subs bracketright.subs plus.subs minus.subs equal.subs fraction zero.dnom one.dnom two.dnom three.dnom four.dnom five.dnom six.dnom seven.dnom eight.dnom nine.dnom plus.dnom minus.dnom equal.dnom parenleft.dnom parenright.dnom zero.numr one.numr two.numr three.numr four.numr five.numr six.numr seven.numr eight.numr nine.numr plus.numr minus.numr equal.numr parenleft.numr parenright.numr onefraction onehalf zerothird onethird twothirds onequarter threequarters onefifth twofifths threefifths fourfifths onesixth fivesixths oneseventh oneeighth threeeighths fiveeighths seveneighths oneninth onetenth percent perthousand pertenthousand uni214D cadauna careof accountof addresssubject acute hungarumlaut grave tonos dieresis dieresis.three circumflex tilde casetilde.cn macron breve cyrillicbreve dotaccent ring ring.uc caron dieresistonos cedilla ogonek commaaccent acutecomb acutedblnosp gravecomb dblgravecmb macroncomb dieresisnosp brevenosp breveinvnosp hookabovecmb circumflexnosp caroncmb tildecomb dotnosp ringnosp hornnosp ogoneknosp cedillanosp circumflexsubnosp brevesubnosp dotbelow commabelowcmb dotdblsubnosp ringsubnosp underscorenosp tildesubnosp space nbspace narrownbspace mediumspace-math enquad emquad enspace emspace thirdemspace quarteremspace sixthemspace figurespace punctuationspace thinspace hairspace zerowidthspace numero degreecentigrade degreefarenheit degreekelvin angstrom bullseye estimated leftArrow leftLongArrow leftLongArrow2 leftDoubleArrow leftLongDoubleArrow rightArrow rightLongArrow rightLongArrow2 rightDoubleArrow rightLongDoubleArrow northWestArrow northEastArrow southEastArrow southWestArrow leftRightArrow leftRightLongArrow leftRightDoubleArrow leftRightLongDoubleArrow upArrow downArrow upDownArrow leftHookArrow rightHookArrow leftArrow.case leftLongArrow.case leftLongArrow2.case leftDoubleArrow.case leftLongDoubleArrow.case rightArrow.case rightLongArrow.case rightLongArrow2.case rightDoubleArrow.case rightLongDoubleArrow.case leftRightArrow.case leftRightLongArrow.case leftRightDoubleArrow.case leftRightLongDoubleArrow.case dngb_check dngb_ballotx triagdn triagup blackleftpointingtriangle triagrt downWhiteTriangle upWhiteTriangle leftWhiteTriangle rightWhiteTriangle warningSign circleblack circlewhite blackSquare whiteSquare whiteRoundedCornersSquare lowerHalfWhiteSquare topHalfWhiteSquare diamondblack diamondblack_x diamondwhite diamondwhite_x sunWithRays blackSunWithRays heartWhiteSuit heartBlackSuit heavyBlackHeart blackstar whitestar upBlackArrow upWhiteArrow capslock placeofinterestsign control projective insertionsymbol option alternativekeysymbol brokenCircleNorthWestArrow anticlockwiseOpenCircleArrow clockwiseOpenCircleArrow deleteleft deleteright clear ejectsymbol returnsymbol carriagereturn downTipRightArrow upTipLeftArrow upTipRightArrow rightCornerDownArrow arrowtableft arrowtabright pageup pagedown largeCircle whiteLargeSquare enclosingcirclecomb enclosingsquarecomb A.circled B.circled C.circled D.circled E.circled F.circled G.circled H.circled I.circled J.circled K.circled L.circled M.circled N.circled O.circled P.circled Q.circled R.circled S.circled T.circled U.circled V.circled W.circled X.circled Y.circled Z.circled zero.circled one.circled two.circled three.circled four.circled five.circled six.circled seven.circled eight.circled nine.circled zero.slash.circled one.ss01.circled three.1.circled four.ss01.circled six.ss01.circled nine.ss01.circled exclam.circled question.circled numbersign.circled hyphen.circled less.circled greater.circled equal.circled plus.circled minus.circled fraction.circled multiply.circled divide.circled upArrow.circled downArrow.circled leftArrow.circled rightArrow.circled dngb_check.circled dngb_ballotx.circled A.squared B.squared C.squared D.squared E.squared F.squared G.squared G.1.squared H.squared I.squared J.squared K.squared L.squared M.squared N.squared O.squared P.squared Q.squared R.squared S.squared T.squared U.squared V.squared W.squared X.squared Y.squared Z.squared zero.squared one.squared two.squared three.squared four.squared five.squared six.squared seven.squared eight.squared nine.squared zero.slash.squared one.ss01.squared three.1.squared four.ss01.squared six.ss01.squared nine.ss01.squared exclam.squared question.squared numbersign.squared hyphen.squared less.squared greater.squared equal.squared plus.squared minus.squared fraction.squared multiply.squared divide.squared upArrow.squared downArrow.squared leftArrow.squared rightArrow.squared dngb_check.squared dngb_ballotx.squared Btopbar DZ Eth Dcroat Dtopbar Epsilon1 Esh Schwa Ezh Ezhcaron Ezhreversed uni021C IJ LJ Ldot NJ OI Tbar Tonesix Vcursive YR mcapturn uni01F7 uni0220 uni0222 uni0241 uni0245 uni1EFA uni1EFC uni1EFE ascript ascriptturn babygamma cstretch deltaturn erev esh eshcurl eshlooprev schwa schwahook ezh ezhcaron ezhcurl ezhreversed ezhtail finalkaf finalmem gcursive glottalstop glottalstopbar glottalstopbarinv glottalstopbarrev glottalstopinv glottalstoprevinv uni021D jhookdblbar kgreenlandic lambdabar lyogh oi omegaclosed oopen philatin rturnascend tesh thook tonefive tonesix ts uni0223 uni0238 uni0239 uni0242 uni0299 uni02AB uni02AC uni1E9D uni1E9F uni1EFB uni1EFD uni1EFF uni2184 upsilonlatin vscript wynn h.sc m.sc t.sc uni2094 Rturnsuper finaltsadi hhooksuper rturnsuper exclam1 pipe pipedbl pipedblbar uniA7FF Ge-cy afii10052 uni04F6 Ghestrokecyrillic afii10061 Pe-cy afii10034 afii10035 Te-cy afii10062 afii10039 Tshe-cy Omegacyrillic afii10146 Eiotifiedcyrillic Yuslittlecyrillic Yuslittleiotifiedcyrillic Yusbigcyrillic Yusbigiotifiedcyrillic Ksicyrillic Psicyrillic Izhitsadblgravecyrillic Ukcyrillic Zedescendercyrillic Esdescendercyrillic Tedescendercyrillic Ustraightcyrillic Ustraightstrokecyrillic Chedescenderabkhasiancyrillic palochkacyrillic Zhebrevecyrillic Eltail-cy Chekhakassiancyrillic Schwadieresiscyrillic Zhedieresiscyrillic Zedieresiscyrillic uni04EC Chedieresiscyrillic Yerudieresiscyrillic uni04FE Koppacyrillic uni048C Pe-cy.turn gjecyrillic gedescender-cy ghestrokecyrillic iishortcyrillic uni045D kjecyrillic omegacyrillic eiotifiedcyrillic yuslittlecyrillic yuslittleiotifiedcyrillic yusbigcyrillic yusbigiotifiedcyrillic ksicyrillic psicyrillic izhitsadblgravecyrillic zedescendercyrillic esdescendercyrillic tedescendercyrillic ustraightcyrillic ustraightstrokecyrillic chedescenderabkhasiancyrillic zhebrevecyrillic chekhakassiancyrillic schwacyrillic schwadieresiscyrillic zhedieresiscyrillic zedieresiscyrillic imacroncyrillic idieresiscyrillic obarredcyrillic obarreddieresiscyrillic edieresis-cy chedieresiscyrillic yerudieresiscyrillic uni04FF koppacyrillic uni0370 uni0372 uni03D8 Stigma Digamma Koppa Sampi uni03CF uni03F7 uni03FD uni03FE uni03FF kappa mugreek nu uni0371 uni0373 uni0377 uni037B uni037C uni037D uni03D9 stigma digamma koppa sampi uni03D7 beta1 thetasymbolgreek pisymbolgreek kappa1 rho1 uni03F5 uni03F8 uni03FB uni1F71 uni1F73 uni1F75 uni1F77 uni1FD3 uni1F79 uni1F7B uni1FE3 uni1F7D uni1FBE ypogegrammeni uni1DBF romanone romantwo romanthree romanfour romanfive romansix romanseven romaneight romannine romanten romaneleven romantwelve romanfifty romanhundred romanfivehundred romanthousand oneroman tworoman threeroman fourroman fiveroman sixroman sevenroman eightroman nineroman tenroman elevenroman twelveroman uni217C uni217D uni217E uni217F uni2180 uni2181 uni2182 uni2183 uni2185 uni2186 uni2187 uni2188 zerowidthjoiner uniA92E uni27EF asterism caretSign caretinsertionpoint charactertie hyphendot onedotleader overline referencemark reversedsemicolon undertie uni204E uni2050 uni2051 uni2053 uni2054 uni2055 uni2056 uni2058 uni2059 uni205A uni205B uni205C uni205D uni205E verticalbardbl hyphen__ hyphennobreak underscoredbl gammasuper thousandcyrillic numeralgreek numeralgreeksub uni03F6 arrowheaddownmod arrowheadleftmod arrowheadrightmod arrowheadupmod dblapostrophe downtackmod lowdownarrowheadmod minusmod plusmod ringhalfleftcentered ringhalfrightcentered uni02EC uni02ED uni02F0 uni02F1 uni02F2 uni02F3 uni02F4 uni02F5 uni02F6 uni02F7 uni02F8 uni02F9 uni02FA uni02FB uni02FC uni02FD uni02FE uni02FF uptackmod tonebarextrahighmod.cn tonebarextralowmod.cn tonebarhighmod.cn tonebarlowmod.cn tonebarmidmod.cn qofdagesh rhotichookmod glottalstopreversed.numr lsquare spaceopenbox uni214F versicle eurocurrency uni20B0 uni20B6 uni20B7 uni20BB commercialMinusSign uni0363 uni0364 uni0365 uni0366 uni0367 uni0368 uni0369 uni036A uni036B uni036C uni036D uni036E uni036F uni1DCA uni1DD3 uni1DD4 uni1DD5 uni1DD6 uni1DD7 uni1DD8 uni1DD9 uni1DDA uni1DDB uni1DDC uni1DDD uni1DDE uni1DDF uni1DE0 uni1DE1 uni1DE2 uni1DE3 uni1DE4 uni1DE5 uni1DE6 uni1DE7 uni1DE9 uni0488 uni0489 titlocyrilliccmb palatalizationcyrilliccmb dasiapneumatacyrilliccmb psilipneumatacyrilliccmb uni0487 uniA69F perispomenigreekcmb koroniscmb diaeresistonosnosp iotasubnosp uni1FBF uni1FBD uni1FFE uni1FCD uni1FDD uni1FCE uni1FDE uni1FCF uni1FDF uni1FED uni1FEE uni1FC1 uni1FEF uni1FFD uni1FC0 uniFE20 uniFE21 uniFE27 uniFE28 overscorenosp linevertnosp linevertdblnosp candrabindunosp commaturnsupnosp commaabovecmb commasuprevnosp commaaboverightcmb gravesubnosp acutesubnosp tackleftsubnosp tackrightsubnosp anglesupnosp ringlefthalfsubnosp tackupsubnosp tackdownsubnosp hooksubpalatnosp hooksubretronosp linevertsubnosp bridgesubnosp archdblsubnosp caronbelowcmb breveinvsubnosp macronsubnosp underscoredblnosp tildemidnosp barmidshortnosp barmidlongnosp slashshortnosp slashshortcomb slashlongnosp ringrighthalfsubnosp bridgeinvsubnosp squaresubnosp seagullsubnosp xsupnosp tildevertsupnosp overscoredblnosp graveleftnosp acuterightnosp uni0346 equalbelowcomb uni0348 uni0349 uni034A uni034B uni034C uni034D uni034E uni034F arrowheadrightabovecomb uni0351 uni0352 uni0353 uni0354 uni0355 uni0356 uni0357 uni0358 uni0359 uni035A uni035B uni035C uni035D uni035E uni035F tildedoublecmb breveinverteddoublecmb uni0362 uni1DC0 uni1DC1 uni1DC2 uni1DC3 uni1DC4 uni1DC5 uni1DC6 uni1DC7 uni1DC8 uni1DC9 uni1DCB uni1DCC uni1DCD uni1DCE uni1DCF uni1DD0 uni1DD1 uni1DD2 uni1DE8 uni1DEA uni1DEB uni1DEC uni1DED uni1DEE uni1DEF uni1DF0 uni1DF1 uni1DF2 uni1DF3 uni1DF4 uni1DF5 uni1DFC uni1DFD uni1DFE uni1DFF uni20DB uni20DC uni20E8 uni20F0 uniFE22 uniFE23 uniFE24 uniFE25 uniFE26 uniFE29 uniFE2A uniFE2B uniFE2C uniFE2D slashshortcomb.uc firsttonechinese secondtonechinese fourthtonechinese uni02EA uni02EB ogonek.A ogonek.O ogonek.U ogonek.a ogonek.e ogonek.o ogonek.y acutelowmod colontriangularhalfmod colontriangularmod commareversedmod commaturnedmod glottalstopmod glottalstopreversedmod gravelowmod linevert macronsub ringhalfleft ringhalfright verticallinelowmod uni2DFF uni0268.ccmp uni2071.ccmp uni02B2.ccmp macronacutecomb.cn macrongravecomb.cn macronacutecomb.lc macrongravecomb.lc uni1FFE.tonos uni1FCD.tonos uni1FDD.tonos uni1FCE.tonos uni1FDE.tonos uni1FCF.tonos uni1FDF.tonos uni1FEF.tonos uni1FFD.tonos crossbar acutedotcomb.lc tildedieresiscomb.lc dieresisacutecomb.lc carondotcomb.lc caronnosp caronsubnosp ascript_uni02DE cyrillichookleft dotmacroncomb.lc dieresismacroncomb.lc dieresisgravecomb.lc largerighthook tildemacroncomb.lc macrondieresiscomb.lc tildeacutecomb dieresiscaroncomb.lc _part.cyrtic_hook ringacute.cn circumflexgravecomb.cn dieresiscaroncomb.cn dieresismacroncomb.cn carondotcomb.cn breveacutecomb.cn acutedotcomb.cn brevegravecomb.cn tildedieresiscomb.cn circumflexhookcomb.cn brevetildecomb.cn dieresisacutecomb.cn dotmacroncomb.cn macrondieresiscomb.cn dieresisgravecomb.cn tildemacroncomb.cn circumflextildecomb.cn brevehookcomb.cn commaaccentrotate.cn tonostop tildeacutecomb.uc circumflexacutecomb.cn pecyrillicturn _part.crossbar_compact _part.crossbar_compact_rext _part.crossbar_vert _part.cyrtail _part.cyrtic _part.cyrtic_center _tildecross.cn commaaccentright.cn koronisaccentleft.cn";
+code = "A Adieresis Atilde Agrave Aacute Acircumflex Aring Aringacute Aringogonek Amacron Abreve Aogonek Acaron Adieresismacron Adotmacron Adblgrave Ainvertedbreve uni0226 Aringbelow Adotbelow Ahookabove Acircumflexacute Acircumflexgrave Acircumflexhookabove Acircumflextilde Acircumflexdotbelow Abreveacute Abrevegrave Abrevehookabove Abrevetilde Abrevedotbelow Alpha Alphatonos uni1F08 uni1F09 uni1F0A uni1F0B uni1F0C uni1F0D uni1F0E uni1F0F uni1FB8 uni1FB9 uni1FBA uni023A uni1FBB afii10017 Abrevecyrillic Adieresiscyrillic uni1F88 uni1F89 uni1F8A uni1F8B uni1F8C uni1F8D uni1F8E uni1F8F uni1FBC Lambda AE AEmacron AEacute Aiecyrillic B Bdotaccent Bdotbelow Blinebelow uni0243 Bhook afii10019 Beta C Chook Ccedilla Cacute Ccircumflex Cdotaccent Ccaron Ccedillaacute uni023B Oopen uni03F9 D Dhook Dcaron Ddotaccent Ddotbelow Dlinebelow Dcedilla Dcircumflexbelow Dbar1 Dz Dzcaron_ E Egrave Eacute Ecircumflex Edieresis Emacron Ebreve Edotaccent Eogonek Ecaron Edblgrave Einvertedbreve uni0228 Emacrongrave Emacronacute Ecircumflexbelow Etildebelow Ecedillabreve Edotbelow Ehookabove Etilde Ecircumflexacute Ecircumflexgrave Ecircumflexhookabove Ecircumflextilde Ecircumflexdotbelow uni0246 Eturn Epsilon Epsilontonos uni1F18 uni1F19 uni1F1A uni1F1B uni1F1C uni1F1D uni1FC8 uni1FC9 afii10022 uni0400 afii10023 Iebrevecyrillic F Fhook Fdotaccent Fturn G Gbar Ghook Gcircumflex Gbreve Gdotaccent Gcommaaccent Gcaron Gacute Gmacron G.1 Gbar.1 Ghook.1 Gcircumflex.1 Gbreve.1 Gdotaccent.1 Gcommaaccent.1 Gcaron.1 Gacute.1 Gmacron.1 H Hcedilla Hcircumflex uni021E Hdotaccent Hdotbelow Hdieresis Hbrevebelow Hbar Enhookcyrillic Endescendercyrillic Entail-cy Enghecyrillic uni01F6 Eta Etatonos uni1F28 uni1F29 uni1F2A uni1F2B uni1F2C uni1F2D uni1F2E uni1F2F uni1FCA uni1FCB afii10031 uni1F98 uni1F99 uni1F9A uni1F9B uni1F9C uni1F9D uni1F9E uni1F9F uni1FCC I I.double Idieresis Idieresisacute Idieresis.double Istroke Itildebelow Igrave Iacute Icircumflex Itilde Imacron Ibreve Iogonek Idotaccent Icaron Idblgrave Iinvertedbreve Ihookabove Idotbelow Iota IotaGreek Iotatonos Iotadieresis uni1F38 uni1F39 uni1F3A uni1F3B uni1F3C uni1F3D uni1F3E uni1F3F uni1FD8 uni1FD9 uni1FDA uni1FDB afii10055 Yi-cy I.1 Idieresis.1 Idieresisacute.1 Istroke.1 Itildebelow.1 Igrave.1 Iacute.1 Icircumflex.1 Itilde.1 Imacron.1 Ibreve.1 Iogonek.1 Idotaccent.1 Icaron.1 Idblgrave.1 Iinvertedbreve.1 Ihookabove.1 Idotbelow.1 uni1F38.1 uni1F39.1 uni1F3A.1 uni1F3B.1 uni1F3C.1 uni1F3D.1 uni1F3E.1 uni1F3F.1 uni1FD8.1 uni1FD9.1 uni1FDA.1 uni1FDB.1 afii10055.1 Yi-cy.1 J Jcircumflex uni0248 uni037F afii10057 K Kcommaaccent Kcaron Kacute Kdotbelow Klinebelow Kabashkircyrillic Kadescendercyrillic Khook Kappa L Lacute Lcommaaccent Lcaron Ldotbelow Ldotbelowmacron Llinebelow Lcircumflexbelow Lslash Lbar Lj M Macute Mdotaccent Mdotbelow uni04CD Mu uni03FA afii10030 N Ntilde Nacute Ncommaaccent Ncaron uni01F8 Ndotaccent Ndotbelow Nlinebelow Ncircumflexbelow Nhook Eng Ii-cy uni040D afii10027 Imacroncyrillic Idieresiscyrillic uni048A uni0376 Nu Nj O Odieresis Otilde Oslash Ohorn Ograve Oacute Ocircumflex Omacron Obreve Ohungarumlaut Ocaron Oogonek Oogonekmacron Odblgrave Oinvertedbreve uni022A uni022C uni022E uni0230 Otildeacute Otildedieresis Omacrongrave Omacronacute Odotbelow Ohookabove Ocircumflexacute Ocircumflexgrave Ocircumflexhookabove Ocircumflextilde Ocircumflexdotbelow Ohornacute Ohorngrave Ohornhookabove Ohorntilde Ohorndotbelow Oslashacute Omicron Omicrontonos uni1F48 uni1F49 uni1F4A uni1F4B uni1F4C uni1F4D uni1FF8 uni03F4 uni1FF9 afii10032 Odieresiscyrillic Obar Obarredcyrillic Obarreddieresiscyrillic OE P Pacute Pdotaccent uni048E Phook Rho uni1FEC Q Q_rthook R Racute Rcommaaccent Rcaron Rdblgrave Rinvertedbreve Rdotaccent Rdotbelow Rdotbelowmacron Rlinebelow response Rx uni024C S Sacute Scircumflex Scedilla Scaron Scommaaccent Sdotaccent Sdotbelow Sacutedotaccent Scarondotaccent Sdotbelowdotaccent afii10054 Tonetwo Germandbls T Tcommaaccent Tcaron uni021A Tdotaccent Tdotbelow Tlinebelow Tcircumflexbelow Thook Thook.base Trthook uni023E Tau U Uhorn Ugrave Uacute Ucircumflex Udieresis Utilde Umacron Ubreve Uring Uhungarumlaut Uogonek Ucaron Udieresismacron Udieresisacute Udieresiscaron Udieresisgrave Udblgrave Uinvertedbreve Udieresisbelow Utildebelow Ucircumflexbelow Utildeacute Umacrondieresis Udotbelow Uhookabove Uhornacute Uhorngrave Uhornhookabove Uhorntilde Uhorndotbelow uni0244 V Vtilde Vdotbelow W Wcircumflex Wgrave Wacute Wdieresis Wdotaccent Wdotbelow X Xdotaccent Xdieresis Hadescendercyrillic uni04FC Chi Y Yhook Yacute Ycircumflex Ydieresis uni0232 Ydotaccent Ygrave Ydotbelow Yhookabove Ytilde uni024E Upsilon Upsilontonos Upsilondieresis uni1F59 uni1F5B uni1F5D uni1F5F uni1FE8 uni1FE9 uni1FEA uni1FEB Yogonek Z Zacute Zdotaccent Zcaron Zcircumflex Zdotbelow Zlinebelow Zhook Zbar Zeta uni2C7F a aacute abreve abreveacute abrevedotbelow abrevegrave abrevehookabove abrevetilde acaron acircumflex acircumflexacute acircumflexdotbelow acircumflexgrave acircumflexhookabove acircumflextilde adblgrave adieresis adieresismacron uni0227 adotbelow adotmacron agrave ahookabove ainvertedbreve amacron aogonek arighthalfring aring aringacute aringogonek aringbelow atilde aturn acyrillic abrevecyrillic adieresiscyrillic ae aemacron aeacute aiecyrillic a.1 aacute.1 abreve.1 abreveacute.1 abrevedotbelow.1 abrevegrave.1 abrevehookabove.1 abrevetilde.1 acaron.1 acircumflex.1 acircumflexacute.1 acircumflexdotbelow.1 acircumflexgrave.1 acircumflexhookabove.1 acircumflextilde.1 adblgrave.1 adieresis.1 adieresismacron.1 uni0227.1 adotbelow.1 adotmacron.1 agrave.1 ahookabove.1 ainvertedbreve.1 amacron.1 aogonek.1 arighthalfring.1 aring.1 aringacute.1 aringbelow.1 atilde.1 areversed.1 b bbar btopbar bhook bdotaccent bdotbelow blinebelow thorn c uni023C chook ccedilla cacute ccircumflex cdotaccent ccaron ccedillaacute sigmalunatesymbolgreek escyrillic d dcroat drthook dhook dtopbar dcurl dcaron ddotaccent ddotbelow dlinebelow dcedilla dcircumflexbelow dz dzaltone dzcaron dyogh dong e edieresis uni0247 egrave eacute ecircumflex emacron ebreve edotaccent eogonek ecaron edblgrave einvertedbreve uni0229 emacrongrave emacronacute ecircumflexbelow etildebelow ecedillabreve edotbelow ehookabove etilde ecircumflexacute ecircumflexgrave ecircumflexhookabove ecircumflextilde ecircumflexdotbelow iecyrillic uni0450 iocyrillic iebrevecyrillic eturn f longs slongstroke slongdotaccent fdotaccent feng g ghook gbar gcircumflex gbreve gdotaccent gcommaaccent gcaron gacute gmacron g.sc ghook.sc h hcedilla tshecyrillic djecyrillic hhook henghook hv hturn hturnlthook hturnhook2 hbar hcircumflex uni021F hdotaccent hdotbelow hdieresis hbrevebelow hlinebelow shhacyrillic i idotless idotless.double idieresis idieresisacute idieresis.double itilde itildebelow uni1E2D.ccmp ibar igrave iacute icircumflex imacron ibreve uni012F.ccmp iogonek icaron idblgrave iinvertedbreve ihookabove idotbelow uni1ECB.ccmp jdotless jdotlessbar uni0249 uni0249.ccmp icyrillic yi-cy ij i.sc j jcrosstail.ccmp jcrosstail jcircumflex jcaron yotgreek jecyrillic lj k khook kcommaaccent kcaron kacute kdotbelow klinebelow kturn k.base l lslash lbar lmidtilde lrthook lbelt lcurl ldot lacute lcommaaccent lcaron ldotbelow ldotbelowmacron llinebelow lcircumflexbelow l.ss02 lslash.ss02 lbar.ss02 lmidtilde.ss02 lbelt.ss02 ldot.ss02 lacute.ss02 lcommaaccent.ss02 lcaron.ss02 ldotbelow.ss02 ldotbelowmacron.ss02 llinebelow.ss02 lcircumflexbelow.ss02 uni04CF l.sc m mhook mturn mturndescend macute mdotaccent mdotbelow n ntilde nrthook eng ncurl nlfthook nlegrightlong nacute ncommaaccent ncaron uni01F9 ndotaccent ndotbelow nlinebelow ncircumflexbelow nj n.sc o odieresis otilde oslash ohorn ograve oacute ocircumflex omacron obreve ohungarumlaut ocaron oogonek oogonekmacron odblgrave oinvertedbreve uni022B uni022D uni022F uni0231 otildeacute otildedieresis omacrongrave omacronacute odotbelow ohookabove ocircumflexacute ocircumflexgrave ocircumflexhookabove ocircumflextilde ocircumflexdotbelow ohornacute ohorngrave ohornhookabove ohorntilde ohorndotbelow oslashacute omicron omicrontonos uni1F40 uni1F41 uni1F42 uni1F43 uni1F44 uni1F45 uni1F78 fitacyrillic obar ocyrillic odieresiscyrillic oe oe.sc ukcyrillic p uni048F phook pacute pdotaccent ercyrillic q qhook qrthook r rrthook uni024D rturn rturnrthook rfishhookrev rfishhook rdescend racute rcommaaccent rcaron rdblgrave rinvertedbreve rdotaccent rdotbelow rdotbelowmacron rlinebelow r.sc rinv.sc s srthook uni023F sacute scircumflex scedilla scaron scommaaccent sdotaccent sdotbelow sacutedotaccent scarondotaccent sdotbelowdotaccent dzecyrillic tonetwo germandbls germandbls.1 _part.t_base t t.1 tpalatalhook trthook _part.tcurl_base tcurl tccurl tturn tbar tcedilla tcaron tcommaaccent tdotaccent tdotbelow tlinebelow tcircumflexbelow tdieresis u udieresis utilde uhorn micro ubar ugrave uacute ucircumflex umacron ubreve uring uhungarumlaut uogonek ucaron udieresismacron udieresisacute udieresiscaron udieresisgrave udblgrave uinvertedbreve udieresisbelow utildebelow ucircumflexbelow utildeacute umacrondieresis udotbelow uhookabove uhornacute uhorngrave uhornhookabove uhorntilde uhorndotbelow v vturn vtilde vdotbelow w wdieresis wturn wcircumflex wgrave wacute wdotaccent wdotbelow wring x xdotaccent xdieresis khacyrillic chi y ydieresis yhook uni024F yacute ycircumflex uni0233 ydotaccent yring ygrave ydotbelow yhookabove ytilde ucyrillic ushortcyrillic umacroncyrillic udieresiscyrillic uhungarumlautcyrillic yturn Umacroncyrillic Udieresiscyrillic Uhungarumlautcyrillic yogonek y.sc z zbar zhook uni0240 zrthook zacute zdotaccent zcaron zcircumflex zdotbelow zlinebelow Thorn Gamma Delta Theta Xi Pi Sigma Phi Psi Omega uni1FFB Omegatonos uni1F68 uni1F69 uni1F6A uni1F6B uni1F6C uni1F6D uni1F6E uni1F6F uni1FFA uni1FA8 uni1FA9 uni1FAA uni1FAB uni1FAC uni1FAD uni1FAE uni1FAF uni1FFC Upsilon2 Upsilonhooksymbol Upsilonacutehooksymbolgreek Upsilondieresishooksymbolgreek Gamma1 afii10018 afii10050 uni04FA afii10021 afii10024 Zhedescendercyrillic afii10025 Kacyr Kaverticalstrokecyrillic Kahookcyrillic afii10029 afii10147 afii10145 afii10037 afii10038 afii10040 Tetsecyrillic Che-cy Chedescendercyrillic Cheverticalstrokecyrillic Shhacyrillic Sha-cy Shcha-cy afii10044 afii10045 Softsign-cy afii10058 afii10059 afii10047 afii10048 afii10049 Ghemiddlehookcyrillic Pemiddlehookcyrillic afii10053 Haabkhasiancyrillic Cheabkhasiancyrillic Schwacyrillic Dzeabkhasiancyrillic afii10148 afii10051 eth alpha alphatonos uni1F00 uni1F01 uni1F02 uni1F03 uni1F04 uni1F05 uni1F06 uni1F07 uni1F70 uni1F80 uni1F81 uni1F82 uni1F83 uni1F84 uni1F85 uni1F86 uni1F87 uni1FB0 uni1FB1 uni1FB2 uni1FB3 uni1FB4 uni1FB6 uni1FB7 beta gamma delta epsilon epsilontonos epsilonclosed epsilon1 epsilon1rev epsilon1revclosed epsilon1revhook uni1F10 uni1F11 uni1F12 uni1F13 uni1F14 uni1F15 uni1F72 zeta eta etatonos uni1F20 uni1F21 uni1F22 uni1F23 uni1F24 uni1F25 uni1F26 uni1F27 uni1F74 uni1F90 uni1F91 uni1F92 uni1F93 uni1F94 uni1F95 uni1F96 uni1F97 uni1FC2 uni1FC3 uni1FC4 uni1FC6 uni1FC7 theta iota iotadieresistonos iotatonos iotadieresis uni1F30 uni1F31 uni1F32 uni1F33 uni1F34 uni1F35 uni1F36 uni1F37 uni1F76 uni1FD0 uni1FD1 uni1FD2 uni1FD6 uni1FD7 lambda xi pi rho uni1FE4 uni1FE5 uni03FC sigma1 sigma tau upsilon upsilondieresistonos upsilondieresis upsilontonos uni1F50 uni1F51 uni1F52 uni1F53 uni1F54 uni1F55 uni1F56 uni1F57 uni1F7A uni1FE0 uni1FE1 uni1FE2 uni1FE6 uni1FE7 phi phigreek psi omega omegatonos uni1F60 uni1F61 uni1F62 uni1F63 uni1F64 uni1F65 uni1F66 uni1F67 uni1F7C uni1FA0 uni1FA1 uni1FA2 uni1FA3 uni1FA4 uni1FA5 uni1FA6 uni1FA7 uni1FF2 uni1FF3 uni1FF4 uni1FF6 uni1FF7 gamma1 becyrillic vecyrillic ge-cy gheupturncyrillic uni04FB decyrillic zhecyrillic zhedescendercyrillic zecyrillic iicyrillic uni048B kacyrillic kahookcyrillic kadescendercyrillic kaverticalstrokecyrillic kabashkircyrillic elcyrillic uni04C6 eldescender-cy emcyrillic uni04CE encyrillic endescendercyrillic enghecyrillic enhookcyrillic uni04CA pecyrillic tecyrillic efcyrillic hahook-cy hadescendercyrillic tsecyrillic dzhecyrillic checyrillic chedescendercyrillic cheverticalstrokecyrillic shacyrillic shchacyrillic softsigncyrillic hardsigncyrillic yericyrillic semisoftsign-cy yatcyrillic ljecyrillic njecyrillic ereversedcyrillic iucyrillic iacyrillic ghemiddlehookcyrillic pemiddlehookcyrillic ecyrillic haabkhasiancyrillic tetsecyrillic cheabkhasiancyrillic dzeabkhasiancyrillic izhitsacyrillic dollar cent yen sterling florin uni20BA uni20BD euro uni20B9 tenge peseta peso kip won lira austral hryvnia naira guarani coloncurrency cedi cruzeiro tugrik uni20AF mill afii57636 manat rupee lari franc baht bitcoin zero one two twostroke three four five Tonefive six seven eight nine zero.slash one.ss01 three.1 four.ss01 six.ss01 nine.ss01 zero.tf one.tf two.tf three.tf four.tf five.tf six.tf seven.tf eight.tf nine.tf zero.tf.slash one.tf.ss01 three.1.tf four.tf.ss01 six.tf.ss01 nine.tf.ss01 ampersand etTironian exclam exclamdbl exclamdown uni2049 question uni2047 uni2048 questiondown interrobang invertedinterrobang parenleft parenright bracketleft bracketleft_quill bracketright bracketright_quill braceleft braceright at parenleft.case parenright.case bracketleft.case bracketright.case braceleft.case braceright.case at.case numbersign currency slash bar brokenbar backslash hyphen softhyphen endash figuredash emdash horizontalbar bullet openbullet hyphenbullet trianglebullet blackleftbullet blackrightbullet blackSmallSquare hyphen.case endash.case figuredash.case emdash.case bullet.case openbullet.case hyphenbullet.case trianglebullet.case blackleftbullet.case blackrightbullet.case blackSmallSquare.case quoteleft quoteright quotesingle quotedbl quotedblleft quotedblright quotedblbase quotesinglbase quotereversed quotedblreversed prime doubleprime tripleprime quadrupleprime primerev doubleprimerev tripleprimerev primemod doubleprimemod comma period ellipsis twodotleader colon colon.case ratio semicolon comma.tf period.tf colon.tf semicolon.tf periodcentered anoteleia questiongreek guilsinglleft guilsinglright guillemetleft guillemetright less greater lessequal greaterequal equal notequal plus minus multiply divide plusminus approxequal asciitilde less.case greater.case lessequal.case greaterequal.case equal.case notequal.case plus.case minus.case multiply.case divide.case plusminus.case approxequal.case asciitilde.case logicalnot underscore dagger daggerdbl asciicircum asterisk asterisk.case registered copyright copyleft published trademark servicemark tel uni213B uni1F16B uni1F16A degree ordfeminine ordmasculine i.numr n.numr paragraph paragraphreversed section infinity partialdiff summation product integral radical emptyset lozenge a.sups b.sups c.sups d.sups e.sups f.sups g.sups h.sups i.sups j.sups k.sups l.sups m.sups n.sups o.sups p.sups q.sups r.sups s.sups t.sups u.sups v.sups w.sups x.sups y.sups z.sups zero.sups one.sups two.sups three.sups four.sups five.sups six.sups seven.sups eight.sups nine.sups parenleft.sups parenright.sups bracketleft.sups bracketright.sups plus.sups minus.sups equal.sups a.subs b.subs c.subs d.subs e.subs f.subs g.subs h.subs i.subs j.subs k.subs l.subs m.subs n.subs o.subs p.subs q.subs r.subs s.subs t.subs u.subs v.subs w.subs x.subs y.subs z.subs zero.subs one.subs two.subs three.subs four.subs five.subs six.subs seven.subs eight.subs nine.subs parenleft.subs parenright.subs bracketleft.subs bracketright.subs plus.subs minus.subs equal.subs fraction zero.dnom one.dnom two.dnom three.dnom four.dnom five.dnom six.dnom seven.dnom eight.dnom nine.dnom plus.dnom minus.dnom equal.dnom parenleft.dnom parenright.dnom zero.numr one.numr two.numr three.numr four.numr five.numr six.numr seven.numr eight.numr nine.numr plus.numr minus.numr equal.numr parenleft.numr parenright.numr onefraction onehalf zerothird onethird twothirds onequarter threequarters onefifth twofifths threefifths fourfifths onesixth fivesixths oneseventh oneeighth threeeighths fiveeighths seveneighths oneninth onetenth percent perthousand pertenthousand uni214D cadauna careof accountof addresssubject acute hungarumlaut grave tonos dieresis dieresis.three circumflex tilde macron breve cyrillicbreve dotaccent ring ring.uc caron dieresistonos cedilla ogonek commaaccent acutecomb acutedblnosp gravecomb dblgravecmb macroncomb dieresisnosp brevenosp breveinvnosp hookabovecmb circumflexnosp caroncmb tildecomb dotnosp ringnosp hornnosp ogoneknosp cedillanosp circumflexsubnosp brevesubnosp dotbelow commabelowcmb dotdblsubnosp ringsubnosp underscorenosp tildesubnosp space nbspace narrownbspace mediumspace-math enquad emquad enspace emspace thirdemspace quarteremspace sixthemspace figurespace punctuationspace thinspace hairspace zerowidthspace numero degreecentigrade degreefarenheit degreekelvin angstrom bullseye estimated leftArrow leftLongArrow leftLongArrow2 leftDoubleArrow leftLongDoubleArrow rightArrow rightLongArrow rightLongArrow2 rightDoubleArrow rightLongDoubleArrow northWestArrow northEastArrow southEastArrow southWestArrow leftRightArrow leftRightLongArrow leftRightDoubleArrow leftRightLongDoubleArrow upArrow downArrow upDownArrow leftHookArrow rightHookArrow leftArrow.case leftLongArrow.case leftLongArrow2.case leftDoubleArrow.case leftLongDoubleArrow.case rightArrow.case rightLongArrow.case rightLongArrow2.case rightDoubleArrow.case rightLongDoubleArrow.case leftRightArrow.case leftRightLongArrow.case leftRightDoubleArrow.case leftRightLongDoubleArrow.case dngb_check dngb_ballotx triagdn triagup blackleftpointingtriangle triagrt downWhiteTriangle upWhiteTriangle leftWhiteTriangle rightWhiteTriangle warningSign circleblack circlewhite blackSquare whiteSquare whiteRoundedCornersSquare lowerHalfWhiteSquare topHalfWhiteSquare diamondblack diamondblack_x diamondwhite diamondwhite_x sunWithRays blackSunWithRays heartWhiteSuit heartBlackSuit heavyBlackHeart blackstar whitestar upBlackArrow upWhiteArrow capslock placeofinterestsign control projective insertionsymbol option alternativekeysymbol brokenCircleNorthWestArrow anticlockwiseOpenCircleArrow clockwiseOpenCircleArrow deleteleft deleteright clear ejectsymbol returnsymbol carriagereturn downTipRightArrow upTipLeftArrow upTipRightArrow rightCornerDownArrow arrowtableft arrowtabright pageup pagedown largeCircle whiteLargeSquare enclosingcirclecomb enclosingsquarecomb A.circled B.circled C.circled D.circled E.circled F.circled G.circled H.circled I.circled J.circled K.circled L.circled M.circled N.circled O.circled P.circled Q.circled R.circled S.circled T.circled U.circled V.circled W.circled X.circled Y.circled Z.circled zero.circled one.circled two.circled three.circled four.circled five.circled six.circled seven.circled eight.circled nine.circled zero.slash.circled one.ss01.circled three.1.circled four.ss01.circled six.ss01.circled nine.ss01.circled exclam.circled question.circled numbersign.circled hyphen.circled less.circled greater.circled equal.circled plus.circled minus.circled fraction.circled multiply.circled divide.circled upArrow.circled downArrow.circled leftArrow.circled rightArrow.circled dngb_check.circled dngb_ballotx.circled A.squared B.squared C.squared D.squared E.squared F.squared G.squared G.1.squared H.squared I.squared J.squared K.squared L.squared M.squared N.squared O.squared P.squared Q.squared R.squared S.squared T.squared U.squared V.squared W.squared X.squared Y.squared Z.squared zero.squared one.squared two.squared three.squared four.squared five.squared six.squared seven.squared eight.squared nine.squared zero.slash.squared one.ss01.squared three.1.squared four.ss01.squared six.ss01.squared nine.ss01.squared exclam.squared question.squared numbersign.squared hyphen.squared less.squared greater.squared equal.squared plus.squared minus.squared fraction.squared multiply.squared divide.squared upArrow.squared downArrow.squared leftArrow.squared rightArrow.squared dngb_check.squared dngb_ballotx.squared Btopbar DZ Eth Dcroat Dtopbar Epsilon1 Esh Schwa Ezh Ezhcaron Ezhreversed uni021C IJ LJ Ldot NJ OI Tbar Tonesix Vcursive YR mcapturn uni01F7 uni0220 uni0222 uni0241 uni0245 uni1EFA uni1EFC uni1EFE ascript ascriptturn babygamma cstretch deltaturn erev esh eshcurl eshlooprev schwa schwahook ezh ezhcaron ezhcurl ezhreversed ezhtail finalkaf finalmem gcursive glottalstop glottalstopbar glottalstopbarinv glottalstopbarrev glottalstopinv glottalstoprevinv uni021D jhookdblbar kgreenlandic lambdabar lyogh oi omegaclosed oopen philatin rturnascend tesh thook tonefive tonesix ts uni0223 uni0238 uni0239 uni0242 uni0299 uni02AB uni02AC uni1E9D uni1E9F uni1EFB uni1EFD uni1EFF uni2184 upsilonlatin vscript wynn h.sc m.sc t.sc uni2094 Rturnsuper finaltsadi hhooksuper rturnsuper exclam1 pipe pipedbl pipedblbar uniA7FF Ge-cy afii10052 uni04F6 Ghestrokecyrillic afii10061 Pe-cy afii10034 afii10035 Te-cy afii10062 afii10039 Tshe-cy Omegacyrillic afii10146 Eiotifiedcyrillic Yuslittlecyrillic Yuslittleiotifiedcyrillic Yusbigcyrillic Yusbigiotifiedcyrillic Ksicyrillic Psicyrillic Izhitsadblgravecyrillic Ukcyrillic Zedescendercyrillic Esdescendercyrillic Tedescendercyrillic Ustraightcyrillic Ustraightstrokecyrillic Chedescenderabkhasiancyrillic palochkacyrillic Zhebrevecyrillic Eltail-cy Chekhakassiancyrillic Schwadieresiscyrillic Zhedieresiscyrillic Zedieresiscyrillic uni04EC Chedieresiscyrillic Yerudieresiscyrillic uni04FE Koppacyrillic uni048C Pe-cy.turn gjecyrillic gedescender-cy ghestrokecyrillic iishortcyrillic uni045D kjecyrillic omegacyrillic eiotifiedcyrillic yuslittlecyrillic yuslittleiotifiedcyrillic yusbigcyrillic yusbigiotifiedcyrillic ksicyrillic psicyrillic izhitsadblgravecyrillic zedescendercyrillic esdescendercyrillic tedescendercyrillic ustraightcyrillic ustraightstrokecyrillic chedescenderabkhasiancyrillic zhebrevecyrillic chekhakassiancyrillic schwacyrillic schwadieresiscyrillic zhedieresiscyrillic zedieresiscyrillic imacroncyrillic idieresiscyrillic obarredcyrillic obarreddieresiscyrillic edieresis-cy chedieresiscyrillic yerudieresiscyrillic uni04FF koppacyrillic uni0370 uni0372 uni03D8 Stigma Digamma Koppa Sampi uni03CF uni03F7 uni03FD uni03FE uni03FF kappa mugreek nu uni0371 uni0373 uni0377 uni037B uni037C uni037D uni03D9 stigma digamma koppa sampi uni03D7 beta1 thetasymbolgreek pisymbolgreek kappa1 rho1 uni03F5 uni03F8 uni03FB uni1F71 uni1F73 uni1F75 uni1F77 uni1FD3 uni1F79 uni1F7B uni1FE3 uni1F7D uni1FBE ypogegrammeni uni1DBF romanone romantwo romanthree romanfour romanfive romansix romanseven romaneight romannine romanten romaneleven romantwelve romanfifty romanhundred romanfivehundred romanthousand oneroman tworoman threeroman fourroman fiveroman sixroman sevenroman eightroman nineroman tenroman elevenroman twelveroman uni217C uni217D uni217E uni217F uni2180 uni2181 uni2182 uni2183 uni2185 uni2186 uni2187 uni2188 zerowidthjoiner uniA92E uni27EF asterism caretSign caretinsertionpoint charactertie hyphendot onedotleader overline referencemark reversedsemicolon undertie uni204E uni2050 uni2051 uni2053 uni2054 uni2055 uni2056 uni2058 uni2059 uni205A uni205B uni205C uni205D uni205E verticalbardbl hyphen__ hyphennobreak underscoredbl gammasuper thousandcyrillic numeralgreek numeralgreeksub uni03F6 arrowheaddownmod arrowheadleftmod arrowheadrightmod arrowheadupmod dblapostrophe downtackmod lowdownarrowheadmod minusmod plusmod ringhalfleftcentered ringhalfrightcentered uni02EC uni02ED uni02F0 uni02F1 uni02F2 uni02F3 uni02F4 uni02F5 uni02F6 uni02F7 uni02F8 uni02F9 uni02FA uni02FB uni02FC uni02FD uni02FE uni02FF uptackmod tonebarextrahighmod.cn tonebarextralowmod.cn tonebarhighmod.cn tonebarlowmod.cn tonebarmidmod.cn qofdagesh rhotichookmod glottalstopreversed.numr lsquare spaceopenbox uni214F versicle eurocurrency uni20B0 uni20B6 uni20B7 uni20BB commercialMinusSign uni0363 uni0364 uni0365 uni0366 uni0367 uni0368 uni0369 uni036A uni036B uni036C uni036D uni036E uni036F uni1DCA uni1DD3 uni1DD4 uni1DD5 uni1DD6 uni1DD7 uni1DD8 uni1DD9 uni1DDA uni1DDB uni1DDC uni1DDD uni1DDE uni1DDF uni1DE0 uni1DE1 uni1DE2 uni1DE3 uni1DE4 uni1DE5 uni1DE6 uni1DE7 uni1DE9 uni0488 uni0489 titlocyrilliccmb palatalizationcyrilliccmb dasiapneumatacyrilliccmb psilipneumatacyrilliccmb uni0487 uniA69F perispomenigreekcmb koroniscmb diaeresistonosnosp iotasubnosp uni1FBF uni1FBD uni1FFE uni1FCD uni1FDD uni1FCE uni1FDE uni1FCF uni1FDF uni1FED uni1FEE uni1FC1 uni1FEF uni1FFD uni1FC0 uni1FFE.tonos uni1FCD.tonos uni1FDD.tonos uni1FCE.tonos uni1FDE.tonos uni1FCF.tonos uni1FDF.tonos uni1FEF.tonos uni1FFD.tonos uniFE20 uniFE21 uniFE27 uniFE28 overscorenosp linevertnosp linevertdblnosp candrabindunosp commaturnsupnosp commaabovecmb commasuprevnosp commaaboverightcmb gravesubnosp acutesubnosp tackleftsubnosp tackrightsubnosp anglesupnosp ringlefthalfsubnosp tackupsubnosp tackdownsubnosp hooksubpalatnosp hooksubretronosp linevertsubnosp bridgesubnosp archdblsubnosp caronbelowcmb breveinvsubnosp macronsubnosp underscoredblnosp tildemidnosp barmidshortnosp barmidlongnosp slashshortnosp slashshortcomb slashlongnosp ringrighthalfsubnosp bridgeinvsubnosp squaresubnosp seagullsubnosp xsupnosp tildevertsupnosp overscoredblnosp graveleftnosp acuterightnosp uni0346 equalbelowcomb uni0348 uni0349 uni034A uni034B uni034C uni034D uni034E uni034F arrowheadrightabovecomb uni0351 uni0352 uni0353 uni0354 uni0355 uni0356 uni0357 uni0358 uni0359 uni035A uni035B uni035C uni035D uni035E uni035F tildedoublecmb breveinverteddoublecmb uni0362 uni1DC0 uni1DC1 uni1DC2 uni1DC3 uni1DC4 uni1DC5 uni1DC6 uni1DC7 uni1DC8 uni1DC9 uni1DCB uni1DCC uni1DCD uni1DCE uni1DCF uni1DD0 uni1DD1 uni1DD2 uni1DE8 uni1DEA uni1DEB uni1DEC uni1DED uni1DEE uni1DEF uni1DF0 uni1DF1 uni1DF2 uni1DF3 uni1DF4 uni1DF5 uni1DFC uni1DFD uni1DFE uni1DFF uni20DB uni20DC uni20E8 uni20F0 uniFE22 uniFE23 uniFE24 uniFE25 uniFE26 uniFE29 uniFE2A uniFE2B uniFE2C uniFE2D macronacutecomb.cn macrongravecomb.cn macronacutecomb.lc macrongravecomb.lc slashshortcomb.uc firsttonechinese secondtonechinese fourthtonechinese uni02EA uni02EB ogonek.A ogonek.O ogonek.U ogonek.a ogonek.e ogonek.o ogonek.y breveinv.cn acutelowmod colontriangularhalfmod colontriangularmod commareversedmod commaturnedmod glottalstopmod glottalstopreversedmod gravelowmod linevert macronsub ringhalfleft ringhalfright verticallinelowmod uni2DFF uni0268.ccmp uni2071.ccmp uni02B2.ccmp dieresisacutecomb.lc caronnosp caronsubnosp ascript_uni02DE cyrillichookleft dotmacroncomb.lc dieresismacroncomb.lc dieresisgravecomb.lc largerighthook macrondieresiscomb.lc tildeacute.lc dieresiscaroncomb.lc dieresiscaroncomb.uc dieresismacroncomb.uc dieresisacutecomb.uc dotmacroncomb.uc dieresisgravecomb.uc tildeacutecomb.uc pecyrillicturn crossbar crossbar_left_long tonostop _part.crossbar_compact _part.crossbar_compact_rext _part.crossbar_vert _part.cyrtail _part.cyrtic _part.cyrtic_center _part.cyrtic_hook _tildecross.cn acutedotcomb.cn acutedotcomb.lc breveacutecomb.cn brevegravecomb.cn brevehookcomb.cn brevetildecomb.cn carondotcomb.cn carondotcomb.lc circumflexacutecomb.cn circumflexgravecomb.cn circumflexhookcomb.cn circumflextildecomb.cn commaaccentright.cn commaaccentrotate.cn koronisaccentleft.cn macrondieresiscomb.cn ringacute.cn tildedieresiscomb.cn tildedieresiscomb.lc tildemacroncomb.cn tildemacroncomb.lc";
 name = All;
 }
 );
@@ -2657,38 +2657,33 @@ Location = 14;
 guides = (
 {
 locked = 1;
-name = "Cap height";
-pos = (0,1490);
+name = "p bottom";
+pos = (0,-418);
 },
 {
 locked = 1;
-name = "Top anchors";
-pos = (0,1304);
+name = "Cap center";
+pos = (0,745);
 },
 {
 locked = 1;
-name = "p bottom";
-pos = (0,-418);
+name = "Low center";
+pos = (0,559);
 },
 {
 locked = 1;
 name = "Top mark center";
-pos = (0,1368);
-},
-{
-locked = 1;
-name = "Cap center";
-pos = (0,745);
+pos = (0,1384);
 },
 {
 locked = 1;
-name = "Top anchors";
-pos = (0,1676);
+name = "Bottom mark center";
+pos = (0,-266);
 },
 {
 locked = 1;
-name = "Low center";
-pos = (0,559);
+name = "Top mark center";
+pos = (0,1812);
 }
 );
 id = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -2803,33 +2798,33 @@ Location = 32;
 guides = (
 {
 locked = 1;
-name = "Cap height";
-pos = (0,1490);
+name = "Low center";
+pos = (0,528);
 },
 {
 locked = 1;
-name = "Low center";
-pos = (0,528);
+name = "p bottom";
+pos = (0,-418);
 },
 {
 locked = 1;
-name = "Top anchors";
-pos = (0,1676);
+name = "Cap center";
+pos = (0,745);
 },
 {
 locked = 1;
-name = "Top anchors";
-pos = (0,1262);
+name = "Top mark center";
+pos = (0,1378);
 },
 {
 locked = 1;
-name = "p bottom";
-pos = (0,-418);
+name = "Bottom mark center";
+pos = (0,-322);
 },
 {
 locked = 1;
-name = "Cap center";
-pos = (0,745);
+name = "Top mark center";
+pos = (0,1812);
 }
 );
 id = m011;
@@ -2860,11 +2855,10 @@ stemValues = (
 47
 );
 userData = {
-GSCornerRadius = 200;
+GSCornerRadius = 140;
 GSOffsetHorizontal = 23;
 GSOffsetKeepCompatible = 1;
 GSOffsetMakeStroke = 1;
-GSOffsetPosition = 1;
 GSOffsetProportional = 1;
 GSOffsetVertical = 64;
 };
@@ -2949,11 +2943,6 @@ pos = (0,745);
 },
 {
 locked = 1;
-name = "Top anchors";
-pos = (0,1676);
-},
-{
-locked = 1;
 name = "Low center";
 pos = (0,559);
 },
@@ -2964,18 +2953,18 @@ pos = (0,-418);
 },
 {
 locked = 1;
-name = "Cap height";
-pos = (0,1490);
+name = "Top mark center";
+pos = (0,1420);
 },
 {
 locked = 1;
-name = "Top anchors";
-pos = (0,1304);
+name = "Bottom mark center";
+pos = (0,-302);
 },
 {
 locked = 1;
 name = "Top mark center";
-pos = (0,1420);
+pos = (0,1792);
 }
 );
 id = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -3089,33 +3078,33 @@ Location = 32;
 guides = (
 {
 locked = 1;
-name = "Top anchors";
-pos = (0,1262);
+name = "p bottom";
+pos = (0,-418);
 },
 {
 locked = 1;
-name = "p bottom";
-pos = (0,-418);
+name = "Low center";
+pos = (0,528);
 },
 {
 locked = 1;
-name = "Cap height";
-pos = (0,1490);
+name = "Cap center";
+pos = (0,745);
 },
 {
 locked = 1;
-name = "Low center";
-pos = (0,528);
+name = "Top mark center";
+pos = (0,1378);
 },
 {
 locked = 1;
-name = "Top anchors";
-pos = (0,1676);
+name = "Bottom mark center";
+pos = (0,-322);
 },
 {
 locked = 1;
-name = "Cap center";
-pos = (0,745);
+name = "Top mark center";
+pos = (0,1812);
 }
 );
 id = m007;
@@ -3146,13 +3135,11 @@ stemValues = (
 180
 );
 userData = {
-GSCornerRadius = 90;
-GSOffsetHorizontal = 76;
+GSCornerRadius = 160;
+GSOffsetHorizontal = 80;
 GSOffsetKeepCompatible = 1;
 GSOffsetMakeStroke = 1;
-GSOffsetPosition = 1;
-GSOffsetProportional = 1;
-GSOffsetVertical = 84;
+GSOffsetVertical = 70;
 };
 },
 {
@@ -3230,26 +3217,11 @@ Location = 14;
 guides = (
 {
 locked = 1;
-name = "Top anchors";
-pos = (0,1304);
-},
-{
-locked = 1;
-name = "Cap height";
-pos = (0,1490);
-},
-{
-locked = 1;
 name = "p bottom";
 pos = (0,-418);
 },
 {
 locked = 1;
-name = "Top anchors";
-pos = (0,1676);
-},
-{
-locked = 1;
 name = "Top mark center";
 pos = (0,1416);
 },
@@ -3262,6 +3234,16 @@ pos = (0,745);
 locked = 1;
 name = "Low center";
 pos = (0,559);
+},
+{
+locked = 1;
+name = "Bottom mark center";
+pos = (0,-298);
+},
+{
+locked = 1;
+name = "Top mark center";
+pos = (0,1788);
 }
 );
 iconName = Bold;
@@ -3376,16 +3358,6 @@ Location = 32;
 guides = (
 {
 locked = 1;
-name = "Cap height";
-pos = (0,1490);
-},
-{
-locked = 1;
-name = "Top anchors";
-pos = (0,1262);
-},
-{
-locked = 1;
 name = "p bottom";
 pos = (0,-418);
 },
@@ -3396,11 +3368,6 @@ pos = (0,528);
 },
 {
 locked = 1;
-name = "Top anchors";
-pos = (0,1676);
-},
-{
-locked = 1;
 name = "Top mark center";
 pos = (0,1336);
 },
@@ -3408,6 +3375,16 @@ pos = (0,1336);
 locked = 1;
 name = "Cap center";
 pos = (0,745);
+},
+{
+locked = 1;
+name = "Bottom mark center";
+pos = (0,-280);
+},
+{
+locked = 1;
+name = "Top mark center";
+pos = (0,1770);
 }
 );
 iconName = Bold;
@@ -3439,15 +3416,13 @@ stemValues = (
 404
 );
 userData = {
-GSCornerRadius = 30;
+GSCornerRadius = 160;
 GSExtrudeAngle = 30;
 GSExtrudeOffset = 15;
-GSOffsetHorizontal = 152;
+GSOffsetHorizontal = 140;
 GSOffsetKeepCompatible = 1;
 GSOffsetMakeStroke = 1;
-GSOffsetPosition = 0;
-GSOffsetProportional = 1;
-GSOffsetVertical = 180;
+GSOffsetVertical = 130;
 };
 }
 );
@@ -4099,7 +4074,7 @@ weightClass = 900;
 kerningLTR = {
 "B1F27B51-9973-4381-9301-4FE46FE1CA59" = {
 "@MMK_L_A" = {
-"@MMK_R_C" = -69;
+"@MMK_R_C" = -40;
 "@MMK_R_T" = -174;
 "@MMK_R_V" = -140;
 "@MMK_R_W" = -116;
@@ -4139,12 +4114,12 @@ tenge = -104;
 underscore = -81;
 };
 "@MMK_L_D" = {
-"@MMK_R_A" = -69;
+"@MMK_R_A" = -40;
 "@MMK_R_T" = -61;
 "@MMK_R_V" = -69;
 "@MMK_R_X" = -23;
 "@MMK_R_Y" = -69;
-"@MMK_R_comma" = -93;
+"@MMK_R_comma" = -90;
 "@MMK_R_quotedblbase" = -81;
 "@MMK_R_quotedblleft" = -69;
 "@MMK_R_registered" = -11;
@@ -4262,6 +4237,10 @@ quotedblreversed = -93;
 quotereversed = -93;
 tripleprime = -139;
 };
+"@MMK_L_Ohorn" = {
+"@MMK_R_A" = -40;
+"@MMK_R_comma" = -90;
+};
 "@MMK_L_Omicrongreek" = {
 "@MMK_R_comma" = -93;
 "@MMK_R_quotedblleft" = -69;
@@ -4375,6 +4354,9 @@ vturn = -87;
 "@MMK_R_comma" = -69;
 "@MMK_R_idblgrave" = 81;
 };
+"@MMK_L_Uhorn" = {
+"@MMK_R_T" = 80;
+};
 "@MMK_L_V" = {
 "@MMK_R_A" = -140;
 "@MMK_R_C" = -69;
@@ -4471,6 +4453,7 @@ tecyrillic = -128;
 "@MMK_R_zero.subs" = -232;
 alpha = -116;
 ampersand = -128;
+atilde = -105;
 chook = -116;
 dcurl = -116;
 drthook = -116;
@@ -4591,6 +4574,7 @@ afii10044 = -104;
 uni023E = -81;
 };
 "@MMK_L_comma" = {
+"@MMK_R_C" = -90;
 "@MMK_R_T" = -69;
 "@MMK_R_T.sc" = -186;
 "@MMK_R_Y" = -69;
@@ -4796,7 +4780,7 @@ seven = -46;
 "@MMK_R_Z" = 186;
 "@MMK_R_f" = 81;
 "@MMK_R_idblgrave" = 104;
-"@MMK_R_idieresis" = 80;
+"@MMK_R_idieresis" = 0;
 "@MMK_R_idotless" = 186;
 "@MMK_R_jdotless" = -116;
 "@MMK_R_one" = 93;
@@ -4812,7 +4796,7 @@ icaron = 69;
 icircumflex = 69;
 igrave = 69;
 iinvertedbreve = 69;
-imacron = 93;
+imacron = 130;
 jcircumflex = 69;
 jcrosstail = -116;
 numero = 151;
@@ -4825,7 +4809,6 @@ uni048A = 151;
 "@MMK_L_idotless" = {
 "@MMK_R_idblgrave" = 69;
 "@MMK_R_idieresis" = 81;
-"@MMK_R_jdotless" = 69;
 idblgrave = 104;
 iinvertedbreve = 69;
 itilde = 69;
@@ -5177,6 +5160,11 @@ logicalnot = -69;
 underscore = -69;
 uni023E = -151;
 };
+"@MMK_L_uhorn" = {
+"@MMK_R_o" = -40;
+"@MMK_R_t" = 30;
+"@MMK_R_v" = 40;
+};
 "@MMK_L_v" = {
 "@MMK_R_A" = -139;
 "@MMK_R_J" = -128;
@@ -5602,9 +5590,6 @@ nlfthook = {
 ntilde = {
 "@MMK_R_T" = -104;
 };
-oacute = {
-"@MMK_R_B" = 20;
-};
 odieresis = {
 "@MMK_R_T" = -104;
 };
@@ -5747,7 +5732,7 @@ underscore = 139;
 };
 m011 = {
 "@MMK_L_A" = {
-"@MMK_R_C" = -69;
+"@MMK_R_C" = -40;
 "@MMK_R_T" = -200;
 "@MMK_R_V" = -190;
 "@MMK_R_W" = -120;
@@ -5762,7 +5747,6 @@ m011 = {
 "@MMK_R_guillemetleft" = -69;
 "@MMK_R_guillemetright" = -69;
 "@MMK_R_hyphen" = -69;
-"@MMK_R_idieresis" = 93;
 "@MMK_R_idotless" = 11;
 "@MMK_R_nine.1" = -20;
 "@MMK_R_o" = -28;
@@ -5794,7 +5778,7 @@ underscore = -81;
 "@MMK_R_V" = -69;
 "@MMK_R_X" = -90;
 "@MMK_R_Y" = -69;
-"@MMK_R_comma" = -93;
+"@MMK_R_comma" = -90;
 "@MMK_R_idblgrave" = 93;
 "@MMK_R_idotless" = 69;
 "@MMK_R_quotedblbase" = -81;
@@ -5927,6 +5911,10 @@ quotedblreversed = -93;
 quotereversed = -93;
 tripleprime = -139;
 };
+"@MMK_L_Ohorn" = {
+"@MMK_R_A" = -40;
+"@MMK_R_comma" = -90;
+};
 "@MMK_L_Omicrongreek" = {
 "@MMK_R_comma" = -93;
 "@MMK_R_quotedblleft" = -69;
@@ -6040,6 +6028,9 @@ vturn = -87;
 "@MMK_R_comma" = -69;
 "@MMK_R_idblgrave" = 81;
 };
+"@MMK_L_Uhorn" = {
+"@MMK_R_T" = 120;
+};
 "@MMK_L_V" = {
 "@MMK_R_A" = -190;
 "@MMK_R_C" = -69;
@@ -6136,6 +6127,7 @@ tecyrillic = -128;
 "@MMK_R_zero.subs" = -232;
 alpha = -116;
 ampersand = -128;
+atilde = -95;
 chook = -116;
 dcurl = -116;
 drthook = -116;
@@ -6175,7 +6167,7 @@ periodcentered = -69;
 "@MMK_R_one" = -81;
 "@MMK_R_quotedblleft" = -93;
 "@MMK_R_registered" = -17;
-"@MMK_R_v" = -40;
+"@MMK_R_v" = -50;
 Gamma1 = -69;
 Trthook = -151;
 Yhook = -104;
@@ -6260,6 +6252,7 @@ afii10044 = -104;
 uni023E = -81;
 };
 "@MMK_L_comma" = {
+"@MMK_R_C" = -90;
 "@MMK_R_T" = -69;
 "@MMK_R_T.sc" = -186;
 "@MMK_R_Y" = -69;
@@ -6293,6 +6286,7 @@ ampersand = -81;
 "@MMK_R_jdotless" = 69;
 "@MMK_R_m" = 69;
 "@MMK_R_one" = 93;
+"@MMK_R_parenright" = 30;
 "@MMK_R_quotedbl" = 69;
 "@MMK_R_quotedblleft" = 69;
 "@MMK_R_registered" = 34;
@@ -6473,7 +6467,7 @@ seven = -46;
 "@MMK_R_Z" = 186;
 "@MMK_R_f" = 81;
 "@MMK_R_idblgrave" = 104;
-"@MMK_R_idieresis" = 160;
+"@MMK_R_idieresis" = 90;
 "@MMK_R_idotless" = 186;
 "@MMK_R_jdotless" = -116;
 "@MMK_R_one" = 93;
@@ -6488,9 +6482,10 @@ Rx = 151;
 ibreve = 69;
 icaron = 69;
 icircumflex = 69;
+idieresis = 300;
 igrave = 69;
 iinvertedbreve = 69;
-imacron = 93;
+imacron = 300;
 jcircumflex = 69;
 jcrosstail = -116;
 numero = 151;
@@ -6770,6 +6765,7 @@ ampersand = -69;
 "@MMK_R_quotedblbase" = -104;
 "@MMK_R_quotedblleft" = -104;
 "@MMK_R_registered" = -17;
+"@MMK_R_v" = -10;
 };
 "@MMK_L_seven" = {
 "@MMK_R_A" = -221;
@@ -6886,6 +6882,11 @@ logicalnot = -69;
 underscore = -69;
 uni023E = -151;
 };
+"@MMK_L_uhorn" = {
+"@MMK_R_o" = -70;
+"@MMK_R_t" = 30;
+"@MMK_R_v" = 40;
+};
 "@MMK_L_v" = {
 "@MMK_R_A" = -139;
 "@MMK_R_J" = -128;
@@ -6903,6 +6904,7 @@ uni023E = -151;
 "@MMK_R_o" = -40;
 "@MMK_R_quotedblbase" = -162;
 "@MMK_R_quotedblright" = 58;
+"@MMK_R_s" = -10;
 "@MMK_R_slash" = -116;
 "@MMK_R_zero.subs" = -104;
 Tcaron = -128;
@@ -7210,7 +7212,6 @@ florin = {
 "@MMK_R_m" = 69;
 };
 gamma1 = {
-"@MMK_R_T" = 151;
 "@MMK_R_comma" = -151;
 };
 germandbls = {
@@ -7361,9 +7362,6 @@ nlfthook = {
 ntilde = {
 "@MMK_R_T" = -104;
 };
-oacute = {
-"@MMK_R_B" = 20;
-};
 ocircumflexhookabove = {
 "@MMK_R_idblgrave" = 93;
 };
@@ -7522,7 +7520,7 @@ underscore = 139;
 };
 "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265" = {
 "@MMK_L_A" = {
-"@MMK_R_C" = -69;
+"@MMK_R_C" = -70;
 "@MMK_R_T" = -174;
 "@MMK_R_V" = -140;
 "@MMK_R_W" = -116;
@@ -7562,12 +7560,12 @@ tenge = -104;
 underscore = -81;
 };
 "@MMK_L_D" = {
-"@MMK_R_A" = -69;
+"@MMK_R_A" = -70;
 "@MMK_R_T" = -61;
 "@MMK_R_V" = -69;
 "@MMK_R_X" = -30;
 "@MMK_R_Y" = -69;
-"@MMK_R_comma" = -93;
+"@MMK_R_comma" = -90;
 "@MMK_R_quotedblbase" = -81;
 "@MMK_R_quotedblleft" = -69;
 "@MMK_R_registered" = -11;
@@ -7687,6 +7685,10 @@ quotedblreversed = -93;
 quotereversed = -93;
 tripleprime = -139;
 };
+"@MMK_L_Ohorn" = {
+"@MMK_R_A" = -70;
+"@MMK_R_comma" = -90;
+};
 "@MMK_L_Omicrongreek" = {
 "@MMK_R_comma" = -93;
 "@MMK_R_quotedblleft" = -69;
@@ -7800,6 +7802,9 @@ vturn = -87;
 "@MMK_R_comma" = -69;
 "@MMK_R_idblgrave" = 81;
 };
+"@MMK_L_Uhorn" = {
+"@MMK_R_T" = 80;
+};
 "@MMK_L_V" = {
 "@MMK_R_A" = -140;
 "@MMK_R_C" = -69;
@@ -8016,6 +8021,7 @@ afii10044 = -104;
 uni023E = -81;
 };
 "@MMK_L_comma" = {
+"@MMK_R_C" = -90;
 "@MMK_R_T" = -69;
 "@MMK_R_T.sc" = -186;
 "@MMK_R_Y" = -69;
@@ -8052,6 +8058,7 @@ ampersand = -81;
 "@MMK_R_jdotless" = 69;
 "@MMK_R_m" = 69;
 "@MMK_R_one" = 93;
+"@MMK_R_parenright" = 180;
 "@MMK_R_quotedbl" = 69;
 "@MMK_R_quotedblleft" = 69;
 "@MMK_R_registered" = 34;
@@ -8239,7 +8246,6 @@ icaron = 69;
 icircumflex = 69;
 igrave = 69;
 iinvertedbreve = 69;
-imacron = 93;
 jcircumflex = 69;
 jcrosstail = -116;
 numero = 151;
@@ -8252,7 +8258,6 @@ uni048A = 151;
 "@MMK_L_idotless" = {
 "@MMK_R_idblgrave" = 69;
 "@MMK_R_idieresis" = 81;
-"@MMK_R_jdotless" = 69;
 idblgrave = 104;
 iinvertedbreve = 69;
 itilde = 69;
@@ -8610,6 +8615,11 @@ logicalnot = -69;
 underscore = -69;
 uni023E = -151;
 };
+"@MMK_L_uhorn" = {
+"@MMK_R_o" = -70;
+"@MMK_R_t" = 60;
+"@MMK_R_v" = 30;
+};
 "@MMK_L_v" = {
 "@MMK_R_A" = -139;
 "@MMK_R_J" = -128;
@@ -9038,9 +9048,6 @@ nlfthook = {
 ntilde = {
 "@MMK_R_T" = -104;
 };
-oacute = {
-"@MMK_R_B" = 50;
-};
 odieresis = {
 "@MMK_R_T" = -104;
 };
@@ -9183,7 +9190,7 @@ underscore = 139;
 };
 m007 = {
 "@MMK_L_A" = {
-"@MMK_R_C" = -69;
+"@MMK_R_C" = -70;
 "@MMK_R_T" = -200;
 "@MMK_R_V" = -190;
 "@MMK_R_W" = -120;
@@ -9223,13 +9230,13 @@ tenge = -104;
 underscore = -81;
 };
 "@MMK_L_D" = {
-"@MMK_R_A" = -69;
+"@MMK_R_A" = -70;
 "@MMK_R_T" = -100;
 "@MMK_R_V" = -69;
 "@MMK_R_W" = -40;
 "@MMK_R_X" = -90;
 "@MMK_R_Y" = -110;
-"@MMK_R_comma" = -93;
+"@MMK_R_comma" = -90;
 "@MMK_R_quotedblbase" = -81;
 "@MMK_R_quotedblleft" = -69;
 "@MMK_R_registered" = -11;
@@ -9285,7 +9292,6 @@ underscore = -69;
 "@MMK_R_Dcroat" = 69;
 "@MMK_R_idblgrave" = 200;
 "@MMK_R_idieresis" = 170;
-"@MMK_R_idotless" = 30;
 Dcroat = 69;
 Istroke = 69;
 };
@@ -9349,6 +9355,10 @@ quotedblreversed = -93;
 quotereversed = -93;
 tripleprime = -139;
 };
+"@MMK_L_Ohorn" = {
+"@MMK_R_A" = -70;
+"@MMK_R_comma" = -90;
+};
 "@MMK_L_Omicrongreek" = {
 "@MMK_R_comma" = -93;
 "@MMK_R_quotedblleft" = -69;
@@ -9464,6 +9474,9 @@ vturn = -87;
 "@MMK_R_comma" = -69;
 "@MMK_R_idblgrave" = 81;
 };
+"@MMK_L_Uhorn" = {
+"@MMK_R_T" = 100;
+};
 "@MMK_L_V" = {
 "@MMK_R_A" = -190;
 "@MMK_R_C" = -69;
@@ -9561,6 +9574,7 @@ tecyrillic = -128;
 "@MMK_R_zero.subs" = -232;
 alpha = -116;
 ampersand = -128;
+atilde = -130;
 chook = -116;
 dcurl = -116;
 drthook = -116;
@@ -9600,7 +9614,7 @@ periodcentered = -69;
 "@MMK_R_quotedbl" = -100;
 "@MMK_R_quotedblleft" = -93;
 "@MMK_R_registered" = -17;
-"@MMK_R_v" = -40;
+"@MMK_R_v" = -50;
 Gamma1 = -69;
 Trthook = -151;
 Yhook = -104;
@@ -9682,6 +9696,7 @@ afii10044 = -104;
 uni023E = -81;
 };
 "@MMK_L_comma" = {
+"@MMK_R_C" = -90;
 "@MMK_R_T" = -69;
 "@MMK_R_T.sc" = -186;
 "@MMK_R_Y" = -69;
@@ -9722,6 +9737,7 @@ uni1F8F = 30;
 "@MMK_R_idieresis" = 220;
 "@MMK_R_idotless" = 81;
 "@MMK_R_one" = 93;
+"@MMK_R_parenright" = 270;
 "@MMK_R_quotedbl" = 69;
 "@MMK_R_quotedblleft" = 69;
 "@MMK_R_registered" = 34;
@@ -9913,7 +9929,6 @@ icaron = 69;
 icircumflex = 69;
 igrave = 69;
 iinvertedbreve = 69;
-imacron = 93;
 jcircumflex = 69;
 jcrosstail = -116;
 numero = 151;
@@ -9924,15 +9939,17 @@ uni0376 = 151;
 uni048A = 151;
 };
 "@MMK_L_idotless" = {
-"@MMK_R_B" = 30;
 "@MMK_R_idblgrave" = 69;
 "@MMK_R_idieresis" = 81;
 "@MMK_R_parenright" = 69;
 idblgrave = 104;
 iinvertedbreve = 69;
 itilde = 69;
+jcircumflex = 50;
 won = 69;
 yen = 69;
+icaron = 190;
+igrave = 200;
 };
 "@MMK_L_idotless.sups" = {
 "@MMK_R_parenright.sups" = 46;
@@ -10178,6 +10195,7 @@ ampersand = -69;
 "@MMK_R_quotedblbase" = -104;
 "@MMK_R_quotedblleft" = -104;
 "@MMK_R_registered" = -17;
+"@MMK_R_v" = -30;
 };
 "@MMK_L_seven" = {
 "@MMK_R_A" = -221;
@@ -10296,6 +10314,11 @@ logicalnot = -69;
 underscore = -69;
 uni023E = -151;
 };
+"@MMK_L_uhorn" = {
+"@MMK_R_o" = -90;
+"@MMK_R_t" = 70;
+"@MMK_R_v" = 40;
+};
 "@MMK_L_v" = {
 "@MMK_R_A" = -139;
 "@MMK_R_J" = -128;
@@ -10308,9 +10331,11 @@ uni023E = -151;
 "@MMK_R_guillemetleft" = -81;
 "@MMK_R_hyphen" = -20;
 "@MMK_R_idblgrave" = 69;
+"@MMK_R_lambda" = -120;
 "@MMK_R_o" = -40;
 "@MMK_R_quotedblbase" = -162;
 "@MMK_R_quotedblright" = 72;
+"@MMK_R_s" = -20;
 "@MMK_R_slash" = -116;
 "@MMK_R_t" = 10;
 "@MMK_R_zero.subs" = -104;
@@ -10745,9 +10770,6 @@ nlfthook = {
 ntilde = {
 "@MMK_R_T" = -104;
 };
-oacute = {
-"@MMK_R_B" = 60;
-};
 odieresis = {
 "@MMK_R_T" = -104;
 };
@@ -10907,7 +10929,6 @@ underscore = 139;
 "@MMK_R_guillemetleft" = -69;
 "@MMK_R_guillemetright" = -69;
 "@MMK_R_hyphen" = -69;
-"@MMK_R_idieresis" = 93;
 "@MMK_R_nine.1" = -20;
 "@MMK_R_o" = -87;
 "@MMK_R_one" = -69;
@@ -10944,7 +10965,7 @@ underscore = -81;
 "@MMK_R_W" = -93;
 "@MMK_R_X" = -98;
 "@MMK_R_Y" = -104;
-"@MMK_R_comma" = -93;
+"@MMK_R_comma" = -90;
 "@MMK_R_idblgrave" = 93;
 "@MMK_R_quotedblbase" = -81;
 "@MMK_R_quotedblleft" = -69;
@@ -11000,7 +11021,6 @@ underscore = -69;
 "@MMK_R_idblgrave" = 69;
 "@MMK_R_idieresis" = 151;
 "@MMK_R_jdotless" = 81;
-"@MMK_R_o" = 10;
 "@MMK_R_parenright" = 69;
 Dcroat = 81;
 Istroke = 81;
@@ -11075,6 +11095,10 @@ quotedblreversed = -93;
 quotereversed = -93;
 tripleprime = -139;
 };
+"@MMK_L_Ohorn" = {
+"@MMK_R_A" = -80;
+"@MMK_R_comma" = -90;
+};
 "@MMK_L_Omicrongreek" = {
 "@MMK_R_comma" = -93;
 "@MMK_R_quotedblleft" = -69;
@@ -11180,6 +11204,9 @@ vturn = -87;
 "@MMK_R_comma" = -69;
 "@MMK_R_idblgrave" = 81;
 };
+"@MMK_L_Uhorn" = {
+"@MMK_R_T" = 120;
+};
 "@MMK_L_V" = {
 "@MMK_R_A" = -220;
 "@MMK_R_C" = -93;
@@ -11277,6 +11304,7 @@ tecyrillic = -128;
 "@MMK_R_u" = -81;
 alpha = -116;
 ampersand = -128;
+atilde = -131;
 chook = -116;
 dcurl = -116;
 drthook = -116;
@@ -11396,6 +11424,7 @@ afii10044 = -104;
 uni023E = -81;
 };
 "@MMK_L_comma" = {
+"@MMK_R_C" = -90;
 "@MMK_R_T" = -69;
 "@MMK_R_T.sc" = -130;
 "@MMK_R_Y" = -186;
@@ -11421,7 +11450,6 @@ space = -116;
 };
 "@MMK_L_dagger" = {
 "@MMK_R_A" = -151;
-"@MMK_R_B" = 81;
 "@MMK_R_J" = -151;
 "@MMK_R_o" = -69;
 ampersand = -81;
@@ -11431,7 +11459,6 @@ ampersand = -81;
 "@MMK_R_T" = 81;
 "@MMK_R_asciicircum" = 116;
 "@MMK_R_dagger" = 81;
-"@MMK_R_eight.sups" = 139;
 "@MMK_R_idblgrave" = 93;
 "@MMK_R_idieresis" = 69;
 "@MMK_R_idotless" = 81;
@@ -11439,7 +11466,7 @@ ampersand = -81;
 "@MMK_R_m" = 69;
 "@MMK_R_one" = 93;
 "@MMK_R_parenleft" = 29;
-"@MMK_R_parenright" = 145;
+"@MMK_R_parenright" = 345;
 "@MMK_R_parenright.case" = 116;
 "@MMK_R_quotedbl" = 69;
 "@MMK_R_quotedblleft" = 69;
@@ -11627,7 +11654,6 @@ icaron = 69;
 icircumflex = 69;
 igrave = 69;
 iinvertedbreve = 69;
-imacron = 93;
 jcircumflex = 69;
 jcrosstail = -116;
 numero = 151;
@@ -11640,8 +11666,6 @@ uni048A = 151;
 "@MMK_L_idotless" = {
 "@MMK_R_idblgrave" = 69;
 "@MMK_R_idieresis" = 81;
-"@MMK_R_jdotless" = 81;
-"@MMK_R_parenright.case" = 116;
 florin = 69;
 idblgrave = 104;
 iinvertedbreve = 69;
@@ -11997,6 +12021,11 @@ less = -81;
 underscore = -69;
 uni023E = -151;
 };
+"@MMK_L_uhorn" = {
+"@MMK_R_o" = -150;
+"@MMK_R_t" = 60;
+"@MMK_R_v" = 40;
+};
 "@MMK_L_v" = {
 "@MMK_R_A" = -139;
 "@MMK_R_B" = 81;
@@ -12303,7 +12332,6 @@ florin = {
 "@MMK_R_m" = 69;
 };
 gamma1 = {
-"@MMK_R_T" = 151;
 "@MMK_R_comma" = -151;
 };
 germandbls = {
@@ -12448,9 +12476,6 @@ nlfthook = {
 ntilde = {
 "@MMK_R_T" = -104;
 };
-oacute = {
-"@MMK_R_B" = 70;
-};
 odieresis = {
 "@MMK_R_T" = -104;
 };
@@ -12610,7 +12635,6 @@ m009 = {
 "@MMK_R_guillemetleft" = -69;
 "@MMK_R_guillemetright" = -69;
 "@MMK_R_hyphen" = -69;
-"@MMK_R_idieresis" = 93;
 "@MMK_R_nine.1" = -20;
 "@MMK_R_o" = -60;
 "@MMK_R_one" = -69;
@@ -12647,7 +12671,7 @@ underscore = -81;
 "@MMK_R_W" = -93;
 "@MMK_R_X" = -90;
 "@MMK_R_Y" = -100;
-"@MMK_R_comma" = -93;
+"@MMK_R_comma" = -90;
 "@MMK_R_idblgrave" = 93;
 "@MMK_R_quotedblbase" = -81;
 "@MMK_R_quotedblleft" = -69;
@@ -12700,12 +12724,9 @@ underscore = -69;
 };
 "@MMK_L_H" = {
 "@MMK_R_Dcroat" = 81;
-"@MMK_R_dagger" = 81;
-"@MMK_R_eight.sups" = 93;
 "@MMK_R_f" = 10;
 "@MMK_R_idblgrave" = 69;
 "@MMK_R_idieresis" = 151;
-"@MMK_R_idotless" = 140;
 "@MMK_R_parenright" = 69;
 "@MMK_R_t" = 10;
 Dcroat = 69;
@@ -12776,6 +12797,10 @@ quotedblreversed = -93;
 quotereversed = -93;
 tripleprime = -139;
 };
+"@MMK_L_Ohorn" = {
+"@MMK_R_A" = -60;
+"@MMK_R_comma" = -90;
+};
 "@MMK_L_Omicrongreek" = {
 "@MMK_R_comma" = -93;
 "@MMK_R_quotedblleft" = -69;
@@ -12881,6 +12906,9 @@ vturn = -87;
 "@MMK_R_comma" = -69;
 "@MMK_R_idblgrave" = 81;
 };
+"@MMK_L_Uhorn" = {
+"@MMK_R_T" = 120;
+};
 "@MMK_L_V" = {
 "@MMK_R_A" = -270;
 "@MMK_R_C" = -60;
@@ -12977,6 +13005,7 @@ tecyrillic = -128;
 "@MMK_R_u" = -81;
 alpha = -116;
 ampersand = -128;
+atilde = -140;
 chook = -116;
 dcurl = -116;
 drthook = -116;
@@ -13096,6 +13125,7 @@ afii10044 = -104;
 uni023E = -81;
 };
 "@MMK_L_comma" = {
+"@MMK_R_C" = -90;
 "@MMK_R_T" = -69;
 "@MMK_R_T.sc" = -130;
 "@MMK_R_Y" = -186;
@@ -13121,7 +13151,6 @@ space = -116;
 };
 "@MMK_L_dagger" = {
 "@MMK_R_A" = -151;
-"@MMK_R_B" = 81;
 "@MMK_R_J" = -151;
 "@MMK_R_o" = -69;
 ampersand = -81;
@@ -13130,13 +13159,12 @@ ampersand = -81;
 "@MMK_R_T" = 81;
 "@MMK_R_asciicircum" = 116;
 "@MMK_R_dagger" = 81;
-"@MMK_R_eight.sups" = 139;
 "@MMK_R_idblgrave" = 93;
 "@MMK_R_idieresis" = 69;
 "@MMK_R_idotless" = 69;
 "@MMK_R_one" = 93;
 "@MMK_R_parenleft" = 29;
-"@MMK_R_parenright" = 145;
+"@MMK_R_parenright" = 355;
 "@MMK_R_parenright.case" = 116;
 "@MMK_R_quotedbl" = 69;
 "@MMK_R_quotedblleft" = 69;
@@ -13306,7 +13334,7 @@ seven = -69;
 "@MMK_R_f" = 81;
 "@MMK_R_idblgrave" = 104;
 "@MMK_R_idieresis" = 270;
-"@MMK_R_idotless" = 186;
+"@MMK_R_idotless" = 80;
 "@MMK_R_jdotless" = -116;
 "@MMK_R_one" = 93;
 "@MMK_R_t" = 104;
@@ -13322,7 +13350,6 @@ icaron = 69;
 icircumflex = 69;
 igrave = 69;
 iinvertedbreve = 69;
-imacron = 93;
 jcircumflex = 69;
 jcrosstail = -116;
 numero = 151;
@@ -13333,11 +13360,8 @@ uni0376 = 151;
 uni048A = 151;
 };
 "@MMK_L_idotless" = {
-"@MMK_R_B" = 140;
 "@MMK_R_idblgrave" = 104;
 "@MMK_R_idieresis" = 69;
-"@MMK_R_jdotless" = 69;
-"@MMK_R_parenright.case" = 116;
 iinvertedbreve = 81;
 itilde = 81;
 };
@@ -13589,6 +13613,7 @@ rrthook = 100;
 "@MMK_R_quotedblbase" = -104;
 "@MMK_R_quotedblleft" = -104;
 "@MMK_R_registered" = -17;
+"@MMK_R_v" = -20;
 };
 "@MMK_L_seven" = {
 "@MMK_R_A" = -221;
@@ -13697,6 +13722,11 @@ less = -81;
 underscore = -69;
 uni023E = -151;
 };
+"@MMK_L_uhorn" = {
+"@MMK_R_o" = -150;
+"@MMK_R_t" = 50;
+"@MMK_R_v" = 40;
+};
 "@MMK_L_v" = {
 "@MMK_R_A" = -139;
 "@MMK_R_J" = -128;
@@ -13711,6 +13741,7 @@ uni023E = -151;
 "@MMK_R_o" = -34;
 "@MMK_R_quotedblbase" = -162;
 "@MMK_R_quotedblright" = 58;
+"@MMK_R_s" = -20;
 "@MMK_R_slash" = -116;
 Tcaron = -128;
 Trthook = -128;
@@ -14003,7 +14034,6 @@ florin = {
 "@MMK_R_m" = 69;
 };
 gamma1 = {
-"@MMK_R_T" = 151;
 "@MMK_R_comma" = -151;
 };
 ghook = {
@@ -14112,9 +14142,6 @@ nlfthook = {
 ntilde = {
 "@MMK_R_T" = -104;
 };
-oacute = {
-"@MMK_R_B" = 70;
-};
 odieresis = {
 "@MMK_R_T" = -104;
 };
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_.glyph
index d0afa0469..2c67792d6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_.glyph
@@ -24,13 +24,7 @@ pos = (494,1490);
 },
 {
 name = top;
-pos = (692,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (1896,1832);
+pos = (692,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -80,7 +74,7 @@ pos = (460,1490);
 },
 {
 name = top;
-pos = (814,1676);
+pos = (814,1490);
 }
 );
 background = {
@@ -148,7 +142,7 @@ pos = (526,1490);
 },
 {
 name = top;
-pos = (632,1676);
+pos = (632,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -198,7 +192,7 @@ pos = (470,1490);
 },
 {
 name = top;
-pos = (668,1676);
+pos = (668,1490);
 }
 );
 guides = (
@@ -263,13 +257,7 @@ pos = (480,1490);
 },
 {
 name = top;
-pos = (586,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (521,1408);
+pos = (586,1490);
 }
 );
 layerId = m011;
@@ -374,7 +362,7 @@ pos = (414,1490);
 },
 {
 name = top;
-pos = (768,1676);
+pos = (768,1490);
 }
 );
 guides = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_E_.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_E_.glyph
index 7c492e8d8..853ee8f8f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_E_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_E_.glyph
@@ -7,7 +7,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (1324,1676);
+pos = (1324,1490);
 }
 );
 background = {
@@ -60,7 +60,7 @@ width = 2028;
 anchors = (
 {
 name = top;
-pos = (1352,1676);
+pos = (1352,1490);
 }
 );
 background = {
@@ -120,7 +120,7 @@ width = 2164;
 anchors = (
 {
 name = top;
-pos = (1256,1676);
+pos = (1256,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -162,7 +162,7 @@ width = 1964;
 anchors = (
 {
 name = top;
-pos = (1288,1676);
+pos = (1288,1490);
 }
 );
 background = {
@@ -221,7 +221,7 @@ width = 1954;
 anchors = (
 {
 name = top;
-pos = (1210,1676);
+pos = (1210,1490);
 }
 );
 layerId = m011;
@@ -263,7 +263,7 @@ width = 1854;
 anchors = (
 {
 name = top;
-pos = (1314,1676);
+pos = (1314,1490);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_E_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_E_acute.glyph
index 81ca955f3..a51795ffa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_E_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_E_acute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (937,414);
+pos = (937,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (904,414);
+pos = (904,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (930,414);
+pos = (926,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_E_macron.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_E_macron.glyph
index 0a7c28ced..dd8493263 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_E_macron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_E_macron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (864,372);
+pos = (724,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (694,372);
+pos = (687,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (956,372);
+pos = (674,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (860,372);
+pos = (720,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (672,372);
+pos = (665,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (974,414);
+pos = (676,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_acute.glyph
index 4b4187e22..f31cd96ca 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_acute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (317,414);
+pos = (317,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (358,414);
+pos = (358,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (306,414);
+pos = (302,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_breve.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_breve.glyph
index 55e3c3087..8f5945ee1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_breve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_breve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (232,372);
+pos = (308,372);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (302,372);
+pos = (334,372);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (216,372);
+pos = (280,372);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (240,414);
+pos = (268,434);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (272,414);
+pos = (288,434);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (170,414);
+pos = (234,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_breveacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_breveacute.glyph
index 6d63cc1c4..978ebf2e1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_breveacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_breveacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (226,372);
+pos = (308,372);
 ref = breveacutecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (294,396);
+pos = (334,372);
 ref = breveacutecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (286,358);
+pos = (280,372);
 ref = breveacutecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (234,372);
+pos = (268,434);
 ref = breveacutecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (264,396);
+pos = (288,434);
 ref = breveacutecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (304,358);
+pos = (234,434);
 ref = breveacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_brevecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_brevecyrillic.glyph
index 872a3608a..3aefb1268 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_brevecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_brevecyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (232,372);
+pos = (308,372);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (302,372);
+pos = (334,372);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (216,372);
+pos = (280,372);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (240,414);
+pos = (268,434);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (272,414);
+pos = (288,434);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (170,414);
+pos = (234,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_brevedotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_brevedotbelow.glyph
index 274f13711..70c61711b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_brevedotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_brevedotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (232,372);
+pos = (308,372);
 ref = breve;
 },
 {
@@ -27,7 +27,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (302,372);
+pos = (334,372);
 ref = breve;
 },
 {
@@ -44,7 +44,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (216,372);
+pos = (280,372);
 ref = breve;
 },
 {
@@ -61,7 +61,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (240,414);
+pos = (268,434);
 ref = breve;
 },
 {
@@ -78,7 +78,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (272,414);
+pos = (288,434);
 ref = breve;
 },
 {
@@ -95,7 +95,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (170,414);
+pos = (234,434);
 ref = breve;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_brevegrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_brevegrave.glyph
index 5cc32a78e..8d89e6333 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_brevegrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_brevegrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (226,372);
+pos = (308,372);
 ref = brevegravecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (294,396);
+pos = (334,372);
 ref = brevegravecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (286,358);
+pos = (280,372);
 ref = brevegravecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (234,372);
+pos = (268,434);
 ref = brevegravecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (264,396);
+pos = (288,434);
 ref = brevegravecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (304,358);
+pos = (234,434);
 ref = brevegravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_brevehookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_brevehookabove.glyph
index 9a8112f11..ecd2013f8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_brevehookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_brevehookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (220,394);
+pos = (308,372);
 ref = brevehookcomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (294,364);
+pos = (334,372);
 ref = brevehookcomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (256,410);
+pos = (280,372);
 ref = brevehookcomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (228,394);
+pos = (268,434);
 ref = brevehookcomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (264,364);
+pos = (288,434);
 ref = brevehookcomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (274,410);
+pos = (234,434);
 ref = brevehookcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_brevetilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_brevetilde.glyph
index 2df2bcf55..8fd399fbd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_brevetilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_brevetilde.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (224,402);
+pos = (308,372);
 ref = brevetildecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (290,364);
+pos = (334,372);
 ref = brevetildecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (238,426);
+pos = (280,372);
 ref = brevetildecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (232,402);
+pos = (268,434);
 ref = brevetildecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (260,364);
+pos = (288,434);
 ref = brevetildecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (256,426);
+pos = (234,434);
 ref = brevetildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_caron.glyph
index f6ddf4c15..cc10e4f2c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_caron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (202,388);
+pos = (200,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (234,414);
+pos = (234,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (138,414);
+pos = (140,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (218,414);
+pos = (218,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_circumflex.glyph
index 6dd142bce..18dc60e33 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (226,372);
+pos = (228,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (168,372);
+pos = (174,372);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (202,372);
+pos = (200,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (234,414);
+pos = (236,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (138,414);
+pos = (140,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (220,414);
+pos = (218,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_circumflexacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_circumflexacute.glyph
index e54cafb88..b00f3abf9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_circumflexacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_circumflexacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (278,376);
+pos = (228,372);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (390,334);
+pos = (174,372);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (328,398);
+pos = (200,372);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (286,376);
+pos = (236,434);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (360,334);
+pos = (140,434);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (346,398);
+pos = (218,434);
 ref = circumflexacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_circumflexdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_circumflexdotbelow.glyph
index 58c62a9f1..baa8c5c71 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_circumflexdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_circumflexdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (226,372);
+pos = (228,372);
 ref = circumflex;
 },
 {
@@ -27,7 +27,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (168,372);
+pos = (174,372);
 ref = circumflex;
 },
 {
@@ -44,7 +44,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (202,372);
+pos = (200,372);
 ref = circumflex;
 },
 {
@@ -61,7 +61,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (234,414);
+pos = (236,434);
 ref = circumflex;
 },
 {
@@ -78,7 +78,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (138,414);
+pos = (140,434);
 ref = circumflex;
 },
 {
@@ -95,7 +95,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (220,414);
+pos = (218,434);
 ref = circumflex;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_circumflexgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_circumflexgrave.glyph
index 6bcde3445..32897db0b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_circumflexgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_circumflexgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (0,394);
+pos = (226,372);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (16,320);
+pos = (162,372);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (132,436);
+pos = (132,250);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (8,394);
+pos = (234,434);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (-14,320);
+pos = (136,434);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (150,436);
+pos = (150,250);
 ref = circumflexgravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_circumflexhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_circumflexhookabove.glyph
index 4fadfb67a..deba8fc4e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_circumflexhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_circumflexhookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (218,356);
+pos = (228,372);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (304,334);
+pos = (174,372);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (280,366);
+pos = (200,372);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (226,356);
+pos = (236,434);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (274,334);
+pos = (140,434);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (298,366);
+pos = (218,434);
 ref = circumflexhookcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_circumflextilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_circumflextilde.glyph
index 08f658e46..d70fd4b84 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_circumflextilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_circumflextilde.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (136,334);
+pos = (228,372);
 ref = circumflextildecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (186,344);
+pos = (174,372);
 ref = circumflextildecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (202,330);
+pos = (202,144);
 ref = circumflextildecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (144,334);
+pos = (236,434);
 ref = circumflextildecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (156,344);
+pos = (140,434);
 ref = circumflextildecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (220,330);
+pos = (220,144);
 ref = circumflextildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_dblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_dblgrave.glyph
index 7f7f73564..8c6800256 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_dblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_dblgrave.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1172,414);
+pos = (1172,434);
 ref = dblgravecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1394,414);
+pos = (1394,434);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1208,414);
+pos = (1208,434);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_dieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_dieresis.glyph
index 43d93c44e..e094865bf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_dieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_dieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (86,372);
+pos = (91,372);
 ref = dieresis;
 }
 );
@@ -29,7 +29,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (307,372);
+pos = (149,372);
 ref = dieresis;
 }
 );
@@ -42,7 +42,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (-42,372);
+pos = (50,372);
 ref = dieresis;
 }
 );
@@ -55,7 +55,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (94,414);
+pos = (99,434);
 ref = dieresis;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (274,414);
+pos = (119,434);
 ref = dieresis;
 }
 );
@@ -87,7 +87,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (-24,414);
+pos = (52,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_dieresismacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_dieresismacron.glyph
index 67ad078c8..0fd40b166 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_dieresismacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_dieresismacron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1274,0);
-ref = dieresismacroncomb.cn;
+pos = (91,0);
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1384;
@@ -23,8 +23,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1488,0);
-ref = dieresismacroncomb.cn;
+pos = (149,0);
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1158,0);
-ref = dieresismacroncomb.cn;
+pos = (50,0);
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1276,0);
-ref = dieresismacroncomb.cn;
+pos = (99,0);
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1338;
@@ -62,8 +62,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1456,0);
-ref = dieresismacroncomb.cn;
+pos = (119,0);
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1178,0);
-ref = dieresismacroncomb.cn;
+pos = (52,0);
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1170;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_dotmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_dotmacron.glyph
index 748917d1c..f22c31249 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_dotmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_dotmacron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1282,0);
-ref = dotmacroncomb.cn;
+pos = (448,372);
+ref = dotmacroncomb.uc;
 }
 );
 width = 1384;
@@ -23,8 +23,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1512,0);
-ref = dotmacroncomb.cn;
+pos = (480,372);
+ref = dotmacroncomb.uc;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1156,0);
-ref = dotmacroncomb.cn;
+pos = (446,372);
+ref = dotmacroncomb.uc;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1290,0);
-ref = dotmacroncomb.cn;
+pos = (456,434);
+ref = dotmacroncomb.uc;
 }
 );
 width = 1338;
@@ -62,8 +62,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1488,0);
-ref = dotmacroncomb.cn;
+pos = (448,434);
+ref = dotmacroncomb.uc;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1174,0);
-ref = dotmacroncomb.cn;
+pos = (464,434);
+ref = dotmacroncomb.uc;
 }
 );
 width = 1170;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_grave.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_grave.glyph
index 2831e933d..f008ae58d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_grave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_grave.glyph
@@ -54,25 +54,20 @@ shapes = (
 ref = A;
 },
 {
-pos = (108,414);
+pos = (108,434);
 ref = grave;
 }
 );
 width = 1338;
 },
 {
-guides = (
-{
-pos = (1580,2240);
-}
-);
 layerId = m009;
 shapes = (
 {
 ref = A;
 },
 {
-pos = (96,414);
+pos = (96,434);
 ref = grave;
 }
 );
@@ -85,7 +80,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (92,414);
+pos = (92,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_hookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_hookabove.glyph
index 2d34467e2..1c1d20b1f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_hookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_hookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1286,398);
+pos = (1279,372);
 ref = hookabovecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1552,366);
+pos = (1478,372);
 ref = hookabovecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1130,416);
+pos = (1154,372);
 ref = hookabovecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1294,398);
+pos = (1231,434);
 ref = hookabovecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1522,414);
+pos = (1422,434);
 ref = hookabovecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1148,416);
+pos = (1090,434);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_invertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_invertedbreve.glyph
index 6240ec309..8a0ab372d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_invertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1348,372);
+pos = (1289,372);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1454,372);
+pos = (1476,372);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1224,372);
+pos = (1214,372);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1324,404);
+pos = (1232,434);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1408,414);
+pos = (1418,434);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1178,414);
+pos = (1115,434);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_macron.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_macron.glyph
index 909c8c01e..d8566350d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_macron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_macron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (232,372);
+pos = (92,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (156,372);
+pos = (149,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (332,372);
+pos = (50,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (240,372);
+pos = (100,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (126,372);
+pos = (119,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (350,414);
+pos = (52,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_ring.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_ring.glyph
index e3260517d..e0a594eb1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_ring.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_ring.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (372,0);
+pos = (388,0);
 ref = ring.uc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (372,0);
+pos = (382,0);
 ref = ring.uc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (388,0);
+pos = (392,0);
 ref = ring.uc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (342,0);
+pos = (336,0);
 ref = ring.uc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (406,0);
+pos = (298,0);
 ref = ring.uc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_ringacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_ringacute.glyph
index 889b0bf56..73c9ac824 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_ringacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_ringacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (390,490);
+pos = (390,304);
 ref = ringacute.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (464,430);
+pos = (464,244);
 ref = ringacute.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (352,524);
+pos = (352,338);
 ref = ringacute.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (398,490);
+pos = (398,304);
 ref = ringacute.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (434,430);
+pos = (434,244);
 ref = ringacute.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (370,524);
+pos = (370,338);
 ref = ringacute.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_tilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_tilde.glyph
index 9b305626b..31e33ef54 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_tilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (232,0);
-ref = casetilde.cn;
+pos = (180,372);
+ref = tilde;
 }
 );
 width = 1384;
@@ -23,8 +23,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (298,0);
-ref = casetilde.cn;
+pos = (302,372);
+ref = tilde;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (208,0);
-ref = casetilde.cn;
+pos = (128,372);
+ref = tilde;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (240,2);
-ref = casetilde.cn;
+pos = (188,434);
+ref = tilde;
 }
 );
 width = 1338;
@@ -62,8 +62,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (268,0);
-ref = casetilde.cn;
+pos = (256,434);
+ref = tilde;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (226,0);
-ref = casetilde.cn;
+pos = (138,434);
+ref = tilde;
 }
 );
 width = 1170;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/B_.glyph b/src/Inter-Roman.glyphspackage/glyphs/B_.glyph
index 95e5fe0b7..b9324529e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/B_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/B_.glyph
@@ -20,23 +20,13 @@ pos = (270,419);
 },
 {
 name = top;
-pos = (638,1676);
+pos = (638,1490);
 },
 {
 name = topl;
 pos = (180,1490);
 }
 );
-guides = (
-{
-angle = 90;
-pos = (924,1772);
-},
-{
-angle = 90;
-pos = (1612,1340);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
@@ -107,7 +97,7 @@ pos = (298,480);
 },
 {
 name = top;
-pos = (666,1676);
+pos = (666,1490);
 },
 {
 name = topl;
@@ -191,7 +181,7 @@ pos = (256,390);
 },
 {
 name = top;
-pos = (620,1676);
+pos = (620,1490);
 },
 {
 name = topl;
@@ -275,7 +265,7 @@ pos = (238,419);
 },
 {
 name = top;
-pos = (606,1676);
+pos = (606,1490);
 },
 {
 name = topl;
@@ -352,7 +342,7 @@ pos = (282,459);
 },
 {
 name = top;
-pos = (650,1676);
+pos = (650,1490);
 },
 {
 name = topl;
@@ -436,7 +426,7 @@ pos = (190,390);
 },
 {
 name = top;
-pos = (554,1676);
+pos = (554,1490);
 },
 {
 name = topl;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/B_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/B_dotaccent.glyph
index 00c5c53c9..449261c0b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/B_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/B_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = B;
 },
 {
-pos = (394,414);
+pos = (394,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = B;
 },
 {
-pos = (330,414);
+pos = (330,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = B;
 },
 {
-pos = (432,414);
+pos = (432,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/B_linebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/B_linebelow.glyph
index e1b9055bc..d7614606e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/B_linebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/B_linebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = B;
 },
 {
-pos = (1252,0);
+pos = (1244,0);
 ref = macronsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = B;
 },
 {
-pos = (1292,0);
+pos = (1330,0);
 ref = macronsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = B;
 },
 {
-pos = (1244,0);
+pos = (1213,0);
 ref = macronsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = B;
 },
 {
-pos = (1252,0);
+pos = (1174,0);
 ref = macronsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = B;
 },
 {
-pos = (1292,0);
+pos = (1293,0);
 ref = macronsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = B;
 },
 {
-pos = (1242,0);
+pos = (1101,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/C_.glyph b/src/Inter-Roman.glyphspackage/glyphs/C_.glyph
index b92db3176..5a475d8bb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/C_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/C_.glyph
@@ -20,7 +20,7 @@ pos = (778,745);
 },
 {
 name = top;
-pos = (780,1676);
+pos = (780,1490);
 },
 {
 name = topr;
@@ -34,12 +34,6 @@ ref = O;
 }
 );
 };
-guides = (
-{
-angle = 90;
-pos = (1072,1432);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
@@ -92,7 +86,7 @@ pos = (804,745);
 },
 {
 name = top;
-pos = (808,1676);
+pos = (808,1490);
 },
 {
 name = topr;
@@ -240,7 +234,7 @@ pos = (760,745);
 },
 {
 name = top;
-pos = (766,1676);
+pos = (766,1490);
 },
 {
 name = topr;
@@ -299,7 +293,7 @@ pos = (769,745);
 },
 {
 name = top;
-pos = (758,1676);
+pos = (758,1490);
 },
 {
 name = topr;
@@ -377,7 +371,7 @@ pos = (757,745);
 },
 {
 name = top;
-pos = (758,1676);
+pos = (758,1490);
 },
 {
 name = topr;
@@ -933,7 +927,7 @@ pos = (696,745);
 },
 {
 name = top;
-pos = (702,1676);
+pos = (702,1490);
 },
 {
 name = topr;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/C_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/C_acute.glyph
index 5ec9e1c45..e1f18dc8b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/C_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/C_acute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (407,414);
+pos = (407,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (348,414);
+pos = (348,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (422,414);
+pos = (418,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/C_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/C_caron.glyph
index 37f4e2202..b384c32e3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/C_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/C_caron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (336,388);
+pos = (334,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (324,414);
+pos = (324,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (128,414);
+pos = (130,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (334,414);
+pos = (334,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/C_cedillaacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/C_cedillaacute.glyph
index 773660678..ce508b908 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/C_cedillaacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/C_cedillaacute.glyph
@@ -65,7 +65,7 @@ pos = (510,0);
 ref = cedilla;
 },
 {
-pos = (407,414);
+pos = (407,434);
 ref = acute;
 }
 );
@@ -82,7 +82,7 @@ pos = (310,6);
 ref = cedilla;
 },
 {
-pos = (348,414);
+pos = (348,434);
 ref = acute;
 }
 );
@@ -99,7 +99,7 @@ pos = (552,0);
 ref = cedilla;
 },
 {
-pos = (422,414);
+pos = (418,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/C_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/C_circumflex.glyph
index 6ca744a77..d1b393192 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/C_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/C_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (314,372);
+pos = (316,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (162,372);
+pos = (168,372);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (336,372);
+pos = (334,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (324,414);
+pos = (326,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (128,414);
+pos = (130,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (336,414);
+pos = (334,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/C_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/C_dotaccent.glyph
index b0a7a04a4..5ec8ef7f3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/C_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/C_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (546,414);
+pos = (546,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (438,414);
+pos = (438,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (580,414);
+pos = (580,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/C_he-cy.glyph b/src/Inter-Roman.glyphspackage/glyphs/C_he-cy.glyph
index 9662d13ca..add45966a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/C_he-cy.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/C_he-cy.glyph
@@ -14,7 +14,7 @@ pos = (1268,0);
 },
 {
 name = top;
-pos = (724,1676);
+pos = (724,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -64,7 +64,7 @@ pos = (1372,0);
 },
 {
 name = top;
-pos = (732,1676);
+pos = (732,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -114,7 +114,7 @@ pos = (1206,0);
 },
 {
 name = top;
-pos = (716,1676);
+pos = (716,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -164,7 +164,7 @@ pos = (1236,0);
 },
 {
 name = top;
-pos = (692,1676);
+pos = (692,1490);
 }
 );
 layerId = m007;
@@ -214,7 +214,7 @@ pos = (1356,0);
 },
 {
 name = top;
-pos = (716,1676);
+pos = (716,1490);
 }
 );
 layerId = m009;
@@ -264,7 +264,7 @@ pos = (1142,0);
 },
 {
 name = top;
-pos = (652,1676);
+pos = (652,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/C_hedieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/C_hedieresiscyrillic.glyph
index 923318973..869a463a3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/C_hedieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/C_hedieresiscyrillic.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = "Che-cy";
 },
 {
-pos = (118,372);
+pos = (123,372);
 ref = dieresis;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = "Che-cy";
 },
 {
-pos = (225,372);
+pos = (67,372);
 ref = dieresis;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = "Che-cy";
 },
 {
-pos = (42,372);
+pos = (134,372);
 ref = dieresis;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = "Che-cy";
 },
 {
-pos = (118,414);
+pos = (123,434);
 ref = dieresis;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = "Che-cy";
 },
 {
-pos = (222,414);
+pos = (67,434);
 ref = dieresis;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = "Che-cy";
 },
 {
-pos = (42,414);
+pos = (118,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/D_.glyph b/src/Inter-Roman.glyphspackage/glyphs/D_.glyph
index 6cd93b60a..52ee24607 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/D_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/D_.glyph
@@ -16,11 +16,11 @@ pos = (622,0);
 },
 {
 name = cross;
-pos = (270,768);
+pos = (270,745);
 },
 {
 name = top;
-pos = (616,1676);
+pos = (616,1490);
 },
 {
 name = topl;
@@ -76,11 +76,11 @@ pos = (674,0);
 },
 {
 name = cross;
-pos = (296,788);
+pos = (296,745);
 },
 {
 name = top;
-pos = (594,1676);
+pos = (594,1490);
 },
 {
 name = topl;
@@ -136,11 +136,11 @@ pos = (590,0);
 },
 {
 name = cross;
-pos = (256,756);
+pos = (256,745);
 },
 {
 name = top;
-pos = (632,1676);
+pos = (632,1490);
 },
 {
 name = topl;
@@ -196,11 +196,11 @@ pos = (590,0);
 },
 {
 name = cross;
-pos = (238,768);
+pos = (238,745);
 },
 {
 name = top;
-pos = (584,1676);
+pos = (584,1490);
 },
 {
 name = topl;
@@ -256,11 +256,11 @@ pos = (666,0);
 },
 {
 name = cross;
-pos = (288,788);
+pos = (288,745);
 },
 {
 name = top;
-pos = (586,1676);
+pos = (586,1490);
 },
 {
 name = topl;
@@ -324,11 +324,11 @@ pos = (526,0);
 },
 {
 name = cross;
-pos = (192,756);
+pos = (192,745);
 },
 {
 name = top;
-pos = (568,1676);
+pos = (568,1490);
 },
 {
 name = topl;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/D_bar1.glyph b/src/Inter-Roman.glyphspackage/glyphs/D_bar1.glyph
index 5b383d131..c9a4cb36a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/D_bar1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/D_bar1.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (-190,47);
+pos = (-190,0);
 ref = crossbar;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (-224,67);
+pos = (-224,0);
 ref = crossbar;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (-168,34);
+pos = (-168,0);
 ref = crossbar;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (-210,48);
+pos = (-210,0);
 ref = crossbar;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (-208,67);
+pos = (-208,0);
 ref = crossbar;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (-168,34);
+pos = (-168,0);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/D_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/D_caron.glyph
index e45bcbadc..fdd1c0d63 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/D_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/D_caron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (202,388);
+pos = (200,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (150,414);
+pos = (150,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (-44,414);
+pos = (-42,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (200,414);
+pos = (200,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/D_circumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/D_circumflexbelow.glyph
index 4640b2cc9..4dbacf879 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/D_circumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/D_circumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1204,0);
+pos = (1214,0);
 ref = circumflexsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1348,0);
+pos = (1339,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1102,0);
+pos = (1164,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1204,0);
+pos = (1158,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1356,0);
+pos = (1318,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1102,0);
+pos = (1054,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/D_croat.glyph b/src/Inter-Roman.glyphspackage/glyphs/D_croat.glyph
index c66eb1b8d..92bc74440 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/D_croat.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/D_croat.glyph
@@ -5,7 +5,11 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-ref = Dbar1;
+ref = D;
+},
+{
+pos = (-190,0);
+ref = crossbar_left_long;
 }
 );
 width = 1472;
@@ -14,7 +18,11 @@ width = 1472;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-ref = Dbar1;
+ref = D;
+},
+{
+pos = (-224,0);
+ref = crossbar_left_long;
 }
 );
 width = 1500;
@@ -23,7 +31,11 @@ width = 1500;
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-ref = Dbar1;
+ref = D;
+},
+{
+pos = (-168,0);
+ref = crossbar_left_long;
 }
 );
 width = 1462;
@@ -32,7 +44,11 @@ width = 1462;
 layerId = m007;
 shapes = (
 {
-ref = Dbar1;
+ref = D;
+},
+{
+pos = (-210,0);
+ref = crossbar_left_long;
 }
 );
 width = 1412;
@@ -41,7 +57,11 @@ width = 1412;
 layerId = m009;
 shapes = (
 {
-ref = Dbar1;
+ref = D;
+},
+{
+pos = (-208,0);
+ref = crossbar_left_long;
 }
 );
 width = 1456;
@@ -50,7 +70,11 @@ width = 1456;
 layerId = m011;
 shapes = (
 {
-ref = Dbar1;
+ref = D;
+},
+{
+pos = (-168,0);
+ref = crossbar_left_long;
 }
 );
 width = 1334;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/D_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/D_dotaccent.glyph
index d3c7dc7f6..acdcde687 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/D_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/D_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (372,414);
+pos = (372,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (266,414);
+pos = (266,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (446,414);
+pos = (446,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/D_linebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/D_linebelow.glyph
index 3d90100fe..430547040 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/D_linebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/D_linebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1228,0);
+pos = (1220,0);
 ref = macronsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1302,0);
+pos = (1340,0);
 ref = macronsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1196,0);
+pos = (1165,0);
 ref = macronsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1228,0);
+pos = (1150,0);
 ref = macronsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1310,0);
+pos = (1311,0);
 ref = macronsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1196,0);
+pos = (1055,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_.glyph
index 5377b4b1d..ed8e93208 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_.glyph
@@ -28,14 +28,7 @@ pos = (134,1490);
 },
 {
 name = top;
-pos = (628,1676);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (1044,516);
+pos = (628,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -84,7 +77,7 @@ pos = (56,1490);
 },
 {
 name = top;
-pos = (638,1676);
+pos = (638,1490);
 }
 );
 guides = (
@@ -143,7 +136,7 @@ pos = (180,1490);
 },
 {
 name = top;
-pos = (634,1676);
+pos = (634,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -192,7 +185,7 @@ pos = (102,1490);
 },
 {
 name = top;
-pos = (596,1676);
+pos = (596,1490);
 }
 );
 guides = (
@@ -248,7 +241,7 @@ pos = (40,1490);
 },
 {
 name = top;
-pos = (630,1676);
+pos = (630,1490);
 }
 );
 guides = (
@@ -307,7 +300,7 @@ pos = (116,1490);
 },
 {
 name = top;
-pos = (570,1676);
+pos = (570,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_acute.glyph
index 35aeb2334..96e0197e6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_acute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (245,414);
+pos = (245,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (220,414);
+pos = (220,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (290,414);
+pos = (286,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_breve.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_breve.glyph
index 92d296429..cd291340b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_breve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_breve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (168,372);
+pos = (244,372);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (126,372);
+pos = (158,372);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (218,372);
+pos = (282,372);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (168,414);
+pos = (196,434);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (134,414);
+pos = (150,434);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (154,414);
+pos = (218,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_caron.glyph
index 3b9c5a7a4..9da441a60 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_caron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (204,388);
+pos = (202,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (162,414);
+pos = (162,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (0,414);
+pos = (2,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (202,414);
+pos = (202,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_cedillabreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_cedillabreve.glyph
index 53756e2e7..414684df4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_cedillabreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_cedillabreve.glyph
@@ -14,7 +14,7 @@ pos = (336,0);
 ref = cedilla;
 },
 {
-pos = (168,372);
+pos = (244,372);
 ref = breve;
 }
 );
@@ -31,7 +31,7 @@ pos = (184,0);
 ref = cedilla;
 },
 {
-pos = (126,372);
+pos = (158,372);
 ref = breve;
 }
 );
@@ -48,7 +48,7 @@ pos = (388,0);
 ref = cedilla;
 },
 {
-pos = (218,372);
+pos = (282,372);
 ref = breve;
 }
 );
@@ -65,7 +65,7 @@ pos = (336,0);
 ref = cedilla;
 },
 {
-pos = (168,414);
+pos = (196,434);
 ref = breve;
 }
 );
@@ -82,7 +82,7 @@ pos = (192,0);
 ref = cedilla;
 },
 {
-pos = (134,414);
+pos = (150,434);
 ref = breve;
 }
 );
@@ -99,7 +99,7 @@ pos = (388,0);
 ref = cedilla;
 },
 {
-pos = (154,414);
+pos = (218,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_circumflex.glyph
index 4425b57f7..e54116f58 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (162,372);
+pos = (164,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-8,372);
+pos = (-2,372);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (204,372);
+pos = (202,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (162,414);
+pos = (164,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (0,414);
+pos = (2,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (204,414);
+pos = (202,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexacute.glyph
index 5db8360fa..7f97d2109 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (214,376);
+pos = (164,372);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (214,334);
+pos = (-2,372);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (330,398);
+pos = (202,372);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (214,376);
+pos = (164,434);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (222,334);
+pos = (2,434);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (330,398);
+pos = (202,434);
 ref = circumflexacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexbelow.glyph
index aeb0ea4e4..0acec333c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1196,0);
+pos = (1206,0);
 ref = circumflexsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1312,0);
+pos = (1303,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1112,0);
+pos = (1174,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1196,0);
+pos = (1150,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1320,0);
+pos = (1282,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1112,0);
+pos = (1064,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexdotbelow.glyph
index 0dd55eacc..bfe60b923 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (162,372);
+pos = (164,372);
 ref = circumflex;
 },
 {
@@ -27,7 +27,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-8,372);
+pos = (-2,372);
 ref = circumflex;
 },
 {
@@ -44,7 +44,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (204,372);
+pos = (202,372);
 ref = circumflex;
 },
 {
@@ -61,7 +61,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (162,414);
+pos = (164,434);
 ref = circumflex;
 },
 {
@@ -78,7 +78,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (0,414);
+pos = (2,434);
 ref = circumflex;
 },
 {
@@ -95,7 +95,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (204,414);
+pos = (202,434);
 ref = circumflex;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexgrave.glyph
index c6c0c3a67..544b70e42 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-64,394);
+pos = (162,372);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-160,320);
+pos = (-14,372);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (134,436);
+pos = (134,250);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-64,394);
+pos = (162,434);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-152,320);
+pos = (-2,434);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (134,436);
+pos = (134,250);
 ref = circumflexgravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexhookabove.glyph
index 64306b957..2ba938bf7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexhookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (154,356);
+pos = (164,372);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (128,334);
+pos = (-2,372);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (282,366);
+pos = (202,372);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (154,356);
+pos = (164,434);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (136,334);
+pos = (2,434);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (282,366);
+pos = (202,434);
 ref = circumflexhookcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_circumflextilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_circumflextilde.glyph
index 0fce3d398..58815bf01 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_circumflextilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_circumflextilde.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (72,334);
+pos = (164,372);
 ref = circumflextildecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (10,344);
+pos = (-2,372);
 ref = circumflextildecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (204,330);
+pos = (204,144);
 ref = circumflextildecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (72,334);
+pos = (164,434);
 ref = circumflextildecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (18,344);
+pos = (2,434);
 ref = circumflextildecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (204,330);
+pos = (204,144);
 ref = circumflextildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_dblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_dblgrave.glyph
index c64f5db2b..96c01d01d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_dblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_dblgrave.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1100,414);
+pos = (1100,434);
 ref = dblgravecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1256,414);
+pos = (1256,434);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1192,414);
+pos = (1192,434);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_dieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_dieresis.glyph
index e7ccd8e71..b48c8a0f5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_dieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_dieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (22,372);
+pos = (27,372);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (131,372);
+pos = (-27,372);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-40,372);
+pos = (52,372);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (22,414);
+pos = (27,434);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (136,414);
+pos = (-19,434);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-40,414);
+pos = (36,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_dotaccent.glyph
index 5c8245dad..4ddf3cca3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (384,414);
+pos = (384,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (310,414);
+pos = (310,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (448,414);
+pos = (448,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_grave.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_grave.glyph
index ad03b2e16..1cb7f9cd6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_grave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_grave.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (36,414);
+pos = (36,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-42,414);
+pos = (-42,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (76,414);
+pos = (76,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_hookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_hookabove.glyph
index f3e8ffd8d..100edfbe5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_hookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_hookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1222,398);
+pos = (1215,372);
 ref = hookabovecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1376,366);
+pos = (1302,372);
 ref = hookabovecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1132,416);
+pos = (1156,372);
 ref = hookabovecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1222,398);
+pos = (1159,434);
 ref = hookabovecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1384,414);
+pos = (1284,434);
 ref = hookabovecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1132,416);
+pos = (1074,434);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_invertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_invertedbreve.glyph
index 40240d8f7..d23d597e3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_invertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1284,372);
+pos = (1225,372);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1278,372);
+pos = (1300,372);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1226,372);
+pos = (1216,372);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1252,404);
+pos = (1160,434);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1270,414);
+pos = (1280,434);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1162,414);
+pos = (1099,434);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_macron.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_macron.glyph
index 031d02279..098f1a729 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_macron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_macron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (168,372);
+pos = (28,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-20,372);
+pos = (-27,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (334,372);
+pos = (52,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (168,372);
+pos = (28,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-12,372);
+pos = (-19,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (334,414);
+pos = (36,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_macronacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_macronacute.glyph
index e0e09f216..5e36d22dd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_macronacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_macronacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1006,0);
+pos = (28,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1104,0);
+pos = (-27,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1006,0);
+pos = (52,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1006,0);
+pos = (28,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1112,0);
+pos = (-19,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1006,0);
+pos = (36,0);
 ref = macronacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_macrongrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_macrongrave.glyph
index 40eae367e..ac5de1d21 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_macrongrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_macrongrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1006,0);
+pos = (28,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (928,0);
+pos = (-27,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1018,0);
+pos = (52,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1006,0);
+pos = (28,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (936,0);
+pos = (-19,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1018,0);
+pos = (36,0);
 ref = macrongravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_tilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_tilde.glyph
index e9b251417..dfd9f8265 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_tilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (168,0);
-ref = casetilde.cn;
+pos = (116,372);
+ref = tilde;
 }
 );
 width = 1224;
@@ -23,8 +23,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (122,0);
-ref = casetilde.cn;
+pos = (126,372);
+ref = tilde;
 }
 );
 width = 1274;
@@ -36,8 +36,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (210,0);
-ref = casetilde.cn;
+pos = (130,372);
+ref = tilde;
 }
 );
 width = 1196;
@@ -49,8 +49,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (168,2);
-ref = casetilde.cn;
+pos = (116,434);
+ref = tilde;
 }
 );
 width = 1160;
@@ -62,8 +62,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (130,0);
-ref = casetilde.cn;
+pos = (118,434);
+ref = tilde;
 }
 );
 width = 1260;
@@ -75,8 +75,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (210,0);
-ref = casetilde.cn;
+pos = (122,434);
+ref = tilde;
 }
 );
 width = 1068;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_tildebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_tildebelow.glyph
index c2b4db157..20d366363 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_tildebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_tildebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1238,0);
+pos = (1214,0);
 ref = tildesubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1358,0);
+pos = (1302,0);
 ref = tildesubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1086,0);
+pos = (1181,0);
 ref = tildesubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1238,0);
+pos = (1150,0);
 ref = tildesubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1350,0);
+pos = (1278,0);
 ref = tildesubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1082,0);
+pos = (1067,0);
 ref = tildesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_turn.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_turn.glyph
index 6f03243b5..042262e52 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_turn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_turn.glyph
@@ -14,7 +14,7 @@ pos = (616,0);
 },
 {
 name = top;
-pos = (628,1676);
+pos = (628,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -39,7 +39,7 @@ pos = (640,0);
 },
 {
 name = top;
-pos = (638,1676);
+pos = (638,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -64,7 +64,7 @@ pos = (602,0);
 },
 {
 name = top;
-pos = (634,1676);
+pos = (634,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -81,15 +81,15 @@ width = 1196;
 anchors = (
 {
 name = bottom;
-pos = (614,0);
+pos = (572,0);
 },
 {
 name = cedilla;
-pos = (616,0);
+pos = (576,0);
 },
 {
 name = top;
-pos = (628,1676);
+pos = (572,1490);
 }
 );
 layerId = m007;
@@ -114,7 +114,7 @@ pos = (640,0);
 },
 {
 name = top;
-pos = (638,1676);
+pos = (638,1490);
 }
 );
 layerId = m009;
@@ -139,7 +139,7 @@ pos = (602,0);
 },
 {
 name = top;
-pos = (634,1676);
+pos = (634,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_zh.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_zh.glyph
index b4529c2fb..db9e47863 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_zh.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_zh.glyph
@@ -6,7 +6,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (698,1676);
+pos = (698,1490);
 }
 );
 background = {
@@ -95,7 +95,7 @@ width = 1396;
 anchors = (
 {
 name = top;
-pos = (706,1676);
+pos = (706,1490);
 }
 );
 background = {
@@ -289,7 +289,7 @@ width = 1694;
 anchors = (
 {
 name = top;
-pos = (712,1676);
+pos = (712,1490);
 }
 );
 background = {
@@ -426,7 +426,7 @@ width = 1352;
 anchors = (
 {
 name = top;
-pos = (666,1676);
+pos = (666,1490);
 }
 );
 background = {
@@ -623,7 +623,7 @@ width = 1352;
 anchors = (
 {
 name = top;
-pos = (690,1676);
+pos = (690,1490);
 }
 );
 background = {
@@ -762,7 +762,7 @@ width = 1694;
 anchors = (
 {
 name = top;
-pos = (644,1676);
+pos = (644,1490);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_zhcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_zhcaron.glyph
index ad885bb11..13d0f6690 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_zhcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_zhcaron.glyph
@@ -34,7 +34,7 @@ shapes = (
 ref = Ezh;
 },
 {
-pos = (282,388);
+pos = (280,372);
 ref = caron;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = Ezh;
 },
 {
-pos = (232,414);
+pos = (232,434);
 ref = caron;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = Ezh;
 },
 {
-pos = (60,414);
+pos = (62,434);
 ref = caron;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = Ezh;
 },
 {
-pos = (276,414);
+pos = (276,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_zhreversed.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_zhreversed.glyph
index b9364b50b..6bb5af4a9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_zhreversed.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_zhreversed.glyph
@@ -5,7 +5,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (698,1676);
+pos = (698,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -51,7 +51,7 @@ width = 1396;
 anchors = (
 {
 name = top;
-pos = (706,1676);
+pos = (706,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -97,7 +97,7 @@ width = 1414;
 anchors = (
 {
 name = top;
-pos = (710,1676);
+pos = (710,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -143,7 +143,7 @@ width = 1422;
 anchors = (
 {
 name = top;
-pos = (666,1676);
+pos = (666,1490);
 }
 );
 layerId = m007;
@@ -189,7 +189,7 @@ width = 1332;
 anchors = (
 {
 name = top;
-pos = (690,1676);
+pos = (690,1490);
 }
 );
 layerId = m009;
@@ -235,7 +235,7 @@ width = 1382;
 anchors = (
 {
 name = top;
-pos = (646,1676);
+pos = (646,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/F_.glyph b/src/Inter-Roman.glyphspackage/glyphs/F_.glyph
index aa904b444..f3976c262 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/F_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/F_.glyph
@@ -24,7 +24,7 @@ pos = (180,0);
 },
 {
 name = top;
-pos = (646,1676);
+pos = (646,1490);
 }
 );
 background = {
@@ -74,7 +74,7 @@ pos = (96,0);
 },
 {
 name = top;
-pos = (622,1676);
+pos = (622,1490);
 }
 );
 background = {
@@ -129,7 +129,7 @@ pos = (232,0);
 },
 {
 name = top;
-pos = (632,1676);
+pos = (632,1490);
 }
 );
 guides = (
@@ -178,7 +178,7 @@ pos = (148,0);
 },
 {
 name = top;
-pos = (614,1676);
+pos = (614,1490);
 }
 );
 background = {
@@ -228,7 +228,7 @@ pos = (80,0);
 },
 {
 name = top;
-pos = (606,1676);
+pos = (606,1490);
 }
 );
 background = {
@@ -327,7 +327,7 @@ pos = (168,0);
 },
 {
 name = top;
-pos = (568,1676);
+pos = (568,1490);
 }
 );
 guides = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/F_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/F_dotaccent.glyph
index 073e5fc13..23a3b8df7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/F_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/F_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = F;
 },
 {
-pos = (402,414);
+pos = (402,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = F;
 },
 {
-pos = (286,414);
+pos = (286,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = F;
 },
 {
-pos = (446,414);
+pos = (446,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/F_turn.glyph b/src/Inter-Roman.glyphspackage/glyphs/F_turn.glyph
index d9bb314c9..bee392a74 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/F_turn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/F_turn.glyph
@@ -10,7 +10,7 @@ pos = (574,0);
 },
 {
 name = top;
-pos = (930,1676);
+pos = (930,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -31,7 +31,7 @@ pos = (576,0);
 },
 {
 name = top;
-pos = (896,1676);
+pos = (896,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -52,7 +52,7 @@ pos = (566,0);
 },
 {
 name = top;
-pos = (942,1676);
+pos = (942,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -69,11 +69,11 @@ width = 1196;
 anchors = (
 {
 name = bottom;
-pos = (574,0);
+pos = (514,0);
 },
 {
 name = top;
-pos = (930,1676);
+pos = (864,1490);
 }
 );
 layerId = m007;
@@ -90,11 +90,11 @@ width = 1102;
 anchors = (
 {
 name = bottom;
-pos = (576,0);
+pos = (584,0);
 },
 {
 name = top;
-pos = (896,1676);
+pos = (904,1490);
 }
 );
 layerId = m009;
@@ -115,7 +115,7 @@ pos = (566,0);
 },
 {
 name = top;
-pos = (942,1676);
+pos = (942,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_.1.glyph
index a039f4dcd..215b882e8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_.1.glyph
@@ -1,4 +1,5 @@
 {
+case = upper;
 color = 9;
 glyphname = G.1;
 kernLeft = C;
@@ -20,7 +21,7 @@ pos = (1060,354);
 },
 {
 name = top;
-pos = (756,1676);
+pos = (756,1490);
 },
 {
 name = topr;
@@ -99,7 +100,7 @@ pos = (996,354);
 },
 {
 name = top;
-pos = (692,1676);
+pos = (692,1490);
 },
 {
 name = topr;
@@ -178,7 +179,7 @@ pos = (1146,390);
 },
 {
 name = top;
-pos = (774,1676);
+pos = (774,1490);
 },
 {
 name = topr;
@@ -327,7 +328,7 @@ pos = (764,745);
 },
 {
 name = bottom;
-pos = (738,0);
+pos = (760,0);
 },
 {
 name = cross;
@@ -335,7 +336,7 @@ pos = (1152,392);
 },
 {
 name = top;
-pos = (742,1676);
+pos = (760,1490);
 },
 {
 name = topr;
@@ -559,7 +560,7 @@ pos = (1221,434);
 },
 {
 name = top;
-pos = (806,1676);
+pos = (806,1490);
 },
 {
 name = topr;
@@ -630,7 +631,7 @@ pos = (774,745);
 },
 {
 name = bottom;
-pos = (752,6);
+pos = (752,0);
 },
 {
 name = cross;
@@ -638,7 +639,7 @@ pos = (1175,432);
 },
 {
 name = top;
-pos = (756,1676);
+pos = (756,1490);
 },
 {
 name = topr;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_.glyph
index ac73f8434..ea9080e1d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_.glyph
@@ -20,7 +20,7 @@ pos = (1146,390);
 },
 {
 name = top;
-pos = (774,1676);
+pos = (774,1490);
 },
 {
 name = topr;
@@ -90,7 +90,7 @@ pos = (1221,434);
 },
 {
 name = top;
-pos = (806,1676);
+pos = (806,1490);
 },
 {
 name = topr;
@@ -174,7 +174,7 @@ pos = (1060,354);
 },
 {
 name = top;
-pos = (756,1676);
+pos = (756,1490);
 },
 {
 name = topr;
@@ -242,7 +242,7 @@ pos = (1152,392);
 },
 {
 name = top;
-pos = (758,1676);
+pos = (758,1490);
 },
 {
 name = topr;
@@ -384,7 +384,7 @@ pos = (758,745);
 },
 {
 name = bottom;
-pos = (752,6);
+pos = (752,0);
 },
 {
 name = cross;
@@ -392,7 +392,7 @@ pos = (1175,432);
 },
 {
 name = top;
-pos = (756,1676);
+pos = (756,1490);
 },
 {
 name = topr;
@@ -470,7 +470,7 @@ pos = (996,354);
 },
 {
 name = top;
-pos = (692,1676);
+pos = (692,1490);
 },
 {
 name = topr;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_acute.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_acute.1.glyph
index f22d18206..7048bfc13 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_acute.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_acute.1.glyph
@@ -52,7 +52,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (391,414);
+pos = (409,434);
 ref = acute;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (346,414);
+pos = (346,434);
 ref = acute;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (412,414);
+pos = (408,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_acute.glyph
index 3dc8623bd..8c7ef3627 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_acute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (407,414);
+pos = (407,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (346,414);
+pos = (346,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (412,414);
+pos = (408,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_amma.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_amma.glyph
index 868d252d3..da68d2c82 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_amma.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_amma.glyph
@@ -15,7 +15,7 @@ pos = (360,0);
 },
 {
 name = top;
-pos = (632,1676);
+pos = (632,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -46,7 +46,7 @@ pos = (500,0);
 },
 {
 name = top;
-pos = (638,1676);
+pos = (638,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -77,7 +77,7 @@ pos = (278,0);
 },
 {
 name = top;
-pos = (632,1676);
+pos = (632,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -108,7 +108,7 @@ pos = (328,0);
 },
 {
 name = top;
-pos = (600,1676);
+pos = (600,1490);
 }
 );
 layerId = m007;
@@ -139,7 +139,7 @@ pos = (496,0);
 },
 {
 name = top;
-pos = (622,1676);
+pos = (622,1490);
 }
 );
 layerId = m009;
@@ -170,7 +170,7 @@ pos = (214,0);
 },
 {
 name = top;
-pos = (568,1676);
+pos = (568,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_breve.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_breve.1.glyph
index 5afb95792..c1553554e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_breve.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_breve.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (340,372);
+pos = (404,372);
 ref = breve;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (314,372);
+pos = (390,372);
 ref = breve;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (294,372);
+pos = (326,372);
 ref = breve;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (314,414);
+pos = (360,434);
 ref = breve;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (260,414);
+pos = (276,434);
 ref = breve;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (276,414);
+pos = (340,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_breve.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_breve.glyph
index b93c5f21c..a59eb1826 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_breve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_breve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (314,372);
+pos = (390,372);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (294,372);
+pos = (326,372);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (340,372);
+pos = (404,372);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (330,414);
+pos = (358,434);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (260,414);
+pos = (276,434);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (276,414);
+pos = (340,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_caron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_caron.1.glyph
index fc9b9050f..126fc88b1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_caron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_caron.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (326,388);
+pos = (324,372);
 ref = caron;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (308,414);
+pos = (326,434);
 ref = caron;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (126,414);
+pos = (128,434);
 ref = caron;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (324,414);
+pos = (324,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_caron.glyph
index 8f86b8908..790c01110 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_caron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (326,388);
+pos = (324,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (324,414);
+pos = (324,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (126,414);
+pos = (128,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (324,414);
+pos = (324,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_circumflex.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_circumflex.1.glyph
index 80c41e7a7..fae6bcbd5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_circumflex.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_circumflex.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (326,372);
+pos = (324,372);
 ref = circumflex;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (308,372);
+pos = (310,372);
 ref = circumflex;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (160,372);
+pos = (166,372);
 ref = circumflex;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (308,414);
+pos = (328,434);
 ref = circumflex;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (126,414);
+pos = (128,434);
 ref = circumflex;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (326,414);
+pos = (324,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_circumflex.glyph
index 0e7480a10..2f5268bd8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (308,372);
+pos = (310,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (160,372);
+pos = (166,372);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (326,372);
+pos = (324,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (324,414);
+pos = (326,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (126,414);
+pos = (128,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (326,414);
+pos = (324,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_commaaccent.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_commaaccent.1.glyph
index 3f39f4fc1..b81e9284c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_commaaccent.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_commaaccent.1.glyph
@@ -56,7 +56,7 @@ ref = G.1;
 },
 {
 alignment = 1;
-pos = (490,0);
+pos = (512,0);
 ref = commaaccent;
 }
 );
@@ -71,7 +71,7 @@ ref = G.1;
 },
 {
 alignment = 1;
-pos = (488,6);
+pos = (488,0);
 ref = commaaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_commaaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_commaaccent.glyph
index 65fa6e476..f76735b32 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_commaaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_commaaccent.glyph
@@ -62,7 +62,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (488,6);
+pos = (488,0);
 ref = commaaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_dotaccent.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_dotaccent.1.glyph
index 79fa2721b..60bf1dc9d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_dotaccent.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_dotaccent.1.glyph
@@ -52,7 +52,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (530,414);
+pos = (548,434);
 ref = dotaccent;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (436,414);
+pos = (436,434);
 ref = dotaccent;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (570,414);
+pos = (570,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_dotaccent.glyph
index 6c98f7c31..3903fb510 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (546,414);
+pos = (546,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (436,414);
+pos = (436,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (570,414);
+pos = (570,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_hestrokecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_hestrokecyrillic.glyph
index df928ae25..938d4f519 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_hestrokecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_hestrokecyrillic.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (-190,47);
+pos = (-190,23);
 ref = crossbar;
 }
 );
@@ -22,7 +22,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (-224,67);
+pos = (-224,43);
 ref = crossbar;
 }
 );
@@ -35,7 +35,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (-169,34);
+pos = (-169,11);
 ref = crossbar;
 }
 );
@@ -48,7 +48,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (-210,48);
+pos = (-210,23);
 ref = crossbar;
 }
 );
@@ -61,7 +61,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (-216,59);
+pos = (-216,35);
 ref = crossbar;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (-169,34);
+pos = (-169,11);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_macron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_macron.1.glyph
index 03b79e640..17ad2dcd6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_macron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_macron.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (456,372);
+pos = (174,372);
 ref = macron;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (314,372);
+pos = (174,372);
 ref = macron;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (148,372);
+pos = (141,372);
 ref = macron;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (314,372);
+pos = (192,434);
 ref = macron;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (114,372);
+pos = (107,434);
 ref = macron;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (456,414);
+pos = (158,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_macron.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_macron.glyph
index 393cc3137..7c8aec956 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_macron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_macron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (314,372);
+pos = (174,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (148,372);
+pos = (141,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (456,372);
+pos = (174,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (330,372);
+pos = (190,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (114,372);
+pos = (107,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (456,414);
+pos = (158,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/H_.glyph b/src/Inter-Roman.glyphspackage/glyphs/H_.glyph
index 2b7b1a0a3..2c371f06e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/H_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/H_.glyph
@@ -36,7 +36,7 @@ pos = (146,1490);
 },
 {
 name = top;
-pos = (756,1676);
+pos = (756,1490);
 }
 );
 guides = (
@@ -99,7 +99,7 @@ pos = (62,1490);
 },
 {
 name = top;
-pos = (768,1676);
+pos = (768,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -156,7 +156,7 @@ pos = (198,1490);
 },
 {
 name = top;
-pos = (754,1676);
+pos = (754,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -189,7 +189,7 @@ pos = (725,745);
 },
 {
 name = bottom;
-pos = (724,0);
+pos = (725,0);
 },
 {
 name = cedilla;
@@ -213,7 +213,7 @@ pos = (114,1490);
 },
 {
 name = top;
-pos = (734,1678);
+pos = (725,1490);
 }
 );
 guides = (
@@ -277,13 +277,7 @@ pos = (46,1490);
 },
 {
 name = top;
-pos = (744,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (664,1520);
+pos = (744,1490);
 }
 );
 layerId = m009;
@@ -401,7 +395,7 @@ pos = (134,1490);
 },
 {
 name = top;
-pos = (690,1676);
+pos = (690,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/H_brevebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/H_brevebelow.glyph
index de8aed785..3914b7d9b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/H_brevebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/H_brevebelow.glyph
@@ -63,7 +63,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (1344,0);
+pos = (1345,0);
 ref = brevesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/H_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/H_circumflex.glyph
index 94319b45c..eb4004e64 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/H_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/H_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (290,372);
+pos = (292,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (122,372);
+pos = (128,372);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (324,372);
+pos = (322,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (300,416);
+pos = (293,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (114,414);
+pos = (116,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (324,414);
+pos = (322,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/H_dieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/H_dieresis.glyph
index 0e112cf84..25efb482c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/H_dieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/H_dieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (150,372);
+pos = (155,372);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (261,372);
+pos = (103,372);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (80,372);
+pos = (172,372);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (160,416);
+pos = (156,434);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (250,414);
+pos = (95,434);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (80,414);
+pos = (156,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/H_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/H_dotaccent.glyph
index c437cb4e8..0cd10498e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/H_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/H_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (522,416);
+pos = (513,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (424,414);
+pos = (424,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (568,414);
+pos = (568,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/H_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/H_dotbelow.glyph
index dbac78737..3581445d8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/H_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/H_dotbelow.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (1362,0);
+pos = (1363,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_.1.glyph
index e1401e31e..01f729c7a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_.1.glyph
@@ -1,4 +1,5 @@
 {
+case = upper;
 color = 9;
 glyphname = I.1;
 kernLeft = B;
@@ -40,7 +41,7 @@ nodes = (
 );
 },
 {
-pos = (184,0);
+pos = (183,0);
 ref = I;
 }
 );
@@ -82,7 +83,7 @@ nodes = (
 );
 },
 {
-pos = (218,0);
+pos = (219,0);
 ref = I;
 }
 );
@@ -103,16 +104,6 @@ name = tonos;
 pos = (128,1490);
 }
 );
-guides = (
-{
-angle = 90;
-pos = (814,104);
-},
-{
-angle = 90;
-pos = (174,104);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
@@ -177,7 +168,7 @@ nodes = (
 );
 },
 {
-pos = (184,0);
+pos = (183,0);
 ref = I;
 }
 );
@@ -219,7 +210,7 @@ nodes = (
 );
 },
 {
-pos = (218,0);
+pos = (213,0);
 ref = I;
 }
 );
@@ -240,16 +231,6 @@ name = tonos;
 pos = (60,1490);
 }
 );
-guides = (
-{
-angle = 90;
-pos = (682,104);
-},
-{
-angle = 90;
-pos = (42,104);
-}
-);
 layerId = m011;
 shapes = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_.double.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_.double.glyph
index c4cda599f..b0adfa83d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_.double.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_.double.glyph
@@ -7,7 +7,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (512,1676);
+pos = (512,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -26,7 +26,7 @@ width = 1024;
 anchors = (
 {
 name = top;
-pos = (384,1676);
+pos = (384,1490);
 }
 );
 layerId = m011;
@@ -45,7 +45,7 @@ width = 768;
 anchors = (
 {
 name = top;
-pos = (540,1676);
+pos = (540,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -64,7 +64,7 @@ width = 1080;
 anchors = (
 {
 name = top;
-pos = (476,1676);
+pos = (476,1490);
 }
 );
 layerId = m007;
@@ -83,7 +83,7 @@ width = 952;
 anchors = (
 {
 name = top;
-pos = (596,1676);
+pos = (596,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -102,7 +102,7 @@ width = 1192;
 anchors = (
 {
 name = top;
-pos = (576,1676);
+pos = (576,1490);
 }
 );
 layerId = m009;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_.glyph
index a10549bea..b1163d5b9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_.glyph
@@ -32,7 +32,7 @@ pos = (180,1490);
 },
 {
 name = top;
-pos = (270,1676);
+pos = (270,1490);
 }
 );
 guides = (
@@ -83,7 +83,7 @@ pos = (96,1490);
 },
 {
 name = top;
-pos = (300,1676);
+pos = (300,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -128,7 +128,7 @@ pos = (232,1490);
 },
 {
 name = top;
-pos = (256,1676);
+pos = (256,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -173,7 +173,7 @@ pos = (148,1490);
 },
 {
 name = top;
-pos = (238,1676);
+pos = (238,1490);
 }
 );
 guides = (
@@ -224,7 +224,7 @@ pos = (80,1490);
 },
 {
 name = top;
-pos = (288,1676);
+pos = (288,1490);
 }
 );
 guides = (
@@ -276,7 +276,7 @@ pos = (168,1490);
 },
 {
 name = top;
-pos = (192,1676);
+pos = (192,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_acute.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_acute.1.glyph
index 6a4043cdb..cb45d44ba 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_acute.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_acute.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (102,372);
+pos = (101,372);
 ref = acute;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (128,372);
+pos = (129,372);
 ref = acute;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (71,414);
+pos = (70,434);
 ref = acute;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (96,414);
+pos = (91,434);
 ref = acute;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (12,414);
+pos = (8,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_acute.glyph
index 077e84692..df9cd4e01 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_acute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-113,414);
+pos = (-113,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-122,414);
+pos = (-122,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-88,414);
+pos = (-92,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_breve.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_breve.1.glyph
index b1a36f9a6..6f27208ff 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_breve.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_breve.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-6,372);
+pos = (69,372);
 ref = breve;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (6,372);
+pos = (39,372);
 ref = breve;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-56,372);
+pos = (8,372);
 ref = breve;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-6,414);
+pos = (21,434);
 ref = breve;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (10,414);
+pos = (21,434);
 ref = breve;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-124,414);
+pos = (-60,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_breve.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_breve.glyph
index 3d2cebe90..f0b0fe67e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_breve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_breve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-190,372);
+pos = (-114,372);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-212,372);
+pos = (-180,372);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-160,372);
+pos = (-96,372);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-190,414);
+pos = (-162,434);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-208,414);
+pos = (-192,434);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-224,414);
+pos = (-160,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_caron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_caron.1.glyph
index 46d33bca3..519b152a4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_caron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_caron.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-12,372);
+pos = (-13,372);
 ref = caron;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-128,372);
+pos = (-127,372);
 ref = caron;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-70,388);
+pos = (-72,372);
 ref = caron;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-12,414);
+pos = (-13,434);
 ref = caron;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-124,414);
+pos = (-127,434);
 ref = caron;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-76,414);
+pos = (-76,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_caron.glyph
index f04cba78b..19e4466fd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_caron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-174,388);
+pos = (-176,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-196,414);
+pos = (-196,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-342,414);
+pos = (-340,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-176,414);
+pos = (-176,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.1.glyph
index 3fa9f3feb..8c609a58d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-12,372);
+pos = (-11,372);
 ref = circumflex;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-128,372);
+pos = (-121,372);
 ref = circumflex;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-70,372);
+pos = (-72,372);
 ref = circumflex;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-12,414);
+pos = (-11,434);
 ref = circumflex;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-124,414);
+pos = (-127,434);
 ref = circumflex;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-74,414);
+pos = (-76,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.glyph
index 391053c6a..d413d6912 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-196,372);
+pos = (-194,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-346,372);
+pos = (-340,372);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-174,372);
+pos = (-176,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-196,414);
+pos = (-194,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-342,414);
+pos = (-340,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-174,414);
+pos = (-176,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.1.glyph
index c6dfdb80d..ce82ce9c6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (926,372);
+pos = (925,372);
 ref = dblgravecmb;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1128,372);
+pos = (1129,372);
 ref = dblgravecmb;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (926,414);
+pos = (925,434);
 ref = dblgravecmb;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1132,414);
+pos = (1127,434);
 ref = dblgravecmb;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (914,414);
+pos = (914,434);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.glyph
index c7e2f874f..20aadc146 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (742,414);
+pos = (742,434);
 ref = dblgravecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (914,414);
+pos = (914,434);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (814,414);
+pos = (814,434);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.1.glyph
index 1c6e4a477..651f6c104 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-152,372);
+pos = (-148,372);
 ref = dieresis;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (11,372);
+pos = (-146,372);
 ref = dieresis;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-314,372);
+pos = (-222,372);
 ref = dieresis;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-152,414);
+pos = (-148,434);
 ref = dieresis;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (12,414);
+pos = (-148,434);
 ref = dieresis;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-318,414);
+pos = (-242,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.double.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.double.glyph
index fae3b73f5..787aadc8e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.double.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.double.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I.double;
 },
 {
-pos = (-34,372);
+pos = (-34,186);
 ref = dieresis.three;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I.double;
 },
 {
-pos = (-97,372);
+pos = (-97,186);
 ref = dieresis.three;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I.double;
 },
 {
-pos = (85,372);
+pos = (85,186);
 ref = dieresis.three;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I.double;
 },
 {
-pos = (-98,414);
+pos = (-98,228);
 ref = dieresis.three;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I.double;
 },
 {
-pos = (-120,414);
+pos = (-120,228);
 ref = dieresis.three;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I.double;
 },
 {
-pos = (-43,414);
+pos = (-43,228);
 ref = dieresis.three;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.glyph
index 90c5dab7d..8940dd87d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-336,372);
+pos = (-331,372);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-207,372);
+pos = (-365,372);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-418,372);
+pos = (-326,372);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-336,414);
+pos = (-331,434);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-206,414);
+pos = (-361,434);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-418,414);
+pos = (-342,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.1.glyph
index da321795f..e17e17636 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.1.glyph
@@ -11,8 +11,8 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (832,0);
-ref = dieresisacutecomb.cn;
+pos = (-148,0);
+ref = dieresisacutecomb.uc;
 }
 );
 width = 906;
@@ -26,8 +26,8 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (926,0);
-ref = dieresisacutecomb.cn;
+pos = (-146,0);
+ref = dieresisacutecomb.uc;
 }
 );
 width = 1034;
@@ -41,8 +41,8 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (732,0);
-ref = dieresisacutecomb.cn;
+pos = (-222,0);
+ref = dieresisacutecomb.uc;
 }
 );
 width = 720;
@@ -56,8 +56,8 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (832,0);
-ref = dieresisacutecomb.cn;
+pos = (-148,0);
+ref = dieresisacutecomb.uc;
 }
 );
 width = 842;
@@ -71,8 +71,8 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (930,0);
-ref = dieresisacutecomb.cn;
+pos = (-148,0);
+ref = dieresisacutecomb.uc;
 }
 );
 width = 1002;
@@ -86,8 +86,8 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (728,0);
-ref = dieresisacutecomb.cn;
+pos = (-242,0);
+ref = dieresisacutecomb.uc;
 }
 );
 width = 584;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.glyph
index bc4f50ee3..665e1737d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.glyph
@@ -11,8 +11,8 @@ ref = I;
 },
 {
 alignment = 1;
-pos = (648,0);
-ref = dieresisacutecomb.cn;
+pos = (-331,0);
+ref = dieresisacutecomb.uc;
 }
 );
 width = 540;
@@ -81,8 +81,8 @@ ref = I;
 },
 {
 alignment = 1;
-pos = (708,0);
-ref = dieresisacutecomb.cn;
+pos = (-365,0);
+ref = dieresisacutecomb.uc;
 }
 );
 width = 596;
@@ -95,8 +95,8 @@ ref = I;
 },
 {
 alignment = 1;
-pos = (628,0);
-ref = dieresisacutecomb.cn;
+pos = (-326,0);
+ref = dieresisacutecomb.uc;
 }
 );
 width = 512;
@@ -109,8 +109,8 @@ ref = I;
 },
 {
 alignment = 1;
-pos = (648,0);
-ref = dieresisacutecomb.cn;
+pos = (-331,0);
+ref = dieresisacutecomb.uc;
 }
 );
 width = 476;
@@ -179,8 +179,8 @@ ref = I;
 },
 {
 alignment = 1;
-pos = (712,0);
-ref = dieresisacutecomb.cn;
+pos = (-361,0);
+ref = dieresisacutecomb.uc;
 }
 );
 width = 576;
@@ -193,8 +193,8 @@ ref = I;
 },
 {
 alignment = 1;
-pos = (628,0);
-ref = dieresisacutecomb.cn;
+pos = (-342,0);
+ref = dieresisacutecomb.uc;
 }
 );
 width = 384;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dieresiscyrillic.glyph
index b19f1cce5..17029d158 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dieresiscyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (168,372);
+pos = (171,372);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (231,372);
+pos = (75,372);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (116,372);
+pos = (208,372);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (156,414);
+pos = (167,434);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (260,414);
+pos = (107,434);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (116,414);
+pos = (192,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dotaccent.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dotaccent.1.glyph
index 9cceb10f5..d7a1f14da 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dotaccent.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dotaccent.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (210,372);
+pos = (209,372);
 ref = dotaccent;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (184,372);
+pos = (185,372);
 ref = dotaccent;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (210,414);
+pos = (209,434);
 ref = dotaccent;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (186,414);
+pos = (181,434);
 ref = dotaccent;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (170,414);
+pos = (170,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dotaccent.glyph
index 3a7c269c7..95f1148aa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (26,414);
+pos = (26,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-32,414);
+pos = (-32,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (70,414);
+pos = (70,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dotbelow.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dotbelow.1.glyph
index 9c0c31415..4e2914aec 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dotbelow.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dotbelow.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1060,0);
+pos = (1059,0);
 ref = dotbelow;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1050,0);
+pos = (1051,0);
 ref = dotbelow;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1060,0);
+pos = (1059,0);
 ref = dotbelow;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1058,0);
+pos = (1053,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_ebrevecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_ebrevecyrillic.glyph
index e8eaae071..3f449aa20 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_ebrevecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_ebrevecyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (168,372);
+pos = (244,372);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (126,372);
+pos = (158,372);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (218,372);
+pos = (282,372);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (168,414);
+pos = (196,434);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (134,414);
+pos = (150,434);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (154,414);
+pos = (218,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_grave.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_grave.1.glyph
index 635d2a26f..d991b2116 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_grave.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_grave.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-84,372);
+pos = (-85,372);
 ref = grave;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-86,372);
+pos = (-85,372);
 ref = grave;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-138,414);
+pos = (-139,434);
 ref = grave;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-166,414);
+pos = (-171,434);
 ref = grave;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-202,414);
+pos = (-202,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_grave.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_grave.glyph
index 2eb1fa16b..81c0175b8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_grave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_grave.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-322,414);
+pos = (-322,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-384,414);
+pos = (-384,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-302,414);
+pos = (-302,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.1.glyph
index 50ffd626f..a0916d692 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.1.glyph
@@ -11,7 +11,7 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (1048,398);
+pos = (1040,372);
 ref = hookabovecmb;
 }
 );
@@ -26,7 +26,7 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (1256,366);
+pos = (1183,372);
 ref = hookabovecmb;
 }
 );
@@ -41,7 +41,7 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (858,416);
+pos = (882,372);
 ref = hookabovecmb;
 }
 );
@@ -56,7 +56,7 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (1048,398);
+pos = (984,434);
 ref = hookabovecmb;
 }
 );
@@ -71,7 +71,7 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (1260,414);
+pos = (1155,434);
 ref = hookabovecmb;
 }
 );
@@ -86,7 +86,7 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (854,416);
+pos = (796,434);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.glyph
index 119e1e138..18e3ba757 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (864,398);
+pos = (857,372);
 ref = hookabovecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (1038,366);
+pos = (964,372);
 ref = hookabovecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (754,416);
+pos = (778,372);
 ref = hookabovecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (864,398);
+pos = (801,434);
 ref = hookabovecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (1042,414);
+pos = (942,434);
 ref = hookabovecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (754,416);
+pos = (696,434);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_i-cy.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_i-cy.glyph
index 11dedc612..0491f4a60 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_i-cy.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_i-cy.glyph
@@ -8,6 +8,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1364,0);
+},
+{
+name = top;
+pos = (772,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -25,6 +29,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1384,0);
+},
+{
+name = top;
+pos = (740,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -42,6 +50,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1348,0);
+},
+{
+name = top;
+pos = (790,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -59,6 +71,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1324,0);
+},
+{
+name = top;
+pos = (736,1490);
 }
 );
 layerId = m007;
@@ -76,6 +92,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1432,0);
+},
+{
+name = top;
+pos = (756,1490);
 }
 );
 layerId = m009;
@@ -198,6 +218,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1284,0);
+},
+{
+name = top;
+pos = (726,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.1.glyph
index cd7d347b8..9e859751c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1110,372);
+pos = (1050,372);
 ref = breveinvnosp;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1158,372);
+pos = (1181,372);
 ref = breveinvnosp;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (952,372);
+pos = (942,372);
 ref = breveinvnosp;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1078,404);
+pos = (985,434);
 ref = breveinvnosp;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1146,414);
+pos = (1151,434);
 ref = breveinvnosp;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (884,414);
+pos = (821,434);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.glyph
index ce2618a9c..ed2f86888 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (926,372);
+pos = (867,372);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (940,372);
+pos = (962,372);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (848,372);
+pos = (838,372);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (894,404);
+pos = (802,434);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (928,414);
+pos = (938,434);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (784,414);
+pos = (721,434);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_macron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_macron.1.glyph
index 67620d13d..201eff0fd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_macron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_macron.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-6,372);
+pos = (-147,372);
 ref = macron;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-140,372);
+pos = (-146,372);
 ref = macron;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (60,372);
+pos = (-222,372);
 ref = macron;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-6,372);
+pos = (-147,434);
 ref = macron;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-136,372);
+pos = (-148,434);
 ref = macron;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (56,414);
+pos = (-242,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_macron.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_macron.glyph
index af7d6b074..1d98d5c48 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_macron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_macron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-190,372);
+pos = (-330,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-358,372);
+pos = (-365,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-44,372);
+pos = (-326,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-190,372);
+pos = (-330,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-354,372);
+pos = (-361,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-44,414);
+pos = (-342,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_macroncyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_macroncyrillic.glyph
index 3ba634f94..4feeb0f36 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_macroncyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_macroncyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (314,372);
+pos = (172,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (80,372);
+pos = (75,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (490,372);
+pos = (208,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (302,372);
+pos = (168,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (112,372);
+pos = (107,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (490,414);
+pos = (192,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_stroke.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_stroke.1.glyph
index 868a3c866..e6fd86649 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_stroke.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_stroke.1.glyph
@@ -11,7 +11,7 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (-6,47);
+pos = (-7,23);
 ref = crossbar;
 }
 );
@@ -26,7 +26,7 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (-6,67);
+pos = (-5,43);
 ref = crossbar;
 }
 );
@@ -41,7 +41,7 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (-64,46);
+pos = (-64,23);
 ref = crossbar;
 }
 );
@@ -56,7 +56,7 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (-26,48);
+pos = (-27,23);
 ref = crossbar;
 }
 );
@@ -71,7 +71,7 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (10,67);
+pos = (5,43);
 ref = crossbar;
 }
 );
@@ -86,7 +86,7 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (-68,46);
+pos = (-68,23);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_stroke.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_stroke.glyph
index 9fdf8d78a..973892d57 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_stroke.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_stroke.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-190,47);
+pos = (-190,23);
 ref = crossbar;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-224,67);
+pos = (-224,43);
 ref = crossbar;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-168,46);
+pos = (-168,23);
 ref = crossbar;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-210,48);
+pos = (-210,23);
 ref = crossbar;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-208,67);
+pos = (-208,43);
 ref = crossbar;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-168,46);
+pos = (-168,23);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_tilde.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_tilde.1.glyph
index 68df460e7..7acdf0d92 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_tilde.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_tilde.1.glyph
@@ -10,8 +10,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-6,0);
-ref = casetilde.cn;
+pos = (-59,372);
+ref = tilde;
 }
 );
 width = 906;
@@ -24,8 +24,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (2,0);
-ref = casetilde.cn;
+pos = (7,372);
+ref = tilde;
 }
 );
 width = 1034;
@@ -38,8 +38,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-64,0);
-ref = casetilde.cn;
+pos = (-144,372);
+ref = tilde;
 }
 );
 width = 720;
@@ -52,8 +52,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-6,2);
-ref = casetilde.cn;
+pos = (-59,434);
+ref = tilde;
 }
 );
 width = 842;
@@ -66,8 +66,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (6,0);
-ref = casetilde.cn;
+pos = (-11,434);
+ref = tilde;
 }
 );
 width = 1002;
@@ -80,8 +80,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-68,0);
-ref = casetilde.cn;
+pos = (-156,434);
+ref = tilde;
 }
 );
 width = 584;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_tilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_tilde.glyph
index 9ca283095..60bd3fc5c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_tilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-190,0);
-ref = casetilde.cn;
+pos = (-242,372);
+ref = tilde;
 }
 );
 width = 540;
@@ -23,8 +23,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-216,0);
-ref = casetilde.cn;
+pos = (-212,372);
+ref = tilde;
 }
 );
 width = 596;
@@ -36,8 +36,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-168,0);
-ref = casetilde.cn;
+pos = (-248,372);
+ref = tilde;
 }
 );
 width = 512;
@@ -49,8 +49,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-190,2);
-ref = casetilde.cn;
+pos = (-242,434);
+ref = tilde;
 }
 );
 width = 476;
@@ -62,8 +62,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-212,0);
-ref = casetilde.cn;
+pos = (-224,434);
+ref = tilde;
 }
 );
 width = 576;
@@ -75,8 +75,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-168,0);
-ref = casetilde.cn;
+pos = (-256,434);
+ref = tilde;
 }
 );
 width = 384;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.1.glyph
index 7f97fb443..04225f08c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1078,0);
+pos = (1053,0);
 ref = tildesubnosp;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1234,0);
+pos = (1179,0);
 ref = tildesubnosp;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (846,0);
+pos = (941,0);
 ref = tildesubnosp;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1078,0);
+pos = (989,0);
 ref = tildesubnosp;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1226,0);
+pos = (1149,0);
 ref = tildesubnosp;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (838,0);
+pos = (823,0);
 ref = tildesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.glyph
index 26ae89db2..d031c7dc2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (894,0);
+pos = (870,0);
 ref = tildesubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (1016,0);
+pos = (960,0);
 ref = tildesubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (742,0);
+pos = (837,0);
 ref = tildesubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (894,0);
+pos = (806,0);
 ref = tildesubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (1008,0);
+pos = (936,0);
 ref = tildesubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (738,0);
+pos = (723,0);
 ref = tildesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_zhitsadblgravecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_zhitsadblgravecyrillic.glyph
index a74c399d7..dd4133eaa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_zhitsadblgravecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_zhitsadblgravecyrillic.glyph
@@ -47,7 +47,7 @@ shapes = (
 ref = afii10148;
 },
 {
-pos = (1188,414);
+pos = (1188,434);
 ref = dblgravecmb;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = afii10148;
 },
 {
-pos = (1404,414);
+pos = (1404,434);
 ref = dblgravecmb;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = afii10148;
 },
 {
-pos = (1240,414);
+pos = (1240,434);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/J_.glyph b/src/Inter-Roman.glyphspackage/glyphs/J_.glyph
index 9e924f996..aeb47b4ff 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/J_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/J_.glyph
@@ -16,7 +16,7 @@ pos = (808,884);
 },
 {
 name = top;
-pos = (808,1676);
+pos = (808,1490);
 }
 );
 guides = (
@@ -65,7 +65,7 @@ pos = (840,884);
 },
 {
 name = top;
-pos = (840,1676);
+pos = (840,1490);
 }
 );
 guides = (
@@ -118,7 +118,7 @@ pos = (808,884);
 },
 {
 name = top;
-pos = (808,1676);
+pos = (808,1490);
 }
 );
 guides = (
@@ -171,7 +171,7 @@ pos = (904,884);
 },
 {
 name = top;
-pos = (908,1676);
+pos = (908,1490);
 }
 );
 guides = (
@@ -220,17 +220,7 @@ pos = (882,884);
 },
 {
 name = top;
-pos = (882,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (1132,1476);
-},
-{
-angle = 90;
-pos = (802,1520);
+pos = (882,1490);
 }
 );
 layerId = m009;
@@ -375,7 +365,7 @@ pos = (744,884);
 },
 {
 name = top;
-pos = (744,1676);
+pos = (744,1490);
 }
 );
 guides = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/J_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/J_circumflex.glyph
index 9eb844d3f..d318c1587 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/J_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/J_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (374,372);
+pos = (376,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (262,372);
+pos = (268,372);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (378,372);
+pos = (376,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (374,414);
+pos = (376,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (252,414);
+pos = (254,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (378,414);
+pos = (376,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/K_.glyph b/src/Inter-Roman.glyphspackage/glyphs/K_.glyph
index 2ebaa94cb..7ede94a10 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/K_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/K_.glyph
@@ -16,7 +16,7 @@ pos = (670,0);
 },
 {
 name = top;
-pos = (674,1676);
+pos = (674,1490);
 }
 );
 guides = (
@@ -64,7 +64,7 @@ pos = (722,2);
 },
 {
 name = top;
-pos = (724,1676);
+pos = (724,1490);
 }
 );
 guides = (
@@ -109,7 +109,7 @@ pos = (634,0);
 },
 {
 name = top;
-pos = (638,1676);
+pos = (638,1490);
 }
 );
 guides = (
@@ -153,7 +153,7 @@ pos = (638,0);
 },
 {
 name = top;
-pos = (642,1676);
+pos = (642,1490);
 }
 );
 guides = (
@@ -201,14 +201,7 @@ pos = (718,2);
 },
 {
 name = top;
-pos = (720,1676);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (-3487,1820);
+pos = (720,1490);
 }
 );
 layerId = m009;
@@ -247,7 +240,7 @@ pos = (568,0);
 },
 {
 name = top;
-pos = (572,1676);
+pos = (572,1490);
 }
 );
 guides = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/K_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/K_acute.glyph
index 5c13bc716..a7294f9a5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/K_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/K_acute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (291,414);
+pos = (291,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (310,414);
+pos = (310,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (292,414);
+pos = (288,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/K_acyr.glyph b/src/Inter-Roman.glyphspackage/glyphs/K_acyr.glyph
index 3fd2b019b..ea0b97bae 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/K_acyr.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/K_acyr.glyph
@@ -8,6 +8,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1216,0);
+},
+{
+name = top;
+pos = (726,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -38,6 +42,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1458,0);
+},
+{
+name = top;
+pos = (809,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -68,6 +76,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1096,0);
+},
+{
+name = top;
+pos = (680,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -98,6 +110,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1184,0);
+},
+{
+name = top;
+pos = (694,1490);
 }
 );
 layerId = m007;
@@ -128,6 +144,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1442,0);
+},
+{
+name = top;
+pos = (793,1490);
 }
 );
 layerId = m009;
@@ -158,6 +178,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1032,0);
+},
+{
+name = top;
+pos = (616,1490);
 }
 );
 layerId = m011;
@@ -181,7 +205,7 @@ nodes = (
 );
 }
 );
-width = 1070;
+width = 1084;
 }
 );
 metricLeft = K;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/K_adescendercyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/K_adescendercyrillic.glyph
index 46939a27f..784d71e0f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/K_adescendercyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/K_adescendercyrillic.glyph
@@ -79,7 +79,7 @@ pos = (936,0);
 ref = _part.cyrtic;
 }
 );
-width = 1070;
+width = 1084;
 }
 );
 metricLeft = K;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/K_averticalstrokecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/K_averticalstrokecyrillic.glyph
index c1cc3a732..b6659bd10 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/K_averticalstrokecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/K_averticalstrokecyrillic.glyph
@@ -199,7 +199,7 @@ nodes = (
 );
 }
 );
-width = 1146;
+width = 1160;
 }
 );
 metricLeft = K;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/K_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/K_caron.glyph
index 32dfa7cd3..fc84cd591 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/K_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/K_caron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (208,388);
+pos = (206,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (208,414);
+pos = (208,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (90,414);
+pos = (92,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (204,414);
+pos = (204,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/K_linebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/K_linebelow.glyph
index 15240fd60..156dd70c0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/K_linebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/K_linebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (1276,0);
+pos = (1268,0);
 ref = macronsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (1350,2);
+pos = (1388,2);
 ref = macronsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (1240,0);
+pos = (1209,0);
 ref = macronsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (1276,0);
+pos = (1198,0);
 ref = macronsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (1362,2);
+pos = (1363,2);
 ref = macronsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (1238,0);
+pos = (1097,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/L_.glyph b/src/Inter-Roman.glyphspackage/glyphs/L_.glyph
index 5dc34b3b4..1699f8dcf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/L_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/L_.glyph
@@ -28,7 +28,7 @@ pos = (614,1490);
 },
 {
 name = top;
-pos = (270,1676);
+pos = (270,1490);
 }
 );
 guides = (
@@ -81,7 +81,7 @@ pos = (704,1490);
 },
 {
 name = top;
-pos = (294,1676);
+pos = (294,1490);
 }
 );
 guides = (
@@ -136,7 +136,7 @@ pos = (626,1490);
 },
 {
 name = top;
-pos = (256,1676);
+pos = (256,1490);
 }
 );
 guides = (
@@ -189,7 +189,7 @@ pos = (582,1490);
 },
 {
 name = top;
-pos = (238,1676);
+pos = (238,1490);
 }
 );
 guides = (
@@ -242,18 +242,11 @@ pos = (688,1490);
 },
 {
 name = top;
-pos = (278,1676);
+pos = (278,1490);
 }
 );
 guides = (
 {
-pos = (-84,1304);
-},
-{
-angle = 90;
-pos = (728,584);
-},
-{
 pos = (892,-416);
 }
 );
@@ -297,7 +290,7 @@ pos = (562,1490);
 },
 {
 name = top;
-pos = (192,1676);
+pos = (192,1490);
 }
 );
 guides = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/L_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/L_acute.glyph
index 107fde9c0..bc73e81c4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/L_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/L_acute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-113,414);
+pos = (-113,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-132,414);
+pos = (-132,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-88,414);
+pos = (-92,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/L_bar.glyph b/src/Inter-Roman.glyphspackage/glyphs/L_bar.glyph
index c74b488c2..330ba2cd5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/L_bar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/L_bar.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-190,47);
+pos = (-190,23);
 ref = crossbar;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-224,67);
+pos = (-224,43);
 ref = crossbar;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-168,46);
+pos = (-168,23);
 ref = crossbar;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-210,48);
+pos = (-210,23);
 ref = crossbar;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-216,67);
+pos = (-216,43);
 ref = crossbar;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-168,46);
+pos = (-168,23);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/L_circumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/L_circumflexbelow.glyph
index 5bef9bdd9..316b6948a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/L_circumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/L_circumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1198,0);
+pos = (1208,0);
 ref = circumflexsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1274,0);
+pos = (1265,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1140,0);
+pos = (1202,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1198,0);
+pos = (1152,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1274,0);
+pos = (1236,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1140,0);
+pos = (1092,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/L_dotbelowmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/L_dotbelowmacron.glyph
index 5e83d1ba3..c318ef9c5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/L_dotbelowmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/L_dotbelowmacron.glyph
@@ -14,7 +14,7 @@ pos = (1222,0);
 ref = dotbelow;
 },
 {
-pos = (-190,372);
+pos = (-330,372);
 ref = macron;
 }
 );
@@ -31,7 +31,7 @@ pos = (1136,0);
 ref = dotbelow;
 },
 {
-pos = (-364,372);
+pos = (-371,372);
 ref = macron;
 }
 );
@@ -48,7 +48,7 @@ pos = (1186,0);
 ref = dotbelow;
 },
 {
-pos = (-44,372);
+pos = (-326,372);
 ref = macron;
 }
 );
@@ -65,7 +65,7 @@ pos = (1222,0);
 ref = dotbelow;
 },
 {
-pos = (-190,372);
+pos = (-330,434);
 ref = macron;
 }
 );
@@ -82,7 +82,7 @@ pos = (1136,0);
 ref = dotbelow;
 },
 {
-pos = (-364,372);
+pos = (-371,434);
 ref = macron;
 }
 );
@@ -99,7 +99,7 @@ pos = (1186,0);
 ref = dotbelow;
 },
 {
-pos = (-44,414);
+pos = (-342,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/L_linebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/L_linebelow.glyph
index ced2570c9..a565ad383 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/L_linebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/L_linebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1222,0);
+pos = (1214,0);
 ref = macronsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1228,0);
+pos = (1266,0);
 ref = macronsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1234,0);
+pos = (1203,0);
 ref = macronsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1222,0);
+pos = (1144,0);
 ref = macronsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1228,0);
+pos = (1229,0);
 ref = macronsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1234,0);
+pos = (1093,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/M_.glyph b/src/Inter-Roman.glyphspackage/glyphs/M_.glyph
index cea1ef146..f425ec0ca 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/M_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/M_.glyph
@@ -20,7 +20,7 @@ pos = (1649,0);
 },
 {
 name = top;
-pos = (910,1676);
+pos = (910,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -65,7 +65,7 @@ pos = (1812,0);
 },
 {
 name = top;
-pos = (954,1676);
+pos = (954,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -182,7 +182,7 @@ pos = (1536,0);
 },
 {
 name = top;
-pos = (884,1676);
+pos = (884,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -227,7 +227,7 @@ pos = (1600,0);
 },
 {
 name = top;
-pos = (874,1676);
+pos = (874,1490);
 }
 );
 guides = (
@@ -283,14 +283,7 @@ pos = (1804,0);
 },
 {
 name = top;
-pos = (938,1676);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (-3742,2164);
+pos = (938,1490);
 }
 );
 layerId = m009;
@@ -407,7 +400,7 @@ pos = (1472,0);
 },
 {
 name = top;
-pos = (820,1676);
+pos = (820,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/M_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/M_acute.glyph
index 667e8b6d0..21648150b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/M_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/M_acute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (523,414);
+pos = (523,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (528,414);
+pos = (528,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (540,414);
+pos = (536,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/M_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/M_dotaccent.glyph
index de0278927..19fed916d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/M_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/M_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (662,414);
+pos = (662,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (618,414);
+pos = (618,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (698,414);
+pos = (698,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/N_.glyph b/src/Inter-Roman.glyphspackage/glyphs/N_.glyph
index 336377c9c..6abce7f3d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/N_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/N_.glyph
@@ -24,7 +24,7 @@ pos = (1348,0);
 },
 {
 name = top;
-pos = (790,1676);
+pos = (790,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -69,7 +69,7 @@ pos = (1364,0);
 },
 {
 name = top;
-pos = (770,1676);
+pos = (770,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -160,7 +160,7 @@ pos = (1384,0);
 },
 {
 name = top;
-pos = (742,1676);
+pos = (742,1490);
 }
 );
 guides = (
@@ -276,14 +276,7 @@ pos = (1432,0);
 },
 {
 name = top;
-pos = (758,1676);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (-4640,1520);
+pos = (758,1490);
 }
 );
 layerId = m009;
@@ -374,7 +367,7 @@ pos = (1284,0);
 },
 {
 name = top;
-pos = (726,1676);
+pos = (726,1490);
 }
 );
 layerId = m011;
@@ -465,7 +458,7 @@ pos = (1324,0);
 },
 {
 name = top;
-pos = (742,1676);
+pos = (742,1490);
 }
 );
 layerId = m007;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/N_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/N_acute.glyph
index ed44366c9..1043f0846 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/N_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/N_acute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (391,414);
+pos = (391,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (348,414);
+pos = (348,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (446,414);
+pos = (442,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/N_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/N_caron.glyph
index 203977dc5..1a7e7f618 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/N_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/N_caron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (360,388);
+pos = (358,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (308,414);
+pos = (308,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (128,414);
+pos = (130,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (358,414);
+pos = (358,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/N_circumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/N_circumflexbelow.glyph
index 95ef03df7..c68251aa8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/N_circumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/N_circumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1352,0);
+pos = (1362,0);
 ref = circumflexsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1416,0);
+pos = (1407,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1302,0);
+pos = (1364,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1356,0);
+pos = (1310,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1448,0);
+pos = (1410,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1302,0);
+pos = (1254,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/N_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/N_dotaccent.glyph
index 799dcceaf..4775b26d3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/N_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/N_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (530,414);
+pos = (530,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (438,414);
+pos = (438,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (604,414);
+pos = (604,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/N_linebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/N_linebelow.glyph
index ad18a4ab3..90c25337c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/N_linebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/N_linebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1376,0);
+pos = (1368,0);
 ref = macronsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1370,0);
+pos = (1408,0);
 ref = macronsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1396,0);
+pos = (1365,0);
 ref = macronsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1380,0);
+pos = (1302,0);
 ref = macronsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1402,0);
+pos = (1403,0);
 ref = macronsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1396,0);
+pos = (1255,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/N_tilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/N_tilde.glyph
index f1c48b28b..e3a187fc5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/N_tilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/N_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (310,0);
-ref = casetilde.cn;
+pos = (258,372);
+ref = tilde;
 }
 );
 width = 1544;
@@ -23,8 +23,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (226,0);
-ref = casetilde.cn;
+pos = (230,372);
+ref = tilde;
 }
 );
 width = 1480;
@@ -36,8 +36,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (366,0);
-ref = casetilde.cn;
+pos = (286,372);
+ref = tilde;
 }
 );
 width = 1580;
@@ -49,8 +49,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (314,2);
-ref = casetilde.cn;
+pos = (262,434);
+ref = tilde;
 }
 );
 width = 1472;
@@ -62,8 +62,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (258,0);
-ref = casetilde.cn;
+pos = (246,434);
+ref = tilde;
 }
 );
 width = 1512;
@@ -75,8 +75,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (366,0);
-ref = casetilde.cn;
+pos = (278,434);
+ref = tilde;
 }
 );
 width = 1452;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_.glyph
index c8ce0138a..39a578627 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_.glyph
@@ -24,7 +24,7 @@ pos = (222,1490);
 },
 {
 name = top;
-pos = (766,1676);
+pos = (766,1490);
 },
 {
 name = tophorn;
@@ -90,7 +90,7 @@ pos = (158,1490);
 },
 {
 name = top;
-pos = (702,1676);
+pos = (702,1490);
 },
 {
 name = tophorn;
@@ -156,7 +156,7 @@ pos = (198,1490);
 },
 {
 name = top;
-pos = (781,1676);
+pos = (781,1490);
 },
 {
 name = tophorn;
@@ -228,7 +228,7 @@ pos = (169,1490);
 },
 {
 name = top;
-pos = (767,1676);
+pos = (767,1490);
 },
 {
 name = tophorn;
@@ -432,7 +432,7 @@ pos = (172,1490);
 },
 {
 name = top;
-pos = (814,1676);
+pos = (814,1490);
 },
 {
 name = tophorn;
@@ -505,7 +505,7 @@ pos = (122,1490);
 },
 {
 name = top;
-pos = (764,1676);
+pos = (764,1490);
 },
 {
 name = tophorn;
@@ -514,16 +514,6 @@ pos = (764,1514);
 );
 guides = (
 {
-orientation = center;
-angle = 90;
-pos = (-3658,940);
-},
-{
-orientation = center;
-angle = 90;
-pos = (-4942,1003);
-},
-{
 name = "x-Height";
 pos = (-34,1056);
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_acute.glyph
index 7fe90424e..ef4754b7a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_acute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (416,414);
+pos = (416,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (354,414);
+pos = (354,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (422,414);
+pos = (418,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_barreddieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_barreddieresiscyrillic.glyph
index 395611d9c..3dab4da63 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_barreddieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_barreddieresiscyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = afii10147;
 },
 {
-pos = (175,372);
+pos = (180,372);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = afii10147;
 },
 {
-pos = (307,372);
+pos = (149,372);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = afii10147;
 },
 {
-pos = (92,372);
+pos = (184,372);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = afii10147;
 },
 {
-pos = (193,414);
+pos = (198,434);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = afii10147;
 },
 {
-pos = (270,414);
+pos = (115,434);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = afii10147;
 },
 {
-pos = (92,414);
+pos = (168,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_breve.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_breve.glyph
index 6032249e0..d43de84aa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_breve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_breve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (321,372);
+pos = (397,372);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (302,372);
+pos = (334,372);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (350,372);
+pos = (414,372);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (339,414);
+pos = (367,434);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (268,414);
+pos = (284,434);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (286,414);
+pos = (350,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_caron.glyph
index 3114b00fd..2ea89bfa0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_caron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (336,388);
+pos = (334,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (333,414);
+pos = (333,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (134,414);
+pos = (136,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (334,414);
+pos = (334,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_circumflex.glyph
index 6d4bdbf8e..79d1fc943 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (315,372);
+pos = (317,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (168,372);
+pos = (174,372);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (336,372);
+pos = (334,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (333,414);
+pos = (335,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (134,414);
+pos = (136,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (336,414);
+pos = (334,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_circumflexacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_circumflexacute.glyph
index 6410111b1..f1d278096 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_circumflexacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_circumflexacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (367,376);
+pos = (317,372);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (390,334);
+pos = (174,372);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (462,398);
+pos = (334,372);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (385,376);
+pos = (335,434);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (356,334);
+pos = (136,434);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (462,398);
+pos = (334,434);
 ref = circumflexacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_circumflexdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_circumflexdotbelow.glyph
index 7ea6be6db..917c0a56b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_circumflexdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_circumflexdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (315,372);
+pos = (317,372);
 ref = circumflex;
 },
 {
@@ -27,7 +27,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (168,372);
+pos = (174,372);
 ref = circumflex;
 },
 {
@@ -44,7 +44,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (336,372);
+pos = (334,372);
 ref = circumflex;
 },
 {
@@ -61,7 +61,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (333,414);
+pos = (335,434);
 ref = circumflex;
 },
 {
@@ -78,7 +78,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (134,414);
+pos = (136,434);
 ref = circumflex;
 },
 {
@@ -95,7 +95,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (336,414);
+pos = (334,434);
 ref = circumflex;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_circumflexgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_circumflexgrave.glyph
index 6c84a3e21..fe8e9554d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_circumflexgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_circumflexgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (89,394);
+pos = (315,372);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (16,320);
+pos = (162,372);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (266,436);
+pos = (266,250);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (107,394);
+pos = (333,434);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (-18,320);
+pos = (132,434);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (266,436);
+pos = (266,250);
 ref = circumflexgravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_circumflexhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_circumflexhookabove.glyph
index ce57fa327..70464b306 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_circumflexhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_circumflexhookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (307,356);
+pos = (317,372);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (304,334);
+pos = (174,372);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (414,366);
+pos = (334,372);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (325,356);
+pos = (335,434);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (270,334);
+pos = (136,434);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (414,366);
+pos = (334,434);
 ref = circumflexhookcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_circumflextilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_circumflextilde.glyph
index a30020775..ec06c7d1f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_circumflextilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_circumflextilde.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (225,334);
+pos = (317,372);
 ref = circumflextildecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (186,344);
+pos = (174,372);
 ref = circumflextildecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (336,330);
+pos = (336,144);
 ref = circumflextildecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (243,334);
+pos = (335,434);
 ref = circumflextildecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (152,344);
+pos = (136,434);
 ref = circumflextildecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (336,330);
+pos = (336,144);
 ref = circumflextildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_dblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_dblgrave.glyph
index 0e57afd91..8f59b5377 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_dblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_dblgrave.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1271,414);
+pos = (1271,434);
 ref = dblgravecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1390,414);
+pos = (1390,434);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1324,414);
+pos = (1324,434);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_dieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_dieresis.glyph
index 4d2ef9df4..78931ff51 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_dieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_dieresis.glyph
@@ -15,7 +15,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (175,372);
+pos = (180,372);
 ref = dieresis;
 }
 );
@@ -28,7 +28,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (307,372);
+pos = (149,372);
 ref = dieresis;
 }
 );
@@ -41,7 +41,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (92,372);
+pos = (184,372);
 ref = dieresis;
 }
 );
@@ -59,7 +59,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (193,414);
+pos = (198,434);
 ref = dieresis;
 }
 );
@@ -72,7 +72,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (270,414);
+pos = (115,434);
 ref = dieresis;
 }
 );
@@ -85,7 +85,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (92,414);
+pos = (168,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_grave.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_grave.glyph
index 2081a12a4..fcc755cfd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_grave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_grave.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (207,414);
+pos = (207,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (92,414);
+pos = (92,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (208,414);
+pos = (208,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_hookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_hookabove.glyph
index c97c86ead..36ec86bdd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_hookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_hookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1375,398);
+pos = (1368,372);
 ref = hookabovecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1552,366);
+pos = (1478,372);
 ref = hookabovecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1264,416);
+pos = (1288,372);
 ref = hookabovecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1393,398);
+pos = (1330,434);
 ref = hookabovecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1518,414);
+pos = (1418,434);
 ref = hookabovecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1264,416);
+pos = (1206,434);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_horn.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_horn.glyph
index c2db722aa..2be7ed27f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_horn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_horn.glyph
@@ -1,7 +1,7 @@
 {
 glyphname = Ohorn;
 kernLeft = C;
-kernRight = D;
+kernRight = Ohorn;
 layers = (
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -10,8 +10,25 @@ shapes = (
 ref = O;
 },
 {
-pos = (171,378);
-ref = _part.rtophorn.o;
+closed = 1;
+nodes = (
+(1123,1386,o),
+(1165,1346,o),
+(1268,1346,cs),
+(1382,1346,o),
+(1438,1402,o),
+(1438,1516,cs),
+(1438,1698,l),
+(1268,1698,l),
+(1268,1508,ls),
+(1268,1497,o),
+(1261,1490,o),
+(1250,1490,cs),
+(910,1490,o),
+(937,1510,o),
+(780,1510,c),
+(780,1386,l)
+);
 }
 );
 width = 1560;
@@ -23,8 +40,25 @@ shapes = (
 ref = O;
 },
 {
-pos = (172,376);
-ref = _part.rtophorn.o;
+closed = 1;
+nodes = (
+(926,1470,o),
+(1142,1444,o),
+(1259,1444,cs),
+(1338,1444,o),
+(1382,1488,o),
+(1382,1567,cs),
+(1382,1698,l),
+(1336,1698,l),
+(1336,1567,ls),
+(1336,1513,o),
+(1313,1490,o),
+(1259,1490,cs),
+(946,1490,o),
+(926,1510,o),
+(765,1510,c),
+(765,1472,l)
+);
 }
 );
 width = 1530;
@@ -36,8 +70,25 @@ shapes = (
 ref = O;
 },
 {
-pos = (205,434);
-ref = _part.rtophorn.o;
+closed = 1;
+nodes = (
+(1128,1366,o),
+(1159,1350,o),
+(1274,1350,cs),
+(1388,1350,o),
+(1444,1406,o),
+(1444,1520,cs),
+(1444,1730,l),
+(1274,1730,l),
+(1274,1508,ls),
+(1274,1497,o),
+(1267,1490,o),
+(1256,1490,cs),
+(957,1490,o),
+(930,1514,o),
+(767,1514,c),
+(767,1366,l)
+);
 }
 );
 width = 1534;
@@ -49,72 +100,55 @@ shapes = (
 ref = O;
 },
 {
-pos = (142,434);
-ref = _part.rtophorn.o;
-}
-);
-width = 1528;
-},
-{
-background = {
-shapes = (
-{
 closed = 1;
 nodes = (
-(1303,1444,o),
-(1255,1380,o),
-(1102,1342,c),
-(1102,1294,l),
-(1280,1332,o),
-(1351,1420,o),
-(1350,1602,c),
-(1304,1602,l)
+(919,1282,o),
+(1075,1258,o),
+(1230,1258,cs),
+(1374,1258,o),
+(1488,1320,o),
+(1488,1470,cs),
+(1488,1730,l),
+(1140,1730,l),
+(1140,1522,ls),
+(1140,1501,o),
+(1129,1490,o),
+(1108,1490,cs),
+(943,1490,o),
+(879,1514,o),
+(764,1514,c),
+(764,1282,l)
 );
-},
-{
-closed = 1;
-nodes = (
-(1318,1200,o),
-(1068,1510,o),
-(702,1510,cs),
-(334,1510,o),
-(84,1199,o),
-(84,744,cs),
-(84,291,o),
-(333,-20,o),
-(702,-20,cs),
-(1068,-20,o),
-(1318,289,o),
-(1318,744,cs)
+}
 );
+width = 1528;
 },
 {
-closed = 1;
-nodes = (
-(1272,317,o),
-(1040,26,o),
-(702,26,cs),
-(359,26,o),
-(131,320,o),
-(130,744,cs),
-(131,1175,o),
-(364,1463,o),
-(702,1464,cs),
-(1040,1463,o),
-(1271,1172,o),
-(1272,744,cs)
-);
-}
-);
-};
 layerId = m011;
 shapes = (
 {
 ref = O;
 },
 {
-pos = (172,376);
-ref = _part.rtophorn.o;
+closed = 1;
+nodes = (
+(866,1469,o),
+(878,1444,o),
+(1195,1444,cs),
+(1274,1444,o),
+(1318,1488,o),
+(1318,1567,cs),
+(1318,1730,l),
+(1272,1730,l),
+(1272,1567,ls),
+(1272,1513,o),
+(1249,1490,o),
+(1195,1490,cs),
+(878,1490,o),
+(866,1510,o),
+(701,1510,c),
+(701,1469,l)
+);
 }
 );
 width = 1402;
@@ -150,13 +184,9 @@ name = "Jun 4, 22, 09:25";
 shapes = (
 {
 ref = O;
-},
-{
-pos = (1534,0);
-ref = _part.rtophorn;
 }
 );
-width = 2254;
+width = 1534;
 },
 {
 associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -196,57 +226,6 @@ nodes = (
 width = 1630;
 },
 {
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(1478,1350,o),
-(1449,1239,o),
-(1314,1240,c),
-(1314,1068,l),
-(1585,1068,o),
-(1696,1242,o),
-(1696,1538,c),
-(1478,1538,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(1539,1242,o),
-(1219,1510,o),
-(814,1510,cs),
-(407,1510,o),
-(90,1242,o),
-(90,744,cs),
-(90,250,o),
-(407,-20,o),
-(814,-20,cs),
-(1219,-20,o),
-(1539,247,o),
-(1538,744,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(1123,477,o),
-(1015,332,o),
-(814,332,cs),
-(614,332,o),
-(506,477,o),
-(506,744,cs),
-(506,1012,o),
-(614,1158,o),
-(814,1158,cs),
-(1015,1158,o),
-(1123,1012,o),
-(1122,744,cs)
-);
-}
-);
-};
 guides = (
 {
 angle = 90;
@@ -260,8 +239,25 @@ shapes = (
 ref = O;
 },
 {
-pos = (174,378);
-ref = _part.rtophorn.o;
+closed = 1;
+nodes = (
+(969,1270,o),
+(1125,1266,o),
+(1280,1266,cs),
+(1424,1266,o),
+(1538,1324,o),
+(1538,1490,cs),
+(1538,1698,l),
+(1190,1698,l),
+(1190,1522,ls),
+(1190,1501,o),
+(1179,1490,o),
+(1158,1490,cs),
+(987,1490,o),
+(929,1510,o),
+(814,1510,c),
+(814,1270,l)
+);
 }
 );
 width = 1628;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_hornacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_hornacute.glyph
index dd6d1d7a1..08e8e715d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_hornacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_hornacute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (416,414);
+pos = (416,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (354,414);
+pos = (354,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (422,414);
+pos = (418,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_horngrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_horngrave.glyph
index 5b1eed7ba..3c3a91105 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_horngrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_horngrave.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (207,414);
+pos = (207,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (92,414);
+pos = (92,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (208,414);
+pos = (208,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_hornhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_hornhookabove.glyph
index 2df3b7b79..e979f01be 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_hornhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_hornhookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1375,398);
+pos = (1368,372);
 ref = hookabovecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1552,366);
+pos = (1478,372);
 ref = hookabovecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1264,416);
+pos = (1288,372);
 ref = hookabovecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1393,398);
+pos = (1330,434);
 ref = hookabovecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1518,414);
+pos = (1418,434);
 ref = hookabovecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1264,416);
+pos = (1206,434);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_horntilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_horntilde.glyph
index 36307ed2e..169737421 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_horntilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_horntilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (321,0);
-ref = casetilde.cn;
+pos = (269,372);
+ref = tilde;
 }
 );
 width = 1560;
@@ -23,8 +23,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (298,0);
-ref = casetilde.cn;
+pos = (302,372);
+ref = tilde;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (342,0);
-ref = casetilde.cn;
+pos = (262,372);
+ref = tilde;
 }
 );
 width = 1530;
@@ -49,8 +49,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (339,2);
-ref = casetilde.cn;
+pos = (287,434);
+ref = tilde;
 }
 );
 width = 1534;
@@ -62,8 +62,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (264,0);
-ref = casetilde.cn;
+pos = (252,434);
+ref = tilde;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (342,0);
-ref = casetilde.cn;
+pos = (254,434);
+ref = tilde;
 }
 );
 width = 1402;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_hungarumlaut.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_hungarumlaut.glyph
index 45dad36a0..d8fa22ac4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_hungarumlaut.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_hungarumlaut.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (429,384);
+pos = (429,198);
 ref = hungarumlaut;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (424,384);
+pos = (424,198);
 ref = hungarumlaut;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (438,384);
+pos = (438,198);
 ref = hungarumlaut;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (447,384);
+pos = (447,198);
 ref = hungarumlaut;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (390,384);
+pos = (390,198);
 ref = hungarumlaut;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (438,384);
+pos = (438,198);
 ref = hungarumlaut;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_invertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_invertedbreve.glyph
index 457146acb..28caa2735 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_invertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1437,372);
+pos = (1378,372);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1454,372);
+pos = (1476,372);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1358,372);
+pos = (1348,372);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1423,404);
+pos = (1331,434);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1404,414);
+pos = (1414,434);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1294,414);
+pos = (1231,434);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_macron.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_macron.glyph
index a2bd9fee6..d738eba7c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_macron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_macron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (321,372);
+pos = (181,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (156,372);
+pos = (149,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (466,372);
+pos = (184,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (339,372);
+pos = (199,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (122,372);
+pos = (115,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (466,414);
+pos = (168,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_macronacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_macronacute.glyph
index 369f7b6ac..ec4620165 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_macronacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_macronacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1159,0);
+pos = (181,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1280,0);
+pos = (149,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1138,0);
+pos = (184,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1177,0);
+pos = (199,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1246,0);
+pos = (115,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1138,0);
+pos = (168,0);
 ref = macronacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_macrongrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_macrongrave.glyph
index e4c540186..bc18f2708 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_macrongrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_macrongrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1159,0);
+pos = (181,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1104,0);
+pos = (149,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1150,0);
+pos = (184,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1177,0);
+pos = (199,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1070,0);
+pos = (115,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1150,0);
+pos = (168,0);
 ref = macrongravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_mega.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_mega.glyph
index c2cda3ea1..7661dabf4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_mega.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_mega.glyph
@@ -11,6 +11,10 @@ pos = (780,0);
 {
 name = tonos;
 pos = (204,1490);
+},
+{
+name = top;
+pos = (780,1490);
 }
 );
 background = {
@@ -87,6 +91,10 @@ pos = (808,0);
 {
 name = tonos;
 pos = (120,1490);
+},
+{
+name = top;
+pos = (809,1490);
 }
 );
 background = {
@@ -157,6 +165,10 @@ pos = (762,0);
 {
 name = tonos;
 pos = (256,1490);
+},
+{
+name = top;
+pos = (762,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -212,6 +224,10 @@ pos = (748,0);
 {
 name = tonos;
 pos = (172,1490);
+},
+{
+name = top;
+pos = (748,1490);
 }
 );
 background = {
@@ -243,15 +259,15 @@ nodes = (
 (620,0,l),
 (620,204,l),
 (428,285,o),
-(265,506,o),
+(264,506,o),
 (264,786,cs),
-(265,1097,o),
-(465,1341,o),
+(264,1097,o),
+(465,1342,o),
 (748,1342,cs),
-(1030,1341,o),
-(1231,1097,o),
+(1030,1342,o),
+(1230,1097,o),
 (1230,786,cs),
-(1231,506,o),
+(1230,506,o),
 (1068,285,o),
 (876,204,c),
 (876,0,l),
@@ -260,9 +276,9 @@ nodes = (
 (1094,160,l),
 (1094,172,l),
 (1286,297,o),
-(1405,503,o),
+(1406,503,o),
 (1406,786,cs),
-(1405,1210,o),
+(1406,1210,o),
 (1132,1510,o),
 (748,1510,cs),
 (364,1510,o),
@@ -288,6 +304,10 @@ pos = (792,0);
 {
 name = tonos;
 pos = (104,1490);
+},
+{
+name = top;
+pos = (793,1490);
 }
 );
 background = {
@@ -358,6 +378,10 @@ pos = (698,0);
 {
 name = tonos;
 pos = (192,1490);
+},
+{
+name = top;
+pos = (698,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_ogonekmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_ogonekmacron.glyph
index a22c15f81..08f1ae875 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_ogonekmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_ogonekmacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Oogonek;
 },
 {
-pos = (321,372);
+pos = (181,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Oogonek;
 },
 {
-pos = (156,372);
+pos = (149,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Oogonek;
 },
 {
-pos = (466,372);
+pos = (184,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Oogonek;
 },
 {
-pos = (339,372);
+pos = (199,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Oogonek;
 },
 {
-pos = (122,372);
+pos = (115,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Oogonek;
 },
 {
-pos = (466,414);
+pos = (168,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_slashacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_slashacute.glyph
index 4c9706190..e1420d7ac 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_slashacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_slashacute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = Oslash;
 },
 {
-pos = (416,414);
+pos = (416,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Oslash;
 },
 {
-pos = (354,414);
+pos = (354,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Oslash;
 },
 {
-pos = (422,414);
+pos = (418,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_tilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_tilde.glyph
index d81aaac2b..fe7136c94 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_tilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (321,0);
-ref = casetilde.cn;
+pos = (269,372);
+ref = tilde;
 }
 );
 width = 1560;
@@ -23,8 +23,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (298,0);
-ref = casetilde.cn;
+pos = (302,372);
+ref = tilde;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (342,0);
-ref = casetilde.cn;
+pos = (262,372);
+ref = tilde;
 }
 );
 width = 1530;
@@ -49,8 +49,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (339,2);
-ref = casetilde.cn;
+pos = (287,434);
+ref = tilde;
 }
 );
 width = 1534;
@@ -62,8 +62,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (264,0);
-ref = casetilde.cn;
+pos = (252,434);
+ref = tilde;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (342,0);
-ref = casetilde.cn;
+pos = (254,434);
+ref = tilde;
 }
 );
 width = 1402;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_tildeacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_tildeacute.glyph
index 57af72049..890e3cc63 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_tildeacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_tildeacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1139,0);
+pos = (269,372);
 ref = tildeacutecomb.uc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1210,0);
+pos = (302,372);
 ref = tildeacutecomb.uc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1138,0);
+pos = (262,372);
 ref = tildeacutecomb.uc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1157,0);
+pos = (287,434);
 ref = tildeacutecomb.uc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1176,0);
+pos = (252,434);
 ref = tildeacutecomb.uc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1138,0);
+pos = (254,434);
 ref = tildeacutecomb.uc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_tildedieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_tildedieresis.glyph
index ba76455ef..9919406be 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_tildedieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_tildedieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1369,414);
+pos = (1369,228);
 ref = tildedieresiscomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1510,398);
+pos = (1510,212);
 ref = tildedieresiscomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1290,422);
+pos = (1290,236);
 ref = tildedieresiscomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1387,414);
+pos = (1387,228);
 ref = tildedieresiscomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1476,398);
+pos = (1476,212);
 ref = tildedieresiscomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1290,422);
+pos = (1290,236);
 ref = tildedieresiscomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/P_.glyph b/src/Inter-Roman.glyphspackage/glyphs/P_.glyph
index 283d908a8..3666658ad 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/P_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/P_.glyph
@@ -16,7 +16,7 @@ pos = (190,1490);
 },
 {
 name = top;
-pos = (638,1676);
+pos = (638,1490);
 },
 {
 name = topl;
@@ -65,7 +65,7 @@ pos = (146,1490);
 },
 {
 name = top;
-pos = (648,1676);
+pos = (648,1490);
 },
 {
 name = topl;
@@ -124,7 +124,7 @@ pos = (114,1490);
 },
 {
 name = top;
-pos = (616,1676);
+pos = (616,1490);
 },
 {
 name = topl;
@@ -183,7 +183,7 @@ pos = (76,1490);
 },
 {
 name = top;
-pos = (658,1676);
+pos = (658,1490);
 },
 {
 name = topl;
@@ -232,7 +232,7 @@ pos = (68,1490);
 },
 {
 name = top;
-pos = (650,1676);
+pos = (650,1490);
 },
 {
 name = topl;
@@ -467,7 +467,7 @@ pos = (126,1490);
 },
 {
 name = top;
-pos = (574,1676);
+pos = (574,1490);
 },
 {
 name = topl;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/P_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/P_acute.glyph
index 2358a9c1d..6b461fd25 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/P_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/P_acute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = P;
 },
 {
-pos = (265,414);
+pos = (265,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = P;
 },
 {
-pos = (240,414);
+pos = (240,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = P;
 },
 {
-pos = (294,414);
+pos = (290,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/P_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/P_dotaccent.glyph
index 05abc750a..5fe460746 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/P_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/P_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = P;
 },
 {
-pos = (404,414);
+pos = (404,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = P;
 },
 {
-pos = (330,414);
+pos = (330,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = P;
 },
 {
-pos = (452,414);
+pos = (452,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/P_e-cy.turn.glyph b/src/Inter-Roman.glyphspackage/glyphs/P_e-cy.turn.glyph
index 10ed40ce1..7f75e4523 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/P_e-cy.turn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/P_e-cy.turn.glyph
@@ -12,6 +12,10 @@ pos = (1290,0);
 {
 name = cyrtic_center;
 pos = (735,0);
+},
+{
+name = top;
+pos = (735,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -41,6 +45,10 @@ pos = (1402,0);
 {
 name = cyrtic_center;
 pos = (749,0);
+},
+{
+name = top;
+pos = (749,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -70,6 +78,10 @@ pos = (1230,0);
 {
 name = cyrtic_center;
 pos = (733,0);
+},
+{
+name = top;
+pos = (731,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -99,6 +111,10 @@ pos = (1258,0);
 {
 name = cyrtic_center;
 pos = (703,0);
+},
+{
+name = top;
+pos = (703,1490);
 }
 );
 layerId = m007;
@@ -128,6 +144,10 @@ pos = (1398,0);
 {
 name = cyrtic_center;
 pos = (739,0);
+},
+{
+name = top;
+pos = (739,1490);
 }
 );
 layerId = m009;
@@ -157,6 +177,10 @@ pos = (1166,0);
 {
 name = cyrtic_center;
 pos = (669,0);
+},
+{
+name = top;
+pos = (667,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Q_.circled.glyph b/src/Inter-Roman.glyphspackage/glyphs/Q_.circled.glyph
index b8c7ea77e..d3a1c4689 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Q_.circled.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Q_.circled.glyph
@@ -9,7 +9,7 @@ alignment = 1;
 ref = largeCircle;
 },
 {
-pos = (658,60);
+pos = (658,0);
 ref = Q;
 }
 );
@@ -23,7 +23,7 @@ alignment = 1;
 ref = largeCircle;
 },
 {
-pos = (722,60);
+pos = (722,0);
 ref = Q;
 }
 );
@@ -37,7 +37,7 @@ alignment = 1;
 ref = largeCircle;
 },
 {
-pos = (643,60);
+pos = (643,0);
 ref = Q;
 }
 );
@@ -51,7 +51,7 @@ alignment = 1;
 ref = largeCircle;
 },
 {
-pos = (656,58);
+pos = (656,0);
 ref = Q;
 }
 );
@@ -65,7 +65,7 @@ alignment = 1;
 ref = largeCircle;
 },
 {
-pos = (605,45);
+pos = (607,0);
 ref = Q;
 }
 );
@@ -79,7 +79,7 @@ alignment = 1;
 ref = largeCircle;
 },
 {
-pos = (636,43);
+pos = (659,0);
 ref = Q;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Q_.glyph b/src/Inter-Roman.glyphspackage/glyphs/Q_.glyph
index b7f041614..ee86dd178 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Q_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Q_.glyph
@@ -5,12 +5,6 @@ kernLeft = C;
 kernRight = D;
 layers = (
 {
-anchors = (
-{
-name = _center;
-pos = (780,685);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
@@ -33,12 +27,6 @@ ref = O;
 width = 1560;
 },
 {
-anchors = (
-{
-name = _center;
-pos = (816,700);
-}
-);
 guides = (
 {
 angle = 90;
@@ -67,12 +55,6 @@ ref = O;
 width = 1632;
 },
 {
-anchors = (
-{
-name = _center;
-pos = (765,685);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
@@ -96,12 +78,6 @@ ref = O;
 width = 1530;
 },
 {
-anchors = (
-{
-name = _center;
-pos = (767,687);
-}
-);
 layerId = m007;
 shapes = (
 {
@@ -124,18 +100,6 @@ ref = O;
 width = 1534;
 },
 {
-anchors = (
-{
-name = _center;
-pos = (787,702);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (928,1432);
-}
-);
 layerId = m009;
 shapes = (
 {
@@ -158,12 +122,6 @@ ref = O;
 width = 1528;
 },
 {
-anchors = (
-{
-name = _center;
-pos = (701,685);
-}
-);
 layerId = m011;
 shapes = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Q_.squared.glyph b/src/Inter-Roman.glyphspackage/glyphs/Q_.squared.glyph
index b19f94be4..419aae42b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Q_.squared.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Q_.squared.glyph
@@ -9,7 +9,7 @@ alignment = 1;
 ref = whiteLargeSquare;
 },
 {
-pos = (649,60);
+pos = (649,0);
 ref = Q;
 }
 );
@@ -23,7 +23,7 @@ alignment = 1;
 ref = whiteLargeSquare;
 },
 {
-pos = (713,60);
+pos = (713,0);
 ref = Q;
 }
 );
@@ -37,7 +37,7 @@ alignment = 1;
 ref = whiteLargeSquare;
 },
 {
-pos = (634,60);
+pos = (634,0);
 ref = Q;
 }
 );
@@ -51,7 +51,7 @@ alignment = 1;
 ref = whiteLargeSquare;
 },
 {
-pos = (647,58);
+pos = (647,0);
 ref = Q;
 }
 );
@@ -65,7 +65,7 @@ alignment = 1;
 ref = whiteLargeSquare;
 },
 {
-pos = (598,45);
+pos = (600,0);
 ref = Q;
 }
 );
@@ -79,7 +79,7 @@ alignment = 1;
 ref = whiteLargeSquare;
 },
 {
-pos = (627,43);
+pos = (650,0);
 ref = Q;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/R_.glyph b/src/Inter-Roman.glyphspackage/glyphs/R_.glyph
index 3c534f254..0a7ca56a6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/R_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/R_.glyph
@@ -16,7 +16,7 @@ pos = (646,0);
 },
 {
 name = top;
-pos = (626,1676);
+pos = (626,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -70,7 +70,7 @@ pos = (672,0);
 },
 {
 name = top;
-pos = (646,1676);
+pos = (646,1490);
 }
 );
 background = {
@@ -225,7 +225,7 @@ pos = (640,0);
 },
 {
 name = top;
-pos = (614,1676);
+pos = (614,1490);
 }
 );
 guides = (
@@ -348,7 +348,7 @@ pos = (698,0);
 },
 {
 name = top;
-pos = (674,1676);
+pos = (674,1490);
 }
 );
 guides = (
@@ -416,7 +416,7 @@ pos = (690,0);
 },
 {
 name = top;
-pos = (666,1676);
+pos = (666,1490);
 }
 );
 background = {
@@ -426,11 +426,6 @@ ref = P;
 }
 );
 };
-guides = (
-{
-pos = (-76,1552);
-}
-);
 layerId = m009;
 shapes = (
 {
@@ -721,7 +716,7 @@ pos = (582,0);
 },
 {
 name = top;
-pos = (562,1676);
+pos = (562,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/R_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/R_acute.glyph
index 9283faa22..001a4322c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/R_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/R_acute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (263,414);
+pos = (263,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (256,414);
+pos = (256,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (282,414);
+pos = (278,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/R_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/R_caron.glyph
index 22e5cc994..b4347a17b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/R_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/R_caron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (196,388);
+pos = (194,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (180,414);
+pos = (180,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (36,414);
+pos = (38,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (194,414);
+pos = (194,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/R_dblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/R_dblgrave.glyph
index 7ae0808de..b51d19321 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/R_dblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/R_dblgrave.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1118,414);
+pos = (1118,434);
 ref = dblgravecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1292,414);
+pos = (1292,434);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1184,414);
+pos = (1184,434);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/R_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/R_dotaccent.glyph
index c17ed5d20..1ccf81c30 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/R_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/R_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (402,414);
+pos = (402,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (346,414);
+pos = (346,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (440,414);
+pos = (440,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/R_dotbelowmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/R_dotbelowmacron.glyph
index dc4142bb6..13797be38 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/R_dotbelowmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/R_dotbelowmacron.glyph
@@ -14,7 +14,7 @@ pos = (1278,0);
 ref = dotbelow;
 },
 {
-pos = (186,372);
+pos = (46,372);
 ref = macron;
 }
 );
@@ -31,7 +31,7 @@ pos = (1234,0);
 ref = dotbelow;
 },
 {
-pos = (16,372);
+pos = (9,372);
 ref = macron;
 }
 );
@@ -48,7 +48,7 @@ pos = (1204,0);
 ref = dotbelow;
 },
 {
-pos = (326,372);
+pos = (44,372);
 ref = macron;
 }
 );
@@ -65,7 +65,7 @@ pos = (1278,0);
 ref = dotbelow;
 },
 {
-pos = (186,372);
+pos = (46,434);
 ref = macron;
 }
 );
@@ -82,7 +82,7 @@ pos = (1242,0);
 ref = dotbelow;
 },
 {
-pos = (24,372);
+pos = (17,434);
 ref = macron;
 }
 );
@@ -99,7 +99,7 @@ pos = (1204,0);
 ref = dotbelow;
 },
 {
-pos = (326,414);
+pos = (28,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/R_invertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/R_invertedbreve.glyph
index 325713aba..73f815ac8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/R_invertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/R_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1302,372);
+pos = (1243,372);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1314,372);
+pos = (1336,372);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1218,372);
+pos = (1208,372);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1270,404);
+pos = (1178,434);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1306,414);
+pos = (1316,434);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1154,414);
+pos = (1091,434);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/R_linebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/R_linebelow.glyph
index 67d1fda80..360553f1d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/R_linebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/R_linebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1278,0);
+pos = (1270,0);
 ref = macronsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1326,0);
+pos = (1364,0);
 ref = macronsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1252,0);
+pos = (1221,0);
 ref = macronsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1278,0);
+pos = (1200,0);
 ref = macronsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1334,0);
+pos = (1335,0);
 ref = macronsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1252,0);
+pos = (1111,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/S_.glyph b/src/Inter-Roman.glyphspackage/glyphs/S_.glyph
index 22540af5f..98ca345a7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/S_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/S_.glyph
@@ -20,7 +20,7 @@ pos = (628,0);
 },
 {
 name = top;
-pos = (628,1676);
+pos = (628,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -287,7 +287,7 @@ pos = (564,0);
 },
 {
 name = top;
-pos = (564,1676);
+pos = (564,1490);
 }
 );
 layerId = m011;
@@ -554,7 +554,7 @@ pos = (654,0);
 },
 {
 name = top;
-pos = (652,1676);
+pos = (652,1490);
 }
 );
 guides = (
@@ -633,7 +633,7 @@ pos = (633,0);
 },
 {
 name = top;
-pos = (624,1676);
+pos = (624,1490);
 }
 );
 guides = (
@@ -839,7 +839,7 @@ pos = (686,0);
 },
 {
 name = top;
-pos = (684,1676);
+pos = (684,1490);
 }
 );
 guides = (
@@ -923,16 +923,11 @@ pos = (701,0);
 },
 {
 name = top;
-pos = (701,1676);
+pos = (701,1490);
 }
 );
 guides = (
 {
-orientation = center;
-angle = 90;
-pos = (-3593,-132);
-},
-{
 angle = 90;
 pos = (701,1568);
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/S_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/S_acute.glyph
index 91af7d96a..e820b468b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/S_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/S_acute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (273,414);
+pos = (273,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (291,414);
+pos = (291,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (284,414);
+pos = (280,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/S_acutedotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/S_acutedotaccent.glyph
index 70655ffeb..8c813fe53 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/S_acutedotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/S_acutedotaccent.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1242,414);
+pos = (1242,228);
 ref = acutedotcomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1338,300);
+pos = (1338,114);
 ref = acutedotcomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1180,480);
+pos = (1180,294);
 ref = acutedotcomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1246,414);
+pos = (1246,228);
 ref = acutedotcomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1371,300);
+pos = (1371,114);
 ref = acutedotcomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1180,480);
+pos = (1180,294);
 ref = acutedotcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/S_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/S_caron.glyph
index d01f21a2a..1518fed6b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/S_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/S_caron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (198,388);
+pos = (196,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (190,414);
+pos = (190,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (71,414);
+pos = (73,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (196,414);
+pos = (196,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/S_carondotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/S_carondotaccent.glyph
index c47379cc1..f20053045 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/S_carondotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/S_carondotaccent.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1242,414);
+pos = (1242,228);
 ref = carondotcomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1390,468);
+pos = (1390,282);
 ref = carondotcomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1148,378);
+pos = (1148,192);
 ref = carondotcomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1246,414);
+pos = (1246,228);
 ref = carondotcomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1423,468);
+pos = (1423,282);
 ref = carondotcomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1148,378);
+pos = (1148,192);
 ref = carondotcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/S_chwacyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/S_chwacyrillic.glyph
index 39a80644a..4b37bbe82 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/S_chwacyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/S_chwacyrillic.glyph
@@ -9,7 +9,7 @@ pos = (684,0);
 },
 {
 name = top;
-pos = (706,1676);
+pos = (706,1490);
 }
 );
 background = {
@@ -103,7 +103,7 @@ pos = (722,0);
 },
 {
 name = top;
-pos = (736,1676);
+pos = (736,1490);
 }
 );
 background = {
@@ -197,7 +197,7 @@ pos = (662,0);
 },
 {
 name = top;
-pos = (694,1676);
+pos = (694,1490);
 }
 );
 background = {
@@ -328,7 +328,7 @@ pos = (652,0);
 },
 {
 name = top;
-pos = (674,1676);
+pos = (674,1490);
 }
 );
 background = {
@@ -422,7 +422,7 @@ pos = (706,0);
 },
 {
 name = top;
-pos = (720,1676);
+pos = (720,1490);
 }
 );
 background = {
@@ -516,7 +516,7 @@ pos = (598,0);
 },
 {
 name = top;
-pos = (630,1676);
+pos = (630,1490);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/S_chwadieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/S_chwadieresiscyrillic.glyph
index c96ec1bad..6b053ca7f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/S_chwadieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/S_chwadieresiscyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Schwacyrillic;
 },
 {
-pos = (100,372);
+pos = (105,372);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Schwacyrillic;
 },
 {
-pos = (229,372);
+pos = (71,372);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Schwacyrillic;
 },
 {
-pos = (20,372);
+pos = (112,372);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Schwacyrillic;
 },
 {
-pos = (100,414);
+pos = (105,434);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Schwacyrillic;
 },
 {
-pos = (226,414);
+pos = (71,434);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Schwacyrillic;
 },
 {
-pos = (20,414);
+pos = (96,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/S_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/S_circumflex.glyph
index d36af8ab8..f2580fb2b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/S_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/S_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (186,372);
+pos = (188,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (38,372);
+pos = (44,372);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (198,372);
+pos = (196,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (190,414);
+pos = (192,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (71,414);
+pos = (73,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (198,414);
+pos = (196,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/S_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/S_dotaccent.glyph
index 090b57325..62c3c738b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/S_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/S_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (412,414);
+pos = (412,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (381,414);
+pos = (381,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (442,414);
+pos = (442,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/S_dotbelowdotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/S_dotbelowdotaccent.glyph
index 4a174abd6..150959a8c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/S_dotbelowdotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/S_dotbelowdotaccent.glyph
@@ -65,7 +65,7 @@ pos = (1271,-24);
 ref = dotbelow;
 },
 {
-pos = (412,414);
+pos = (412,434);
 ref = dotaccent;
 }
 );
@@ -82,7 +82,7 @@ pos = (1256,0);
 ref = dotbelow;
 },
 {
-pos = (381,414);
+pos = (381,434);
 ref = dotaccent;
 }
 );
@@ -99,7 +99,7 @@ pos = (1186,-24);
 ref = dotbelow;
 },
 {
-pos = (442,414);
+pos = (442,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/S_ha-cy.glyph b/src/Inter-Roman.glyphspackage/glyphs/S_ha-cy.glyph
index 81b6b41e5..2f65edc23 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/S_ha-cy.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/S_ha-cy.glyph
@@ -8,6 +8,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1768,0);
+},
+{
+name = top;
+pos = (974,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -37,6 +41,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1984,0);
+},
+{
+name = top;
+pos = (1040,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -66,6 +74,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1630,0);
+},
+{
+name = top;
+pos = (931,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -95,6 +107,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1736,0);
+},
+{
+name = top;
+pos = (942,1490);
 }
 );
 layerId = m007;
@@ -124,6 +140,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1968,0);
+},
+{
+name = top;
+pos = (1024,1490);
 }
 );
 layerId = m009;
@@ -153,6 +173,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1566,0);
+},
+{
+name = top;
+pos = (867,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/T_.glyph b/src/Inter-Roman.glyphspackage/glyphs/T_.glyph
index 5308fa274..a44d7afa6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/T_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/T_.glyph
@@ -36,7 +36,7 @@ pos = (698,0);
 },
 {
 name = top;
-pos = (658,1676);
+pos = (658,1490);
 }
 );
 guides = (
@@ -96,7 +96,7 @@ pos = (856,0);
 },
 {
 name = top;
-pos = (703,1676);
+pos = (703,1490);
 }
 );
 guides = (
@@ -160,7 +160,7 @@ pos = (642,0);
 },
 {
 name = top;
-pos = (630,1676);
+pos = (630,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -213,14 +213,7 @@ pos = (666,0);
 },
 {
 name = top;
-pos = (626,1676);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (-4791,176);
+pos = (626,1490);
 }
 );
 layerId = m007;
@@ -273,7 +266,7 @@ pos = (849,0);
 },
 {
 name = top;
-pos = (697,1676);
+pos = (697,1490);
 }
 );
 layerId = m009;
@@ -326,7 +319,7 @@ pos = (574,0);
 },
 {
 name = top;
-pos = (562,1676);
+pos = (562,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/T_bar.glyph b/src/Inter-Roman.glyphspackage/glyphs/T_bar.glyph
index a725a42b7..aa21642b0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/T_bar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/T_bar.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (198,47);
+pos = (198,23);
 ref = crossbar;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (183,-55);
+pos = (183,-79);
 ref = crossbar;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (206,46);
+pos = (206,23);
 ref = crossbar;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (178,48);
+pos = (178,23);
 ref = crossbar;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (199,-55);
+pos = (199,-79);
 ref = crossbar;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (202,46);
+pos = (202,23);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/T_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/T_caron.glyph
index 43125befd..2c4c7a2ae 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/T_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/T_caron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (200,388);
+pos = (198,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (192,414);
+pos = (192,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (67,414);
+pos = (69,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (194,414);
+pos = (194,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/T_circumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/T_circumflexbelow.glyph
index bc2bb78c6..36ae1d6da 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/T_circumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/T_circumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1240,0);
+pos = (1250,0);
 ref = circumflexsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1377,0);
+pos = (1368,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1142,0);
+pos = (1204,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1240,0);
+pos = (1194,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1385,0);
+pos = (1347,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1138,0);
+pos = (1090,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/T_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/T_dotaccent.glyph
index b64cba744..b896de664 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/T_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/T_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (414,414);
+pos = (414,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (377,414);
+pos = (377,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (440,414);
+pos = (440,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/T_hook.base.glyph b/src/Inter-Roman.glyphspackage/glyphs/T_hook.base.glyph
index 8c31955e5..cd8d142f2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/T_hook.base.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/T_hook.base.glyph
@@ -6,6 +6,10 @@ layers = (
 {
 anchors = (
 {
+name = top;
+pos = (657,1490);
+},
+{
 name = topl;
 pos = (456,1490);
 }
@@ -45,6 +49,10 @@ width = 1314;
 {
 anchors = (
 {
+name = top;
+pos = (703,1490);
+},
+{
 name = topl;
 pos = (469,1490);
 }
@@ -88,6 +96,10 @@ width = 1406;
 {
 anchors = (
 {
+name = top;
+pos = (631,1490);
+},
+{
 name = topl;
 pos = (430,1490);
 }
@@ -120,6 +132,10 @@ width = 1262;
 {
 anchors = (
 {
+name = top;
+pos = (625,1490);
+},
+{
 name = topl;
 pos = (432,1490);
 }
@@ -159,6 +175,10 @@ width = 1250;
 {
 anchors = (
 {
+name = top;
+pos = (696,1490);
+},
+{
 name = topl;
 pos = (488,1490);
 }
@@ -191,6 +211,10 @@ width = 1392;
 {
 anchors = (
 {
+name = top;
+pos = (563,1490);
+},
+{
 name = topl;
 pos = (362,1490);
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/T_linebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/T_linebelow.glyph
index 6a4f4be90..f42c2de5a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/T_linebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/T_linebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1264,0);
+pos = (1256,0);
 ref = macronsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1331,0);
+pos = (1369,0);
 ref = macronsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1236,0);
+pos = (1205,0);
 ref = macronsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1264,0);
+pos = (1186,0);
 ref = macronsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1339,0);
+pos = (1340,0);
 ref = macronsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1232,0);
+pos = (1091,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_.glyph
index 1468239e7..8795fac27 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_.glyph
@@ -28,7 +28,7 @@ pos = (1158,1490);
 },
 {
 name = top;
-pos = (760,1676);
+pos = (760,1490);
 }
 );
 guides = (
@@ -43,6 +43,11 @@ shapes = (
 {
 closed = 1;
 nodes = (
+(1110,-24,o),
+(1338,200,o),
+(1338,506,cs),
+(1338,1490,l),
+(1158,1490,l),
 (1158,520,ls),
 (1158,302,o),
 (1008,144,o),
@@ -55,12 +60,7 @@ nodes = (
 (180,506,ls),
 (180,200,o),
 (409,-24,o),
-(760,-24,cs),
-(1110,-24,o),
-(1338,200,o),
-(1338,506,cs),
-(1338,1490,l),
-(1158,1490,l)
+(760,-24,cs)
 );
 }
 );
@@ -90,7 +90,7 @@ pos = (978,1490);
 },
 {
 name = top;
-pos = (738,1676);
+pos = (738,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -98,6 +98,11 @@ shapes = (
 {
 closed = 1;
 nodes = (
+(1121,-18,o),
+(1382,195,o),
+(1382,536,cs),
+(1382,1490,l),
+(978,1490,l),
 (978,570,ls),
 (978,431,o),
 (878,332,o),
@@ -110,12 +115,7 @@ nodes = (
 (96,536,ls),
 (96,195,o),
 (353,-18,o),
-(738,-18,cs),
-(1121,-18,o),
-(1382,195,o),
-(1382,536,cs),
-(1382,1490,l),
-(978,1490,l)
+(738,-18,cs)
 );
 }
 );
@@ -145,7 +145,7 @@ pos = (1256,1490);
 },
 {
 name = top;
-pos = (768,1676);
+pos = (768,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -153,24 +153,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1256,504,ls),
-(1256,228,o),
+(1074,-22,o),
+(1304,201,o),
+(1304,504,cs),
+(1304,1490,l),
+(1258,1490,l),
+(1258,504,ls),
+(1258,228,o),
 (1049,24,o),
 (768,24,cs),
 (487,24,o),
-(280,228,o),
-(280,504,cs),
-(280,1490,l),
+(278,228,o),
+(278,504,cs),
+(278,1490,l),
 (232,1490,l),
 (232,504,ls),
 (232,202,o),
-(463,-24,o),
-(768,-24,cs),
-(1074,-24,o),
-(1304,201,o),
-(1304,504,cs),
-(1304,1490,l),
-(1256,1490,l)
+(463,-22,o),
+(768,-22,cs)
 );
 }
 );
@@ -188,7 +188,7 @@ pos = (720,0);
 },
 {
 name = ogonek;
-pos = (1298,506);
+pos = (1300,506);
 },
 {
 name = right;
@@ -196,28 +196,53 @@ pos = (804,0);
 },
 {
 name = rtophorn;
-pos = (1118,1490);
+pos = (1120,1490);
 },
 {
 name = top;
-pos = (720,1676);
+pos = (720,1490);
 }
 );
-guides = (
+background = {
+shapes = (
 {
-orientation = center;
-angle = 90;
-pos = (-6672,2084);
+closed = 1;
+nodes = (
+(1120,520,ls),
+(1120,302,o),
+(968,144,o),
+(720,144,cs),
+(471,144,o),
+(320,302,o),
+(320,520,cs),
+(320,1490,l),
+(140,1490,l),
+(140,506,ls),
+(140,200,o),
+(369,-24,o),
+(720,-24,cs),
+(1070,-24,o),
+(1300,200,o),
+(1300,506,cs),
+(1300,1490,l),
+(1120,1490,l)
+);
 }
 );
+};
 layerId = m007;
 shapes = (
 {
 closed = 1;
 nodes = (
-(1118,520,ls),
-(1118,302,o),
-(968,144,o),
+(1071,-24,o),
+(1300,200,o),
+(1300,506,cs),
+(1300,1490,l),
+(1120,1490,l),
+(1120,520,ls),
+(1120,302,o),
+(969,144,o),
 (720,144,cs),
 (471,144,o),
 (320,302,o),
@@ -227,16 +252,11 @@ nodes = (
 (140,506,ls),
 (140,200,o),
 (369,-24,o),
-(720,-24,cs),
-(1070,-24,o),
-(1298,200,o),
-(1298,506,cs),
-(1298,1490,l),
-(1118,1490,l)
+(720,-24,cs)
 );
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 anchors = (
@@ -262,7 +282,7 @@ pos = (960,1490);
 },
 {
 name = top;
-pos = (722,1676);
+pos = (722,1490);
 }
 );
 layerId = m009;
@@ -270,6 +290,11 @@ shapes = (
 {
 closed = 1;
 nodes = (
+(1111,-24,o),
+(1364,194,o),
+(1364,530,cs),
+(1364,1490,l),
+(960,1490,l),
 (960,564,ls),
 (960,425,o),
 (862,326,o),
@@ -282,12 +307,7 @@ nodes = (
 (80,530,ls),
 (80,193,o),
 (332,-24,o),
-(722,-24,cs),
-(1111,-24,o),
-(1364,194,o),
-(1364,530,cs),
-(1364,1490,l),
-(960,1490,l)
+(722,-24,cs)
 );
 }
 );
@@ -317,7 +337,7 @@ pos = (1164,1490);
 },
 {
 name = top;
-pos = (676,1676);
+pos = (676,1490);
 }
 );
 layerId = m011;
@@ -326,24 +346,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1164,504,ls),
-(1164,228,o),
-(957,24,o),
-(676,24,cs),
-(395,24,o),
-(188,228,o),
-(188,504,cs),
-(188,1490,l),
-(140,1490,l),
-(140,504,ls),
-(140,202,o),
-(371,-24,o),
-(676,-24,cs),
-(982,-24,o),
-(1212,201,o),
-(1212,504,cs),
+(982,-16,o),
+(1212,207,o),
+(1212,510,cs),
 (1212,1490,l),
-(1164,1490,l)
+(1166,1490,l),
+(1166,510,ls),
+(1166,234,o),
+(957,30,o),
+(676,30,cs),
+(395,30,o),
+(186,234,o),
+(186,510,cs),
+(186,1490,l),
+(140,1490,l),
+(140,510,ls),
+(140,208,o),
+(371,-16,o),
+(676,-16,cs)
 );
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_acute.glyph
index d33b9e63a..822722fdf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_acute.glyph
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (369,414);
+pos = (369,434);
 ref = acute;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (312,414);
+pos = (312,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (396,414);
+pos = (392,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_breve.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_breve.glyph
index 3fd37e620..5052d947f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_breve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_breve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (300,372);
+pos = (376,372);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (226,372);
+pos = (258,372);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (352,372);
+pos = (416,372);
 ref = breve;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (292,414);
+pos = (320,434);
 ref = breve;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (226,414);
+pos = (242,434);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (260,414);
+pos = (324,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_caron.glyph
index a8134c213..b647f0a0c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_caron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (338,388);
+pos = (336,372);
 ref = caron;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (286,414);
+pos = (286,434);
 ref = caron;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (92,414);
+pos = (94,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (308,414);
+pos = (308,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_circumflex.glyph
index 21cbd6259..b9c81259c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (294,372);
+pos = (296,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (92,372);
+pos = (98,372);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (338,372);
+pos = (336,372);
 ref = circumflex;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (286,414);
+pos = (288,434);
 ref = circumflex;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (92,414);
+pos = (94,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (310,414);
+pos = (308,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_circumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_circumflexbelow.glyph
index b1717a47c..e14d65077 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_circumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_circumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1342,0);
+pos = (1352,0);
 ref = circumflexsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1412,0);
+pos = (1403,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1280,0);
+pos = (1342,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (1334,0);
+pos = (1288,0);
 ref = circumflexsubnosp;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1412,0);
+pos = (1374,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1252,0);
+pos = (1204,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_dblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_dblgrave.glyph
index a44004bb3..7de40f631 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_dblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_dblgrave.glyph
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (1224,414);
+pos = (1224,434);
 ref = dblgravecmb;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1348,414);
+pos = (1348,434);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1298,414);
+pos = (1298,434);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_dieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_dieresis.glyph
index 1e04c8460..bf2252887 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_dieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_dieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (154,372);
+pos = (159,372);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (231,372);
+pos = (73,372);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (94,372);
+pos = (186,372);
 ref = dieresis;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (146,414);
+pos = (151,434);
 ref = dieresis;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (228,414);
+pos = (73,434);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (66,414);
+pos = (142,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_dieresisacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_dieresisacute.glyph
index f47442be5..238ada42b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_dieresisacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_dieresisacute.glyph
@@ -11,8 +11,8 @@ ref = U;
 },
 {
 alignment = 1;
-pos = (1138,0);
-ref = dieresisacutecomb.cn;
+pos = (159,0);
+ref = dieresisacutecomb.uc;
 }
 );
 width = 1518;
@@ -25,8 +25,8 @@ ref = U;
 },
 {
 alignment = 1;
-pos = (1146,0);
-ref = dieresisacutecomb.cn;
+pos = (73,0);
+ref = dieresisacutecomb.uc;
 }
 );
 width = 1478;
@@ -39,8 +39,8 @@ ref = U;
 },
 {
 alignment = 1;
-pos = (1140,0);
-ref = dieresisacutecomb.cn;
+pos = (186,0);
+ref = dieresisacutecomb.uc;
 }
 );
 width = 1536;
@@ -53,11 +53,11 @@ ref = U;
 },
 {
 alignment = 1;
-pos = (1130,0);
-ref = dieresisacutecomb.cn;
+pos = (151,0);
+ref = dieresisacutecomb.uc;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -67,8 +67,8 @@ ref = U;
 },
 {
 alignment = 1;
-pos = (1146,0);
-ref = dieresisacutecomb.cn;
+pos = (73,0);
+ref = dieresisacutecomb.uc;
 }
 );
 width = 1444;
@@ -81,8 +81,8 @@ ref = U;
 },
 {
 alignment = 1;
-pos = (1112,0);
-ref = dieresisacutecomb.cn;
+pos = (142,0);
+ref = dieresisacutecomb.uc;
 }
 );
 width = 1352;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_dieresisbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_dieresisbelow.glyph
index b15f0c854..dee8fc0ea 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_dieresisbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_dieresisbelow.glyph
@@ -60,7 +60,7 @@ pos = (1440,0);
 ref = dotdblsubnosp;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 guides = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_dieresiscaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_dieresiscaron.glyph
index 9e2479365..12f4f3cec 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_dieresiscaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_dieresiscaron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1348,414);
-ref = dieresiscaroncomb.cn;
+pos = (159,0);
+ref = dieresiscaroncomb.uc;
 }
 );
 width = 1518;
@@ -23,8 +23,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1444,414);
-ref = dieresiscaroncomb.cn;
+pos = (73,0);
+ref = dieresiscaroncomb.uc;
 }
 );
 width = 1478;
@@ -36,8 +36,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1286,414);
-ref = dieresiscaroncomb.cn;
+pos = (186,0);
+ref = dieresiscaroncomb.uc;
 }
 );
 width = 1536;
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (1340,414);
-ref = dieresiscaroncomb.cn;
+pos = (151,0);
+ref = dieresiscaroncomb.uc;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,8 +62,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1444,414);
-ref = dieresiscaroncomb.cn;
+pos = (73,0);
+ref = dieresiscaroncomb.uc;
 }
 );
 width = 1444;
@@ -75,8 +75,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1258,414);
-ref = dieresiscaroncomb.cn;
+pos = (142,0);
+ref = dieresiscaroncomb.uc;
 }
 );
 width = 1352;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_dieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_dieresiscyrillic.glyph
index c0e917002..1271f6e6e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_dieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_dieresiscyrillic.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (28,372);
+pos = (33,372);
 ref = dieresis;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (223,372);
+pos = (65,372);
 ref = dieresis;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (-84,372);
+pos = (8,372);
 ref = dieresis;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (28,414);
+pos = (33,434);
 ref = dieresis;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (190,414);
+pos = (35,434);
 ref = dieresis;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (-66,414);
+pos = (10,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_dieresisgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_dieresisgrave.glyph
index 6f984830f..ed23ab4f9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_dieresisgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_dieresisgrave.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1348,414);
-ref = dieresisgravecomb.cn;
+pos = (159,0);
+ref = dieresisgravecomb.uc;
 }
 );
 width = 1518;
@@ -23,8 +23,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1434,414);
-ref = dieresisgravecomb.cn;
+pos = (73,0);
+ref = dieresisgravecomb.uc;
 }
 );
 width = 1478;
@@ -36,8 +36,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1292,414);
-ref = dieresisgravecomb.cn;
+pos = (186,0);
+ref = dieresisgravecomb.uc;
 }
 );
 width = 1536;
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (1340,414);
-ref = dieresisgravecomb.cn;
+pos = (151,0);
+ref = dieresisgravecomb.uc;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,8 +62,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1434,414);
-ref = dieresisgravecomb.cn;
+pos = (73,0);
+ref = dieresisgravecomb.uc;
 }
 );
 width = 1444;
@@ -75,8 +75,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1264,414);
-ref = dieresisgravecomb.cn;
+pos = (142,0);
+ref = dieresisgravecomb.uc;
 }
 );
 width = 1352;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_dieresismacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_dieresismacron.glyph
index 68c15bea8..89d6ebe69 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_dieresismacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_dieresismacron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1342,0);
-ref = dieresismacroncomb.cn;
+pos = (159,0);
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1518;
@@ -23,8 +23,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1412,0);
-ref = dieresismacroncomb.cn;
+pos = (73,0);
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1478;
@@ -36,8 +36,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1294,0);
-ref = dieresismacroncomb.cn;
+pos = (186,0);
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1536;
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (1328,0);
-ref = dieresismacroncomb.cn;
+pos = (151,0);
+ref = dieresismacroncomb.uc;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,8 +62,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1410,0);
-ref = dieresismacroncomb.cn;
+pos = (73,0);
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1444;
@@ -75,8 +75,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1268,0);
-ref = dieresismacroncomb.cn;
+pos = (142,0);
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1352;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_dotbelow.glyph
index 2aac2674d..7397d9088 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_dotbelow.glyph
@@ -53,7 +53,7 @@ pos = (1358,0);
 ref = dotbelow;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_grave.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_grave.glyph
index e15ec0313..66a61e372 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_grave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_grave.glyph
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (160,414);
+pos = (160,434);
 ref = grave;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (50,414);
+pos = (50,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (182,414);
+pos = (182,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_hookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_hookabove.glyph
index a35e9680c..597651336 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_hookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_hookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1354,398);
+pos = (1347,372);
 ref = hookabovecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1476,366);
+pos = (1402,372);
 ref = hookabovecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1266,416);
+pos = (1290,372);
 ref = hookabovecmb;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (1346,398);
+pos = (1283,434);
 ref = hookabovecmb;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1476,414);
+pos = (1376,434);
 ref = hookabovecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1238,416);
+pos = (1180,434);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_horn.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_horn.glyph
index dc6c5031b..a8a22054b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_horn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_horn.glyph
@@ -1,26 +1,30 @@
 {
 glyphname = Uhorn;
 kernLeft = U;
-kernRight = U;
+kernRight = Uhorn;
 layers = (
 {
-guides = (
-{
-angle = 90;
-pos = (1844,244);
-},
-{
-pos = (2415,1776);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 ref = U;
 },
 {
-pos = (1030,0);
-ref = _part.rtophorn;
+closed = 1;
+nodes = (
+(1356,1346,ls),
+(1470,1346,o),
+(1526,1402,o),
+(1526,1516,cs),
+(1526,1698,l),
+(1356,1698,l),
+(1356,1508,ls),
+(1356,1497,o),
+(1349,1490,o),
+(1338,1490,cs),
+(1158,1490,l),
+(1158,1346,l)
+);
 }
 );
 width = 1518;
@@ -32,48 +36,76 @@ shapes = (
 ref = U;
 },
 {
-pos = (876,0);
-ref = _part.rtophorn;
+closed = 1;
+nodes = (
+(1290,1250,ls),
+(1434,1250,o),
+(1548,1324,o),
+(1548,1490,cs),
+(1548,1698,l),
+(1200,1698,l),
+(1200,1522,ls),
+(1200,1501,o),
+(1189,1490,o),
+(1168,1490,cs),
+(978,1490,l),
+(978,1250,l)
+);
 }
 );
 width = 1478;
 },
 {
-guides = (
-{
-pos = (2044,1776);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 ref = U;
 },
 {
-pos = (1058,0);
-ref = _part.rtophorn;
+closed = 1;
+nodes = (
+(1375,1444,ls),
+(1454,1444,o),
+(1498,1488,o),
+(1498,1567,cs),
+(1498,1698,l),
+(1452,1698,l),
+(1452,1567,ls),
+(1452,1513,o),
+(1429,1490,o),
+(1375,1490,cs),
+(1258,1490,l),
+(1258,1444,l)
+);
 }
 );
 width = 1536;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (1552,244);
-}
-);
 layerId = m007;
 shapes = (
 {
 ref = U;
 },
 {
-pos = (990,0);
-ref = _part.rtophorn;
+closed = 1;
+nodes = (
+(1312,1350,ls),
+(1426,1350,o),
+(1482,1406,o),
+(1482,1520,cs),
+(1482,1730,l),
+(1312,1730,l),
+(1312,1508,ls),
+(1312,1497,o),
+(1305,1490,o),
+(1294,1490,cs),
+(1120,1490,l),
+(1120,1350,l)
+);
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -82,8 +114,21 @@ shapes = (
 ref = U;
 },
 {
-pos = (874,0);
-ref = _part.rtophorn;
+closed = 1;
+nodes = (
+(1261,1258,ls),
+(1405,1258,o),
+(1519,1320,o),
+(1519,1470,cs),
+(1519,1730,l),
+(1171,1730,l),
+(1171,1522,ls),
+(1171,1501,o),
+(1160,1490,o),
+(1139,1490,cs),
+(960,1490,l),
+(960,1258,l)
+);
 }
 );
 width = 1444;
@@ -96,15 +141,27 @@ shapes = (
 ref = U;
 },
 {
-pos = (1030,0);
-ref = _part.rtophorn;
+closed = 1;
+nodes = (
+(1275,1444,ls),
+(1354,1444,o),
+(1398,1488,o),
+(1398,1567,cs),
+(1398,1730,l),
+(1352,1730,l),
+(1352,1567,ls),
+(1352,1513,o),
+(1329,1490,o),
+(1275,1490,cs),
+(1166,1490,l),
+(1166,1444,l)
+);
 }
 );
 width = 1352;
 }
 );
 metricLeft = U;
-metricRight = T;
 unicode = 431;
 userData = {
 com.typemytype.robofont.guideline.magnetic.w9xhz5LEo8 = 5;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_hornacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_hornacute.glyph
index 0e5d41ab1..f899d7f1f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_hornacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_hornacute.glyph
@@ -49,11 +49,11 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (369,414);
+pos = (369,434);
 ref = acute;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (312,414);
+pos = (312,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (396,414);
+pos = (392,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_horndotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_horndotbelow.glyph
index 8b5c74620..cc4e8b367 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_horndotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_horndotbelow.glyph
@@ -53,7 +53,7 @@ pos = (1358,0);
 ref = dotbelow;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_horngrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_horngrave.glyph
index 53fb505f1..90a6f97d3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_horngrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_horngrave.glyph
@@ -49,11 +49,11 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (160,414);
+pos = (160,434);
 ref = grave;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (50,414);
+pos = (50,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (182,414);
+pos = (182,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_hornhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_hornhookabove.glyph
index 51a30d04b..31456b28d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_hornhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_hornhookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1354,398);
+pos = (1347,372);
 ref = hookabovecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1476,366);
+pos = (1402,372);
 ref = hookabovecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1266,416);
+pos = (1290,372);
 ref = hookabovecmb;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1346,398);
+pos = (1283,434);
 ref = hookabovecmb;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1476,414);
+pos = (1376,434);
 ref = hookabovecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1238,416);
+pos = (1180,434);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_horntilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_horntilde.glyph
index b52d2ec19..256804018 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_horntilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_horntilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (300,0);
-ref = casetilde.cn;
+pos = (248,372);
+ref = tilde;
 }
 );
 width = 1518;
@@ -23,8 +23,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (222,0);
-ref = casetilde.cn;
+pos = (226,372);
+ref = tilde;
 }
 );
 width = 1478;
@@ -36,8 +36,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (344,0);
-ref = casetilde.cn;
+pos = (264,372);
+ref = tilde;
 }
 );
 width = 1536;
@@ -49,11 +49,11 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (292,2);
-ref = casetilde.cn;
+pos = (240,434);
+ref = tilde;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,8 +62,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (222,0);
-ref = casetilde.cn;
+pos = (210,434);
+ref = tilde;
 }
 );
 width = 1444;
@@ -75,8 +75,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (316,0);
-ref = casetilde.cn;
+pos = (228,434);
+ref = tilde;
 }
 );
 width = 1352;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_hungarumlaut.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_hungarumlaut.glyph
index a14ed9ffb..88c9a9e05 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_hungarumlaut.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_hungarumlaut.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (408,384);
+pos = (408,198);
 ref = hungarumlaut;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (348,384);
+pos = (348,198);
 ref = hungarumlaut;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (440,384);
+pos = (440,198);
 ref = hungarumlaut;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (400,384);
+pos = (400,198);
 ref = hungarumlaut;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (348,384);
+pos = (348,198);
 ref = hungarumlaut;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (412,384);
+pos = (412,198);
 ref = hungarumlaut;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_hungarumlautcyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_hungarumlautcyrillic.glyph
index bef9f6624..6bce978aa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_hungarumlautcyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_hungarumlautcyrillic.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (282,384);
+pos = (282,198);
 ref = hungarumlaut;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (340,384);
+pos = (340,198);
 ref = hungarumlaut;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (262,384);
+pos = (262,198);
 ref = hungarumlaut;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (282,384);
+pos = (282,198);
 ref = hungarumlaut;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (310,384);
+pos = (310,198);
 ref = hungarumlaut;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (280,384);
+pos = (280,198);
 ref = hungarumlaut;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_invertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_invertedbreve.glyph
index b91b3d847..8bbf5dcbd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_invertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1416,372);
+pos = (1357,372);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1378,372);
+pos = (1400,372);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1360,372);
+pos = (1350,372);
 ref = breveinvnosp;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (1376,404);
+pos = (1284,434);
 ref = breveinvnosp;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1362,414);
+pos = (1372,434);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1268,414);
+pos = (1205,434);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_macron.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_macron.glyph
index b3ca4ea9d..2c1e5c36f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_macron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_macron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (300,372);
+pos = (160,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (80,372);
+pos = (73,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (468,372);
+pos = (186,372);
 ref = macron;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (292,372);
+pos = (152,434);
 ref = macron;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (80,372);
+pos = (73,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (440,414);
+pos = (142,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_macroncyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_macroncyrillic.glyph
index 2e3b5bf08..f75413a0a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_macroncyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_macroncyrillic.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (174,372);
+pos = (34,372);
 ref = macron;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (72,372);
+pos = (65,372);
 ref = macron;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (290,372);
+pos = (8,372);
 ref = macron;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (174,372);
+pos = (34,434);
 ref = macron;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (42,372);
+pos = (35,434);
 ref = macron;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (308,414);
+pos = (10,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_macrondieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_macrondieresis.glyph
index 732d981a9..fb99c4223 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_macrondieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_macrondieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1348,474);
+pos = (160,0);
 ref = macrondieresiscomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1434,346);
+pos = (73,0);
 ref = macrondieresiscomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1292,550);
+pos = (186,0);
 ref = macrondieresiscomb.cn;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (1340,474);
+pos = (152,0);
 ref = macrondieresiscomb.cn;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1434,346);
+pos = (73,0);
 ref = macrondieresiscomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1264,550);
+pos = (142,0);
 ref = macrondieresiscomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_ogonek.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_ogonek.glyph
index df72fe19c..3c43e1ce9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_ogonek.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_ogonek.glyph
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (508,0);
+pos = (510,0);
 ref = ogonek.U;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_psilon.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_psilon.glyph
index 52932e90a..512e18ff9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_psilon.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_psilon.glyph
@@ -46,7 +46,7 @@ shapes = (
 ref = Y;
 }
 );
-width = 1534;
+width = 1496;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_psilondieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_psilondieresis.glyph
index 92d0b6ea8..f84d00530 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_psilondieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_psilondieresis.glyph
@@ -46,7 +46,7 @@ shapes = (
 ref = Ydieresis;
 }
 );
-width = 1534;
+width = 1496;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_psilondieresishooksymbolgreek.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_psilondieresishooksymbolgreek.glyph
index 7d8be4890..f4faf6a32 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_psilondieresishooksymbolgreek.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_psilondieresishooksymbolgreek.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = Upsilonhooksymbol;
 },
 {
-pos = (72,372);
+pos = (77,372);
 ref = dieresis;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = Upsilonhooksymbol;
 },
 {
-pos = (247,372);
+pos = (89,372);
 ref = dieresis;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = Upsilonhooksymbol;
 },
 {
-pos = (-42,372);
+pos = (50,372);
 ref = dieresis;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = Upsilonhooksymbol;
 },
 {
-pos = (72,414);
+pos = (77,434);
 ref = dieresis;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = Upsilonhooksymbol;
 },
 {
-pos = (244,414);
+pos = (89,434);
 ref = dieresis;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = Upsilonhooksymbol;
 },
 {
-pos = (-42,414);
+pos = (34,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_psilonhooksymbol.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_psilonhooksymbol.glyph
index fd68d2046..6e617a7ff 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_psilonhooksymbol.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_psilonhooksymbol.glyph
@@ -9,7 +9,7 @@ pos = (44,1454);
 },
 {
 name = top;
-pos = (678,1676);
+pos = (678,1490);
 }
 );
 guides = (
@@ -70,7 +70,7 @@ pos = (6,1454);
 },
 {
 name = top;
-pos = (754,1676);
+pos = (754,1490);
 }
 );
 background = {
@@ -166,7 +166,7 @@ pos = (66,1454);
 },
 {
 name = top;
-pos = (632,1676);
+pos = (632,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -220,7 +220,7 @@ pos = (12,1454);
 },
 {
 name = top;
-pos = (646,1676);
+pos = (646,1490);
 }
 );
 guides = (
@@ -281,7 +281,7 @@ pos = (-10,1454);
 },
 {
 name = top;
-pos = (738,1676);
+pos = (738,1490);
 }
 );
 background = {
@@ -377,7 +377,7 @@ pos = (2,1454);
 },
 {
 name = top;
-pos = (568,1676);
+pos = (568,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_ring.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_ring.glyph
index 00dae0f36..a535d9f53 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_ring.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_ring.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (440,0);
+pos = (456,0);
 ref = ring.uc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (296,0);
+pos = (306,0);
 ref = ring.uc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (524,0);
+pos = (528,0);
 ref = ring.uc;
 }
 );
@@ -53,7 +53,7 @@ pos = (432,0);
 ref = ring.uc;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (296,0);
+pos = (290,0);
 ref = ring.uc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (496,0);
+pos = (388,0);
 ref = ring.uc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_straightcyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_straightcyrillic.glyph
index 29cde57d0..02f9eda21 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_straightcyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_straightcyrillic.glyph
@@ -46,7 +46,7 @@ shapes = (
 ref = Y;
 }
 );
-width = 1534;
+width = 1496;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_straightstrokecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_straightstrokecyrillic.glyph
index 43861e1b3..71ac47136 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_straightstrokecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_straightstrokecyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (220,-127);
+pos = (220,-151);
 ref = crossbar;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (274,-165);
+pos = (274,-189);
 ref = crossbar;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (200,-116);
+pos = (200,-139);
 ref = crossbar;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (200,-126);
+pos = (200,-151);
 ref = crossbar;
 }
 );
@@ -62,11 +62,11 @@ shapes = (
 ref = Y;
 },
 {
-pos = (270,-165);
+pos = (252,-189);
 ref = crossbar;
 }
 );
-width = 1534;
+width = 1496;
 },
 {
 layerId = m011;
@@ -75,7 +75,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (218,-116);
+pos = (218,-139);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_tilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_tilde.glyph
index f49320eac..543bc456c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_tilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (300,0);
-ref = casetilde.cn;
+pos = (248,372);
+ref = tilde;
 }
 );
 width = 1518;
@@ -23,8 +23,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (222,0);
-ref = casetilde.cn;
+pos = (226,372);
+ref = tilde;
 }
 );
 width = 1478;
@@ -36,8 +36,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (344,0);
-ref = casetilde.cn;
+pos = (264,372);
+ref = tilde;
 }
 );
 width = 1536;
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (292,2);
-ref = casetilde.cn;
+pos = (240,434);
+ref = tilde;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,8 +62,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (222,0);
-ref = casetilde.cn;
+pos = (210,434);
+ref = tilde;
 }
 );
 width = 1444;
@@ -75,8 +75,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (316,0);
-ref = casetilde.cn;
+pos = (228,434);
+ref = tilde;
 }
 );
 width = 1352;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_tildeacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_tildeacute.glyph
index 3025b0f6d..5a5b8a8a8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_tildeacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_tildeacute.glyph
@@ -71,7 +71,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1118,0);
+pos = (248,372);
 ref = tildeacutecomb.uc;
 }
 );
@@ -145,7 +145,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1134,0);
+pos = (226,372);
 ref = tildeacutecomb.uc;
 }
 );
@@ -158,7 +158,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1140,0);
+pos = (264,372);
 ref = tildeacutecomb.uc;
 }
 );
@@ -232,81 +232,20 @@ shapes = (
 ref = U;
 },
 {
-pos = (1110,0);
+pos = (240,434);
 ref = tildeacutecomb.uc;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(530,1490,l),
-(108,1490,l),
-(108,562,ls),
-(108,231,o),
-(361,22,o),
-(742,20,cs),
-(1123,19,o),
-(1379,231,o),
-(1378,562,cs),
-(1378,1490,l),
-(954,1490,l),
-(954,608,ls),
-(954,455,o),
-(879,372,o),
-(742,372,cs),
-(605,372,o),
-(529,455,o),
-(530,608,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(1024,1583,o),
-(1137,1694,o),
-(1138,1882,c),
-(936,1882,l),
-(933,1819,o),
-(913,1775,o),
-(866,1774,cs),
-(798,1775,o),
-(742,1895,o),
-(596,1896,cs),
-(460,1898,o),
-(347,1790,o),
-(346,1602,c),
-(546,1602,l),
-(551,1655,o),
-(571,1703,o),
-(616,1704,cs),
-(686,1707,o),
-(742,1583,o),
-(888,1582,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(588,1972,l),
-(872,1972,l),
-(1112,2252,l),
-(788,2252,l)
-);
-}
-);
-};
 layerId = m009;
 shapes = (
 {
 ref = U;
 },
 {
-pos = (1134,0);
+pos = (210,434);
 ref = tildeacutecomb.uc;
 }
 );
@@ -319,7 +258,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1112,0);
+pos = (228,434);
 ref = tildeacutecomb.uc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_tildebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_tildebelow.glyph
index efcda58eb..5854b197e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_tildebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_tildebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1384,0);
+pos = (1360,0);
 ref = tildesubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1458,0);
+pos = (1402,0);
 ref = tildesubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1254,0);
+pos = (1349,0);
 ref = tildesubnosp;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = U;
 },
 {
-pos = (1376,0);
+pos = (1288,0);
 ref = tildesubnosp;
 }
 );
-width = 1438;
+width = 1440;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1442,0);
+pos = (1370,0);
 ref = tildesubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1222,0);
+pos = (1207,0);
 ref = tildesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/V_.glyph b/src/Inter-Roman.glyphspackage/glyphs/V_.glyph
index 185e4385d..55fc7f53e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/V_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/V_.glyph
@@ -16,7 +16,7 @@ pos = (692,0);
 },
 {
 name = top;
-pos = (692,1676);
+pos = (692,1490);
 }
 );
 guides = (
@@ -64,7 +64,7 @@ pos = (814,0);
 },
 {
 name = top;
-pos = (814,1676);
+pos = (814,1490);
 }
 );
 guides = (
@@ -142,7 +142,7 @@ pos = (632,0);
 },
 {
 name = top;
-pos = (632,1676);
+pos = (632,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -175,22 +175,7 @@ pos = (669,0);
 },
 {
 name = top;
-pos = (669,1676);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (-6077,476);
-},
-{
-angle = 90;
-pos = (29,2088);
-},
-{
-angle = 90;
-pos = (1269,2196);
+pos = (669,1490);
 }
 );
 layerId = m007;
@@ -223,14 +208,7 @@ pos = (768,0);
 },
 {
 name = top;
-pos = (768,1676);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (-5429,1048);
+pos = (768,1490);
 }
 );
 layerId = m009;
@@ -301,7 +279,7 @@ pos = (586,0);
 },
 {
 name = top;
-pos = (586,1676);
+pos = (586,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/V_tilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/V_tilde.glyph
index 02dd6d264..5bd7924a5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/V_tilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/V_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (232,0);
-ref = casetilde.cn;
+pos = (180,372);
+ref = tilde;
 }
 );
 width = 1384;
@@ -23,8 +23,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (298,0);
-ref = casetilde.cn;
+pos = (302,372);
+ref = tilde;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (208,0);
-ref = casetilde.cn;
+pos = (128,372);
+ref = tilde;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (241,2);
-ref = casetilde.cn;
+pos = (189,434);
+ref = tilde;
 }
 );
 width = 1338;
@@ -62,8 +62,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (268,0);
-ref = casetilde.cn;
+pos = (256,434);
+ref = tilde;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (226,0);
-ref = casetilde.cn;
+pos = (138,434);
+ref = tilde;
 }
 );
 width = 1170;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/W_.glyph b/src/Inter-Roman.glyphspackage/glyphs/W_.glyph
index edad03ae8..e736e029d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/W_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/W_.glyph
@@ -16,7 +16,7 @@ pos = (1006,12);
 },
 {
 name = top;
-pos = (1006,1676);
+pos = (1006,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -57,7 +57,7 @@ pos = (1155,0);
 },
 {
 name = top;
-pos = (1155,1676);
+pos = (1155,1490);
 }
 );
 guides = (
@@ -105,7 +105,7 @@ pos = (955,12);
 },
 {
 name = top;
-pos = (955,1676);
+pos = (955,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -215,17 +215,7 @@ pos = (958,12);
 },
 {
 name = top;
-pos = (958,1676);
-}
-);
-guides = (
-{
-pos = (854,258);
-},
-{
-orientation = center;
-angle = 90;
-pos = (-11327,2096);
+pos = (958,1490);
 }
 );
 layerId = m007;
@@ -266,14 +256,7 @@ pos = (1086,0);
 },
 {
 name = top;
-pos = (1086,1676);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (-10734,2076);
+pos = (1086,1490);
 }
 );
 layerId = m009;
@@ -314,7 +297,7 @@ pos = (886,12);
 },
 {
 name = top;
-pos = (886,1676);
+pos = (886,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/W_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/W_acute.glyph
index 6ae83c53a..c5378aecb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/W_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/W_acute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (607,414);
+pos = (607,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (676,414);
+pos = (676,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (606,414);
+pos = (602,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/W_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/W_circumflex.glyph
index 3dbecb998..e23e92059 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/W_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/W_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (540,372);
+pos = (542,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (509,372);
+pos = (515,372);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (525,372);
+pos = (523,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (524,414);
+pos = (526,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (456,414);
+pos = (458,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (520,414);
+pos = (518,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/W_dieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/W_dieresis.glyph
index 49b36a8ec..b73035f43 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/W_dieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/W_dieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (400,372);
+pos = (405,372);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (648,372);
+pos = (490,372);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (281,372);
+pos = (373,372);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (384,414);
+pos = (389,434);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (592,414);
+pos = (437,434);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (276,414);
+pos = (352,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/W_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/W_dotaccent.glyph
index def27297c..a726edcc2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/W_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/W_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (746,414);
+pos = (746,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (766,414);
+pos = (766,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (764,414);
+pos = (764,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/W_grave.glyph b/src/Inter-Roman.glyphspackage/glyphs/W_grave.glyph
index dfe154963..c9ec57890 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/W_grave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/W_grave.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (398,414);
+pos = (398,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (414,414);
+pos = (414,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (392,414);
+pos = (392,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/X_.glyph b/src/Inter-Roman.glyphspackage/glyphs/X_.glyph
index 4c5afb8d8..9961d3723 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/X_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/X_.glyph
@@ -24,7 +24,7 @@ pos = (1244,0);
 },
 {
 name = top;
-pos = (706,1676);
+pos = (706,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -71,7 +71,7 @@ pos = (1466,0);
 },
 {
 name = top;
-pos = (768,1676);
+pos = (768,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -118,7 +118,7 @@ pos = (1158,0);
 },
 {
 name = top;
-pos = (662,1676);
+pos = (662,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -312,14 +312,7 @@ pos = (1180,0);
 },
 {
 name = top;
-pos = (642,1676);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (-7023,1372);
+pos = (642,1490);
 }
 );
 layerId = m007;
@@ -366,18 +359,7 @@ pos = (1418,0);
 },
 {
 name = top;
-pos = (726,1676);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (-5919,2152);
-},
-{
-angle = 90;
-pos = (-40,2084);
+pos = (726,1490);
 }
 );
 layerId = m009;
@@ -424,7 +406,7 @@ pos = (1066,0);
 },
 {
 name = top;
-pos = (570,1676);
+pos = (570,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/X_dieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/X_dieresis.glyph
index 510d97818..6e0f85f14 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/X_dieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/X_dieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = X;
 },
 {
-pos = (100,372);
+pos = (105,372);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = X;
 },
 {
-pos = (261,372);
+pos = (103,372);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = X;
 },
 {
-pos = (-12,372);
+pos = (80,372);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = X;
 },
 {
-pos = (68,414);
+pos = (73,434);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = X;
 },
 {
-pos = (232,414);
+pos = (77,434);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = X;
 },
 {
-pos = (-40,414);
+pos = (36,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/X_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/X_dotaccent.glyph
index e33671f4a..474ccb96a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/X_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/X_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = X;
 },
 {
-pos = (430,414);
+pos = (430,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = X;
 },
 {
-pos = (406,414);
+pos = (406,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = X;
 },
 {
-pos = (448,414);
+pos = (448,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_.circled.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_.circled.glyph
index 15a7dbd49..4b7ea08b2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_.circled.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_.circled.glyph
@@ -79,7 +79,7 @@ alignment = 1;
 ref = largeCircle;
 },
 {
-pos = (656,0);
+pos = (674,0);
 ref = Y;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_.glyph
index da2e882a3..be12fac93 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_.glyph
@@ -28,7 +28,7 @@ pos = (-2,1490);
 },
 {
 name = top;
-pos = (680,1676);
+pos = (680,1490);
 }
 );
 guides = (
@@ -90,7 +90,7 @@ pos = (-58,1490);
 },
 {
 name = top;
-pos = (794,1676);
+pos = (794,1490);
 }
 );
 guides = (
@@ -144,7 +144,7 @@ pos = (40,1490);
 },
 {
 name = top;
-pos = (624,1676);
+pos = (624,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -258,14 +258,7 @@ pos = (-34,1490);
 },
 {
 name = top;
-pos = (648,1676);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (-5343,1360);
+pos = (648,1490);
 }
 );
 layerId = m007;
@@ -312,14 +305,7 @@ pos = (-104,1490);
 },
 {
 name = top;
-pos = (748,1676);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (-3760,1724);
+pos = (748,1490);
 }
 );
 layerId = m009;
@@ -366,7 +352,7 @@ pos = (-6,1490);
 },
 {
 name = top;
-pos = (578,1676);
+pos = (578,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_.squared.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_.squared.glyph
index ad99df916..b833a7eac 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_.squared.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_.squared.glyph
@@ -79,7 +79,7 @@ alignment = 1;
 ref = whiteLargeSquare;
 },
 {
-pos = (647,0);
+pos = (665,0);
 ref = Y;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_acute.glyph
index 449d7148a..715b6cc84 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_acute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (297,414);
+pos = (297,434);
 ref = acute;
 }
 );
@@ -62,11 +62,11 @@ shapes = (
 ref = Y;
 },
 {
-pos = (356,414);
+pos = (338,434);
 ref = acute;
 }
 );
-width = 1534;
+width = 1496;
 },
 {
 layerId = m011;
@@ -75,7 +75,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (298,414);
+pos = (294,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_circumflex.glyph
index b22a70912..a94ce29a2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (214,372);
+pos = (216,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (148,372);
+pos = (154,372);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (194,372);
+pos = (192,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (214,414);
+pos = (216,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (118,414);
+pos = (120,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (212,414);
+pos = (210,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_dieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_dieresis.glyph
index 8479f3dbf..90060370c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_dieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_dieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (74,372);
+pos = (79,372);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (287,372);
+pos = (129,372);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (-50,372);
+pos = (42,372);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (74,414);
+pos = (79,434);
 ref = dieresis;
 }
 );
@@ -62,11 +62,11 @@ shapes = (
 ref = Y;
 },
 {
-pos = (272,414);
+pos = (99,434);
 ref = dieresis;
 }
 );
-width = 1534;
+width = 1496;
 },
 {
 layerId = m011;
@@ -75,7 +75,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (-32,414);
+pos = (44,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_dotaccent.glyph
index 22ca3abbf..6cfda2cfa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (436,414);
+pos = (436,434);
 ref = dotaccent;
 }
 );
@@ -62,11 +62,11 @@ shapes = (
 ref = Y;
 },
 {
-pos = (446,414);
+pos = (428,434);
 ref = dotaccent;
 }
 );
-width = 1534;
+width = 1496;
 },
 {
 layerId = m011;
@@ -75,7 +75,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (456,414);
+pos = (456,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_erudieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_erudieresiscyrillic.glyph
index 7c6b7c2e2..186899290 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_erudieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_erudieresiscyrillic.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = afii10045;
 },
 {
-pos = (264,372);
+pos = (269,372);
 ref = dieresis;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = afii10045;
 },
 {
-pos = (419,372);
+pos = (261,372);
 ref = dieresis;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = afii10045;
 },
 {
-pos = (139,372);
+pos = (231,372);
 ref = dieresis;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = afii10045;
 },
 {
-pos = (251,414);
+pos = (256,434);
 ref = dieresis;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = afii10045;
 },
 {
-pos = (412,414);
+pos = (257,434);
 ref = dieresis;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = afii10045;
 },
 {
-pos = (107,414);
+pos = (183,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_grave.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_grave.glyph
index 655d3b941..c4afa4e6a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_grave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_grave.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (88,414);
+pos = (88,434);
 ref = grave;
 }
 );
@@ -62,11 +62,11 @@ shapes = (
 ref = Y;
 },
 {
-pos = (94,414);
+pos = (76,434);
 ref = grave;
 }
 );
-width = 1534;
+width = 1496;
 },
 {
 layerId = m011;
@@ -75,7 +75,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (84,414);
+pos = (84,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_hookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_hookabove.glyph
index bdd7d7fc5..25f1a6fc4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_hookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_hookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1274,398);
+pos = (1267,372);
 ref = hookabovecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1532,366);
+pos = (1458,372);
 ref = hookabovecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1122,416);
+pos = (1146,372);
 ref = hookabovecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1274,398);
+pos = (1211,434);
 ref = hookabovecmb;
 }
 );
@@ -62,11 +62,11 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1520,414);
+pos = (1402,434);
 ref = hookabovecmb;
 }
 );
-width = 1534;
+width = 1496;
 },
 {
 layerId = m011;
@@ -75,7 +75,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1140,416);
+pos = (1082,434);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_i-cy.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_i-cy.1.glyph
index 048487ce8..94305294f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_i-cy.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_i-cy.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-152,372);
+pos = (-148,372);
 ref = dieresis;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (11,372);
+pos = (-146,372);
 ref = dieresis;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-314,372);
+pos = (-222,372);
 ref = dieresis;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-152,414);
+pos = (-148,434);
 ref = dieresis;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (12,414);
+pos = (-148,434);
 ref = dieresis;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-318,414);
+pos = (-242,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_ogonek.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_ogonek.glyph
index 4da669661..a06821be8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_ogonek.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_ogonek.glyph
@@ -62,11 +62,11 @@ shapes = (
 ref = Y;
 },
 {
-pos = (401,0);
+pos = (383,0);
 ref = ogonek;
 }
 );
-width = 1534;
+width = 1496;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_tilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_tilde.glyph
index e1e64ae8b..7bee16b5a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_tilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (220,0);
-ref = casetilde.cn;
+pos = (168,372);
+ref = tilde;
 }
 );
 width = 1362;
@@ -23,8 +23,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (278,0);
-ref = casetilde.cn;
+pos = (282,372);
+ref = tilde;
 }
 );
 width = 1588;
@@ -36,8 +36,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (200,0);
-ref = casetilde.cn;
+pos = (120,372);
+ref = tilde;
 }
 );
 width = 1248;
@@ -49,8 +49,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (220,2);
-ref = casetilde.cn;
+pos = (168,434);
+ref = tilde;
 }
 );
 width = 1298;
@@ -62,8 +62,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (248,0);
-ref = casetilde.cn;
+pos = (236,434);
+ref = tilde;
 }
 );
 width = 1496;
@@ -75,8 +75,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (218,0);
-ref = casetilde.cn;
+pos = (130,434);
+ref = tilde;
 }
 );
 width = 1156;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Z_.glyph b/src/Inter-Roman.glyphspackage/glyphs/Z_.glyph
index 19af7bf47..95102bddb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Z_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Z_.glyph
@@ -24,7 +24,7 @@ pos = (654,768);
 },
 {
 name = top;
-pos = (640,1676);
+pos = (640,1490);
 }
 );
 guides = (
@@ -81,7 +81,7 @@ pos = (742,788);
 },
 {
 name = top;
-pos = (716,1676);
+pos = (716,1490);
 }
 );
 guides = (
@@ -150,7 +150,7 @@ pos = (620,744);
 },
 {
 name = top;
-pos = (620,1676);
+pos = (620,1490);
 }
 );
 guides = (
@@ -203,21 +203,7 @@ pos = (622,768);
 },
 {
 name = top;
-pos = (608,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (1300,248);
-},
-{
-angle = 90;
-pos = (-124,1280);
-},
-{
-angle = 90;
-pos = (580,2156);
+pos = (608,1490);
 }
 );
 layerId = m007;
@@ -260,33 +246,17 @@ pos = (726,788);
 },
 {
 name = top;
-pos = (700,1676);
+pos = (700,1490);
 }
 );
 guides = (
 {
-pos = (-84,1552);
-},
-{
 angle = 55.0453;
 pos = (1596,1788);
 },
 {
 angle = 55.0343;
 pos = (40,276);
-},
-{
-angle = 90;
-pos = (36,1664);
-},
-{
-angle = 90;
-pos = (1588,384);
-},
-{
-orientation = center;
-angle = 90;
-pos = (-2487,800);
 }
 );
 layerId = m009;
@@ -329,7 +299,7 @@ pos = (556,744);
 },
 {
 name = top;
-pos = (556,1676);
+pos = (556,1490);
 }
 );
 guides = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Z_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/Z_acute.glyph
index bc6bfd843..2596395f4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Z_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Z_acute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (257,414);
+pos = (257,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (290,414);
+pos = (290,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (276,414);
+pos = (272,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Z_bar.glyph b/src/Inter-Roman.glyphspackage/glyphs/Z_bar.glyph
index 431373bcd..ba4d127a8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Z_bar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Z_bar.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (194,47);
+pos = (194,23);
 ref = crossbar;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (222,67);
+pos = (222,43);
 ref = crossbar;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (196,22);
+pos = (196,-1);
 ref = crossbar;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (174,48);
+pos = (174,23);
 ref = crossbar;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (230,67);
+pos = (230,43);
 ref = crossbar;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (196,22);
+pos = (196,-1);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Z_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/Z_caron.glyph
index acfcaa3e8..aa62310dd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Z_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Z_caron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (190,388);
+pos = (188,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (174,414);
+pos = (174,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (70,414);
+pos = (72,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (188,414);
+pos = (188,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Z_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/Z_circumflex.glyph
index 9ffbc1de6..ecf3083c7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Z_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Z_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (174,372);
+pos = (176,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (70,372);
+pos = (76,372);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (190,372);
+pos = (188,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (174,414);
+pos = (176,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (70,414);
+pos = (72,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (190,414);
+pos = (188,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Z_dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/Z_dotaccent.glyph
index 702fb24c1..69009c99a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Z_dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Z_dotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (396,414);
+pos = (396,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (380,414);
+pos = (380,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (434,414);
+pos = (434,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Z_edescendercyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/Z_edescendercyrillic.glyph
index c47f8bedc..d3949614d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Z_edescendercyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Z_edescendercyrillic.glyph
@@ -48,7 +48,7 @@ shapes = (
 ref = afii10025;
 },
 {
-pos = (412,0);
+pos = (368,0);
 ref = cedilla;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Z_edieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/Z_edieresiscyrillic.glyph
index 76d4f26e2..393420841 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Z_edieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Z_edieresiscyrillic.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = afii10025;
 },
 {
-pos = (52,372);
+pos = (55,372);
 ref = dieresis;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = afii10025;
 },
 {
-pos = (185,372);
+pos = (23,372);
 ref = dieresis;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = afii10025;
 },
 {
-pos = (-40,372);
+pos = (52,372);
 ref = dieresis;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = afii10025;
 },
 {
-pos = (84,414);
+pos = (47,434);
 ref = dieresis;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = afii10025;
 },
 {
-pos = (198,414);
+pos = (23,434);
 ref = dieresis;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = afii10025;
 },
 {
-pos = (24,414);
+pos = (36,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Z_hebrevecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/Z_hebrevecyrillic.glyph
index db3b523d9..489c32a65 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Z_hebrevecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Z_hebrevecyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (560,372);
+pos = (636,372);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (680,372);
+pos = (712,372);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (546,372);
+pos = (610,372);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (528,414);
+pos = (556,434);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (616,414);
+pos = (632,434);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (454,414);
+pos = (518,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Z_hedieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/Z_hedieresiscyrillic.glyph
index 6eca22416..e6bea35d8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Z_hedieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Z_hedieresiscyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (414,372);
+pos = (419,372);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (685,372);
+pos = (527,372);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (288,372);
+pos = (380,372);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (382,414);
+pos = (387,434);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (618,414);
+pos = (463,434);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (260,414);
+pos = (336,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Z_linebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/Z_linebelow.glyph
index f94e71d09..ef57918d0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Z_linebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Z_linebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1240,0);
+pos = (1232,0);
 ref = macronsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1340,0);
+pos = (1378,0);
 ref = macronsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1226,0);
+pos = (1195,0);
 ref = macronsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1240,0);
+pos = (1162,0);
 ref = macronsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1340,0);
+pos = (1341,0);
 ref = macronsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1226,0);
+pos = (1085,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/_part.cyrtic_hook.glyph b/src/Inter-Roman.glyphspackage/glyphs/_part.cyrtic_hook.glyph
index 6aaecfcb8..2f9784571 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/_part.cyrtic_hook.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/_part.cyrtic_hook.glyph
@@ -247,7 +247,6 @@ width = 374;
 tags = (
 "TODO-opsz"
 );
-unicode = 57620;
 userData = {
 interface.gridadjust.original = "{'width': 712, 'leftMargin': -89, 'rightMargin': 199}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/_part.lambdabar.glyph b/src/Inter-Roman.glyphspackage/glyphs/_part.lambdabar.glyph
new file mode 100644
index 000000000..a164cfdfc
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/_part.lambdabar.glyph
@@ -0,0 +1,132 @@
+{
+export = 0;
+glyphname = _part.lambdabar;
+layers = (
+{
+anchors = (
+{
+name = _bar;
+pos = (457,1249);
+}
+);
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+closed = 1;
+nodes = (
+(650,1313,l),
+(650,1364,l),
+(256,1178,l),
+(256,1127,l)
+);
+}
+);
+width = 1230;
+},
+{
+anchors = (
+{
+name = _bar;
+pos = (394,1236);
+}
+);
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(591,1305,l),
+(574,1348,l),
+(180,1161,l),
+(197,1119,l)
+);
+}
+);
+width = 1102;
+},
+{
+anchors = (
+{
+name = _bar;
+pos = (507,1236);
+}
+);
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+closed = 1;
+nodes = (
+(751,1247,l),
+(751,1404,l),
+(259,1214,l),
+(259,1061,l)
+);
+}
+);
+width = 1292;
+},
+{
+anchors = (
+{
+name = _bar;
+pos = (474,1239);
+}
+);
+layerId = m007;
+shapes = (
+{
+closed = 1;
+nodes = (
+(751,1264,l),
+(700,1403,l),
+(179,1202,l),
+(227,1063,l)
+);
+}
+);
+width = 1228;
+},
+{
+anchors = (
+{
+name = _bar;
+pos = (593,1158);
+}
+);
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+closed = 1;
+nodes = (
+(942,1198,l),
+(942,1314,l),
+(222,1102,l),
+(222,980,l)
+);
+}
+);
+width = 1420;
+},
+{
+anchors = (
+{
+name = _bar;
+pos = (585,1150);
+}
+);
+layerId = m009;
+shapes = (
+{
+closed = 1;
+nodes = (
+(934,1182,l),
+(892,1311,l),
+(227,1109,l),
+(263,976,l)
+);
+}
+);
+width = 1388;
+}
+);
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/_part.rtophorn.glyph b/src/Inter-Roman.glyphspackage/glyphs/_part.rtophorn.glyph
deleted file mode 100644
index 188fca691..000000000
--- a/src/Inter-Roman.glyphspackage/glyphs/_part.rtophorn.glyph
+++ /dev/null
@@ -1,252 +0,0 @@
-{
-export = 0;
-glyphname = _part.rtophorn;
-layers = (
-{
-anchors = (
-{
-name = _rtophorn;
-pos = (198,1490);
-}
-);
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-shapes = (
-{
-closed = 1;
-nodes = (
-(392,1446,o),
-(475,1546,o),
-(475,1756,c),
-(429,1756,l),
-(429,1569,o),
-(364,1490,o),
-(198,1490,c),
-(198,1446,l)
-);
-}
-);
-width = 666;
-},
-{
-anchors = (
-{
-name = _rtophorn;
-pos = (128,1490);
-}
-);
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-shapes = (
-{
-closed = 1;
-nodes = (
-(400,1395,o),
-(524,1538,o),
-(524,1776,c),
-(364,1776,l),
-(364,1579,o),
-(291,1490,o),
-(128,1490,c),
-(193,1395,l)
-);
-}
-);
-width = 720;
-},
-{
-anchors = (
-{
-name = _rtophorn;
-pos = (102,1490);
-}
-);
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-shapes = (
-{
-closed = 1;
-nodes = (
-(512,1304,o),
-(695,1451,o),
-(703,1756,c),
-(404,1756,l),
-(396,1550,o),
-(319,1490,o),
-(102,1490,c),
-(193,1304,l)
-);
-}
-);
-width = 809;
-},
-{
-anchors = (
-{
-name = _rtophorn;
-pos = (86,1490);
-}
-);
-layerId = m009;
-shapes = (
-{
-closed = 1;
-nodes = (
-(445,1288,o),
-(727,1393,o),
-(727,1778,c),
-(388,1778,l),
-(388,1572,o),
-(303,1490,o),
-(86,1490,c),
-(86,1288,l)
-);
-}
-);
-width = 777;
-},
-{
-anchors = (
-{
-name = _rtophorn;
-pos = (134,1490);
-}
-);
-layerId = m011;
-shapes = (
-{
-closed = 1;
-nodes = (
-(328,1446,o),
-(411,1546,o),
-(411,1756,c),
-(365,1756,l),
-(365,1569,o),
-(300,1490,o),
-(134,1490,c),
-(134,1446,l)
-);
-}
-);
-width = 538;
-},
-{
-anchors = (
-{
-name = _rtophorn;
-pos = (86,1490);
-}
-);
-associatedMasterId = m009;
-layerId = "DB8373F9-DF6B-4CD5-B5A5-D49F75EC4571";
-name = "Jun 4, 22, 10:14";
-shapes = (
-{
-closed = 1;
-nodes = (
-(203,1288,ls),
-(325,1292,o),
-(421,1314,o),
-(492,1349,cs),
-(635,1420,o),
-(691,1546,o),
-(691,1776,c),
-(395,1776,l),
-(395,1700,o),
-(389,1642,o),
-(372,1599,cs),
-(339,1512,o),
-(254,1499,o),
-(86,1490,c),
-(86,1284,l)
-);
-}
-);
-width = 777;
-},
-{
-anchors = (
-{
-name = _rtophorn;
-pos = (128,1490);
-}
-);
-associatedMasterId = m007;
-layerId = "9D30917E-B633-4681-AC2B-09E0EB72539F";
-name = "Jun 4, 22, 11:36";
-shapes = (
-{
-closed = 1;
-nodes = (
-(202,1357,ls),
-(301,1357,o),
-(394,1388,o),
-(459,1440,cs),
-(549,1512,o),
-(592,1618,o),
-(592,1776,c),
-(424,1776,l),
-(424,1679,o),
-(400,1607,o),
-(351,1560,cs),
-(302,1513,o),
-(229,1490,o),
-(128,1490,c),
-(128,1357,l)
-);
-}
-);
-width = 720;
-},
-{
-anchors = (
-{
-name = _rtophorn;
-pos = (128,1490);
-}
-);
-layerId = m007;
-name = "Regular Display";
-shapes = (
-{
-closed = 1;
-nodes = (
-(386,1367,o),
-(531,1502,o),
-(531,1776,c),
-(364,1776,l),
-(364,1579,o),
-(291,1490,o),
-(128,1490,c),
-(128,1367,l)
-);
-}
-);
-width = 720;
-},
-{
-anchors = (
-{
-name = _rtophorn;
-pos = (128,1490);
-}
-);
-associatedMasterId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-layerId = "F415874C-693F-4528-938E-94A60D3562A7";
-name = "Jun 4, 22, 12:07";
-shapes = (
-{
-closed = 1;
-nodes = (
-(430,1368,o),
-(572,1521,o),
-(572,1776,c),
-(404,1776,l),
-(404,1582,o),
-(318,1490,o),
-(128,1490,c),
-(193,1368,l)
-);
-}
-);
-width = 720;
-}
-);
-}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/_part.rtophorn.o.glyph b/src/Inter-Roman.glyphspackage/glyphs/_part.rtophorn.o.glyph
deleted file mode 100644
index 275f680d0..000000000
--- a/src/Inter-Roman.glyphspackage/glyphs/_part.rtophorn.o.glyph
+++ /dev/null
@@ -1,349 +0,0 @@
-{
-export = 0;
-glyphname = _part.rtophorn.o;
-layers = (
-{
-anchors = (
-{
-name = _tophorn;
-pos = (594,1134);
-}
-);
-background = {
-shapes = (
-{
-ref = o;
-}
-);
-};
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-shapes = (
-{
-closed = 1;
-nodes = (
-(892,1090,o),
-(1056,1171,o),
-(1056,1400,c),
-(1010,1400,l),
-(1010,1197,o),
-(864,1134,o),
-(594,1134,c),
-(594,1090,l)
-);
-}
-);
-width = 1186;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (530,1134);
-}
-);
-background = {
-shapes = (
-{
-ref = o;
-}
-);
-};
-layerId = m011;
-shapes = (
-{
-closed = 1;
-nodes = (
-(828,1090,o),
-(992,1171,o),
-(992,1400,c),
-(946,1400,l),
-(946,1197,o),
-(800,1134,o),
-(530,1134,c),
-(530,1090,l)
-);
-}
-);
-width = 1058;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (562,1080);
-}
-);
-background = {
-shapes = (
-{
-ref = o;
-}
-);
-};
-guides = (
-{
-pos = (914,1342);
-}
-);
-layerId = m007;
-shapes = (
-{
-closed = 1;
-nodes = (
-(873,957,o),
-(1052,1068,o),
-(1052,1342,c),
-(885,1342,l),
-(885,1162,o),
-(774,1080,o),
-(562,1080,c),
-(562,957,l)
-);
-}
-);
-width = 1124;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (640,1132);
-}
-);
-background = {
-shapes = (
-{
-ref = o;
-}
-);
-};
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-shapes = (
-{
-closed = 1;
-nodes = (
-(972,946,o),
-(1216,1063,o),
-(1222,1384,c),
-(923,1384,l),
-(915,1178,o),
-(857,1132,o),
-(640,1132,c),
-(640,946,l)
-);
-}
-);
-width = 1280;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (622,1080);
-}
-);
-background = {
-shapes = (
-{
-ref = o;
-}
-);
-};
-layerId = m009;
-shapes = (
-{
-closed = 1;
-nodes = (
-(981,878,o),
-(1208,959,o),
-(1208,1344,c),
-(869,1344,l),
-(869,1138,o),
-(831,1080,o),
-(622,1080,c),
-(622,878,l)
-);
-}
-);
-width = 1244;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (814,1510);
-}
-);
-associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-layerId = "7A5B171D-341B-4290-8F7A-2C166B71D0C9";
-name = "Jun 4, 22, 10:03";
-shapes = (
-{
-closed = 1;
-nodes = (
-(1083,1342,o),
-(1186,1373,o),
-(1261,1426,cs),
-(1367,1501,o),
-(1422,1619,o),
-(1422,1772,c),
-(1121,1772,l),
-(1117,1672,o),
-(1092,1609,o),
-(1041,1569,cs),
-(993,1531,o),
-(920,1512,o),
-(814,1510,c),
-(814,1312,l)
-);
-}
-);
-width = 1630;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (128,1262);
-}
-);
-associatedMasterId = m009;
-layerId = "49102609-91A7-4BC2-BD33-728E54B45F75";
-name = "Jun 4, 22, 10:47";
-shapes = (
-{
-closed = 1;
-nodes = (
-(550,1064,o),
-(784,1199,o),
-(784,1443,cs),
-(784,1524,l),
-(507,1524,l),
-(507,1483,ls),
-(507,1322,o),
-(412,1262,o),
-(128,1262,c),
-(128,1064,l)
-);
-}
-);
-width = 936;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (281,1134);
-}
-);
-associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-layerId = "9C09B263-A1A6-4544-B751-69985AB295E5";
-name = "Jun 4, 22, 10:55";
-shapes = (
-{
-closed = 1;
-nodes = (
-(445,1284,o),
-(396,1218,o),
-(243,1180,c),
-(256,1134,l),
-(434,1172,o),
-(492,1260,o),
-(491,1442,c),
-(445,1442,l)
-);
-}
-);
-width = 718;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (223,1118);
-}
-);
-associatedMasterId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-layerId = "D71CEA6D-75AC-43DE-ADCE-6E1CF78A54FD";
-name = "Jun 4, 22, 11:25";
-shapes = (
-{
-closed = 1;
-nodes = (
-(441,1360,o),
-(375,1262,o),
-(223,1262,c),
-(223,1118,l),
-(482,1118,o),
-(613,1267,o),
-(613,1530,c),
-(441,1530,l)
-);
-}
-);
-width = 832;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (610,1132);
-}
-);
-background = {
-shapes = (
-{
-ref = o;
-}
-);
-};
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-name = Regular;
-shapes = (
-{
-closed = 1;
-nodes = (
-(921,1013,o),
-(1098,1142,o),
-(1098,1404,c),
-(933,1404,l),
-(933,1236,o),
-(814,1132,o),
-(610,1132,c),
-(610,1013,l)
-);
-}
-);
-width = 1222;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (223,1056);
-}
-);
-associatedMasterId = m007;
-layerId = "94D1381D-3781-4FA5-A4BB-471CC1C8545C";
-name = "Jun 4, 22, 11:29";
-shapes = (
-{
-closed = 1;
-nodes = (
-(441,1298,o),
-(375,1200,o),
-(223,1200,c),
-(223,1056,l),
-(482,1056,o),
-(613,1205,o),
-(613,1468,c),
-(441,1468,l)
-);
-}
-);
-width = 840;
-}
-);
-metricWidth = o;
-note = "Based on /_part.rtophorn";
-}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/_part.t_base.glyph b/src/Inter-Roman.glyphspackage/glyphs/_part.t_base.glyph
index a0eed8a24..acc9b70b5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/_part.t_base.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/_part.t_base.glyph
@@ -18,7 +18,7 @@ pos = (546,4);
 },
 {
 name = top;
-pos = (290,1490);
+pos = (291,1384);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -63,7 +63,7 @@ pos = (664,6);
 },
 {
 name = top;
-pos = (320,1490);
+pos = (317,1384);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -108,7 +108,7 @@ pos = (788,18);
 },
 {
 name = top;
-pos = (376,1542);
+pos = (375,1384);
 }
 );
 guides = (
@@ -162,7 +162,7 @@ pos = (584,0);
 },
 {
 name = top;
-pos = (285,1490);
+pos = (285,1344);
 }
 );
 layerId = m007;
@@ -293,7 +293,7 @@ pos = (776,0);
 },
 {
 name = top;
-pos = (358,1542);
+pos = (358,1344);
 }
 );
 layerId = m009;
@@ -339,7 +339,7 @@ pos = (482,0);
 },
 {
 name = top;
-pos = (227,1490);
+pos = (227,1344);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/a.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/a.1.glyph
index c97a4938e..5a1098773 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/a.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/a.1.glyph
@@ -19,12 +19,8 @@ name = ogonek;
 pos = (992,0);
 },
 {
-name = rhalfring;
-pos = (584,1304);
-},
-{
 name = top;
-pos = (582,1304);
+pos = (582,1118);
 },
 {
 name = topr;
@@ -92,12 +88,8 @@ name = ogonek;
 pos = (1088,0);
 },
 {
-name = rhalfring;
-pos = (614,1304);
-},
-{
 name = top;
-pos = (626,1304);
+pos = (626,1118);
 },
 {
 name = topr;
@@ -165,12 +157,8 @@ name = ogonek;
 pos = (1220,0);
 },
 {
-name = rhalfring;
-pos = (680,1304);
-},
-{
 name = top;
-pos = (670,1304);
+pos = (670,1118);
 },
 {
 name = topr;
@@ -238,24 +226,14 @@ name = ogonek;
 pos = (1034,0);
 },
 {
-name = rhalfring;
-pos = (565,1262);
-},
-{
 name = top;
-pos = (568,1262);
+pos = (568,1056);
 },
 {
 name = topr;
 pos = (1034,1056);
 }
 );
-guides = (
-{
-angle = 90;
-pos = (552,1155);
-}
-);
 layerId = m007;
 shapes = (
 {
@@ -317,12 +295,8 @@ name = ogonek;
 pos = (1188,0);
 },
 {
-name = rhalfring;
-pos = (664,1262);
-},
-{
 name = top;
-pos = (654,1262);
+pos = (654,1056);
 },
 {
 name = topr;
@@ -390,12 +364,8 @@ name = ogonek;
 pos = (984,0);
 },
 {
-name = rhalfring;
-pos = (530,1262);
-},
-{
 name = top;
-pos = (530,1262);
+pos = (530,1056);
 },
 {
 name = topr;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/a.glyph b/src/Inter-Roman.glyphspackage/glyphs/a.glyph
index b2f37391f..171fc7e05 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/a.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/a.glyph
@@ -15,12 +15,8 @@ name = ogonek;
 pos = (998,0);
 },
 {
-name = rhalfring;
-pos = (584,1304);
-},
-{
 name = top;
-pos = (596,1304);
+pos = (596,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -79,7 +75,7 @@ nodes = (
 );
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 anchors = (
@@ -92,12 +88,8 @@ name = ogonek;
 pos = (1120,0);
 },
 {
-name = rhalfring;
-pos = (626,1304);
-},
-{
 name = top;
-pos = (616,1304);
+pos = (616,1118);
 }
 );
 background = {
@@ -156,11 +148,6 @@ nodes = (
 }
 );
 };
-guides = (
-{
-pos = (-24,2280);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
@@ -217,7 +204,7 @@ nodes = (
 );
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 anchors = (
@@ -230,18 +217,8 @@ name = ogonek;
 pos = (904,0);
 },
 {
-name = rhalfring;
-pos = (556,1304);
-},
-{
 name = top;
-pos = (552,1304);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (748,1616);
+pos = (552,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -300,7 +277,7 @@ nodes = (
 );
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 anchors = (
@@ -313,21 +290,8 @@ name = ogonek;
 pos = (934,0);
 },
 {
-name = rhalfring;
-pos = (540,1262);
-},
-{
 name = top;
-pos = (552,1262);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (280,1092);
-},
-{
-pos = (252,0);
+pos = (532,1056);
 }
 );
 layerId = m007;
@@ -386,7 +350,7 @@ nodes = (
 );
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 anchors = (
@@ -630,17 +594,8 @@ name = ogonek;
 pos = (1092,0);
 },
 {
-name = rhalfring;
-pos = (586,1262);
-},
-{
 name = top;
-pos = (576,1262);
-}
-);
-guides = (
-{
-pos = (-132,2280);
+pos = (576,1056);
 }
 );
 layerId = m009;
@@ -700,7 +655,7 @@ nodes = (
 );
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 anchors = (
@@ -997,12 +952,8 @@ name = ogonek;
 pos = (848,0);
 },
 {
-name = rhalfring;
-pos = (500,1262);
-},
-{
 name = top;
-pos = (496,1262);
+pos = (496,1056);
 }
 );
 background = {
@@ -1119,7 +1070,7 @@ nodes = (
 );
 }
 );
-width = 1014;
+width = 1000;
 },
 {
 anchors = (
@@ -1758,7 +1709,6 @@ nodes = (
 width = 974;
 }
 );
-metricRight = n;
 tags = (
 "TODO-opsz-thin"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aacute.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/aacute.1.glyph
index 560ec7718..28347f6a6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aacute.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aacute.1.glyph
@@ -82,7 +82,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (250,0);
+pos = (246,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/aacute.glyph
index 523002690..27bcab818 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aacute.glyph
@@ -14,7 +14,7 @@ pos = (244,0);
 ref = acute;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -49,11 +49,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (201,0);
+pos = (181,0);
 ref = acute;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -66,7 +66,7 @@ pos = (166,0);
 ref = acute;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -75,7 +75,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (216,0);
+pos = (212,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abreve.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/abreve.1.glyph
index 4b10b9caa..5a04f9082 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abreve.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abreve.1.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (166,0);
+pos = (230,0);
 ref = breve;
 }
 );
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (166,0);
+pos = (242,0);
 ref = breve;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (158,0);
+pos = (190,0);
 ref = breve;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (140,0);
+pos = (168,0);
 ref = breve;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (158,0);
+pos = (174,0);
 ref = breve;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (114,0);
+pos = (178,0);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/abreve.glyph
index b335750d3..fafc15221 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abreve.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (136,0);
+pos = (212,0);
 ref = breve;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (104,0);
+pos = (136,0);
 ref = breve;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (136,0);
+pos = (200,0);
 ref = breve;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (124,0);
+pos = (132,0);
 ref = breve;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (80,0);
+pos = (96,0);
 ref = breve;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (80,0);
+pos = (144,0);
 ref = breve;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 259;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abreveacute.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/abreveacute.1.glyph
index 150a9839e..604328ca2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abreveacute.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abreveacute.1.glyph
@@ -13,7 +13,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (236,-14);
+pos = (230,0);
 ref = breveacutecomb.cn;
 }
 );
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (160,0);
+pos = (242,0);
 ref = breveacutecomb.cn;
 }
 );
@@ -43,7 +43,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (150,24);
+pos = (190,0);
 ref = breveacutecomb.cn;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (134,-42);
+pos = (168,0);
 ref = breveacutecomb.cn;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (150,-18);
+pos = (174,0);
 ref = breveacutecomb.cn;
 }
 );
@@ -88,7 +88,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (248,-56);
+pos = (178,0);
 ref = breveacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abreveacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/abreveacute.glyph
index 4e650196c..a24edab67 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abreveacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abreveacute.glyph
@@ -11,11 +11,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (130,0);
+pos = (212,0);
 ref = breveacutecomb.cn;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -25,11 +25,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (96,24);
+pos = (136,0);
 ref = breveacutecomb.cn;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -39,11 +39,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (206,-14);
+pos = (200,0);
 ref = breveacutecomb.cn;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -53,11 +53,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (118,-42);
+pos = (132,0);
 ref = breveacutecomb.cn;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -67,11 +67,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (72,-18);
+pos = (96,0);
 ref = breveacutecomb.cn;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -81,11 +81,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (214,-56);
+pos = (144,0);
 ref = breveacutecomb.cn;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 7855;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevecyrillic.glyph
index 935d4f408..ef24e0fee 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevecyrillic.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (136,0);
+pos = (212,0);
 ref = breve;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,7 +23,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (104,0);
+pos = (136,0);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (136,0);
+pos = (200,0);
 ref = breve;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (124,0);
+pos = (132,0);
 ref = breve;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (80,0);
+pos = (96,0);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (80,0);
+pos = (144,0);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevedotbelow.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevedotbelow.1.glyph
index 9ea561ac3..a2da88ef9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevedotbelow.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevedotbelow.1.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (166,0);
+pos = (230,0);
 ref = breve;
 },
 {
@@ -30,7 +30,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (166,0);
+pos = (242,0);
 ref = breve;
 },
 {
@@ -48,7 +48,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (158,0);
+pos = (190,0);
 ref = breve;
 },
 {
@@ -66,7 +66,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (140,0);
+pos = (168,0);
 ref = breve;
 },
 {
@@ -84,7 +84,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (158,0);
+pos = (174,0);
 ref = breve;
 },
 {
@@ -102,7 +102,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (114,0);
+pos = (178,0);
 ref = breve;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevedotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevedotbelow.glyph
index c964fd315..498bd51e2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevedotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevedotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (136,0);
+pos = (212,0);
 ref = breve;
 },
 {
@@ -18,7 +18,7 @@ pos = (1194,0);
 ref = dotbelow;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -27,7 +27,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (104,0);
+pos = (136,0);
 ref = breve;
 },
 {
@@ -44,7 +44,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (136,0);
+pos = (200,0);
 ref = breve;
 },
 {
@@ -61,7 +61,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (124,0);
+pos = (132,0);
 ref = breve;
 },
 {
@@ -69,7 +69,7 @@ pos = (1164,0);
 ref = dotbelow;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -78,7 +78,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (80,0);
+pos = (96,0);
 ref = breve;
 },
 {
@@ -95,7 +95,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (80,0);
+pos = (144,0);
 ref = breve;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevegrave.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevegrave.1.glyph
index 0412f2c08..c1d8d507b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevegrave.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevegrave.1.glyph
@@ -13,7 +13,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (236,-14);
+pos = (230,0);
 ref = brevegravecomb.cn;
 }
 );
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (160,0);
+pos = (242,0);
 ref = brevegravecomb.cn;
 }
 );
@@ -43,7 +43,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (150,24);
+pos = (190,0);
 ref = brevegravecomb.cn;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (134,-42);
+pos = (168,0);
 ref = brevegravecomb.cn;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (150,-18);
+pos = (174,0);
 ref = brevegravecomb.cn;
 }
 );
@@ -88,7 +88,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (248,-56);
+pos = (178,0);
 ref = brevegravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevegrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevegrave.glyph
index 198650601..a650dc5c7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevegrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevegrave.glyph
@@ -11,11 +11,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (130,0);
+pos = (212,0);
 ref = brevegravecomb.cn;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -25,11 +25,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (96,24);
+pos = (136,0);
 ref = brevegravecomb.cn;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -39,11 +39,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (206,-14);
+pos = (200,0);
 ref = brevegravecomb.cn;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -53,11 +53,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (118,-42);
+pos = (132,0);
 ref = brevegravecomb.cn;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -67,11 +67,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (72,-18);
+pos = (96,0);
 ref = brevegravecomb.cn;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -81,11 +81,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (214,-56);
+pos = (144,0);
 ref = brevegravecomb.cn;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 7857;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevehookabove.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevehookabove.1.glyph
index 7a54733cb..f80d0f607 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevehookabove.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevehookabove.1.glyph
@@ -13,7 +13,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (206,38);
+pos = (230,0);
 ref = brevehookcomb.cn;
 }
 );
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (154,22);
+pos = (242,0);
 ref = brevehookcomb.cn;
 }
 );
@@ -43,7 +43,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (150,-8);
+pos = (190,0);
 ref = brevehookcomb.cn;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (128,-20);
+pos = (168,0);
 ref = brevehookcomb.cn;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (150,-50);
+pos = (174,0);
 ref = brevehookcomb.cn;
 }
 );
@@ -88,7 +88,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (218,-4);
+pos = (178,0);
 ref = brevehookcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevehookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevehookabove.glyph
index dca031088..1756d3c50 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevehookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevehookabove.glyph
@@ -11,11 +11,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (124,22);
+pos = (212,0);
 ref = brevehookcomb.cn;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -25,11 +25,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (96,-8);
+pos = (136,0);
 ref = brevehookcomb.cn;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -39,11 +39,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (176,38);
+pos = (200,0);
 ref = brevehookcomb.cn;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -53,11 +53,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (112,-20);
+pos = (132,0);
 ref = brevehookcomb.cn;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -67,11 +67,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (72,-50);
+pos = (96,0);
 ref = brevehookcomb.cn;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -81,11 +81,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (184,-4);
+pos = (144,0);
 ref = brevehookcomb.cn;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 7859;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevetilde.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevetilde.1.glyph
index 2f494775c..7488ce367 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevetilde.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevetilde.1.glyph
@@ -13,7 +13,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (188,54);
+pos = (230,0);
 ref = brevetildecomb.cn;
 }
 );
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (158,30);
+pos = (242,0);
 ref = brevetildecomb.cn;
 }
 );
@@ -43,7 +43,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (146,-8);
+pos = (190,0);
 ref = brevetildecomb.cn;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (132,-12);
+pos = (168,0);
 ref = brevetildecomb.cn;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (146,-50);
+pos = (174,0);
 ref = brevetildecomb.cn;
 }
 );
@@ -88,7 +88,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (200,12);
+pos = (178,0);
 ref = brevetildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevetilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevetilde.glyph
index bbfdc9e95..40ce64ffe 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevetilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevetilde.glyph
@@ -11,11 +11,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (128,30);
+pos = (212,0);
 ref = brevetildecomb.cn;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -25,11 +25,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (92,-8);
+pos = (136,0);
 ref = brevetildecomb.cn;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -39,11 +39,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (158,54);
+pos = (200,0);
 ref = brevetildecomb.cn;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -53,11 +53,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (116,-12);
+pos = (132,0);
 ref = brevetildecomb.cn;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -67,11 +67,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (68,-50);
+pos = (96,0);
 ref = brevetildecomb.cn;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -81,11 +81,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (166,12);
+pos = (144,0);
 ref = brevetildecomb.cn;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 7861;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acaron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/acaron.1.glyph
index 8b58a7b98..43a5b7aaa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acaron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acaron.1.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (152,16);
+pos = (150,0);
 ref = caron;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (24,0);
+pos = (26,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/acaron.glyph
index 5cf10bffe..f7eb4e869 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acaron.glyph
@@ -14,7 +14,7 @@ pos = (130,0);
 ref = caron;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -36,7 +36,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (122,16);
+pos = (120,0);
 ref = caron;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (118,0);
+pos = (98,0);
 ref = caron;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (-54,0);
+pos = (-52,0);
 ref = caron;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflex.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflex.1.glyph
index bb105b7b1..aa2815a50 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflex.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflex.1.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (152,0);
+pos = (150,0);
 ref = circumflex;
 }
 );
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (160,0);
+pos = (162,0);
 ref = circumflex;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (24,0);
+pos = (30,0);
 ref = circumflex;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (134,0);
+pos = (136,0);
 ref = circumflex;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (24,0);
+pos = (26,0);
 ref = circumflex;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (164,0);
+pos = (162,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflex.glyph
index 23059842b..45e8d0892 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflex.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (130,0);
+pos = (132,0);
 ref = circumflex;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (-30,0);
+pos = (-24,0);
 ref = circumflex;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (122,0);
+pos = (120,0);
 ref = circumflex;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (118,0);
+pos = (100,0);
 ref = circumflex;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (-54,0);
+pos = (-52,0);
 ref = circumflex;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (130,0);
+pos = (128,0);
 ref = circumflex;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 226;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflexacute.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflexacute.1.glyph
index 84bb07eb3..e57643926 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflexacute.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflexacute.1.glyph
@@ -13,7 +13,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (278,26);
+pos = (150,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (212,4);
+pos = (162,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -43,7 +43,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (246,-38);
+pos = (30,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (186,-38);
+pos = (136,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (246,-80);
+pos = (26,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -88,7 +88,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (290,-16);
+pos = (162,0);
 ref = circumflexacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflexacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflexacute.glyph
index a82f3c6ed..a2171936c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflexacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflexacute.glyph
@@ -11,11 +11,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (182,4);
+pos = (132,0);
 ref = circumflexacutecomb.cn;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -25,11 +25,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (192,-38);
+pos = (-24,0);
 ref = circumflexacutecomb.cn;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -39,11 +39,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (248,26);
+pos = (120,0);
 ref = circumflexacutecomb.cn;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -53,11 +53,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (170,-38);
+pos = (100,0);
 ref = circumflexacutecomb.cn;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -67,11 +67,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (168,-80);
+pos = (-52,0);
 ref = circumflexacutecomb.cn;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -81,11 +81,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (256,-16);
+pos = (128,0);
 ref = circumflexacutecomb.cn;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 7845;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflexdotbelow.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflexdotbelow.1.glyph
index 327d51e0d..b8bcd95a7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflexdotbelow.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflexdotbelow.1.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (152,0);
+pos = (150,0);
 ref = circumflex;
 },
 {
@@ -30,7 +30,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (160,0);
+pos = (162,0);
 ref = circumflex;
 },
 {
@@ -48,7 +48,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (24,0);
+pos = (30,0);
 ref = circumflex;
 },
 {
@@ -66,7 +66,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (134,0);
+pos = (136,0);
 ref = circumflex;
 },
 {
@@ -84,7 +84,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (24,0);
+pos = (26,0);
 ref = circumflex;
 },
 {
@@ -102,7 +102,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (164,0);
+pos = (162,0);
 ref = circumflex;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflexdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflexdotbelow.glyph
index eab63f4ad..f574e2806 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflexdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflexdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (130,0);
+pos = (132,0);
 ref = circumflex;
 },
 {
@@ -18,7 +18,7 @@ pos = (1194,0);
 ref = dotbelow;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -27,7 +27,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (-30,0);
+pos = (-24,0);
 ref = circumflex;
 },
 {
@@ -44,7 +44,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (122,0);
+pos = (120,0);
 ref = circumflex;
 },
 {
@@ -61,7 +61,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (118,0);
+pos = (100,0);
 ref = circumflex;
 },
 {
@@ -69,7 +69,7 @@ pos = (1164,0);
 ref = dotbelow;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -78,7 +78,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (-54,0);
+pos = (-52,0);
 ref = circumflex;
 },
 {
@@ -95,7 +95,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (130,0);
+pos = (128,0);
 ref = circumflex;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflexgrave.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflexgrave.1.glyph
index 93cc82659..ce4174a86 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflexgrave.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflexgrave.1.glyph
@@ -13,7 +13,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (82,64);
+pos = (150,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (-66,22);
+pos = (160,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -43,7 +43,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (-128,-52);
+pos = (-128,-238);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (-92,-20);
+pos = (134,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (-128,-94);
+pos = (22,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -88,7 +88,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (94,22);
+pos = (94,-184);
 ref = circumflexgravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflexgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflexgrave.glyph
index d21d0cd06..40faa1eef 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflexgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflexgrave.glyph
@@ -11,11 +11,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (-96,22);
+pos = (130,0);
 ref = circumflexgravecomb.cn;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -25,11 +25,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (-182,-52);
+pos = (-36,0);
 ref = circumflexgravecomb.cn;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -39,11 +39,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (52,64);
+pos = (120,0);
 ref = circumflexgravecomb.cn;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -53,11 +53,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (-108,-20);
+pos = (98,0);
 ref = circumflexgravecomb.cn;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -67,11 +67,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (-206,-94);
+pos = (-56,0);
 ref = circumflexgravecomb.cn;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -81,11 +81,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (60,22);
+pos = (132,0);
 ref = circumflexgravecomb.cn;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 7847;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflexhookabove.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflexhookabove.1.glyph
index e97b08bc4..5fd293230 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflexhookabove.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflexhookabove.1.glyph
@@ -13,7 +13,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (230,-6);
+pos = (150,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (152,-16);
+pos = (162,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -43,7 +43,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (160,-38);
+pos = (30,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (126,-58);
+pos = (136,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (160,-80);
+pos = (26,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -88,7 +88,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (242,-48);
+pos = (162,0);
 ref = circumflexhookcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflexhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflexhookabove.glyph
index bcad14375..36a158159 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflexhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflexhookabove.glyph
@@ -11,11 +11,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (122,-16);
+pos = (132,0);
 ref = circumflexhookcomb.cn;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -25,11 +25,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (106,-38);
+pos = (-24,0);
 ref = circumflexhookcomb.cn;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -39,11 +39,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (200,-6);
+pos = (120,0);
 ref = circumflexhookcomb.cn;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -53,11 +53,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (110,-58);
+pos = (100,0);
 ref = circumflexhookcomb.cn;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -67,11 +67,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (82,-80);
+pos = (-52,0);
 ref = circumflexhookcomb.cn;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -81,11 +81,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (208,-48);
+pos = (128,0);
 ref = circumflexhookcomb.cn;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 7849;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflextilde.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflextilde.1.glyph
index b7ddcd86a..cdc5148db 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflextilde.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflextilde.1.glyph
@@ -13,7 +13,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (152,-42);
+pos = (150,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (70,-38);
+pos = (162,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -43,7 +43,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (42,-28);
+pos = (42,-214);
 ref = circumflextildecomb.cn;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (44,-80);
+pos = (136,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (42,-70);
+pos = (26,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -88,7 +88,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (164,-84);
+pos = (164,-290);
 ref = circumflextildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflextilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflextilde.glyph
index af9413494..9df95c21d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflextilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflextilde.glyph
@@ -11,11 +11,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (40,-38);
+pos = (132,0);
 ref = circumflextildecomb.cn;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -25,11 +25,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (-12,-28);
+pos = (-24,0);
 ref = circumflextildecomb.cn;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -39,11 +39,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (122,-42);
+pos = (120,0);
 ref = circumflextildecomb.cn;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -53,11 +53,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (28,-80);
+pos = (100,0);
 ref = circumflextildecomb.cn;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -67,11 +67,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (-36,-70);
+pos = (-52,0);
 ref = circumflextildecomb.cn;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -81,11 +81,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (130,-84);
+pos = (128,0);
 ref = circumflextildecomb.cn;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 7851;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/acute.glyph
index dc134b99e..a5b0363e0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acute.glyph
@@ -6,11 +6,11 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (352,1304);
+pos = (352,1118);
 },
 {
 name = top;
-pos = (352,1676);
+pos = (352,1532);
 }
 );
 background = {
@@ -59,11 +59,11 @@ width = 890;
 anchors = (
 {
 name = _top;
-pos = (390,1304);
+pos = (390,1118);
 },
 {
 name = top;
-pos = (390,1676);
+pos = (390,1582);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -84,11 +84,11 @@ width = 994;
 anchors = (
 {
 name = _top;
-pos = (280,1304);
+pos = (280,1118);
 },
 {
 name = top;
-pos = (284,1676);
+pos = (284,1594);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -136,11 +136,11 @@ width = 1018;
 anchors = (
 {
 name = _top;
-pos = (351,1262);
+pos = (351,1056);
 },
 {
 name = top;
-pos = (351,1676);
+pos = (351,1490);
 }
 );
 guides = (
@@ -167,11 +167,11 @@ width = 911;
 anchors = (
 {
 name = _top;
-pos = (410,1262);
+pos = (410,1056);
 },
 {
 name = top;
-pos = (410,1676);
+pos = (410,1490);
 }
 );
 guides = (
@@ -198,11 +198,11 @@ width = 1082;
 anchors = (
 {
 name = _top;
-pos = (280,1262);
+pos = (284,1056);
 },
 {
 name = top;
-pos = (284,1676);
+pos = (284,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acutedotcomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/acutedotcomb.cn.glyph
index a3536ee2f..08c1cbbf6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acutedotcomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acutedotcomb.cn.glyph
@@ -233,5 +233,4 @@ width = 0;
 tags = (
 "TODO-opsz"
 );
-unicode = 57627;
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acutedotcomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/acutedotcomb.lc.glyph
index 915c0a7cc..f57306d70 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acutedotcomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acutedotcomb.lc.glyph
@@ -257,5 +257,4 @@ width = 0;
 tags = (
 "TODO-opsz"
 );
-unicode = 57604;
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/acyrillic.glyph
index 3032e6b3f..1c3eda1ff 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -37,7 +37,7 @@ shapes = (
 ref = a;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/adblgrave.glyph
index e289d7a37..85fc5f317 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adblgrave.glyph
@@ -14,7 +14,7 @@ pos = (1068,0);
 ref = dblgravecmb;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -49,11 +49,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1056,0);
+pos = (1036,0);
 ref = dblgravecmb;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adieresis.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/adieresis.1.glyph
index 71ac9365a..c22bc0c56 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adieresis.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adieresis.1.glyph
@@ -12,7 +12,6 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (-92,0);
 ref = dieresis;
 }
 );
@@ -26,7 +25,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (20,0);
+pos = (25,0);
 ref = dieresis;
 }
 );
@@ -40,7 +39,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (163,0);
+pos = (5,0);
 ref = dieresis;
 }
 );
@@ -54,7 +53,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (-6,0);
+pos = (-1,0);
 ref = dieresis;
 }
 );
@@ -68,7 +67,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (160,0);
+pos = (5,0);
 ref = dieresis;
 }
 );
@@ -82,7 +81,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (-80,0);
+pos = (-4,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/adieresis.glyph
index 43f2517e5..bbc4418e7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adieresis.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (-10,0);
+pos = (-5,0);
 ref = dieresis;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,7 +23,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (109,0);
+pos = (-49,0);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (-122,0);
+pos = (-30,0);
 ref = dieresis;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (-22,0);
+pos = (-37,0);
 ref = dieresis;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -62,20 +62,102 @@ shapes = (
 ref = a;
 },
 {
-pos = (82,0);
+pos = (-73,0);
 ref = dieresis;
 }
 );
 width = 1178;
 },
 {
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(113,86,o),
+(238,-16,o),
+(435,-16,cs),
+(649,-16,o),
+(798,93,o),
+(851,275,c),
+(853,275,l),
+(853,1,l),
+(886,1,l),
+(886,701,ls),
+(886,938,o),
+(752,1072,o),
+(530,1072,cs),
+(315,1072,o),
+(167,950,o),
+(149,726,c),
+(182,726,l),
+(198,933,o),
+(332,1042,o),
+(530,1042,cs),
+(733,1042,o),
+(851,926,o),
+(851,701,cs),
+(851,633,o),
+(788,610,o),
+(700,595,cs),
+(417,549,ls),
+(225,522,o),
+(113,427,o),
+(113,260,c),
+(113,260,l),
+(113,260,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(261,14,o),
+(147,106,o),
+(147,262,cs),
+(147,412,o),
+(251,493,o),
+(424,522,cs),
+(705,565,ls),
+(764,575,o),
+(826,594,o),
+(851,632,c),
+(851,461,ls),
+(851,167,o),
+(678,14,o),
+(435,14,c),
+(435,14,l),
+(435,14,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(754,1495,l),
+(719,1495,l),
+(719,1314,l),
+(754,1314,l),
+(754,1314,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(346,1495,l),
+(311,1495,l),
+(311,1314,l),
+(346,1314,l),
+(346,1314,l)
+);
+}
+);
+};
 layerId = m011;
 shapes = (
 {
 ref = a;
 },
 {
-pos = (-114,0);
+pos = (-38,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/adieresiscyrillic.glyph
index f8e93a2fe..83300ee05 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adieresiscyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = adieresis;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -37,7 +37,7 @@ shapes = (
 ref = adieresis;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adieresismacron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/adieresismacron.1.glyph
index 227dcf417..66a36d262 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adieresismacron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adieresismacron.1.glyph
@@ -13,7 +13,6 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1236,-46);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -28,7 +27,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1208,-18);
+pos = (25,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -43,7 +42,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1344,-32);
+pos = (5,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -58,7 +57,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1176,-60);
+pos = (-1,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -73,7 +72,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1342,-74);
+pos = (5,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -88,7 +87,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1250,-88);
+pos = (-4,0);
 ref = dieresismacroncomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adieresismacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/adieresismacron.glyph
index 1cbfd8ab2..44b06c754 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adieresismacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adieresismacron.glyph
@@ -11,11 +11,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1178,-18);
+pos = (-5,0);
 ref = dieresismacroncomb.lc;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -25,7 +25,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1290,-32);
+pos = (-49,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -39,7 +39,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1206,-46);
+pos = (-30,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -53,11 +53,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1160,-60);
+pos = (-37,0);
 ref = dieresismacroncomb.lc;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -67,7 +67,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1264,-74);
+pos = (-73,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -81,7 +81,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1216,-88);
+pos = (-38,0);
 ref = dieresismacroncomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/adotbelow.glyph
index 9e72bc28c..e68916c36 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adotbelow.glyph
@@ -14,7 +14,7 @@ pos = (1194,0);
 ref = dotbelow;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -53,7 +53,7 @@ pos = (1164,0);
 ref = dotbelow;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adotmacron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/adotmacron.1.glyph
index 9601e4b56..4cba09d7c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adotmacron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adotmacron.1.glyph
@@ -13,7 +13,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1234,0);
+pos = (396,0);
 ref = dotmacroncomb.lc;
 }
 );
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1216,0);
+pos = (382,0);
 ref = dotmacroncomb.lc;
 }
 );
@@ -43,7 +43,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1374,0);
+pos = (336,0);
 ref = dotmacroncomb.lc;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1190,0);
+pos = (356,0);
 ref = dotmacroncomb.lc;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1374,0);
+pos = (334,0);
 ref = dotmacroncomb.lc;
 }
 );
@@ -88,7 +88,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1250,0);
+pos = (408,0);
 ref = dotmacroncomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adotmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/adotmacron.glyph
index fbdbfacf7..4dd358eb7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adotmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adotmacron.glyph
@@ -11,11 +11,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1186,0);
+pos = (352,0);
 ref = dotmacroncomb.lc;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -25,7 +25,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1320,0);
+pos = (282,0);
 ref = dotmacroncomb.lc;
 }
 );
@@ -39,7 +39,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1204,0);
+pos = (366,0);
 ref = dotmacroncomb.lc;
 }
 );
@@ -53,11 +53,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1174,0);
+pos = (320,0);
 ref = dotmacroncomb.lc;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -67,7 +67,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1296,0);
+pos = (256,0);
 ref = dotmacroncomb.lc;
 }
 );
@@ -81,7 +81,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1216,0);
+pos = (374,0);
 ref = dotmacroncomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ae.glyph b/src/Inter-Roman.glyphspackage/glyphs/ae.glyph
index 3054f94a1..50902e70a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ae.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ae.glyph
@@ -7,7 +7,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (944,1304);
+pos = (944,1118);
 }
 );
 background = {
@@ -100,7 +100,7 @@ width = 1890;
 anchors = (
 {
 name = top;
-pos = (902,1304);
+pos = (902,1118);
 }
 );
 background = {
@@ -240,7 +240,7 @@ width = 1852;
 anchors = (
 {
 name = top;
-pos = (930,1304);
+pos = (930,1118);
 }
 );
 background = {
@@ -329,7 +329,7 @@ width = 1900;
 anchors = (
 {
 name = top;
-pos = (888,1262);
+pos = (888,1056);
 }
 );
 background = {
@@ -561,7 +561,7 @@ width = 1756;
 anchors = (
 {
 name = top;
-pos = (874,1262);
+pos = (874,1056);
 }
 );
 background = {
@@ -830,7 +830,7 @@ width = 1785;
 anchors = (
 {
 name = top;
-pos = (860,1262);
+pos = (860,1056);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aeacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/aeacute.glyph
index 169bbc2f2..55c9b68d9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aeacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aeacute.glyph
@@ -75,7 +75,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (594,0);
+pos = (590,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aemacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/aemacron.glyph
index 8b150aa3e..7317ea4f2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aemacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aemacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (484,0);
+pos = (344,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (244,0);
+pos = (237,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (630,0);
+pos = (348,0);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (432,-42);
+pos = (292,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (246,-42);
+pos = (239,0);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (638,0);
+pos = (340,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10023.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10023.glyph
index 006383a04..7e49a34f5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10023.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10023.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (22,372);
+pos = (27,372);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (131,372);
+pos = (-27,372);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-40,372);
+pos = (52,372);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (22,414);
+pos = (27,434);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (136,414);
+pos = (-19,434);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-40,414);
+pos = (36,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10024.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10024.glyph
index 8dfc008c5..dca9d340f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10024.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10024.glyph
@@ -11,7 +11,7 @@ pos = (1872,0);
 },
 {
 name = top;
-pos = (1020,1676);
+pos = (1020,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -55,7 +55,7 @@ pos = (2280,0);
 },
 {
 name = top;
-pos = (1192,1676);
+pos = (1192,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -99,7 +99,7 @@ pos = (1764,0);
 },
 {
 name = top;
-pos = (962,1676);
+pos = (962,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -143,7 +143,7 @@ pos = (1805,0);
 },
 {
 name = top;
-pos = (956,1676);
+pos = (956,1490);
 }
 );
 layerId = m007;
@@ -187,7 +187,7 @@ pos = (2160,0);
 },
 {
 name = top;
-pos = (1112,1676);
+pos = (1112,1490);
 }
 );
 layerId = m009;
@@ -231,7 +231,7 @@ pos = (1672,0);
 },
 {
 name = top;
-pos = (870,1676);
+pos = (870,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10025.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10025.glyph
index bd52ca093..845c082c5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10025.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10025.glyph
@@ -7,10 +7,6 @@ anchors = (
 {
 name = cedilla;
 pos = (660,0);
-},
-{
-name = top;
-pos = (658,1676);
 }
 );
 guides = (
@@ -34,23 +30,11 @@ anchors = (
 {
 name = cedilla;
 pos = (696,0);
-},
-{
-name = top;
-pos = (692,1676);
 }
 );
 guides = (
 {
 pos = (-36,2280);
-},
-{
-pos = (-36,764);
-},
-{
-orientation = center;
-angle = 90;
-pos = (896,1076);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -67,10 +51,6 @@ anchors = (
 {
 name = cedilla;
 pos = (640,0);
-},
-{
-name = top;
-pos = (634,1676);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -86,11 +66,7 @@ width = 1256;
 anchors = (
 {
 name = cedilla;
-pos = (660,0);
-},
-{
-name = top;
-pos = (658,1676);
+pos = (616,0);
 }
 );
 guides = (
@@ -103,7 +79,6 @@ pos = (916,1044);
 layerId = m007;
 shapes = (
 {
-alignment = 1;
 ref = three;
 }
 );
@@ -114,10 +89,6 @@ anchors = (
 {
 name = cedilla;
 pos = (696,0);
-},
-{
-name = top;
-pos = (692,1676);
 }
 );
 guides = (
@@ -126,11 +97,6 @@ pos = (-36,2280);
 },
 {
 pos = (-36,764);
-},
-{
-orientation = center;
-angle = 90;
-pos = (896,1076);
 }
 );
 layerId = m009;
@@ -147,10 +113,6 @@ anchors = (
 {
 name = cedilla;
 pos = (640,0);
-},
-{
-name = top;
-pos = (634,1676);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10027.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10027.glyph
index e686c92ac..6ab4fb868 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10027.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10027.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (314,372);
+pos = (388,372);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (226,372);
+pos = (260,372);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (374,372);
+pos = (438,372);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (302,414);
+pos = (336,434);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (258,414);
+pos = (276,434);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (310,414);
+pos = (374,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10029.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10029.glyph
index 448ae4b72..972931e0b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10029.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10029.glyph
@@ -12,6 +12,10 @@ pos = (738,0);
 {
 name = cyrtic;
 pos = (1278,0);
+},
+{
+name = top;
+pos = (730,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -49,6 +53,10 @@ pos = (762,0);
 {
 name = cyrtic;
 pos = (1454,0);
+},
+{
+name = top;
+pos = (775,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -86,6 +94,10 @@ pos = (748,0);
 {
 name = cyrtic;
 pos = (1208,0);
+},
+{
+name = top;
+pos = (720,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -123,6 +135,10 @@ pos = (706,0);
 {
 name = cyrtic;
 pos = (1246,0);
+},
+{
+name = top;
+pos = (698,1490);
 }
 );
 layerId = m007;
@@ -160,6 +176,10 @@ pos = (720,0);
 {
 name = cyrtic;
 pos = (1412,0);
+},
+{
+name = top;
+pos = (746,1490);
 }
 );
 layerId = m009;
@@ -197,6 +217,10 @@ pos = (702,0);
 {
 name = cyrtic;
 pos = (1162,0);
+},
+{
+name = top;
+pos = (665,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10037.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10037.glyph
index cbb2a4e40..36f4b11cf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10037.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10037.glyph
@@ -7,7 +7,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (634,1676);
+pos = (634,1490);
 }
 );
 background = {
@@ -67,7 +67,7 @@ width = 1276;
 anchors = (
 {
 name = top;
-pos = (730,1676);
+pos = (730,1490);
 }
 );
 guides = (
@@ -108,7 +108,7 @@ width = 1464;
 anchors = (
 {
 name = top;
-pos = (590,1676);
+pos = (590,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -141,7 +141,7 @@ width = 1166;
 anchors = (
 {
 name = top;
-pos = (602,1676);
+pos = (602,1490);
 }
 );
 background = {
@@ -201,7 +201,7 @@ width = 1212;
 anchors = (
 {
 name = top;
-pos = (684,1676);
+pos = (684,1490);
 }
 );
 guides = (
@@ -242,7 +242,7 @@ width = 1372;
 anchors = (
 {
 name = top;
-pos = (544,1676);
+pos = (544,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10045.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10045.glyph
index f8186fa41..409d9cc32 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10045.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10045.glyph
@@ -7,7 +7,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (870,1676);
+pos = (870,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -27,7 +27,7 @@ width = 1741;
 anchors = (
 {
 name = top;
-pos = (926,1676);
+pos = (926,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -47,7 +47,7 @@ width = 1852;
 anchors = (
 {
 name = top;
-pos = (813,1676);
+pos = (813,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -67,7 +67,7 @@ width = 1625;
 anchors = (
 {
 name = top;
-pos = (825,1676);
+pos = (825,1490);
 }
 );
 layerId = m007;
@@ -87,7 +87,7 @@ width = 1650;
 anchors = (
 {
 name = top;
-pos = (906,1676);
+pos = (906,1490);
 }
 );
 layerId = m009;
@@ -107,7 +107,7 @@ width = 1813;
 anchors = (
 {
 name = top;
-pos = (717,1676);
+pos = (717,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10047.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10047.glyph
index 8fc790738..da72d4c3d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10047.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10047.glyph
@@ -7,7 +7,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (686,1676);
+pos = (686,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -61,7 +61,7 @@ width = 1372;
 anchors = (
 {
 name = top;
-pos = (736,1676);
+pos = (736,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -115,7 +115,7 @@ width = 1474;
 anchors = (
 {
 name = top;
-pos = (660,1676);
+pos = (660,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -169,7 +169,7 @@ width = 1316;
 anchors = (
 {
 name = top;
-pos = (654,1676);
+pos = (654,1490);
 }
 );
 layerId = m007;
@@ -223,7 +223,7 @@ width = 1308;
 anchors = (
 {
 name = top;
-pos = (686,1676);
+pos = (686,1490);
 }
 );
 layerId = m009;
@@ -277,7 +277,7 @@ width = 1374;
 anchors = (
 {
 name = top;
-pos = (596,1676);
+pos = (596,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10052.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10052.glyph
index a8bdcc987..15c94363a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10052.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10052.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (249,414);
+pos = (249,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (212,414);
+pos = (212,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (288,414);
+pos = (284,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10061.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10061.glyph
index 95ebd9dd9..e6ab02d69 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10061.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10061.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (291,414);
+pos = (291,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (310,414);
+pos = (310,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (292,414);
+pos = (288,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10062.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10062.glyph
index ace2851a9..cd80d9e0c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10062.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10062.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (174,372);
+pos = (250,372);
 ref = breve;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (218,372);
+pos = (250,372);
 ref = breve;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (174,372);
+pos = (238,372);
 ref = breve;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (174,414);
+pos = (202,434);
 ref = breve;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (188,414);
+pos = (204,434);
 ref = breve;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (128,414);
+pos = (192,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10146.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10146.glyph
index c79cf6948..bba436404 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10146.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10146.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = "Softsign-cy";
 },
 {
-pos = (-174,455);
+pos = (-174,431);
 ref = crossbar;
 }
 );
@@ -22,7 +22,7 @@ shapes = (
 ref = "Softsign-cy";
 },
 {
-pos = (-178,457);
+pos = (-178,433);
 ref = crossbar;
 }
 );
@@ -35,7 +35,7 @@ shapes = (
 ref = "Softsign-cy";
 },
 {
-pos = (-169,454);
+pos = (-169,431);
 ref = crossbar;
 }
 );
@@ -48,7 +48,7 @@ shapes = (
 ref = "Softsign-cy";
 },
 {
-pos = (-194,456);
+pos = (-194,431);
 ref = crossbar;
 }
 );
@@ -61,7 +61,7 @@ shapes = (
 ref = "Softsign-cy";
 },
 {
-pos = (-166,457);
+pos = (-166,433);
 ref = crossbar;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = "Softsign-cy";
 },
 {
-pos = (-169,454);
+pos = (-169,431);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10148.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10148.glyph
index d4456a8b7..000c343f7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10148.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10148.glyph
@@ -7,7 +7,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (716,1676);
+pos = (716,1490);
 }
 );
 background = {
@@ -57,7 +57,7 @@ width = 1432;
 anchors = (
 {
 name = top;
-pos = (824,1676);
+pos = (824,1490);
 }
 );
 background = {
@@ -123,7 +123,7 @@ width = 1646;
 anchors = (
 {
 name = top;
-pos = (664,1676);
+pos = (664,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -156,7 +156,7 @@ width = 1328;
 anchors = (
 {
 name = top;
-pos = (684,1676);
+pos = (684,1490);
 }
 );
 background = {
@@ -206,7 +206,7 @@ width = 1368;
 anchors = (
 {
 name = top;
-pos = (778,1676);
+pos = (778,1490);
 }
 );
 background = {
@@ -272,7 +272,7 @@ width = 1554;
 anchors = (
 {
 name = top;
-pos = (618,1676);
+pos = (618,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/agrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/agrave.glyph
index 9f1b39b01..a2ebfcedc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/agrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/agrave.glyph
@@ -14,7 +14,7 @@ pos = (58,0);
 ref = grave;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -49,11 +49,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (-8,0);
+pos = (-28,0);
 ref = grave;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -66,7 +66,7 @@ pos = (-96,0);
 ref = grave;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ahookabove.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/ahookabove.1.glyph
index e8d24bb2b..733528db8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ahookabove.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ahookabove.1.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1080,44);
+pos = (1104,0);
 ref = hookabovecmb;
 }
 );
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1220,26);
+pos = (1213,0);
 ref = hookabovecmb;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1408,-6);
+pos = (1334,0);
 ref = hookabovecmb;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1194,-16);
+pos = (1131,0);
 ref = hookabovecmb;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1408,0);
+pos = (1308,0);
 ref = hookabovecmb;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1092,2);
+pos = (1034,0);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ahookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/ahookabove.glyph
index 397995b86..ff4309530 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ahookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ahookabove.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1190,26);
+pos = (1183,0);
 ref = hookabovecmb;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,7 +23,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1354,-6);
+pos = (1280,0);
 ref = hookabovecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1050,44);
+pos = (1074,0);
 ref = hookabovecmb;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1178,-16);
+pos = (1095,0);
 ref = hookabovecmb;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1330,0);
+pos = (1230,0);
 ref = hookabovecmb;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1058,2);
+pos = (1000,0);
 ref = hookabovecmb;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 7843;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ainvertedbreve.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/ainvertedbreve.1.glyph
index bc7beca92..652070044 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ainvertedbreve.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ainvertedbreve.1.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1174,0);
+pos = (1164,0);
 ref = breveinvnosp;
 }
 );
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1282,0);
+pos = (1223,0);
 ref = breveinvnosp;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1310,0);
+pos = (1332,0);
 ref = breveinvnosp;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1224,-10);
+pos = (1132,0);
 ref = breveinvnosp;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1294,0);
+pos = (1304,0);
 ref = breveinvnosp;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1122,0);
+pos = (1059,0);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ainvertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/ainvertedbreve.glyph
index 7edd8ec6b..f47576b6c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ainvertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ainvertedbreve.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1252,0);
+pos = (1193,0);
 ref = breveinvnosp;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1256,0);
+pos = (1278,0);
 ref = breveinvnosp;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,7 +36,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1144,0);
+pos = (1134,0);
 ref = breveinvnosp;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1208,-10);
+pos = (1096,0);
 ref = breveinvnosp;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1216,0);
+pos = (1226,0);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1088,0);
+pos = (1025,0);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/alpha.glyph b/src/Inter-Roman.glyphspackage/glyphs/alpha.glyph
index dcdf76372..b1edf7840 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/alpha.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/alpha.glyph
@@ -11,7 +11,7 @@ pos = (596,0);
 },
 {
 name = top;
-pos = (610,1304);
+pos = (610,1118);
 }
 );
 guides = (
@@ -72,7 +72,7 @@ pos = (574,0);
 },
 {
 name = top;
-pos = (630,1304);
+pos = (630,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -224,7 +224,7 @@ pos = (636,0);
 },
 {
 name = top;
-pos = (602,1304);
+pos = (602,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -279,7 +279,7 @@ pos = (564,0);
 },
 {
 name = top;
-pos = (554,1262);
+pos = (554,1056);
 }
 );
 layerId = m007;
@@ -431,7 +431,7 @@ pos = (614,0);
 },
 {
 name = top;
-pos = (634,1262);
+pos = (634,1056);
 }
 );
 background = {
@@ -493,7 +493,7 @@ pos = (530,0);
 },
 {
 name = top;
-pos = (530,1262);
+pos = (530,1056);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/alphatonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/alphatonos.glyph
index 7c41126cc..750aeaa1f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/alphatonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/alphatonos.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (388,0);
+pos = (388,-186);
 ref = tonostop;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (258,22);
+pos = (258,-164);
 ref = tonostop;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (472,-10);
+pos = (472,-196);
 ref = tonostop;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (364,-42);
+pos = (364,-248);
 ref = tonostop;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (278,-20);
+pos = (278,-226);
 ref = tonostop;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (464,-52);
+pos = (464,-258);
 ref = tonostop;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/amacron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/amacron.1.glyph
index d56dca1da..608a4a3e7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/amacron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/amacron.1.glyph
@@ -12,7 +12,6 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (282,0);
 ref = macron;
 }
 );
@@ -26,7 +25,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (166,0);
+pos = (26,0);
 ref = macron;
 }
 );
@@ -40,7 +39,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (12,0);
+pos = (5,0);
 ref = macron;
 }
 );
@@ -54,7 +53,6 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (140,-42);
 ref = macron;
 }
 );
@@ -68,7 +66,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (12,-42);
+pos = (5,0);
 ref = macron;
 }
 );
@@ -82,7 +80,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (294,0);
+pos = (-4,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/amacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/amacron.glyph
index 164f681ba..49600e9e5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/amacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/amacron.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (136,0);
+pos = (-4,0);
 ref = macron;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,7 +23,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (-42,0);
+pos = (-49,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (252,0);
+pos = (-30,0);
 ref = macron;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (124,-42);
+pos = (-36,0);
 ref = macron;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (-66,-42);
+pos = (-73,0);
 ref = macron;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -75,7 +75,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (260,0);
+pos = (-38,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aogonek.glyph b/src/Inter-Roman.glyphspackage/glyphs/aogonek.glyph
index daa08f257..4827668a7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aogonek.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aogonek.glyph
@@ -14,7 +14,7 @@ pos = (562,0);
 ref = ogonek.a;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -53,7 +53,7 @@ pos = (530,0);
 ref = ogonek.a;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/areversed.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/areversed.1.glyph
index 55ffc46a7..e4dc0c791 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/areversed.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/areversed.1.glyph
@@ -4,6 +4,10 @@ layers = (
 {
 anchors = (
 {
+name = top;
+pos = (595,1118);
+},
+{
 name = topr;
 pos = (244,1118);
 }
@@ -22,6 +26,10 @@ width = 1190;
 {
 anchors = (
 {
+name = top;
+pos = (559,1056);
+},
+{
 name = topr;
 pos = (180,1118);
 }
@@ -40,6 +48,10 @@ width = 1118;
 {
 anchors = (
 {
+name = top;
+pos = (623,1118);
+},
+{
 name = topr;
 pos = (328,1118);
 }
@@ -58,6 +70,10 @@ width = 1246;
 {
 anchors = (
 {
+name = top;
+pos = (581,1056);
+},
+{
 name = topr;
 pos = (298,1056);
 }
@@ -76,6 +92,10 @@ width = 1162;
 {
 anchors = (
 {
+name = top;
+pos = (661,1118);
+},
+{
 name = topr;
 pos = (504,1118);
 }
@@ -94,6 +114,10 @@ width = 1322;
 {
 anchors = (
 {
+name = top;
+pos = (637,1056);
+},
+{
 name = topr;
 pos = (486,1056);
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/arighthalfring.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/arighthalfring.1.glyph
index 998f3a65b..5ec892c3a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/arighthalfring.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/arighthalfring.1.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (458,118);
+pos = (427,0);
 ref = ringhalfright;
 }
 );
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (454,152);
+pos = (480,0);
 ref = ringhalfright;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (538,164);
+pos = (515,0);
 ref = ringhalfright;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (437,110);
+pos = (419,0);
 ref = ringhalfright;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (538,122);
+pos = (505,0);
 ref = ringhalfright;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (468,76);
+pos = (375,0);
 ref = ringhalfright;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/arighthalfring.glyph b/src/Inter-Roman.glyphspackage/glyphs/arighthalfring.glyph
index 811e45763..c842146a0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/arighthalfring.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/arighthalfring.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (424,152);
+pos = (450,0);
 ref = ringhalfright;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,7 +23,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (484,164);
+pos = (461,0);
 ref = ringhalfright;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (430,118);
+pos = (397,0);
 ref = ringhalfright;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (412,110);
+pos = (383,0);
 ref = ringhalfright;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (460,122);
+pos = (427,0);
 ref = ringhalfright;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (438,76);
+pos = (341,0);
 ref = ringhalfright;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aring.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/aring.1.glyph
index c737efc4b..40eaf380d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aring.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aring.1.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (338,0);
+pos = (342,0);
 ref = ring;
 }
 );
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (306,0);
+pos = (322,0);
 ref = ring;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (228,0);
+pos = (238,0);
 ref = ring;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (280,-42);
+pos = (280,0);
 ref = ring;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (228,0);
+pos = (222,0);
 ref = ring;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (350,-42);
+pos = (242,0);
 ref = ring;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aring.glyph b/src/Inter-Roman.glyphspackage/glyphs/aring.glyph
index a29919144..edb8bd9b8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aring.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aring.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (276,0);
+pos = (292,0);
 ref = ring;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,7 +23,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (174,0);
+pos = (184,0);
 ref = ring;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (308,0);
+pos = (312,0);
 ref = ring;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (264,-42);
+pos = (244,0);
 ref = ring;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -62,7 +62,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (150,0);
+pos = (144,0);
 ref = ring;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (316,-42);
+pos = (208,0);
 ref = ring;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aringacute.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/aringacute.1.glyph
index 13207e678..aa52a0cf0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aringacute.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aringacute.1.glyph
@@ -13,7 +13,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (302,152);
+pos = (302,-34);
 ref = ringacute.cn;
 }
 );
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (324,118);
+pos = (324,-68);
 ref = ringacute.cn;
 }
 );
@@ -43,7 +43,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (320,58);
+pos = (320,-128);
 ref = ringacute.cn;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (298,76);
+pos = (298,-130);
 ref = ringacute.cn;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (320,16);
+pos = (320,-190);
 ref = ringacute.cn;
 }
 );
@@ -88,7 +88,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (314,110);
+pos = (314,-96);
 ref = ringacute.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aringacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/aringacute.glyph
index 52884468c..85ba28d4e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aringacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aringacute.glyph
@@ -11,11 +11,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (294,118);
+pos = (294,-68);
 ref = ringacute.cn;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 background = {
@@ -72,7 +72,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (266,58);
+pos = (266,-128);
 ref = ringacute.cn;
 }
 );
@@ -86,7 +86,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (272,152);
+pos = (272,-34);
 ref = ringacute.cn;
 }
 );
@@ -100,11 +100,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (282,76);
+pos = (262,-130);
 ref = ringacute.cn;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 background = {
@@ -161,7 +161,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (242,16);
+pos = (242,-190);
 ref = ringacute.cn;
 }
 );
@@ -175,7 +175,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (280,110);
+pos = (280,-96);
 ref = ringacute.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aringbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/aringbelow.glyph
index c81f45465..8ebda633f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aringbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aringbelow.glyph
@@ -15,7 +15,7 @@ pos = (314,0);
 ref = uni02F3;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -57,7 +57,7 @@ pos = (284,0);
 ref = uni02F3;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aringogonek.glyph b/src/Inter-Roman.glyphspackage/glyphs/aringogonek.glyph
index e01752781..63f3322cf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aringogonek.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aringogonek.glyph
@@ -27,7 +27,7 @@ pos = (562,0);
 ref = ogonek.a;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -53,7 +53,7 @@ pos = (530,0);
 ref = ogonek.a;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/atilde.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/atilde.1.glyph
index 149ee0483..e83768fa5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/atilde.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/atilde.1.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (72,0);
+pos = (78,0);
 ref = tilde;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/atilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/atilde.glyph
index 23cebe302..42e2817dd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/atilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/atilde.glyph
@@ -14,7 +14,7 @@ pos = (84,0);
 ref = tilde;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -36,7 +36,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (42,0);
+pos = (48,0);
 ref = tilde;
 }
 );
@@ -49,11 +49,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (72,0);
+pos = (52,0);
 ref = tilde;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
@@ -66,7 +66,7 @@ pos = (64,0);
 ref = tilde;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/aturn.glyph
index ed06f2b52..c4afd5dc1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aturn.glyph
@@ -11,18 +11,18 @@ pos = (588,0);
 },
 {
 name = top;
-pos = (596,1304);
+pos = (596,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 angle = 180;
-pos = (1156,1118);
+pos = (1148,1118);
 ref = a;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 anchors = (
@@ -32,7 +32,7 @@ pos = (602,0);
 },
 {
 name = top;
-pos = (616,1304);
+pos = (616,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -53,7 +53,7 @@ pos = (556,0);
 },
 {
 name = top;
-pos = (552,1304);
+pos = (552,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -74,18 +74,18 @@ pos = (588,0);
 },
 {
 name = top;
-pos = (596,1304);
+pos = (596,1056);
 }
 );
 layerId = m007;
 shapes = (
 {
 angle = 180;
-pos = (1060,1056);
+pos = (1049,1056);
 ref = a;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 anchors = (
@@ -95,7 +95,7 @@ pos = (602,0);
 },
 {
 name = top;
-pos = (616,1304);
+pos = (616,1056);
 }
 );
 layerId = m009;
@@ -116,7 +116,7 @@ pos = (556,0);
 },
 {
 name = top;
-pos = (552,1304);
+pos = (552,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/b.glyph b/src/Inter-Roman.glyphspackage/glyphs/b.glyph
index 276b509ae..5fe264b37 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/b.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/b.glyph
@@ -23,12 +23,6 @@ name = topbar;
 pos = (198,1490);
 }
 );
-guides = (
-{
-angle = 90;
-pos = (878,1580);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
@@ -189,14 +183,6 @@ pos = (158,1490);
 guides = (
 {
 pos = (480,168);
-},
-{
-angle = 90;
-pos = (662,1218);
-},
-{
-angle = 90;
-pos = (243,1493);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -272,14 +258,6 @@ pos = (191,168);
 orientation = center;
 angle = 90;
 pos = (-7671,536);
-},
-{
-angle = 90;
-pos = (626,1628);
-},
-{
-angle = 90;
-pos = (-47,1493);
 }
 );
 layerId = m007;
@@ -355,13 +333,6 @@ ref = o;
 }
 );
 };
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (400,128);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
@@ -427,13 +398,6 @@ name = topbar;
 pos = (86,1490);
 }
 );
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (-3468,128);
-}
-);
 layerId = m009;
 shapes = (
 {
@@ -706,12 +670,6 @@ name = topbar;
 pos = (134,1490);
 }
 );
-guides = (
-{
-angle = 90;
-pos = (851,1580);
-}
-);
 layerId = m011;
 name = "Thin Display";
 shapes = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/bbar.glyph b/src/Inter-Roman.glyphspackage/glyphs/bbar.glyph
index 065d7a1c8..1e1ecaf81 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/bbar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/bbar.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (-132,583);
+pos = (-132,559);
 ref = crossbar;
 }
 );
@@ -22,7 +22,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (-136,583);
+pos = (-136,559);
 ref = crossbar;
 }
 );
@@ -35,7 +35,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (-180,582);
+pos = (-180,559);
 ref = crossbar;
 }
 );
@@ -48,7 +48,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (-150,542);
+pos = (-150,517);
 ref = crossbar;
 }
 );
@@ -61,7 +61,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (-114,541);
+pos = (-114,517);
 ref = crossbar;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (-180,540);
+pos = (-180,517);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/bdotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/bdotaccent.glyph
index 3f1835e73..c1a5156a3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/bdotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/bdotaccent.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (418,0);
+pos = (418,186);
 ref = dotaccent;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (504,0);
+pos = (504,186);
 ref = dotaccent;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (444,0);
+pos = (444,186);
 ref = dotaccent;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (434,0);
+pos = (434,206);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (500,42);
+pos = (500,248);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (466,0);
+pos = (466,206);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/blinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/blinebelow.glyph
index 7c5441d3f..720a3e9be 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/blinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/blinebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (1272,0);
+pos = (1264,0);
 ref = macronsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (1266,0);
+pos = (1304,0);
 ref = macronsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (1236,0);
+pos = (1205,0);
 ref = macronsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (1264,0);
+pos = (1186,0);
 ref = macronsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (1264,0);
+pos = (1265,0);
 ref = macronsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (1258,0);
+pos = (1117,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/breve.glyph b/src/Inter-Roman.glyphspackage/glyphs/breve.glyph
index 713914537..d429d3c14 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/breve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/breve.glyph
@@ -6,213 +6,398 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (460,1304);
+pos = (384,1118);
 },
 {
 name = top;
-pos = (460,1626);
+pos = (384,1550);
 }
 );
+background = {
+shapes = (
+{
+pos = (-82,0);
+ref = caron;
+}
+);
+};
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 closed = 1;
 nodes = (
-(639,1251,o),
-(761,1361,o),
-(761,1523,c),
-(601,1523,l),
-(601,1436,o),
-(544,1376,o),
-(460,1376,cs),
-(376,1376,o),
-(319,1436,o),
-(319,1523,c),
-(159,1523,l),
-(159,1361,o),
-(281,1251,o),
-(460,1251,cs)
+(557,1250,o),
+(685,1382,o),
+(685,1550,c),
+(557,1550,l),
+(557,1451,o),
+(476,1382,o),
+(384,1382,cs),
+(292,1382,o),
+(211,1451,o),
+(211,1550,c),
+(83,1550,l),
+(83,1382,o),
+(211,1250,o),
+(384,1250,cs)
 );
 }
 );
-width = 920;
+width = 768;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (512,1304);
+pos = (480,1118);
 },
 {
 name = top;
-pos = (512,1676);
+pos = (480,1590);
 }
 );
+background = {
+shapes = (
+{
+pos = (-166,0);
+ref = caron;
+}
+);
+};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 closed = 1;
 nodes = (
-(750,1238,o),
-(912,1369,o),
-(912,1562,c),
-(658,1562,l),
-(658,1482,o),
-(603,1434,o),
-(512,1434,cs),
-(419,1434,o),
-(364,1482,o),
-(364,1562,c),
-(112,1562,l),
-(112,1369,o),
-(274,1238,o),
-(512,1238,cs)
+(704,1256,o),
+(872,1403,o),
+(872,1590,c),
+(658,1590,l),
+(658,1512,o),
+(580,1451,o),
+(480,1451,cs),
+(379,1451,o),
+(300,1512,o),
+(300,1590,c),
+(88,1590,l),
+(88,1403,o),
+(256,1256,o),
+(480,1256,cs)
 );
 }
 );
-width = 1032;
+width = 960;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (416,1304);
+pos = (352,1118);
 },
 {
 name = top;
-pos = (416,1676);
+pos = (352,1512);
 }
 );
+background = {
+shapes = (
+{
+pos = (-80,0);
+ref = caron;
+}
+);
+};
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 closed = 1;
 nodes = (
-(515,1277,o),
-(579,1343,o),
-(579,1443,c),
-(533,1443,l),
-(533,1368,o),
-(489,1321,o),
-(416,1321,cs),
-(343,1321,o),
-(299,1368,o),
-(299,1443,c),
-(253,1443,l),
-(253,1343,o),
-(317,1277,o),
-(416,1277,cs)
+(498,1272,o),
+(614,1377,o),
+(614,1512,c),
+(568,1512,l),
+(568,1403,o),
+(473,1317,o),
+(352,1317,cs),
+(231,1317,o),
+(136,1403,o),
+(136,1512,c),
+(90,1512,l),
+(90,1377,o),
+(206,1272,o),
+(352,1272,cs)
 );
 }
 );
-width = 850;
+width = 704;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (428,1262);
+pos = (400,1056);
 },
 {
 name = top;
-pos = (428,1626);
+pos = (400,1482);
+}
+);
+background = {
+shapes = (
+{
+pos = (-34,0);
+ref = caron;
 }
 );
+};
 layerId = m007;
 shapes = (
 {
 closed = 1;
 nodes = (
-(607,1218,o),
-(729,1328,o),
-(729,1490,c),
-(569,1490,l),
-(569,1403,o),
-(512,1343,o),
-(428,1343,cs),
-(344,1343,o),
-(287,1403,o),
-(287,1490,c),
-(127,1490,l),
-(127,1328,o),
-(249,1218,o),
-(428,1218,cs)
+(569,1208,o),
+(685,1328,o),
+(685,1480,c),
+(557,1480,l),
+(557,1393,o),
+(492,1332,o),
+(400,1332,cs),
+(308,1332,o),
+(243,1393,o),
+(243,1480,c),
+(115,1480,l),
+(115,1328,o),
+(231,1208,o),
+(400,1208,cs)
+);
+}
+);
+width = 800;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (352,1056);
+},
+{
+name = top;
+pos = (352,1456);
+}
+);
+background = {
+shapes = (
+{
+pos = (-16,0);
+ref = caron;
+}
+);
+};
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(498,1216,o),
+(614,1321,o),
+(614,1456,c),
+(568,1456,l),
+(568,1347,o),
+(471,1259,o),
+(352,1259,cs),
+(233,1259,o),
+(136,1347,o),
+(136,1456,c),
+(90,1456,l),
+(90,1321,o),
+(206,1216,o),
+(352,1216,cs)
+);
+}
+);
+width = 704;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (480,1056);
+},
+{
+name = top;
+pos = (480,1490);
+}
+);
+associatedMasterId = m009;
+background = {
+shapes = (
+{
+pos = (-144,0);
+ref = caron;
+}
+);
+};
+layerId = "6C75D8AE-7D03-460C-8D1E-D8106A109C7F";
+name = "Apr 11, 23, 14:05";
+shapes = (
+{
+closed = 1;
+nodes = (
+(704,1156,o),
+(880,1303,o),
+(880,1490,c),
+(651,1490,l),
+(651,1394,o),
+(580,1327,o),
+(480,1327,cs),
+(378,1327,o),
+(307,1394,o),
+(307,1490,c),
+(80,1490,l),
+(80,1303,o),
+(256,1156,o),
+(480,1156,cs)
 );
 }
 );
-width = 856;
+width = 960;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (496,1262);
+pos = (480,1056);
 },
 {
 name = top;
-pos = (496,1676);
+pos = (480,1490);
+}
+);
+background = {
+shapes = (
+{
+pos = (-144,0);
+ref = caron;
 }
 );
+};
 layerId = m009;
+name = "Display Black";
 shapes = (
 {
 closed = 1;
 nodes = (
-(721,1148,o),
-(896,1298,o),
-(896,1490,c),
-(642,1490,l),
-(642,1410,o),
-(578,1347,o),
-(496,1347,cs),
-(413,1347,o),
-(348,1410,o),
-(348,1490,c),
-(96,1490,l),
-(96,1298,o),
-(271,1148,o),
-(496,1148,cs)
+(704,1156,o),
+(872,1303,o),
+(872,1490,c),
+(650,1490,l),
+(650,1406,o),
+(580,1347,o),
+(480,1347,cs),
+(379,1347,o),
+(308,1406,o),
+(308,1490,c),
+(88,1490,l),
+(88,1303,o),
+(256,1156,o),
+(480,1156,cs)
 );
 }
 );
-width = 1000;
+width = 960;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (416,1262);
+pos = (480,1056);
 },
 {
 name = top;
-pos = (416,1676);
+pos = (480,1490);
 }
 );
-layerId = m011;
+associatedMasterId = m009;
+background = {
+shapes = (
+{
+pos = (-144,0);
+ref = caron;
+}
+);
+};
+layerId = "283B0FFE-A13D-4998-A8F9-97859B95C863";
+name = "Apr 11, 23, 14:05";
+shapes = (
+{
+closed = 1;
+nodes = (
+(704,1156,o),
+(880,1303,o),
+(880,1490,c),
+(626,1490,l),
+(626,1414,o),
+(562,1355,o),
+(480,1355,cs),
+(397,1355,o),
+(332,1414,o),
+(332,1490,c),
+(80,1490,l),
+(80,1303,o),
+(256,1156,o),
+(480,1156,cs)
+);
+}
+);
+width = 960;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (400,1056);
+},
+{
+name = top;
+pos = (400,1482);
+}
+);
+associatedMasterId = m007;
+background = {
+shapes = (
+{
+pos = (-34,0);
+ref = caron;
+}
+);
+};
+layerId = "69782264-7D09-4995-B1DE-EE79717E26A6";
+name = "Apr 11, 23, 18:06";
 shapes = (
 {
 closed = 1;
 nodes = (
-(515,1243,o),
-(579,1309,o),
-(579,1409,c),
-(533,1409,l),
-(533,1334,o),
-(489,1287,o),
-(416,1287,cs),
-(343,1287,o),
-(299,1334,o),
-(299,1409,c),
-(253,1409,l),
-(253,1309,o),
-(317,1243,o),
-(416,1243,cs)
+(569,1208,o),
+(701,1328,o),
+(701,1480,c),
+(549,1480,l),
+(549,1394,o),
+(487,1333,o),
+(400,1333,cs),
+(313,1333,o),
+(251,1394,o),
+(251,1480,c),
+(99,1480,l),
+(99,1328,o),
+(231,1208,o),
+(400,1208,cs)
 );
 }
 );
-width = 722;
+width = 800;
 }
 );
+note = "Harmonize with /caron";
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/breveacutecomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/breveacutecomb.cn.glyph
index d41c9ca9c..3cb5455b4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/breveacutecomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/breveacutecomb.cn.glyph
@@ -4,8 +4,8 @@ layers = (
 {
 anchors = (
 {
-name = _top;
-pos = (466,1304);
+name = top;
+pos = (384,1891);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -13,39 +13,23 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(602,1396,o),
-(561,1344,o),
-(460,1344,cs),
-(355,1344,o),
-(317,1396,o),
-(318,1458,c),
-(154,1458,l),
-(154,1335,o),
-(271,1248,o),
-(460,1248,cs),
-(649,1248,o),
-(765,1335,o),
-(766,1458,c),
-(602,1458,l)
+(459,1616,l),
+(651,1890,l),
+(457,1890,l),
+(317,1616,l)
 );
 },
 {
-closed = 1;
-nodes = (
-(510,1480,l),
-(672,1678,l),
-(510,1678,l),
-(402,1480,l)
-);
+ref = breve;
 }
 );
-width = 920;
+width = 768;
 },
 {
 anchors = (
 {
-name = _top;
-pos = (520,1280);
+name = top;
+pos = (480,1888);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -53,39 +37,23 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(692,1402,o),
-(645,1344,o),
-(518,1344,cs),
-(392,1344,o),
-(343,1402,o),
-(344,1458,c),
-(122,1458,l),
-(121,1303,o),
-(276,1199,o),
-(518,1198,cs),
-(761,1199,o),
-(919,1303,o),
-(920,1458,c),
-(692,1458,l)
+(568,1618,l),
+(810,1888,l),
+(514,1888,l),
+(384,1618,l)
 );
 },
 {
-closed = 1;
-nodes = (
-(614,1440,l),
-(806,1618,l),
-(558,1618,l),
-(416,1440,l)
-);
+ref = breve;
 }
 );
-width = 1038;
+width = 960;
 },
 {
 anchors = (
 {
-name = _top;
-pos = (346,1318);
+name = top;
+pos = (352,1846);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -93,39 +61,23 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(454,1383,o),
-(413,1341,o),
-(338,1342,cs),
-(262,1341,o),
-(221,1383,o),
-(222,1460,c),
-(174,1460,l),
-(175,1358,o),
-(236,1295,o),
-(338,1294,cs),
-(439,1295,o),
-(500,1358,o),
-(500,1460,c),
-(454,1460,l)
+(368,1586,l),
+(564,1846,l),
+(506,1846,l),
+(322,1586,l)
 );
 },
 {
-closed = 1;
-nodes = (
-(350,1506,l),
-(482,1720,l),
-(424,1720,l),
-(312,1506,l)
-);
+ref = breve;
 }
 );
-width = 674;
+width = 704;
 },
 {
 anchors = (
 {
-name = _top;
-pos = (434,1304);
+name = top;
+pos = (400,1812);
 }
 );
 layerId = m007;
@@ -133,119 +85,135 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(570,1396,o),
-(529,1344,o),
-(428,1344,cs),
-(323,1344,o),
-(285,1396,o),
-(286,1458,c),
-(122,1458,l),
-(122,1335,o),
-(239,1248,o),
-(428,1248,cs),
-(617,1248,o),
-(733,1335,o),
-(734,1458,c),
-(570,1458,l)
+(466,1545,l),
+(658,1819,l),
+(464,1819,l),
+(324,1545,l)
+);
+},
+{
+ref = breve;
+}
 );
+width = 800;
 },
 {
+anchors = (
+{
+name = top;
+pos = (480,1770);
+}
+);
+layerId = m009;
+shapes = (
+{
 closed = 1;
 nodes = (
-(478,1480,l),
-(640,1678,l),
-(478,1678,l),
-(370,1480,l)
+(582,1534,l),
+(840,1770,l),
+(520,1770,l),
+(374,1534,l)
 );
+},
+{
+ref = breve;
 }
 );
-width = 856;
+width = 960;
 },
 {
 anchors = (
 {
-name = _top;
-pos = (504,1280);
+name = top;
+pos = (352,1764);
 }
 );
-layerId = m009;
+background = {
 shapes = (
 {
 closed = 1;
 nodes = (
-(676,1402,o),
-(629,1344,o),
-(502,1344,cs),
-(376,1344,o),
-(327,1402,o),
-(328,1458,c),
-(106,1458,l),
-(105,1303,o),
-(260,1199,o),
-(502,1198,cs),
-(745,1199,o),
-(903,1303,o),
-(904,1458,c),
-(676,1458,l)
+(406,1522,l),
+(598,1764,l),
+(404,1764,l),
+(280,1522,l)
 );
-},
+}
+);
+};
+layerId = m011;
+shapes = (
 {
 closed = 1;
 nodes = (
-(598,1440,l),
-(790,1618,l),
-(542,1618,l),
-(400,1440,l)
+(363,1522,l),
+(539,1764,l),
+(481,1764,l),
+(312,1522,l)
 );
+},
+{
+ref = breve;
 }
 );
-width = 1006;
+width = 704;
 },
 {
 anchors = (
 {
-name = _top;
-pos = (282,1318);
+name = top;
+pos = (400,1764);
 }
 );
-layerId = m011;
+associatedMasterId = m007;
+layerId = "39527349-CCAE-418A-BF67-50D7319AEEFA";
+name = "Apr 11, 23, 18:22";
 shapes = (
 {
+ref = breve;
+},
+{
 closed = 1;
 nodes = (
-(390,1383,o),
-(349,1341,o),
-(274,1342,cs),
-(198,1341,o),
-(157,1383,o),
-(158,1460,c),
-(110,1460,l),
-(111,1358,o),
-(172,1295,o),
-(274,1294,cs),
-(375,1295,o),
-(436,1358,o),
-(436,1460,c),
-(390,1460,l)
+(454,1522,l),
+(646,1764,l),
+(452,1764,l),
+(328,1522,l)
+);
+}
 );
+width = 800;
+},
+{
+anchors = (
+{
+name = top;
+pos = (384,1846);
+}
+);
+associatedMasterId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+layerId = "0532E5A9-7446-47A9-A499-2F212D70F7D5";
+name = "Apr 11, 23, 18:23";
+shapes = (
+{
+ref = breve;
 },
 {
 closed = 1;
 nodes = (
-(286,1506,l),
-(418,1720,l),
-(360,1720,l),
-(248,1506,l)
+(442,1604,l),
+(634,1846,l),
+(440,1846,l),
+(308,1604,l)
 );
 }
 );
-width = 546;
+width = 768;
 }
 );
 tags = (
 "TODO-opsz"
 );
-unicode = 57626;
 userData = {
 interface.gridadjust.original = "{'width': 1284, 'leftMargin': 176, 'rightMargin': 268}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/brevegravecomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/brevegravecomb.cn.glyph
index decd2a568..a79ce8e08 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/brevegravecomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/brevegravecomb.cn.glyph
@@ -2,250 +2,75 @@
 glyphname = brevegravecomb.cn;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (466,1304);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(602,1396,o),
-(561,1344,o),
-(460,1344,cs),
-(355,1344,o),
-(317,1396,o),
-(318,1458,c),
-(154,1458,l),
-(154,1335,o),
-(271,1248,o),
-(460,1248,cs),
-(649,1248,o),
-(765,1335,o),
-(766,1458,c),
-(602,1458,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(532,1480,l),
-(424,1678,l),
-(262,1678,l),
-(424,1480,l)
-);
+pos = (768,0);
+ref = breveacutecomb.cn;
+scale = (-1,1);
 }
 );
-width = 920;
+width = 768;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (520,1280);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(692,1405,o),
-(642,1347,o),
-(518,1346,cs),
-(392,1347,o),
-(343,1405,o),
-(344,1460,c),
-(122,1460,l),
-(121,1312,o),
-(276,1204,o),
-(518,1204,cs),
-(764,1204,o),
-(919,1312,o),
-(920,1460,c),
-(692,1460,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(626,1440,l),
-(486,1618,l),
-(238,1618,l),
-(434,1440,l)
-);
+pos = (960,0);
+ref = breveacutecomb.cn;
+scale = (-1,1);
 }
 );
-width = 1038;
+width = 960;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (346,1318);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(454,1383,o),
-(413,1341,o),
-(338,1342,cs),
-(262,1341,o),
-(221,1383,o),
-(222,1460,c),
-(174,1460,l),
-(175,1358,o),
-(236,1295,o),
-(338,1294,cs),
-(439,1295,o),
-(500,1358,o),
-(500,1460,c),
-(454,1460,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(364,1506,l),
-(252,1716,l),
-(194,1716,l),
-(326,1506,l)
-);
+pos = (704,0);
+ref = breveacutecomb.cn;
+scale = (-1,1);
 }
 );
-width = 674;
+width = 704;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (434,1304);
-}
-);
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(570,1396,o),
-(529,1344,o),
-(428,1344,cs),
-(323,1344,o),
-(285,1396,o),
-(286,1458,c),
-(122,1458,l),
-(122,1335,o),
-(239,1248,o),
-(428,1248,cs),
-(617,1248,o),
-(733,1335,o),
-(734,1458,c),
-(570,1458,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(500,1480,l),
-(392,1678,l),
-(230,1678,l),
-(392,1480,l)
-);
+pos = (800,0);
+ref = breveacutecomb.cn;
+scale = (-1,1);
 }
 );
-width = 856;
+width = 800;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (504,1280);
-}
-);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(676,1405,o),
-(626,1347,o),
-(502,1346,cs),
-(376,1347,o),
-(327,1405,o),
-(328,1460,c),
-(106,1460,l),
-(105,1312,o),
-(260,1204,o),
-(502,1204,cs),
-(748,1204,o),
-(903,1312,o),
-(904,1460,c),
-(676,1460,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(610,1440,l),
-(470,1618,l),
-(222,1618,l),
-(418,1440,l)
-);
+pos = (960,0);
+ref = breveacutecomb.cn;
+scale = (-1,1);
 }
 );
-width = 1006;
+width = 960;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (282,1318);
-}
-);
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(390,1383,o),
-(349,1341,o),
-(274,1342,cs),
-(198,1341,o),
-(157,1383,o),
-(158,1460,c),
-(110,1460,l),
-(111,1358,o),
-(172,1295,o),
-(274,1294,cs),
-(375,1295,o),
-(436,1358,o),
-(436,1460,c),
-(390,1460,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(300,1506,l),
-(188,1716,l),
-(130,1716,l),
-(262,1506,l)
-);
+pos = (704,0);
+ref = breveacutecomb.cn;
+scale = (-1,1);
 }
 );
-width = 546;
+width = 704;
 }
 );
 tags = (
 "TODO-opsz"
 );
-unicode = 57628;
 userData = {
 interface.gridadjust.original = "{'width': 1284, 'leftMargin': 176, 'rightMargin': 268}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/brevehookcomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/brevehookcomb.cn.glyph
index 5b3572ad9..1becefc4a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/brevehookcomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/brevehookcomb.cn.glyph
@@ -2,322 +2,98 @@
 glyphname = brevehookcomb.cn;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (472,1282);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(596,1396,o),
-(559,1344,o),
-(460,1344,cs),
-(361,1344,o),
-(323,1396,o),
-(322,1458,c),
-(166,1458,l),
-(166,1335,o),
-(279,1248,o),
-(460,1248,cs),
-(643,1248,o),
-(753,1335,o),
-(754,1458,c),
-(596,1458,l)
-);
+ref = breve;
 },
 {
-closed = 1;
-nodes = (
-(538,1542,l),
-(611,1551,o),
-(684,1580,o),
-(684,1656,cs),
-(684,1740,o),
-(585,1798,o),
-(390,1798,c),
-(382,1714,l),
-(468,1713,o),
-(535,1699,o),
-(536,1658,cs),
-(535,1620,o),
-(495,1609,o),
-(398,1606,c),
-(402,1478,l),
-(538,1478,l)
-);
+alignment = -1;
+pos = (971,346);
+ref = hookabovecmb;
 }
 );
-width = 920;
+width = 768;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (520,1312);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(697,1402,o),
-(644,1356,o),
-(514,1356,cs),
-(388,1356,o),
-(336,1399,o),
-(334,1458,c),
-(108,1458,l),
-(109,1303,o),
-(263,1204,o),
-(514,1204,cs),
-(767,1204,o),
-(927,1303,o),
-(926,1458,c),
-(696,1458,l)
-);
+ref = breve;
 },
 {
-closed = 1;
-nodes = (
-(614,1538,l),
-(694,1548,o),
-(772,1580,o),
-(770,1646,cs),
-(772,1751,o),
-(636,1807,o),
-(376,1806,c),
-(366,1682,l),
-(447,1681,o),
-(505,1676,o),
-(504,1630,cs),
-(505,1606,o),
-(461,1588,o),
-(360,1586,c),
-(390,1498,l),
-(614,1498,l)
-);
+alignment = -1;
+pos = (1144,362);
+ref = hookabovecmb;
 }
 );
-width = 1030;
+width = 960;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (376,1266);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(476,1383,o),
-(435,1341,o),
-(360,1342,cs),
-(284,1341,o),
-(243,1383,o),
-(242,1460,c),
-(196,1460,l),
-(196,1358,o),
-(257,1295,o),
-(360,1294,cs),
-(461,1295,o),
-(522,1358,o),
-(522,1460,c),
-(476,1460,l)
-);
+ref = breve;
 },
 {
-closed = 1;
-nodes = (
-(382,1552,l),
-(452,1560,o),
-(506,1597,o),
-(506,1662,cs),
-(506,1735,o),
-(433,1791,o),
-(318,1792,c),
-(310,1746,l),
-(400,1745,o),
-(455,1721,o),
-(456,1662,cs),
-(458,1615,o),
-(417,1599,o),
-(336,1592,c),
-(336,1474,l),
-(382,1474,l)
-);
+alignment = -1;
+pos = (874,306);
+ref = hookabovecmb;
 }
 );
-width = 718;
+width = 704;
 },
 {
-anchors = (
+guides = (
 {
-name = _top;
-pos = (440,1282);
+pos = (559,1839);
 }
 );
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(564,1396,o),
-(527,1344,o),
-(428,1344,cs),
-(329,1344,o),
-(291,1396,o),
-(290,1458,c),
-(134,1458,l),
-(134,1335,o),
-(247,1248,o),
-(428,1248,cs),
-(611,1248,o),
-(721,1335,o),
-(722,1458,c),
-(564,1458,l)
-);
+ref = breve;
 },
 {
-closed = 1;
-nodes = (
-(506,1542,l),
-(579,1551,o),
-(652,1580,o),
-(652,1656,cs),
-(652,1740,o),
-(553,1798,o),
-(358,1798,c),
-(350,1714,l),
-(436,1713,o),
-(503,1699,o),
-(504,1658,cs),
-(503,1620,o),
-(463,1609,o),
-(366,1606,c),
-(370,1478,l),
-(506,1478,l)
-);
+alignment = -1;
+pos = (953,306);
+ref = hookabovecmb;
 }
 );
-width = 856;
+width = 800;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (504,1312);
-}
-);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(681,1402,o),
-(628,1356,o),
-(498,1356,cs),
-(372,1356,o),
-(320,1399,o),
-(318,1458,c),
-(92,1458,l),
-(93,1303,o),
-(247,1204,o),
-(498,1204,cs),
-(751,1204,o),
-(911,1303,o),
-(910,1458,c),
-(680,1458,l)
-);
+ref = breve;
 },
 {
-closed = 1;
-nodes = (
-(598,1538,l),
-(678,1548,o),
-(756,1580,o),
-(754,1646,cs),
-(756,1751,o),
-(620,1807,o),
-(360,1806,c),
-(350,1682,l),
-(431,1681,o),
-(489,1676,o),
-(488,1630,cs),
-(489,1606,o),
-(445,1588,o),
-(344,1586,c),
-(374,1498,l),
-(598,1498,l)
-);
+alignment = -1;
+pos = (1134,370);
+ref = hookabovecmb;
 }
 );
-width = 998;
+width = 960;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (312,1266);
-}
-);
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(412,1383,o),
-(371,1341,o),
-(296,1342,cs),
-(220,1341,o),
-(179,1383,o),
-(178,1460,c),
-(132,1460,l),
-(132,1358,o),
-(193,1295,o),
-(296,1294,cs),
-(397,1295,o),
-(458,1358,o),
-(458,1460,c),
-(412,1460,l)
-);
+ref = breve;
 },
 {
-closed = 1;
-nodes = (
-(318,1552,l),
-(388,1560,o),
-(442,1597,o),
-(442,1662,cs),
-(442,1735,o),
-(369,1791,o),
-(254,1792,c),
-(246,1746,l),
-(336,1745,o),
-(391,1721,o),
-(392,1662,cs),
-(394,1615,o),
-(353,1599,o),
-(272,1592,c),
-(272,1474,l),
-(318,1474,l)
-);
+alignment = -1;
+pos = (856,306);
+ref = hookabovecmb;
 }
 );
-width = 590;
+width = 704;
 }
 );
 tags = (
 "TODO-opsz"
 );
-unicode = 57639;
 userData = {
 interface.gridadjust.original = "{'width': 1284, 'leftMargin': 176, 'rightMargin': 298}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/breveinv.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/breveinv.cn.glyph
new file mode 100644
index 000000000..dbfc2daa4
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/breveinv.cn.glyph
@@ -0,0 +1,310 @@
+{
+case = lower;
+category = Mark;
+glyphname = breveinv.cn;
+layers = (
+{
+anchors = (
+{
+name = _top;
+pos = (362,1118);
+},
+{
+name = top;
+pos = (362,1512);
+}
+);
+background = {
+shapes = (
+{
+pos = (-70,0);
+ref = circumflex;
+}
+);
+};
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+closed = 1;
+nodes = (
+(216,1520,o),
+(100,1415,o),
+(100,1280,c),
+(143,1280,l),
+(143,1389,o),
+(241,1475,o),
+(362,1475,cs),
+(483,1475,o),
+(581,1389,o),
+(581,1280,c),
+(624,1280,l),
+(624,1415,o),
+(508,1520,o),
+(362,1520,cs)
+);
+}
+);
+width = 724;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (362,1056);
+},
+{
+name = top;
+pos = (362,1448);
+}
+);
+background = {
+shapes = (
+{
+pos = (-6,0);
+ref = circumflex;
+}
+);
+};
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(216,1456,o),
+(100,1351,o),
+(100,1216,c),
+(146,1216,l),
+(146,1325,o),
+(243,1413,o),
+(362,1413,cs),
+(481,1413,o),
+(578,1325,o),
+(578,1216,c),
+(624,1216,l),
+(624,1351,o),
+(508,1456,o),
+(362,1456,cs)
+);
+}
+);
+width = 724;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (409,1118);
+},
+{
+name = top;
+pos = (409,1550);
+}
+);
+background = {
+shapes = (
+{
+pos = (-55,0);
+ref = circumflex;
+}
+);
+};
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+closed = 1;
+nodes = (
+(236,1558,o),
+(108,1426,o),
+(108,1258,c),
+(236,1258,l),
+(236,1357,o),
+(317,1426,o),
+(409,1426,cs),
+(501,1426,o),
+(582,1357,o),
+(582,1258,c),
+(710,1258,l),
+(710,1426,o),
+(582,1558,o),
+(409,1558,cs)
+);
+}
+);
+width = 818;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (400,1056);
+},
+{
+name = top;
+pos = (400,1480);
+}
+);
+background = {
+shapes = (
+{
+pos = (-31,0);
+ref = circumflex;
+}
+);
+};
+layerId = m007;
+shapes = (
+{
+closed = 1;
+nodes = (
+(231,1488,o),
+(115,1368,o),
+(115,1216,c),
+(243,1216,l),
+(243,1303,o),
+(308,1364,o),
+(400,1364,cs),
+(492,1364,o),
+(557,1303,o),
+(557,1216,c),
+(685,1216,l),
+(685,1368,o),
+(569,1488,o),
+(400,1488,cs)
+);
+}
+);
+width = 800;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (500,1118);
+},
+{
+name = top;
+pos = (500,1582);
+}
+);
+background = {
+shapes = (
+{
+pos = (-140,0);
+ref = circumflex;
+}
+);
+};
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+closed = 1;
+nodes = (
+(276,1590,o),
+(108,1443,o),
+(108,1256,c),
+(320,1256,l),
+(320,1334,o),
+(399,1395,o),
+(500,1395,cs),
+(600,1395,o),
+(678,1334,o),
+(678,1256,c),
+(892,1256,l),
+(892,1443,o),
+(724,1590,o),
+(500,1590,cs)
+);
+}
+);
+width = 1000;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (500,1056);
+},
+{
+name = top;
+pos = (500,1490);
+}
+);
+background = {
+shapes = (
+{
+pos = (-124,0);
+ref = circumflex;
+}
+);
+};
+layerId = m009;
+shapes = (
+{
+closed = 1;
+nodes = (
+(276,1498,o),
+(108,1351,o),
+(108,1164,c),
+(328,1164,l),
+(328,1248,o),
+(399,1307,o),
+(500,1307,cs),
+(600,1307,o),
+(670,1248,o),
+(670,1164,c),
+(892,1164,l),
+(892,1351,o),
+(724,1498,o),
+(500,1498,cs)
+);
+}
+);
+width = 1000;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (401,1056);
+},
+{
+name = top;
+pos = (401,1480);
+}
+);
+associatedMasterId = m007;
+background = {
+shapes = (
+{
+pos = (-31,0);
+ref = circumflex;
+}
+);
+};
+layerId = "AB7027F3-89F2-4794-86F4-FE5D7709FDA5";
+name = "Apr 11, 23, 18:08";
+shapes = (
+{
+closed = 1;
+nodes = (
+(251,1216,l),
+(251,1302,o),
+(313,1363,o),
+(400,1363,cs),
+(487,1363,o),
+(549,1302,o),
+(549,1216,c),
+(701,1216,l),
+(701,1368,o),
+(569,1488,o),
+(400,1488,cs),
+(231,1488,o),
+(99,1368,o),
+(99,1216,c)
+);
+}
+);
+width = 800;
+}
+);
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/breveinvnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/breveinvnosp.glyph
index 69dd9d422..3f9662625 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/breveinvnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/breveinvnosp.glyph
@@ -3,231 +3,121 @@ color = (250,227,227,1);
 glyphname = breveinvnosp;
 layers = (
 {
-anchors = (
+background = {
+shapes = (
 {
-name = _top;
-pos = (-656,1304);
+pos = (-1063,0);
+ref = circumflex;
 }
 );
+};
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-797,1258,l),
-(-797,1345,o),
-(-740,1405,o),
-(-656,1405,cs),
-(-572,1405,o),
-(-515,1345,o),
-(-515,1258,c),
-(-355,1258,l),
-(-355,1420,o),
-(-477,1530,o),
-(-656,1530,cs),
-(-835,1530,o),
-(-957,1420,o),
-(-957,1258,c)
-);
+alignment = -1;
+pos = (-1006,0);
+ref = breveinv.cn;
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-640,1304);
-}
-);
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(-514,1256,l),
-(-296,1582,l),
-(-640,1582,l),
-(-778,1256,l)
-);
+pos = (-1304,0);
+ref = circumflex;
 }
 );
 };
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-788,1256,l),
-(-788,1336,o),
-(-733,1384,o),
-(-640,1384,cs),
-(-549,1384,o),
-(-494,1336,o),
-(-494,1256,c),
-(-240,1256,l),
-(-240,1449,o),
-(-402,1580,o),
-(-640,1580,cs),
-(-878,1580,o),
-(-1040,1449,o),
-(-1040,1256,c)
-);
+alignment = -1;
+pos = (-1162,0);
+ref = breveinv.cn;
 }
 );
-width = 30;
+width = 0;
 },
 {
-anchors = (
+background = {
+shapes = (
 {
-name = _top;
-pos = (-592,1304);
+pos = (-1011,0);
+ref = circumflex;
 }
 );
+};
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-709,1286,l),
-(-709,1361,o),
-(-665,1408,o),
-(-592,1408,cs),
-(-519,1408,o),
-(-475,1361,o),
-(-475,1286,c),
-(-429,1286,l),
-(-429,1386,o),
-(-493,1452,o),
-(-592,1452,cs),
-(-691,1452,o),
-(-755,1386,o),
-(-755,1286,c)
-);
+alignment = -1;
+pos = (-944,0);
+ref = breveinv.cn;
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-656,1272);
-}
-);
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(-534,1216,l),
-(-342,1490,l),
-(-536,1490,l),
-(-676,1216,l)
-);
+pos = (-996,0);
+ref = circumflex;
 }
 );
 };
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-797,1226,l),
-(-797,1313,o),
-(-740,1373,o),
-(-656,1373,cs),
-(-572,1373,o),
-(-515,1313,o),
-(-515,1226,c),
-(-355,1226,l),
-(-355,1388,o),
-(-477,1498,o),
-(-656,1498,cs),
-(-835,1498,o),
-(-957,1388,o),
-(-957,1226,c)
-);
+alignment = -1;
+pos = (-964,0);
+ref = breveinv.cn;
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-640,1262);
-}
-);
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(-490,1164,l),
-(-184,1490,l),
-(-552,1490,l),
-(-754,1164,l)
-);
+pos = (-1272,0);
+ref = circumflex;
 }
 );
 };
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-788,1164,l),
-(-788,1244,o),
-(-723,1307,o),
-(-640,1307,cs),
-(-558,1307,o),
-(-494,1244,o),
-(-494,1164,c),
-(-240,1164,l),
-(-240,1356,o),
-(-415,1506,o),
-(-640,1506,cs),
-(-865,1506,o),
-(-1040,1356,o),
-(-1040,1164,c)
-);
+alignment = -1;
+pos = (-1150,0);
+ref = breveinv.cn;
 }
 );
 width = 0;
 },
 {
-anchors = (
+background = {
+shapes = (
 {
-name = _top;
-pos = (-592,1262);
+pos = (-895,0);
+ref = circumflex;
 }
 );
+};
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-709,1244,l),
-(-709,1319,o),
-(-665,1366,o),
-(-592,1366,cs),
-(-519,1366,o),
-(-475,1319,o),
-(-475,1244,c),
-(-429,1244,l),
-(-429,1344,o),
-(-493,1410,o),
-(-592,1410,cs),
-(-691,1410,o),
-(-755,1344,o),
-(-755,1244,c)
-);
+alignment = -1;
+pos = (-891,0);
+ref = breveinv.cn;
 }
 );
 width = 0;
 }
 );
+note = "mirrored copy of /breve\012Harmonize with /circumflex";
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/brevetildecomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/brevetildecomb.cn.glyph
index 6491366d2..7a2657b76 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/brevetildecomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/brevetildecomb.cn.glyph
@@ -5,7 +5,11 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (468,1274);
+pos = (384,1118);
+},
+{
+name = top;
+pos = (384,1885);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -13,55 +17,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(599,1396,o),
-(561,1341,o),
-(460,1342,cs),
-(358,1341,o),
-(320,1396,o),
-(320,1458,c),
-(160,1458,l),
-(160,1332,o),
-(276,1242,o),
-(460,1242,cs),
-(646,1242,o),
-(759,1332,o),
-(760,1458,c),
-(600,1458,l)
+(557,1250,o),
+(685,1382,o),
+(685,1550,c),
+(557,1550,l),
+(557,1451,o),
+(476,1382,o),
+(384,1382,cs),
+(292,1382,o),
+(211,1451,o),
+(211,1550,c),
+(83,1550,l),
+(83,1382,o),
+(211,1250,o),
+(384,1250,cs)
 );
 },
 {
-closed = 1;
-nodes = (
-(663,1702,o),
-(625,1664,o),
-(582,1664,cs),
-(497,1664,o),
-(448,1737,o),
-(360,1736,cs),
-(262,1737,o),
-(192,1647,o),
-(192,1550,c),
-(282,1530,l),
-(282,1580,o),
-(317,1617,o),
-(360,1618,cs),
-(448,1617,o),
-(474,1545,o),
-(582,1544,cs),
-(681,1545,o),
-(751,1626,o),
-(750,1726,c),
-(664,1752,l)
-);
+alignment = -1;
+pos = (-136,368);
+ref = tilde;
 }
 );
-width = 920;
+width = 768;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (524,1312);
+pos = (480,1118);
+},
+{
+name = top;
+pos = (480,1974);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -69,55 +57,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(692,1399,o),
-(639,1359,o),
-(518,1358,cs),
-(389,1359,o),
-(343,1402,o),
-(344,1458,c),
-(120,1458,l),
-(119,1303,o),
-(276,1201,o),
-(518,1202,cs),
-(761,1201,o),
-(919,1303,o),
-(920,1458,c),
-(692,1458,l)
+(704,1256,o),
+(872,1403,o),
+(872,1590,c),
+(658,1590,l),
+(658,1512,o),
+(580,1451,o),
+(480,1451,cs),
+(379,1451,o),
+(300,1512,o),
+(300,1590,c),
+(88,1590,l),
+(88,1403,o),
+(256,1256,o),
+(480,1256,cs)
 );
 },
 {
-closed = 1;
-nodes = (
-(671,1731,o),
-(642,1693,o),
-(614,1694,cs),
-(523,1693,o),
-(444,1754,o),
-(358,1754,cs),
-(258,1754,o),
-(188,1670,o),
-(190,1574,c),
-(338,1530,l),
-(337,1580,o),
-(369,1615,o),
-(402,1614,cs),
-(488,1615,o),
-(546,1553,o),
-(658,1554,cs),
-(753,1553,o),
-(825,1641,o),
-(826,1734,c),
-(672,1780,l)
-);
+alignment = -1;
+pos = (-32,406);
+ref = tilde;
 }
 );
-width = 1036;
+width = 960;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (394,1250);
+pos = (352,1118);
+},
+{
+name = top;
+pos = (352,1823);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -125,55 +97,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(499,1373,o),
-(458,1331,o),
-(382,1330,cs),
-(307,1331,o),
-(266,1373,o),
-(266,1450,c),
-(220,1450,l),
-(220,1348,o),
-(281,1284,o),
-(382,1284,cs),
-(484,1284,o),
-(545,1348,o),
-(546,1450,c),
-(498,1450,l)
+(498,1272,o),
+(614,1377,o),
+(614,1512,c),
+(568,1512,l),
+(568,1403,o),
+(473,1317,o),
+(352,1317,cs),
+(231,1317,o),
+(136,1403,o),
+(136,1512,c),
+(90,1512,l),
+(90,1377,o),
+(206,1272,o),
+(352,1272,cs)
 );
 },
 {
-closed = 1;
-nodes = (
-(564,1629,o),
-(532,1582,o),
-(486,1582,cs),
-(409,1580,o),
-(380,1686,o),
-(280,1686,cs),
-(205,1686,o),
-(155,1623,o),
-(146,1546,c),
-(188,1540,l),
-(197,1592,o),
-(228,1639,o),
-(278,1640,cs),
-(355,1639,o),
-(392,1534,o),
-(488,1534,cs),
-(556,1535,o),
-(606,1599,o),
-(616,1674,c),
-(574,1680,l)
-);
+alignment = -1;
+pos = (-136,370);
+ref = tilde;
 }
 );
-width = 760;
+width = 704;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (436,1274);
+pos = (400,1056);
+},
+{
+name = top;
+pos = (400,1797);
 }
 );
 layerId = m007;
@@ -181,55 +137,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(567,1396,o),
-(529,1341,o),
-(428,1342,cs),
-(326,1341,o),
-(288,1396,o),
-(288,1458,c),
-(128,1458,l),
-(128,1332,o),
-(244,1242,o),
-(428,1242,cs),
-(614,1242,o),
-(727,1332,o),
-(728,1458,c),
-(568,1458,l)
+(569,1208,o),
+(685,1328,o),
+(685,1480,c),
+(557,1480,l),
+(557,1393,o),
+(492,1332,o),
+(400,1332,cs),
+(308,1332,o),
+(243,1393,o),
+(243,1480,c),
+(119,1480,l),
+(119,1328,o),
+(231,1208,o),
+(400,1208,cs)
 );
 },
 {
-closed = 1;
-nodes = (
-(631,1702,o),
-(593,1664,o),
-(550,1664,cs),
-(465,1664,o),
-(416,1737,o),
-(328,1736,cs),
-(230,1737,o),
-(160,1647,o),
-(160,1550,c),
-(250,1530,l),
-(250,1580,o),
-(285,1617,o),
-(328,1618,cs),
-(416,1617,o),
-(442,1545,o),
-(550,1544,cs),
-(649,1545,o),
-(719,1626,o),
-(718,1726,c),
-(632,1752,l)
-);
+alignment = -1;
+pos = (-75,322);
+ref = tilde;
 }
 );
-width = 856;
+width = 800;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (508,1312);
+pos = (480,1056);
+},
+{
+name = top;
+pos = (480,1869);
 }
 );
 layerId = m009;
@@ -237,55 +177,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(676,1399,o),
-(623,1359,o),
-(502,1358,cs),
-(373,1359,o),
-(327,1402,o),
-(328,1458,c),
-(104,1458,l),
-(103,1303,o),
-(260,1201,o),
-(502,1202,cs),
-(745,1201,o),
-(903,1303,o),
-(904,1458,c),
-(676,1458,l)
+(704,1156,o),
+(872,1303,o),
+(872,1490,c),
+(650,1490,l),
+(650,1406,o),
+(580,1347,o),
+(480,1347,cs),
+(379,1347,o),
+(297,1406,o),
+(297,1490,c),
+(99,1490,l),
+(99,1303,o),
+(256,1156,o),
+(480,1156,cs)
 );
 },
 {
-closed = 1;
-nodes = (
-(655,1731,o),
-(626,1693,o),
-(598,1694,cs),
-(507,1693,o),
-(428,1754,o),
-(342,1754,cs),
-(242,1754,o),
-(172,1670,o),
-(174,1574,c),
-(322,1530,l),
-(321,1580,o),
-(353,1615,o),
-(386,1614,cs),
-(472,1615,o),
-(530,1553,o),
-(642,1554,cs),
-(737,1553,o),
-(809,1641,o),
-(810,1734,c),
-(656,1780,l)
-);
+alignment = -1;
+pos = (-17,381);
+ref = tilde;
 }
 );
-width = 1004;
+width = 960;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (330,1250);
+pos = (352,1056);
+},
+{
+name = top;
+pos = (352,1772);
 }
 );
 layerId = m011;
@@ -293,55 +217,50 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(435,1373,o),
-(394,1331,o),
-(318,1330,cs),
-(243,1331,o),
-(202,1373,o),
-(202,1450,c),
-(156,1450,l),
-(156,1348,o),
-(217,1284,o),
-(318,1284,cs),
-(420,1284,o),
-(481,1348,o),
-(482,1450,c),
-(434,1450,l)
+(498,1216,o),
+(614,1321,o),
+(614,1456,c),
+(568,1456,l),
+(568,1347,o),
+(471,1259,o),
+(352,1259,cs),
+(233,1259,o),
+(136,1347,o),
+(136,1456,c),
+(90,1456,l),
+(90,1321,o),
+(206,1216,o),
+(352,1216,cs)
 );
 },
 {
-closed = 1;
-nodes = (
-(500,1629,o),
-(468,1582,o),
-(422,1582,cs),
-(345,1580,o),
-(316,1686,o),
-(216,1686,cs),
-(141,1686,o),
-(91,1623,o),
-(82,1546,c),
-(124,1540,l),
-(133,1592,o),
-(164,1639,o),
-(214,1640,cs),
-(291,1639,o),
-(328,1534,o),
-(424,1534,cs),
-(492,1535,o),
-(542,1599,o),
-(552,1674,c),
-(510,1680,l)
+alignment = -1;
+pos = (-80,320);
+ref = tilde;
+}
 );
+width = 704;
+},
+{
+associatedMasterId = m009;
+layerId = "02AF1C6D-F5F2-4D81-B8D1-70D57DA9C4BD";
+name = "Apr 11, 23, 18:29";
+shapes = (
+{
+ref = breve;
+},
+{
+alignment = -1;
+pos = (-17,381);
+ref = tilde;
 }
 );
-width = 632;
+width = 960;
 }
 );
 tags = (
 "TODO-opsz"
 );
-unicode = 57632;
 userData = {
 interface.gridadjust.original = "{'width': 1284, 'leftMargin': 176, 'rightMargin': 286}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/c.glyph b/src/Inter-Roman.glyphspackage/glyphs/c.glyph
index 2332f7b0d..e3fa15732 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/c.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/c.glyph
@@ -16,7 +16,7 @@ pos = (600,559);
 },
 {
 name = top;
-pos = (588,1304);
+pos = (588,1118);
 },
 {
 name = topr;
@@ -78,7 +78,7 @@ pos = (530,528);
 },
 {
 name = top;
-pos = (530,1262);
+pos = (530,1056);
 },
 {
 name = topr;
@@ -172,7 +172,7 @@ pos = (610,559);
 },
 {
 name = top;
-pos = (606,1304);
+pos = (606,1118);
 },
 {
 name = topr;
@@ -241,7 +241,7 @@ pos = (562,528);
 },
 {
 name = top;
-pos = (562,1262);
+pos = (562,1056);
 },
 {
 name = topr;
@@ -435,7 +435,7 @@ pos = (640,559);
 },
 {
 name = top;
-pos = (642,1304);
+pos = (642,1118);
 },
 {
 name = topr;
@@ -586,7 +586,7 @@ pos = (618,528);
 },
 {
 name = top;
-pos = (606,1262);
+pos = (606,1056);
 },
 {
 name = topr;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/cacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/cacute.glyph
index a4ecd084e..9eaa411f9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/cacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/cacute.glyph
@@ -75,7 +75,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (250,0);
+pos = (246,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/caron.glyph
index eec0f7a41..fe34641c1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/caron.glyph
@@ -5,28 +5,34 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (466,1304);
+pos = (466,1118);
+},
+{
+name = top;
+pos = (466,1574);
 }
 );
-guides = (
+background = {
+shapes = (
 {
-pos = (754,1720);
+ref = acute;
 }
 );
+};
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 closed = 1;
 nodes = (
-(152,1566,l),
-(152,1554,l),
-(386,1250,l),
-(544,1250,l),
-(780,1554,l),
-(780,1566,l),
-(616,1566,l),
-(466,1362,l),
-(314,1566,l)
+(152,1574,l),
+(152,1562,l),
+(386,1258,l),
+(544,1258,l),
+(780,1562,l),
+(780,1574,l),
+(616,1574,l),
+(466,1370,l),
+(314,1574,l)
 );
 }
 );
@@ -36,28 +42,34 @@ width = 930;
 anchors = (
 {
 name = _top;
-pos = (646,1304);
+pos = (646,1118);
+},
+{
+name = top;
+pos = (646,1582);
 }
 );
-guides = (
+background = {
+shapes = (
 {
-pos = (1248,1720);
+ref = acute;
 }
 );
+};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 closed = 1;
 nodes = (
-(172,1592,l),
 (172,1582,l),
-(506,1250,l),
-(786,1250,l),
+(172,1576,l),
+(506,1256,l),
+(786,1256,l),
+(1120,1576,l),
 (1120,1582,l),
-(1120,1592,l),
-(788,1592,l),
-(646,1432,l),
-(504,1592,l)
+(788,1582,l),
+(646,1416,l),
+(504,1582,l)
 );
 }
 );
@@ -67,23 +79,34 @@ width = 1292;
 anchors = (
 {
 name = _top;
-pos = (430,1288);
+pos = (432,1118);
+},
+{
+name = top;
+pos = (432,1552);
+}
+);
+background = {
+shapes = (
+{
+ref = acute;
 }
 );
+};
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 closed = 1;
 nodes = (
-(158,1536,l),
-(158,1530,l),
-(424,1256,l),
-(436,1256,l),
-(704,1530,l),
-(704,1536,l),
-(648,1536,l),
-(430,1312,l),
-(212,1536,l)
+(159,1552,l),
+(159,1546,l),
+(425,1272,l),
+(437,1272,l),
+(705,1546,l),
+(705,1552,l),
+(649,1552,l),
+(431,1328,l),
+(213,1552,l)
 );
 }
 );
@@ -93,24 +116,30 @@ width = 862;
 anchors = (
 {
 name = _top;
-pos = (434,1262);
+pos = (434,1056);
+},
+{
+name = top;
+pos = (434,1490);
 }
 );
-guides = (
+background = {
+shapes = (
 {
-pos = (462,1720);
+ref = acute;
 }
 );
+};
 layerId = m007;
 shapes = (
 {
 closed = 1;
 nodes = (
 (120,1490,l),
-(120,1486,l),
+(120,1489,l),
 (350,1216,l),
 (516,1216,l),
-(748,1486,l),
+(748,1489,l),
 (748,1490,l),
 (576,1490,l),
 (434,1314,l),
@@ -124,28 +153,34 @@ width = 866;
 anchors = (
 {
 name = _top;
-pos = (630,1262);
+pos = (628,1056);
+},
+{
+name = top;
+pos = (628,1490);
 }
 );
-guides = (
+background = {
+shapes = (
 {
-pos = (1152,1720);
+ref = acute;
 }
 );
+};
 layerId = m009;
 shapes = (
 {
 closed = 1;
 nodes = (
-(156,1490,l),
-(156,1489,l),
-(450,1164,l),
-(810,1164,l),
-(1104,1489,l),
-(1104,1490,l),
-(772,1490,l),
-(630,1322,l),
-(488,1490,l)
+(222,1490,l),
+(222,1489,l),
+(476,1164,l),
+(772,1164,l),
+(1034,1489,l),
+(1034,1490,l),
+(750,1490,l),
+(624,1330,l),
+(506,1490,l)
 );
 }
 );
@@ -155,9 +190,20 @@ width = 1260;
 anchors = (
 {
 name = _top;
-pos = (368,1262);
+pos = (368,1056);
+},
+{
+name = top;
+pos = (368,1490);
+}
+);
+background = {
+shapes = (
+{
+ref = acute;
 }
 );
+};
 layerId = m011;
 shapes = (
 {
@@ -176,8 +222,48 @@ nodes = (
 }
 );
 width = 734;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (624,1056);
+},
+{
+name = top;
+pos = (624,1490);
+}
+);
+associatedMasterId = m009;
+background = {
+shapes = (
+{
+ref = acute;
+}
+);
+};
+layerId = "DAB07AB3-202F-4EC1-80DD-D0BCB19EA106";
+name = "Apr 11, 23, 18:00";
+shapes = (
+{
+closed = 1;
+nodes = (
+(150,1490,l),
+(150,1489,l),
+(460,1164,l),
+(788,1164,l),
+(1098,1489,l),
+(1098,1490,l),
+(766,1490,l),
+(624,1322,l),
+(482,1490,l)
+);
+}
+);
+width = 1260;
 }
 );
+note = "Harmonize with /breve";
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/caroncmb.glyph b/src/Inter-Roman.glyphspackage/glyphs/caroncmb.glyph
index 1e9de2b07..1e28dd245 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/caroncmb.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/caroncmb.glyph
@@ -3,157 +3,67 @@ color = (250,227,227,1);
 glyphname = caroncmb;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (-590,1198);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-532,1254,l),
-(-282,1528,l),
-(-282,1538,l),
-(-446,1538,l),
-(-594,1370,l),
-(-736,1538,l),
-(-898,1538,l),
-(-898,1528,l),
-(-652,1254,l)
-);
+alignment = -1;
+pos = (136,0);
+ref = caron;
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-652,1198);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-544,1240,l),
-(-186,1522,l),
-(-186,1536,l),
-(-482,1536,l),
-(-652,1410,l),
-(-820,1536,l),
-(-1108,1536,l),
-(-1108,1516,l),
-(-760,1240,l)
-);
+alignment = -1;
+pos = (16,0);
+ref = caron;
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-606,1198);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-598,1256,l),
-(-330,1486,l),
-(-330,1492,l),
-(-388,1492,l),
-(-604,1310,l),
-(-818,1492,l),
-(-878,1492,l),
-(-878,1486,l),
-(-610,1256,l)
-);
+alignment = -1;
+pos = (152,0);
+ref = caron;
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-622,1198);
-}
-);
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-564,1254,l),
-(-314,1528,l),
-(-314,1538,l),
-(-478,1538,l),
-(-626,1370,l),
-(-768,1538,l),
-(-930,1538,l),
-(-930,1528,l),
-(-684,1254,l)
-);
+alignment = -1;
+pos = (140,0);
+ref = caron;
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-668,1198);
-}
-);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-560,1240,l),
-(-202,1522,l),
-(-202,1536,l),
-(-498,1536,l),
-(-668,1410,l),
-(-836,1536,l),
-(-1124,1536,l),
-(-1124,1516,l),
-(-776,1240,l)
-);
+alignment = -1;
+pos = (16,0);
+ref = caron;
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-670,1198);
-}
-);
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-662,1256,l),
-(-394,1486,l),
-(-394,1492,l),
-(-452,1492,l),
-(-668,1310,l),
-(-882,1492,l),
-(-942,1492,l),
-(-942,1486,l),
-(-674,1256,l)
-);
+alignment = -1;
+pos = (167,0);
+ref = caron;
 }
 );
 width = 0;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/carondotcomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/carondotcomb.cn.glyph
index 8f5e3f149..83bcd0211 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/carondotcomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/carondotcomb.cn.glyph
@@ -264,5 +264,4 @@ width = 0;
 tags = (
 "TODO-opsz"
 );
-unicode = 57625;
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/carondotcomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/carondotcomb.lc.glyph
index b4fc93a7a..7ed0fc21e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/carondotcomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/carondotcomb.lc.glyph
@@ -287,5 +287,4 @@ width = 0;
 tags = (
 "TODO-opsz"
 );
-unicode = 57607;
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/casetilde.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/casetilde.cn.glyph
deleted file mode 100644
index f7a56c946..000000000
--- a/src/Inter-Roman.glyphspackage/glyphs/casetilde.cn.glyph
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-color = (205,246,203,1);
-glyphname = casetilde.cn;
-layers = (
-{
-anchors = (
-{
-name = _top;
-pos = (460,1676);
-}
-);
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-shapes = (
-{
-alignment = -1;
-pos = (-52,386);
-ref = tilde;
-}
-);
-width = 920;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (516,1676);
-}
-);
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-shapes = (
-{
-alignment = -1;
-pos = (4,378);
-ref = tilde;
-}
-);
-width = 1032;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (424,1676);
-}
-);
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-shapes = (
-{
-alignment = -1;
-pos = (-82,392);
-ref = tilde;
-}
-);
-width = 852;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (428,1674);
-}
-);
-layerId = m007;
-shapes = (
-{
-alignment = -1;
-pos = (-52,448);
-ref = tilde;
-}
-);
-width = 856;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (500,1676);
-}
-);
-layerId = m009;
-shapes = (
-{
-alignment = -1;
-pos = (4,378);
-ref = tilde;
-}
-);
-width = 1000;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (360,1676);
-}
-);
-layerId = m011;
-shapes = (
-{
-alignment = -1;
-pos = (-82,392);
-ref = tilde;
-}
-);
-width = 724;
-}
-);
-tags = (
-"TODO-opsz"
-);
-}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ccaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/ccaron.glyph
index f4270bce9..d9c55fd0e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ccaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ccaron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (158,16);
+pos = (156,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (-24,0);
+pos = (-22,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ccedillaacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/ccedillaacute.glyph
index 2c3694be0..3662d37a2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ccedillaacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ccedillaacute.glyph
@@ -99,7 +99,7 @@ pos = (380,0);
 ref = cedilla;
 },
 {
-pos = (250,0);
+pos = (246,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ccircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/ccircumflex.glyph
index d926ef4d6..160ca613e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ccircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ccircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (140,0);
+pos = (142,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (-4,0);
+pos = (2,0);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (158,0);
+pos = (156,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (128,0);
+pos = (130,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (-24,0);
+pos = (-22,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (164,0);
+pos = (162,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/checyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/checyrillic.glyph
index fa0a6254d..0ca5ec45e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/checyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/checyrillic.glyph
@@ -15,7 +15,7 @@ pos = (1016,0);
 },
 {
 name = top;
-pos = (588,1304);
+pos = (588,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -65,7 +65,7 @@ pos = (1170,0);
 },
 {
 name = top;
-pos = (635,1304);
+pos = (635,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -115,7 +115,7 @@ pos = (948,0);
 },
 {
 name = top;
-pos = (574,1304);
+pos = (574,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -165,7 +165,7 @@ pos = (986,0);
 },
 {
 name = top;
-pos = (558,1262);
+pos = (558,1056);
 }
 );
 layerId = m007;
@@ -215,7 +215,7 @@ pos = (1152,0);
 },
 {
 name = top;
-pos = (619,1262);
+pos = (619,1056);
 }
 );
 layerId = m009;
@@ -265,7 +265,7 @@ pos = (884,0);
 },
 {
 name = top;
-pos = (510,1262);
+pos = (510,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/chedieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/chedieresiscyrillic.glyph
index 163d20896..6685ab30b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/chedieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/chedieresiscyrillic.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = checyrillic;
 },
 {
-pos = (-18,0);
+pos = (-13,0);
 ref = dieresis;
 }
 );
@@ -22,7 +22,7 @@ shapes = (
 ref = checyrillic;
 },
 {
-pos = (128,0);
+pos = (-30,0);
 ref = dieresis;
 }
 );
@@ -35,7 +35,7 @@ shapes = (
 ref = checyrillic;
 },
 {
-pos = (-100,0);
+pos = (-8,0);
 ref = dieresis;
 }
 );
@@ -48,7 +48,7 @@ shapes = (
 ref = checyrillic;
 },
 {
-pos = (-16,0);
+pos = (-11,0);
 ref = dieresis;
 }
 );
@@ -61,7 +61,7 @@ shapes = (
 ref = checyrillic;
 },
 {
-pos = (125,0);
+pos = (-30,0);
 ref = dieresis;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = checyrillic;
 },
 {
-pos = (-100,0);
+pos = (-24,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/circumflex.glyph
index ddecc342e..2b0a0a082 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/circumflex.glyph
@@ -5,21 +5,35 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (466,1304);
+pos = (464,1118);
+},
+{
+name = top;
+pos = (464,1574);
 }
 );
-guides = (
+background = {
+shapes = (
 {
-pos = (754,1720);
+ref = acute;
 }
 );
+};
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-angle = 180;
-pos = (930,2816);
-ref = caron;
+closed = 1;
+nodes = (
+(464,1462,l),
+(614,1258,l),
+(778,1258,l),
+(778,1270,l),
+(542,1574,l),
+(384,1574,l),
+(150,1270,l),
+(150,1258,l),
+(312,1258,l)
+);
 }
 );
 width = 930;
@@ -28,16 +42,35 @@ width = 930;
 anchors = (
 {
 name = _top;
-pos = (646,1304);
+pos = (640,1118);
+},
+{
+name = top;
+pos = (640,1582);
+}
+);
+background = {
+shapes = (
+{
+ref = acute;
 }
 );
+};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-angle = 180;
-pos = (1292,2842);
-ref = caron;
+closed = 1;
+nodes = (
+(640,1422,l),
+(782,1256,l),
+(1114,1256,l),
+(1114,1262,l),
+(780,1582,l),
+(500,1582,l),
+(166,1262,l),
+(166,1256,l),
+(498,1256,l)
+);
 }
 );
 width = 1292;
@@ -46,39 +79,72 @@ width = 1292;
 anchors = (
 {
 name = _top;
-pos = (430,1304);
+pos = (432,1118);
+},
+{
+name = top;
+pos = (432,1552);
+}
+);
+background = {
+shapes = (
+{
+ref = acute;
 }
 );
+};
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-angle = 180;
-pos = (862,2786);
-ref = caron;
+closed = 1;
+nodes = (
+(431,1504,l),
+(649,1280,l),
+(705,1280,l),
+(705,1286,l),
+(437,1560,l),
+(425,1560,l),
+(159,1286,l),
+(159,1280,l),
+(213,1280,l)
+);
 }
 );
-width = 862;
+width = 864;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (434,1262);
+pos = (432,1056);
+},
+{
+name = top;
+pos = (432,1490);
 }
 );
-guides = (
+background = {
+shapes = (
 {
-pos = (462,1720);
+ref = acute;
 }
 );
+};
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-angle = 180;
-pos = (866,2706);
-ref = caron;
+closed = 1;
+nodes = (
+(432,1392,l),
+(574,1216,l),
+(746,1216,l),
+(746,1217,l),
+(514,1490,l),
+(348,1490,l),
+(118,1217,l),
+(118,1216,l),
+(288,1216,l)
+);
 }
 );
 width = 866;
@@ -87,21 +153,75 @@ width = 866;
 anchors = (
 {
 name = _top;
-pos = (630,1262);
+pos = (368,1056);
+},
+{
+name = top;
+pos = (368,1490);
 }
 );
-guides = (
+background = {
+shapes = (
 {
-pos = (1152,1720);
+ref = acute;
 }
 );
-layerId = m009;
+};
+layerId = m011;
 shapes = (
 {
-alignment = -1;
-angle = 180;
-pos = (1260,2654);
-ref = caron;
+closed = 1;
+nodes = (
+(367,1451,l),
+(584,1216,l),
+(643,1216,l),
+(643,1217,l),
+(389,1490,l),
+(345,1490,l),
+(93,1217,l),
+(93,1216,l),
+(153,1216,l)
+);
+}
+);
+width = 732;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (624,1056);
+},
+{
+name = top;
+pos = (624,1490);
+}
+);
+associatedMasterId = m009;
+background = {
+shapes = (
+{
+pos = (-63,0);
+ref = acute;
+}
+);
+};
+layerId = "42C19D3A-5965-49BE-8C52-B6E920068666";
+name = "Apr 11, 23, 17:57";
+shapes = (
+{
+closed = 1;
+nodes = (
+(624,1332,l),
+(766,1164,l),
+(1098,1164,l),
+(1098,1165,l),
+(788,1490,l),
+(460,1490,l),
+(150,1165,l),
+(150,1164,l),
+(482,1164,l)
+);
 }
 );
 width = 1260;
@@ -110,22 +230,43 @@ width = 1260;
 anchors = (
 {
 name = _top;
-pos = (366,1262);
+pos = (628,1056);
+},
+{
+name = top;
+pos = (628,1490);
 }
 );
-layerId = m011;
+background = {
 shapes = (
 {
-alignment = -1;
-angle = 180;
-pos = (734,2706);
-ref = caron;
+pos = (-22,0);
+ref = acute;
 }
 );
-width = 734;
+};
+layerId = m009;
+name = "Display Black";
+shapes = (
+{
+closed = 1;
+nodes = (
+(624,1324,l),
+(750,1164,l),
+(1034,1164,l),
+(1034,1165,l),
+(772,1490,l),
+(476,1490,l),
+(222,1165,l),
+(222,1164,l),
+(506,1164,l)
+);
+}
+);
+width = 1260;
 }
 );
-metricWidth = caron;
+note = "Harmonize with /breveinvnosp";
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/circumflexacutecomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/circumflexacutecomb.cn.glyph
index 1bdac7276..42ef72624 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/circumflexacutecomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/circumflexacutecomb.cn.glyph
@@ -4,206 +4,151 @@ layers = (
 {
 anchors = (
 {
-name = _top;
-pos = (414,1300);
+name = top;
+pos = (464,1891);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(250,1254,l),
-(416,1408,l),
-(582,1254,l),
-(792,1254,l),
-(494,1518,l),
-(334,1518,l),
-(38,1254,l)
-);
+ref = circumflex;
 },
 {
 closed = 1;
 nodes = (
-(864,1432,l),
-(1068,1694,l),
-(856,1694,l),
-(712,1432,l)
+(748,1616,l),
+(940,1890,l),
+(746,1890,l),
+(606,1616,l)
 );
 }
 );
-width = 1106;
+width = 930;
 },
 {
 anchors = (
 {
-name = _top;
-pos = (424,1342);
+name = top;
+pos = (640,1888);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(274,1266,l),
-(422,1368,l),
-(568,1266,l),
-(800,1266,l),
-(506,1466,l),
-(334,1466,l),
-(44,1266,l)
-);
+ref = circumflex;
 },
 {
 closed = 1;
 nodes = (
-(916,1362,l),
-(1172,1640,l),
-(914,1640,l),
-(724,1362,l)
+(968,1618,l),
+(1210,1888,l),
+(914,1888,l),
+(784,1618,l)
 );
 }
 );
-width = 1216;
+width = 1292;
 },
 {
 anchors = (
 {
-name = _top;
-pos = (304,1278);
+name = top;
+pos = (432,1846);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(94,1256,l),
-(312,1480,l),
-(530,1256,l),
-(592,1256,l),
-(318,1536,l),
-(306,1536,l),
-(34,1256,l)
-);
+ref = circumflex;
 },
 {
 closed = 1;
 nodes = (
-(622,1438,l),
-(808,1694,l),
-(750,1694,l),
-(574,1438,l)
+(629,1586,l),
+(825,1846,l),
+(767,1846,l),
+(583,1586,l)
 );
 }
 );
-width = 840;
+width = 864;
 },
 {
 anchors = (
 {
-name = _top;
-pos = (382,1300);
+name = top;
+pos = (432,1812);
 }
 );
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(218,1254,l),
-(384,1408,l),
-(550,1254,l),
-(760,1254,l),
-(462,1518,l),
-(302,1518,l),
-(6,1254,l)
-);
+ref = circumflex;
 },
 {
 closed = 1;
 nodes = (
-(832,1432,l),
-(1036,1694,l),
-(824,1694,l),
-(680,1432,l)
+(715,1545,l),
+(907,1819,l),
+(713,1819,l),
+(573,1545,l)
 );
 }
 );
-width = 1042;
+width = 866;
 },
 {
 anchors = (
 {
-name = _top;
-pos = (408,1342);
+name = top;
+pos = (628,1770);
 }
 );
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(258,1266,l),
-(406,1368,l),
-(552,1266,l),
-(784,1266,l),
-(490,1466,l),
-(318,1466,l),
-(28,1266,l)
-);
+ref = circumflex;
 },
 {
 closed = 1;
 nodes = (
-(900,1362,l),
-(1156,1640,l),
-(898,1640,l),
-(708,1362,l)
+(998,1534,l),
+(1256,1770,l),
+(936,1770,l),
+(790,1534,l)
 );
 }
 );
-width = 1184;
+width = 1260;
 },
 {
 anchors = (
 {
-name = _top;
-pos = (240,1278);
+name = top;
+pos = (368,1764);
 }
 );
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(30,1256,l),
-(248,1480,l),
-(466,1256,l),
-(528,1256,l),
-(254,1536,l),
-(242,1536,l),
-(-30,1256,l)
-);
+ref = circumflex;
 },
 {
 closed = 1;
 nodes = (
-(558,1438,l),
-(744,1694,l),
-(686,1694,l),
-(510,1438,l)
+(563,1522,l),
+(739,1764,l),
+(681,1764,l),
+(512,1522,l)
 );
 }
 );
-width = 712;
+width = 732;
 }
 );
 tags = (
 "TODO-opsz"
 );
-unicode = 57700;
 userData = {
 interface.gridadjust.original = "{'width': 1430.0, 'leftMargin': 158, 'rightMargin': -143.0}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/circumflexgravecomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/circumflexgravecomb.cn.glyph
index 36f13405e..a25b93910 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/circumflexgravecomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/circumflexgravecomb.cn.glyph
@@ -4,206 +4,156 @@ layers = (
 {
 anchors = (
 {
-name = _top;
-pos = (692,1282);
+name = top;
+pos = (466,1891);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(610,1498,l),
-(318,1234,l),
-(526,1234,l),
-(692,1388,l),
-(858,1234,l),
-(1068,1234,l),
-(770,1498,l)
-);
+pos = (2,0);
+ref = circumflex;
 },
 {
 closed = 1;
 nodes = (
-(38,1676,l),
-(244,1410,l),
-(392,1410,l),
-(254,1676,l)
+(678,1890,l),
+(484,1890,l),
+(676,1616,l),
+(818,1616,l)
 );
 }
 );
-width = 1106;
+width = 930;
 },
 {
 anchors = (
 {
-name = _top;
-pos = (798,1356);
+name = top;
+pos = (652,1888);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(710,1474,l),
-(418,1274,l),
-(648,1274,l),
-(798,1376,l),
-(942,1274,l),
-(1176,1274,l),
-(882,1474,l)
-);
+pos = (12,0);
+ref = circumflex;
 },
 {
 closed = 1;
 nodes = (
-(50,1646,l),
-(306,1370,l),
-(494,1370,l),
-(302,1646,l)
+(993,1888,l),
+(697,1888,l),
+(939,1618,l),
+(1123,1618,l)
 );
 }
 );
-width = 1218;
+width = 1292;
 },
 {
 anchors = (
 {
-name = _top;
-pos = (500,1240);
+name = top;
+pos = (432,1846);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(498,1536,l),
-(224,1256,l),
-(286,1256,l),
-(504,1480,l),
-(722,1256,l),
-(782,1256,l),
-(510,1536,l)
-);
+ref = circumflex;
 },
 {
 closed = 1;
 nodes = (
-(34,1694,l),
-(206,1438,l),
-(252,1438,l),
-(92,1694,l)
+(513,1846,l),
+(455,1846,l),
+(651,1586,l),
+(697,1586,l)
 );
 }
 );
-width = 810;
+width = 864;
 },
 {
 anchors = (
 {
-name = _top;
-pos = (660,1282);
+name = top;
+pos = (434,1812);
 }
 );
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(578,1498,l),
-(286,1234,l),
-(494,1234,l),
-(660,1388,l),
-(826,1234,l),
-(1036,1234,l),
-(738,1498,l)
-);
+pos = (2,0);
+ref = circumflex;
 },
 {
 closed = 1;
 nodes = (
-(6,1676,l),
-(212,1410,l),
-(360,1410,l),
-(222,1676,l)
+(609,1819,l),
+(415,1819,l),
+(607,1545,l),
+(749,1545,l)
 );
 }
 );
-width = 1042;
+width = 866;
 },
 {
 anchors = (
 {
-name = _top;
-pos = (782,1356);
+name = top;
+pos = (632,1770);
 }
 );
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(694,1474,l),
-(402,1274,l),
-(632,1274,l),
-(782,1376,l),
-(926,1274,l),
-(1160,1274,l),
-(866,1474,l)
-);
+pos = (4,0);
+ref = circumflex;
 },
 {
 closed = 1;
 nodes = (
-(34,1646,l),
-(290,1370,l),
-(478,1370,l),
-(286,1646,l)
+(876,1770,l),
+(556,1770,l),
+(814,1534,l),
+(1022,1534,l)
 );
 }
 );
-width = 1186;
+width = 1260;
 },
 {
 anchors = (
 {
-name = _top;
-pos = (436,1240);
+name = top;
+pos = (364,1764);
 }
 );
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(434,1536,l),
-(160,1256,l),
-(222,1256,l),
-(440,1480,l),
-(658,1256,l),
-(718,1256,l),
-(446,1536,l)
-);
+pos = (-4,0);
+ref = circumflex;
 },
 {
 closed = 1;
 nodes = (
-(-30,1694,l),
-(142,1438,l),
-(188,1438,l),
-(28,1694,l)
+(455,1764,l),
+(397,1764,l),
+(573,1522,l),
+(624,1522,l)
 );
 }
 );
-width = 682;
+width = 732;
 }
 );
 tags = (
 "TODO-opsz"
 );
-unicode = 57622;
 userData = {
 interface.gridadjust.original = "{'width': 1430.0, 'leftMargin': -239, 'rightMargin': 254.0}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/circumflexhookcomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/circumflexhookcomb.cn.glyph
index e7637ed5b..3f543e7a0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/circumflexhookcomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/circumflexhookcomb.cn.glyph
@@ -2,280 +2,93 @@
 glyphname = circumflexhookcomb.cn;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (474,1320);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(372,1518,l),
-(96,1254,l),
-(276,1254,l),
-(472,1438,l),
-(670,1254,l),
-(850,1254,l),
-(574,1518,l)
-);
+ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(878,1454,l),
-(945,1463,o),
-(1009,1498,o),
-(1010,1586,cs),
-(1009,1684,o),
-(919,1748,o),
-(744,1748,c),
-(738,1652,l),
-(817,1652,o),
-(876,1635,o),
-(876,1588,cs),
-(876,1545,o),
-(838,1533,o),
-(756,1528,c),
-(756,1394,l),
-(878,1394,l)
-);
+alignment = -1;
+pos = (1247,346);
+ref = hookabovecmb;
 }
 );
-width = 1106;
+width = 930;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (510,1342);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(424,1466,l),
-(130,1266,l),
-(366,1266,l),
-(510,1356,l),
-(646,1266,l),
-(882,1266,l),
-(588,1466,l)
-);
+ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(972,1432,l),
-(1036,1443,o),
-(1103,1481,o),
-(1102,1544,cs),
-(1103,1652,o),
-(986,1711,o),
-(774,1710,c),
-(766,1580,l),
-(832,1580,o),
-(881,1571,o),
-(882,1528,cs),
-(881,1501,o),
-(847,1481,o),
-(762,1478,c),
-(786,1384,l),
-(972,1384,l)
-);
+alignment = -1;
+pos = (1585,361);
+ref = hookabovecmb;
 }
 );
-width = 1230;
+width = 1292;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (352,1310);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(350,1536,l),
-(78,1256,l),
-(138,1256,l),
-(356,1480,l),
-(574,1256,l),
-(636,1256,l),
-(362,1536,l)
-);
+ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(702,1476,l),
-(792,1484,o),
-(854,1543,o),
-(854,1620,cs),
-(852,1706,o),
-(784,1773,o),
-(636,1774,c),
-(628,1728,l),
-(748,1727,o),
-(803,1689,o),
-(804,1614,cs),
-(804,1553,o),
-(765,1524,o),
-(654,1518,c),
-(654,1400,l),
-(702,1400,l)
-);
+alignment = -1;
+pos = (1118,306);
+ref = hookabovecmb;
 }
 );
-width = 930;
+width = 864;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (442,1320);
-}
-);
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(340,1518,l),
-(64,1254,l),
-(244,1254,l),
-(440,1438,l),
-(638,1254,l),
-(818,1254,l),
-(542,1518,l)
-);
+ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(846,1454,l),
-(913,1463,o),
-(977,1498,o),
-(978,1586,cs),
-(977,1684,o),
-(887,1748,o),
-(712,1748,c),
-(706,1652,l),
-(785,1652,o),
-(844,1635,o),
-(844,1588,cs),
-(844,1545,o),
-(806,1533,o),
-(724,1528,c),
-(724,1394,l),
-(846,1394,l)
-);
+alignment = -1;
+pos = (1189,306);
+ref = hookabovecmb;
 }
 );
-width = 1042;
+width = 866;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (494,1342);
-}
-);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(408,1466,l),
-(114,1266,l),
-(350,1266,l),
-(494,1356,l),
-(630,1266,l),
-(866,1266,l),
-(572,1466,l)
-);
+ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(956,1432,l),
-(1020,1443,o),
-(1087,1481,o),
-(1086,1544,cs),
-(1087,1652,o),
-(970,1711,o),
-(758,1710,c),
-(750,1580,l),
-(816,1580,o),
-(865,1571,o),
-(866,1528,cs),
-(865,1501,o),
-(831,1481,o),
-(746,1478,c),
-(770,1384,l),
-(956,1384,l)
-);
+alignment = -1;
+pos = (1553,370);
+ref = hookabovecmb;
 }
 );
-width = 1198;
+width = 1260;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (288,1310);
-}
-);
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(286,1536,l),
-(14,1256,l),
-(74,1256,l),
-(292,1480,l),
-(510,1256,l),
-(572,1256,l),
-(298,1536,l)
-);
+ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(638,1476,l),
-(728,1484,o),
-(790,1543,o),
-(790,1620,cs),
-(788,1706,o),
-(720,1773,o),
-(572,1774,c),
-(564,1728,l),
-(684,1727,o),
-(739,1689,o),
-(740,1614,cs),
-(740,1553,o),
-(701,1524,o),
-(590,1518,c),
-(590,1400,l),
-(638,1400,l)
-);
+alignment = -1;
+pos = (1040,306);
+ref = hookabovecmb;
 }
 );
-width = 802;
+width = 732;
 }
 );
 tags = (
 "TODO-opsz"
 );
-unicode = 57631;
 userData = {
 interface.gridadjust.original = "{'width': 1430.0, 'leftMargin': 143, 'rightMargin': 32.0}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/circumflexnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/circumflexnosp.glyph
index 76385ea39..31ff51134 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/circumflexnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/circumflexnosp.glyph
@@ -7,35 +7,29 @@ layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-1070,0);
+pos = (-1066,0);
 ref = circumflex;
 }
 );
 width = 0;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (-932,1912);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-1312,0);
+pos = (-1308,0);
 ref = circumflex;
 }
 );
-width = 18;
+width = 0;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-926,0);
+pos = (-1010,0);
 ref = circumflex;
 }
 );
@@ -46,24 +40,18 @@ layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-1070,0);
+pos = (-998,0);
 ref = circumflex;
 }
 );
 width = 0;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (-1028,1912);
-}
-);
 layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1312,0);
+pos = (-1279,0);
 ref = circumflex;
 }
 );
@@ -74,7 +62,7 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-926,0);
+pos = (-892,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/circumflexsubnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/circumflexsubnosp.glyph
index 075412cef..d52e002e1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/circumflexsubnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/circumflexsubnosp.glyph
@@ -6,24 +6,14 @@ layers = (
 anchors = (
 {
 name = _bottom;
-pos = (-582,0);
-}
-);
-guides = (
-{
-orientation = center;
-pos = (-670,-352);
-},
-{
-orientation = center;
-pos = (-702,0);
+pos = (-592,0);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-1048,-1668);
+pos = (-1056,-1676);
 ref = circumflex;
 }
 );
@@ -33,24 +23,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-674,0);
-}
-);
-guides = (
-{
-orientation = center;
-pos = (-702,0);
-},
-{
-orientation = center;
-pos = (-666,-384);
+pos = (-665,0);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-1320,-1668);
+pos = (-1305,-1668);
 ref = circumflex;
 }
 );
@@ -60,24 +40,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-512,0);
-}
-);
-guides = (
-{
-orientation = center;
-pos = (-666,-320);
-},
-{
-orientation = center;
-pos = (92,0);
+pos = (-574,0);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-942,-1668);
+pos = (-1006,-1668);
 ref = circumflex;
 }
 );
@@ -87,20 +57,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-614,0);
-}
-);
-guides = (
-{
-orientation = center;
-pos = (-994,0);
+pos = (-568,0);
 }
 );
 layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-1048,-1634);
+pos = (-1000,-1658);
 ref = circumflex;
 }
 );
@@ -110,20 +74,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-690,0);
-}
-);
-guides = (
-{
-orientation = center;
-pos = (-798,0);
+pos = (-652,0);
 }
 );
 layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1320,-1582);
+pos = (-1276,-1590);
 ref = circumflex;
 }
 );
@@ -133,24 +91,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-576,0);
-}
-);
-guides = (
-{
-orientation = center;
-pos = (-794,-320);
-},
-{
-orientation = center;
-pos = (-36,0);
+pos = (-528,0);
 }
 );
 layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-942,-1634);
+pos = (-894,-1658);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/circumflextildecomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/circumflextildecomb.cn.glyph
index 16ec5ad8b..d81e2d790 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/circumflextildecomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/circumflextildecomb.cn.glyph
@@ -2,304 +2,93 @@
 glyphname = circumflextildecomb.cn;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (556,1342);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(482,1498,l),
-(178,1254,l),
-(358,1254,l),
-(552,1408,l),
-(748,1254,l),
-(928,1254,l),
-(622,1498,l)
-);
+ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(733,1719,o),
-(689,1684,o),
-(648,1684,cs),
-(573,1684,o),
-(529,1751,o),
-(448,1752,cs),
-(355,1751,o),
-(285,1670,o),
-(286,1592,c),
-(364,1570,l),
-(364,1606,o),
-(407,1644,o),
-(448,1644,cs),
-(527,1644,o),
-(550,1574,o),
-(648,1574,cs),
-(742,1574,o),
-(815,1652,o),
-(814,1730,c),
-(734,1754,l)
-);
+alignment = -1;
+pos = (-48,368);
+ref = tilde;
 }
 );
-width = 1106;
+width = 930;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (628,1332);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(538,1474,l),
-(250,1266,l),
-(492,1266,l),
-(628,1368,l),
-(770,1266,l),
-(1006,1266,l),
-(722,1474,l)
-);
+ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(773,1679,o),
-(767,1635,o),
-(744,1634,cs),
-(677,1635,o),
-(584,1693,o),
-(514,1694,cs),
-(436,1693,o),
-(395,1615,o),
-(396,1542,c),
-(518,1506,l),
-(517,1545,o),
-(523,1574,o),
-(550,1574,cs),
-(619,1574,o),
-(692,1513,o),
-(780,1512,cs),
-(857,1513,o),
-(898,1591,o),
-(898,1670,c),
-(774,1716,l)
-);
+alignment = -1;
+pos = (128,406);
+ref = tilde;
 }
 );
-width = 1256;
+width = 1292;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (430,1346);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(408,1536,l),
-(136,1256,l),
-(196,1256,l),
-(414,1480,l),
-(632,1256,l),
-(694,1256,l),
-(420,1536,l)
-);
+ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(635,1697,o),
-(582,1657,o),
-(530,1658,cs),
-(441,1660,o),
-(405,1777,o),
-(300,1778,cs),
-(228,1777,o),
-(154,1721,o),
-(138,1624,c),
-(184,1618,l),
-(196,1692,o),
-(249,1732,o),
-(302,1730,cs),
-(387,1729,o),
-(417,1612,o),
-(528,1612,cs),
-(604,1612,o),
-(677,1668,o),
-(692,1766,c),
-(646,1772,l)
-);
+alignment = -1;
+pos = (-72,370);
+ref = tilde;
 }
 );
-width = 830;
+width = 864;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (524,1342);
-}
-);
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(450,1498,l),
-(146,1254,l),
-(326,1254,l),
-(520,1408,l),
-(716,1254,l),
-(896,1254,l),
-(590,1498,l)
-);
+ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(701,1719,o),
-(657,1684,o),
-(616,1684,cs),
-(541,1684,o),
-(497,1751,o),
-(416,1752,cs),
-(323,1751,o),
-(253,1670,o),
-(254,1592,c),
-(332,1570,l),
-(332,1606,o),
-(375,1644,o),
-(416,1644,cs),
-(495,1644,o),
-(518,1574,o),
-(616,1574,cs),
-(710,1574,o),
-(783,1652,o),
-(782,1730,c),
-(702,1754,l)
-);
+alignment = -1;
+pos = (-48,322);
+ref = tilde;
 }
 );
-width = 1042;
+width = 866;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (612,1332);
-}
-);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(522,1474,l),
-(234,1266,l),
-(476,1266,l),
-(612,1368,l),
-(754,1266,l),
-(990,1266,l),
-(706,1474,l)
-);
+ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(757,1679,o),
-(751,1635,o),
-(728,1634,cs),
-(661,1635,o),
-(568,1693,o),
-(498,1694,cs),
-(420,1693,o),
-(379,1615,o),
-(380,1542,c),
-(502,1506,l),
-(501,1545,o),
-(507,1574,o),
-(534,1574,cs),
-(603,1574,o),
-(676,1513,o),
-(764,1512,cs),
-(841,1513,o),
-(882,1591,o),
-(882,1670,c),
-(758,1716,l)
-);
+alignment = -1;
+pos = (116,381);
+ref = tilde;
 }
 );
-width = 1224;
+width = 1260;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (366,1346);
-}
-);
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(344,1536,l),
-(72,1256,l),
-(132,1256,l),
-(350,1480,l),
-(568,1256,l),
-(630,1256,l),
-(356,1536,l)
-);
+ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(571,1697,o),
-(518,1657,o),
-(466,1658,cs),
-(377,1660,o),
-(341,1777,o),
-(236,1778,cs),
-(164,1777,o),
-(90,1721,o),
-(74,1624,c),
-(120,1618,l),
-(132,1692,o),
-(185,1732,o),
-(238,1730,cs),
-(323,1729,o),
-(353,1612,o),
-(464,1612,cs),
-(540,1612,o),
-(613,1668,o),
-(628,1766,c),
-(582,1772,l)
-);
+alignment = -1;
+pos = (-80,320);
+ref = tilde;
 }
 );
-width = 702;
+width = 732;
 }
 );
 tags = (
 "TODO-opsz"
 );
-unicode = 57638;
 userData = {
 interface.gridadjust.original = "{'width': 1430.0, 'leftMargin': 143, 'rightMargin': 254.0}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/commaaccentrotate.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/commaaccentrotate.cn.glyph
index 928f07593..784017eb4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/commaaccentrotate.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/commaaccentrotate.cn.glyph
@@ -167,7 +167,6 @@ width = 290;
 tags = (
 "TODO-opsz"
 );
-unicode = 57640;
 userData = {
 interface.gridadjust.original = "{'width': 718, 'leftMargin': 221, 'rightMargin': 135}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/crossbar.glyph b/src/Inter-Roman.glyphspackage/glyphs/crossbar.glyph
index eab950d2b..f6d71cc71 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/crossbar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/crossbar.glyph
@@ -5,7 +5,7 @@ layers = (
 anchors = (
 {
 name = _cross;
-pos = (460,721);
+pos = (460,745);
 }
 );
 guides = (
@@ -24,10 +24,10 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(780,654,l),
-(780,788,l),
-(140,788,l),
-(140,654,l)
+(780,678,l),
+(780,812,l),
+(140,812,l),
+(140,678,l)
 );
 }
 );
@@ -37,7 +37,7 @@ width = 920;
 anchors = (
 {
 name = _cross;
-pos = (520,721);
+pos = (520,745);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -45,10 +45,10 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(910,613,l),
-(910,829,l),
-(128,829,l),
-(128,613,l)
+(910,637,l),
+(910,853,l),
+(128,853,l),
+(128,637,l)
 );
 }
 );
@@ -58,7 +58,7 @@ width = 1038;
 anchors = (
 {
 name = _cross;
-pos = (424,722);
+pos = (424,745);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -66,10 +66,10 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(702,698,l),
-(702,744,l),
-(148,744,l),
-(148,698,l)
+(702,722,l),
+(702,768,l),
+(148,768,l),
+(148,722,l)
 );
 }
 );
@@ -79,18 +79,7 @@ width = 850;
 anchors = (
 {
 name = _cross;
-pos = (448,720);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (-3786,1168);
-},
-{
-orientation = center;
-pos = (-4118,992);
+pos = (448,745);
 }
 );
 layerId = m007;
@@ -98,10 +87,10 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(768,647,l),
-(768,793,l),
-(128,793,l),
-(128,647,l)
+(768,672,l),
+(768,818,l),
+(128,818,l),
+(128,672,l)
 );
 }
 );
@@ -111,7 +100,7 @@ width = 896;
 anchors = (
 {
 name = _cross;
-pos = (496,721);
+pos = (496,745);
 }
 );
 layerId = m009;
@@ -119,10 +108,10 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(926,613,l),
-(926,829,l),
-(64,829,l),
-(64,613,l)
+(926,637,l),
+(926,853,l),
+(64,853,l),
+(64,637,l)
 );
 }
 );
@@ -132,7 +121,7 @@ width = 990;
 anchors = (
 {
 name = _cross;
-pos = (360,722);
+pos = (360,745);
 }
 );
 layerId = m011;
@@ -140,10 +129,10 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(638,698,l),
-(638,744,l),
-(84,744,l),
-(84,698,l)
+(638,722,l),
+(638,768,l),
+(84,768,l),
+(84,722,l)
 );
 }
 );
@@ -176,7 +165,6 @@ width = 1006;
 tags = (
 "TODO-opsz"
 );
-unicode = 57603;
 userData = {
 "interface.width-adjustments" = (
 -16
diff --git a/src/Inter-Roman.glyphspackage/glyphs/crossbar_left_long.glyph b/src/Inter-Roman.glyphspackage/glyphs/crossbar_left_long.glyph
new file mode 100644
index 000000000..66d6863b7
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/crossbar_left_long.glyph
@@ -0,0 +1,162 @@
+{
+glyphname = crossbar_left_long;
+layers = (
+{
+anchors = (
+{
+name = _cross;
+pos = (460,745);
+}
+);
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1012,678,l),
+(1012,812,l),
+(140,812,l),
+(140,678,l)
+);
+}
+);
+width = 1176;
+},
+{
+anchors = (
+{
+name = _cross;
+pos = (520,745);
+}
+);
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1014,621,l),
+(1014,869,l),
+(128,869,l),
+(128,621,l)
+);
+}
+);
+width = 1166;
+},
+{
+anchors = (
+{
+name = _cross;
+pos = (424,745);
+}
+);
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+closed = 1;
+nodes = (
+(958,722,l),
+(958,768,l),
+(148,768,l),
+(148,722,l)
+);
+}
+);
+width = 1162;
+},
+{
+anchors = (
+{
+name = _cross;
+pos = (448,745);
+}
+);
+layerId = m007;
+shapes = (
+{
+closed = 1;
+nodes = (
+(984,672,l),
+(984,818,l),
+(128,818,l),
+(128,672,l)
+);
+}
+);
+width = 1192;
+},
+{
+anchors = (
+{
+name = _cross;
+pos = (496,745);
+}
+);
+layerId = m009;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1022,621,l),
+(1022,869,l),
+(104,869,l),
+(104,621,l)
+);
+}
+);
+width = 1118;
+},
+{
+anchors = (
+{
+name = _cross;
+pos = (360,745);
+}
+);
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(942,722,l),
+(942,768,l),
+(84,768,l),
+(84,722,l)
+);
+}
+);
+width = 1074;
+},
+{
+anchors = (
+{
+name = _cross;
+pos = (520,721);
+}
+);
+associatedMasterId = m009;
+layerId = "717EA9D1-8D19-49FD-82C7-E237B4672D6F";
+name = "Apr 7, 23, 15:08";
+shapes = (
+{
+closed = 1;
+nodes = (
+(910,613,l),
+(910,829,l),
+(128,829,l),
+(128,613,l)
+);
+}
+);
+width = 1006;
+}
+);
+tags = (
+"TODO-opsz"
+);
+userData = {
+"interface.width-adjustments" = (
+-16
+);
+};
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/cyrillicbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/cyrillicbreve.glyph
index ccc238b0a..c26702081 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/cyrillicbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/cyrillicbreve.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = breve;
 }
 );
-width = 920;
+width = 768;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -39,7 +39,7 @@ shapes = (
 ref = breve;
 }
 );
-width = 856;
+width = 800;
 },
 {
 layerId = m009;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dblgravecmb.glyph b/src/Inter-Roman.glyphspackage/glyphs/dblgravecmb.glyph
index f4e4b90ba..041cb2448 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dblgravecmb.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dblgravecmb.glyph
@@ -6,7 +6,7 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (-472,1304);
+pos = (-472,1118);
 }
 );
 background = {
@@ -22,12 +22,6 @@ nodes = (
 }
 );
 };
-guides = (
-{
-angle = 90;
-pos = (-648,1776);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
@@ -55,9 +49,17 @@ width = 0;
 anchors = (
 {
 name = _top;
-pos = (-610,1304);
+pos = (-610,1118);
+}
+);
+background = {
+shapes = (
+{
+pos = (-970,0);
+ref = grave;
 }
 );
+};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
@@ -85,7 +87,7 @@ width = 0;
 anchors = (
 {
 name = _top;
-pos = (-558,1304);
+pos = (-558,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -147,15 +149,17 @@ width = 582;
 anchors = (
 {
 name = _top;
-pos = (-504,1262);
+pos = (-504,1056);
 }
 );
-guides = (
+background = {
+shapes = (
 {
-angle = 90;
-pos = (-940,1776);
+pos = (-896,0);
+ref = grave;
 }
 );
+};
 layerId = m007;
 shapes = (
 {
@@ -183,7 +187,7 @@ width = 0;
 anchors = (
 {
 name = _top;
-pos = (-626,1262);
+pos = (-626,1056);
 }
 );
 background = {
@@ -258,7 +262,7 @@ width = 582;
 anchors = (
 {
 name = _top;
-pos = (-622,1262);
+pos = (-622,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dcircumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/dcircumflexbelow.glyph
index cfdb7c97e..02838d792 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dcircumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dcircumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1162,0);
+pos = (1172,0);
 ref = circumflexsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1358,0);
+pos = (1349,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1072,0);
+pos = (1134,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1148,0);
+pos = (1102,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1350,0);
+pos = (1312,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1106,0);
+pos = (1058,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dcroat.glyph b/src/Inter-Roman.glyphspackage/glyphs/dcroat.glyph
index 2d1157b8d..d070f01f2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dcroat.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dcroat.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (458,583);
+pos = (458,559);
 ref = crossbar;
 }
 );
@@ -22,7 +22,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (418,583);
+pos = (418,559);
 ref = crossbar;
 }
 );
@@ -35,7 +35,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (522,582);
+pos = (522,559);
 ref = crossbar;
 }
 );
@@ -48,7 +48,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (414,542);
+pos = (414,517);
 ref = crossbar;
 }
 );
@@ -61,7 +61,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (402,541);
+pos = (402,517);
 ref = crossbar;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (578,540);
+pos = (578,517);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ddotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/ddotaccent.glyph
index 3de6673e4..131572d6e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ddotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ddotaccent.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (340,0);
+pos = (340,186);
 ref = dotaccent;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (150,0);
+pos = (150,186);
 ref = dotaccent;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (374,0);
+pos = (374,186);
 ref = dotaccent;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (302,0);
+pos = (302,206);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (140,42);
+pos = (140,248);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (408,0);
+pos = (408,206);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresis.glyph
index b2d043c35..ba588773a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresis.glyph
@@ -6,16 +6,11 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (606,1304);
+pos = (601,1118);
 },
 {
 name = top;
-pos = (606,1676);
-}
-);
-guides = (
-{
-pos = (354,1984);
+pos = (601,1536);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -23,49 +18,49 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(878,1304,o),
-(930,1356,o),
-(930,1420,cs),
-(930,1484,o),
-(878,1536,o),
-(814,1536,cs),
-(750,1536,o),
-(698,1484,o),
-(698,1420,cs),
-(698,1356,o),
-(750,1304,o),
-(814,1304,cs)
+(873,1304,o),
+(925,1356,o),
+(925,1420,cs),
+(925,1484,o),
+(873,1536,o),
+(809,1536,cs),
+(745,1536,o),
+(693,1484,o),
+(693,1420,cs),
+(693,1356,o),
+(745,1304,o),
+(809,1304,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(460,1304,o),
-(512,1356,o),
-(512,1420,cs),
-(512,1484,o),
-(460,1536,o),
-(396,1536,cs),
-(332,1536,o),
-(280,1484,o),
-(280,1420,cs),
-(280,1356,o),
-(332,1304,o),
-(396,1304,cs)
+(455,1304,o),
+(507,1356,o),
+(507,1420,cs),
+(507,1484,o),
+(455,1536,o),
+(391,1536,cs),
+(327,1536,o),
+(275,1484,o),
+(275,1420,cs),
+(275,1356,o),
+(327,1304,o),
+(391,1304,cs)
 );
 }
 );
-width = 1210;
+width = 1200;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (507,1304);
+pos = (665,1118);
 },
 {
 name = top;
-pos = (507,1676);
+pos = (665,1585);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -73,54 +68,49 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(835,1248,o),
-(914,1324,o),
-(914,1417,cs),
-(914,1510,o),
-(835,1586,o),
-(738,1586,cs),
-(641,1586,o),
-(562,1510,o),
-(562,1417,cs),
-(562,1324,o),
-(641,1248,o),
-(738,1248,cs)
+(993,1247,o),
+(1072,1323,o),
+(1072,1416,cs),
+(1072,1509,o),
+(993,1585,o),
+(896,1585,cs),
+(799,1585,o),
+(720,1509,o),
+(720,1416,cs),
+(720,1323,o),
+(799,1247,o),
+(896,1247,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(373,1248,o),
-(452,1324,o),
-(452,1417,cs),
-(452,1510,o),
-(373,1586,o),
-(276,1586,cs),
-(179,1586,o),
-(100,1510,o),
-(100,1417,cs),
-(100,1324,o),
-(179,1248,o),
-(276,1248,cs)
+(531,1247,o),
+(610,1323,o),
+(610,1416,cs),
+(610,1509,o),
+(531,1585,o),
+(434,1585,cs),
+(337,1585,o),
+(258,1509,o),
+(258,1416,cs),
+(258,1323,o),
+(337,1247,o),
+(434,1247,cs)
 );
 }
 );
-width = 1014;
+width = 1330;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (674,1304);
+pos = (582,1118);
 },
 {
 name = top;
-pos = (674,1676);
-}
-);
-guides = (
-{
-pos = (752,1880);
+pos = (582,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -128,54 +118,49 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(841,1320,o),
-(862,1341,o),
-(862,1367,cs),
-(862,1393,o),
-(841,1414,o),
-(815,1414,cs),
-(789,1414,o),
-(768,1393,o),
-(768,1367,cs),
-(768,1341,o),
-(789,1320,o),
-(815,1320,cs)
+(810,1337,o),
+(831,1358,o),
+(831,1384,cs),
+(831,1410,o),
+(810,1431,o),
+(784,1431,cs),
+(758,1431,o),
+(737,1410,o),
+(737,1384,cs),
+(737,1358,o),
+(758,1337,o),
+(784,1337,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(561,1320,o),
-(582,1341,o),
-(582,1367,cs),
-(582,1393,o),
-(561,1414,o),
-(535,1414,cs),
-(509,1414,o),
-(488,1393,o),
-(488,1367,cs),
-(488,1341,o),
-(509,1320,o),
-(535,1320,cs)
+(406,1337,o),
+(427,1358,o),
+(427,1384,cs),
+(427,1410,o),
+(406,1431,o),
+(380,1431,cs),
+(354,1431,o),
+(333,1410,o),
+(333,1384,cs),
+(333,1358,o),
+(354,1337,o),
+(380,1337,cs)
 );
 }
 );
-width = 1350;
+width = 1164;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (574,1262);
+pos = (569,1056);
 },
 {
 name = top;
-pos = (574,1676);
-}
-);
-guides = (
-{
-pos = (62,1984);
+pos = (569,1490);
 }
 );
 layerId = m007;
@@ -183,49 +168,49 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(846,1262,o),
-(898,1314,o),
-(898,1378,cs),
-(898,1442,o),
-(846,1494,o),
-(782,1494,cs),
-(718,1494,o),
-(666,1442,o),
-(666,1378,cs),
-(666,1314,o),
-(718,1262,o),
-(782,1262,cs)
+(841,1262,o),
+(893,1314,o),
+(893,1378,cs),
+(893,1442,o),
+(841,1494,o),
+(777,1494,cs),
+(713,1494,o),
+(661,1442,o),
+(661,1378,cs),
+(661,1314,o),
+(713,1262,o),
+(777,1262,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(428,1262,o),
-(480,1314,o),
-(480,1378,cs),
-(480,1442,o),
-(428,1494,o),
-(364,1494,cs),
-(300,1494,o),
-(248,1442,o),
-(248,1378,cs),
-(248,1314,o),
-(300,1262,o),
-(364,1262,cs)
+(423,1262,o),
+(475,1314,o),
+(475,1378,cs),
+(475,1442,o),
+(423,1494,o),
+(359,1494,cs),
+(295,1494,o),
+(243,1442,o),
+(243,1378,cs),
+(243,1314,o),
+(295,1262,o),
+(359,1262,cs)
 );
 }
 );
-width = 1146;
+width = 1136;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (494,1262);
+pos = (649,1056);
 },
 {
 name = top;
-pos = (494,1676);
+pos = (649,1505);
 }
 );
 guides = (
@@ -240,96 +225,196 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(823,1166,o),
-(902,1242,o),
-(902,1335,cs),
-(902,1428,o),
-(823,1504,o),
-(726,1504,cs),
-(629,1504,o),
-(550,1428,o),
-(550,1335,cs),
-(550,1242,o),
-(629,1166,o),
-(726,1166,cs)
+(978,1167,o),
+(1057,1243,o),
+(1057,1336,cs),
+(1057,1429,o),
+(978,1505,o),
+(881,1505,cs),
+(784,1505,o),
+(705,1429,o),
+(705,1336,cs),
+(705,1243,o),
+(784,1167,o),
+(881,1167,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(359,1166,o),
-(438,1242,o),
-(438,1335,cs),
-(438,1428,o),
-(359,1504,o),
-(262,1504,cs),
-(165,1504,o),
-(86,1428,o),
-(86,1335,cs),
-(86,1242,o),
-(165,1166,o),
-(262,1166,cs)
+(514,1167,o),
+(593,1243,o),
+(593,1336,cs),
+(593,1429,o),
+(514,1505,o),
+(417,1505,cs),
+(320,1505,o),
+(241,1429,o),
+(241,1336,cs),
+(241,1243,o),
+(320,1167,o),
+(417,1167,cs)
 );
 }
 );
-width = 988;
+width = 1298;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (610,1262);
+pos = (534,1056);
 },
 {
 name = top;
-pos = (610,1676);
+pos = (534,1490);
 }
 );
-guides = (
+layerId = m011;
+shapes = (
 {
-pos = (624,1880);
+closed = 1;
+nodes = (
+(762,1331,o),
+(783,1352,o),
+(783,1378,cs),
+(783,1404,o),
+(762,1425,o),
+(736,1425,cs),
+(710,1425,o),
+(689,1404,o),
+(689,1378,cs),
+(689,1352,o),
+(710,1331,o),
+(736,1331,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(358,1331,o),
+(379,1352,o),
+(379,1378,cs),
+(379,1404,o),
+(358,1425,o),
+(332,1425,cs),
+(306,1425,o),
+(285,1404,o),
+(285,1378,cs),
+(285,1352,o),
+(306,1331,o),
+(332,1331,cs)
+);
 }
 );
-layerId = m011;
+width = 1068;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (533,1262);
+},
+{
+name = top;
+pos = (533,1676);
+}
+);
+associatedMasterId = m011;
+layerId = "DE17F4EB-A899-434E-932C-2478ABB59FC9";
+name = "Apr 10, 23, 08:57";
+shapes = (
+{
+closed = 1;
+nodes = (
+(700,1279,o),
+(721,1300,o),
+(721,1326,cs),
+(721,1352,o),
+(700,1373,o),
+(674,1373,cs),
+(648,1373,o),
+(627,1352,o),
+(627,1326,cs),
+(627,1300,o),
+(648,1279,o),
+(674,1279,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(420,1279,o),
+(441,1300,o),
+(441,1326,cs),
+(441,1352,o),
+(420,1373,o),
+(394,1373,cs),
+(368,1373,o),
+(347,1352,o),
+(347,1326,cs),
+(347,1300,o),
+(368,1279,o),
+(394,1279,cs)
+);
+}
+);
+width = 1068;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (581,1304);
+},
+{
+name = top;
+pos = (581,1676);
+}
+);
+associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+layerId = "E7A34F70-44F9-4122-AB2C-7BDC530E98B7";
+name = "Apr 10, 23, 09:05";
 shapes = (
 {
 closed = 1;
 nodes = (
-(777,1278,o),
-(798,1299,o),
-(798,1325,cs),
-(798,1351,o),
-(777,1372,o),
-(751,1372,cs),
-(725,1372,o),
-(704,1351,o),
-(704,1325,cs),
-(704,1299,o),
-(725,1278,o),
-(751,1278,cs)
+(748,1320,o),
+(769,1341,o),
+(769,1367,cs),
+(769,1393,o),
+(748,1414,o),
+(722,1414,cs),
+(696,1414,o),
+(675,1393,o),
+(675,1367,cs),
+(675,1341,o),
+(696,1320,o),
+(722,1320,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(497,1278,o),
-(518,1299,o),
-(518,1325,cs),
-(518,1351,o),
-(497,1372,o),
-(471,1372,cs),
-(445,1372,o),
-(424,1351,o),
-(424,1325,cs),
-(424,1299,o),
-(445,1278,o),
-(471,1278,cs)
+(468,1320,o),
+(489,1341,o),
+(489,1367,cs),
+(489,1393,o),
+(468,1414,o),
+(442,1414,cs),
+(416,1414,o),
+(395,1393,o),
+(395,1367,cs),
+(395,1341,o),
+(416,1320,o),
+(442,1320,cs)
 );
 }
 );
-width = 1222;
+width = 1164;
 }
 );
+metricWidth = n;
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresisacutecomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresisacutecomb.cn.glyph
deleted file mode 100644
index 6a808b262..000000000
--- a/src/Inter-Roman.glyphspackage/glyphs/dieresisacutecomb.cn.glyph
+++ /dev/null
@@ -1,195 +0,0 @@
-{
-glyphname = dieresisacutecomb.cn;
-layers = (
-{
-anchors = (
-{
-name = _top;
-pos = (-378,1676);
-}
-);
-background = {
-shapes = (
-{
-ref = tildeacutecomb.uc;
-}
-);
-};
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-302,1944,l),
-(-40,2164,l),
-(-242,2164,l),
-(-454,1944,l)
-);
-},
-{
-alignment = -1;
-pos = (-984,371);
-ref = dieresis;
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-408,1676);
-}
-);
-background = {
-shapes = (
-{
-ref = tildeacutecomb.uc;
-}
-);
-};
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-286,1972,l),
-(-34,2254,l),
-(-362,2254,l),
-(-556,1972,l)
-);
-},
-{
-alignment = -1;
-pos = (-882,495);
-ref = dieresis;
-scale = (0.9346,0.9028);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-372,1676);
-}
-);
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-348,1838,l),
-(-164,2024,l),
-(-232,2024,l),
-(-402,1838,l)
-);
-},
-{
-alignment = -1;
-pos = (-1048,372);
-ref = dieresis;
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-410,1676);
-}
-);
-background = {
-shapes = (
-{
-ref = tildeacutecomb.uc;
-}
-);
-};
-layerId = m007;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-334,1944,l),
-(-72,2164,l),
-(-274,2164,l),
-(-486,1944,l)
-);
-},
-{
-alignment = -1;
-pos = (-984,414);
-ref = dieresis;
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-424,1676);
-}
-);
-background = {
-shapes = (
-{
-ref = tildeacutecomb.uc;
-}
-);
-};
-layerId = m009;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-302,1972,l),
-(-50,2254,l),
-(-378,2254,l),
-(-572,1972,l)
-);
-},
-{
-alignment = -1;
-pos = (-883,528);
-ref = dieresis;
-scale = (0.9346,0.9028);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-436,1676);
-}
-);
-layerId = m011;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-412,1838,l),
-(-228,2024,l),
-(-296,2024,l),
-(-466,1838,l)
-);
-},
-{
-alignment = -1;
-pos = (-1048,413);
-ref = dieresis;
-}
-);
-width = 0;
-}
-);
-tags = (
-"TODO-opsz"
-);
-unicode = 57633;
-}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresisacutecomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresisacutecomb.lc.glyph
index ff305e167..cc66c78f7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dieresisacutecomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresisacutecomb.lc.glyph
@@ -11,97 +11,85 @@ pos = (-4800,1920);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (-1200,0);
 ref = dieresis;
 },
 {
-pos = (-946,372);
+alignment = -1;
+pos = (257,333);
 ref = acute;
 }
 );
-width = 0;
+width = 1200;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (-1180,0);
 ref = dieresis;
 },
 {
-pos = (-1063,372);
+alignment = -1;
+pos = (277,365);
 ref = acute;
 }
 );
-width = 0;
+width = 1330;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (-1257,0);
 ref = dieresis;
 },
 {
-pos = (-863,372);
+alignment = -1;
+pos = (311,239);
 ref = acute;
 }
 );
-width = 0;
+width = 1164;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (-5198,1920);
-}
-);
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (-1130,0);
 ref = dieresis;
 },
 {
-pos = (-907,414);
+alignment = -1;
+pos = (226,343);
 ref = acute;
 }
 );
-width = 0;
+width = 1136;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (-1140,0);
 ref = dieresis;
 },
 {
-pos = (-1056,414);
+alignment = -1;
+pos = (253,369);
 ref = acute;
 }
 );
-width = 0;
+width = 1298;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (-1117,0);
 ref = dieresis;
 },
 {
-pos = (-787,414);
+alignment = -1;
+pos = (256,323);
 ref = acute;
 }
 );
-width = 0;
+width = 1068;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresisacutecomb.uc.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresisacutecomb.uc.glyph
new file mode 100644
index 000000000..9f7daab32
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresisacutecomb.uc.glyph
@@ -0,0 +1,76 @@
+{
+case = minor;
+glyphname = dieresisacutecomb.uc;
+layers = (
+{
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+alignment = 1;
+pos = (0,372);
+ref = dieresisacutecomb.lc;
+}
+);
+width = 1200;
+},
+{
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+alignment = 1;
+pos = (0,372);
+ref = dieresisacutecomb.lc;
+}
+);
+width = 1330;
+},
+{
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+alignment = 1;
+pos = (0,372);
+ref = dieresisacutecomb.lc;
+}
+);
+width = 1164;
+},
+{
+layerId = m007;
+shapes = (
+{
+alignment = 1;
+pos = (0,434);
+ref = dieresisacutecomb.lc;
+}
+);
+width = 1136;
+},
+{
+layerId = m009;
+shapes = (
+{
+alignment = 1;
+pos = (0,434);
+ref = dieresisacutecomb.lc;
+}
+);
+width = 1298;
+},
+{
+layerId = m011;
+shapes = (
+{
+alignment = 1;
+pos = (0,434);
+ref = dieresisacutecomb.lc;
+}
+);
+width = 1068;
+}
+);
+tags = (
+"TODO-opsz"
+);
+unicode = 57633;
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresiscaroncomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresiscaroncomb.cn.glyph
deleted file mode 100644
index b227e7610..000000000
--- a/src/Inter-Roman.glyphspackage/glyphs/dieresiscaroncomb.cn.glyph
+++ /dev/null
@@ -1,370 +0,0 @@
-{
-color = 4;
-glyphname = dieresiscaroncomb.cn;
-layers = (
-{
-anchors = (
-{
-name = _top;
-pos = (-588,1262);
-}
-);
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-530,1442,l),
-(-274,1662,l),
-(-274,1678,l),
-(-446,1678,l),
-(-590,1554,l),
-(-736,1678,l),
-(-904,1678,l),
-(-904,1658,l),
-(-652,1442,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-748,1236,o),
-(-707,1283,o),
-(-706,1344,cs),
-(-707,1408,o),
-(-748,1457,o),
-(-824,1458,cs),
-(-896,1457,o),
-(-937,1408,o),
-(-936,1344,cs),
-(-937,1286,o),
-(-899,1236,o),
-(-822,1236,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-276,1233,o),
-(-239,1286,o),
-(-238,1344,cs),
-(-239,1405,o),
-(-279,1455,o),
-(-352,1454,cs),
-(-428,1455,o),
-(-468,1405,o),
-(-468,1344,cs),
-(-468,1283,o),
-(-428,1233,o),
-(-352,1234,cs)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-706,1262);
-}
-);
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-568,1498,l),
-(-256,1736,l),
-(-256,1752,l),
-(-576,1752,l),
-(-704,1650,l),
-(-832,1752,l),
-(-1154,1752,l),
-(-1154,1742,l),
-(-838,1498,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-832,1236,o),
-(-765,1289,o),
-(-766,1362,cs),
-(-765,1428,o),
-(-829,1484,o),
-(-922,1484,cs),
-(-1012,1484,o),
-(-1076,1428,o),
-(-1076,1362,cs),
-(-1076,1289,o),
-(-1009,1236,o),
-(-922,1236,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-404,1236,o),
-(-335,1289,o),
-(-334,1362,cs),
-(-335,1431,o),
-(-404,1484,o),
-(-492,1484,cs),
-(-585,1484,o),
-(-649,1428,o),
-(-648,1362,cs),
-(-649,1292,o),
-(-585,1236,o),
-(-492,1236,cs)
-);
-}
-);
-width = 26;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-518,1262);
-}
-);
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-514,1422,l),
-(-248,1666,l),
-(-248,1672,l),
-(-302,1672,l),
-(-520,1474,l),
-(-738,1672,l),
-(-794,1672,l),
-(-794,1666,l),
-(-526,1422,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-721,1321,o),
-(-700,1342,o),
-(-700,1368,cs),
-(-700,1393,o),
-(-721,1414,o),
-(-746,1414,cs),
-(-772,1414,o),
-(-793,1393,o),
-(-792,1368,cs),
-(-793,1342,o),
-(-772,1321,o),
-(-746,1320,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-267,1321,o),
-(-246,1342,o),
-(-246,1368,cs),
-(-246,1393,o),
-(-267,1414,o),
-(-292,1414,cs),
-(-318,1414,o),
-(-339,1393,o),
-(-338,1368,cs),
-(-339,1342,o),
-(-318,1321,o),
-(-292,1320,cs)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-620,1262);
-}
-);
-layerId = m007;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-562,1442,l),
-(-306,1662,l),
-(-306,1678,l),
-(-478,1678,l),
-(-622,1554,l),
-(-768,1678,l),
-(-936,1678,l),
-(-936,1658,l),
-(-684,1442,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-780,1236,o),
-(-739,1283,o),
-(-738,1344,cs),
-(-739,1408,o),
-(-780,1457,o),
-(-856,1458,cs),
-(-928,1457,o),
-(-969,1408,o),
-(-968,1344,cs),
-(-969,1286,o),
-(-931,1236,o),
-(-854,1236,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-308,1233,o),
-(-271,1286,o),
-(-270,1344,cs),
-(-271,1405,o),
-(-311,1455,o),
-(-384,1454,cs),
-(-460,1455,o),
-(-500,1405,o),
-(-500,1344,cs),
-(-500,1283,o),
-(-460,1233,o),
-(-384,1234,cs)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-722,1262);
-}
-);
-layerId = m009;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-584,1498,l),
-(-272,1736,l),
-(-272,1752,l),
-(-592,1752,l),
-(-720,1650,l),
-(-848,1752,l),
-(-1170,1752,l),
-(-1170,1742,l),
-(-854,1498,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-848,1236,o),
-(-781,1289,o),
-(-782,1362,cs),
-(-781,1428,o),
-(-845,1484,o),
-(-938,1484,cs),
-(-1028,1484,o),
-(-1092,1428,o),
-(-1092,1362,cs),
-(-1092,1289,o),
-(-1025,1236,o),
-(-938,1236,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-420,1236,o),
-(-351,1289,o),
-(-350,1362,cs),
-(-351,1431,o),
-(-420,1484,o),
-(-508,1484,cs),
-(-601,1484,o),
-(-665,1428,o),
-(-664,1362,cs),
-(-665,1292,o),
-(-601,1236,o),
-(-508,1236,cs)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-582,1262);
-}
-);
-layerId = m011;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-578,1422,l),
-(-312,1666,l),
-(-312,1672,l),
-(-366,1672,l),
-(-584,1474,l),
-(-802,1672,l),
-(-858,1672,l),
-(-858,1666,l),
-(-590,1422,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-785,1321,o),
-(-764,1342,o),
-(-764,1368,cs),
-(-764,1393,o),
-(-785,1414,o),
-(-810,1414,cs),
-(-836,1414,o),
-(-857,1393,o),
-(-856,1368,cs),
-(-857,1342,o),
-(-836,1321,o),
-(-810,1320,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-331,1321,o),
-(-310,1342,o),
-(-310,1368,cs),
-(-310,1393,o),
-(-331,1414,o),
-(-356,1414,cs),
-(-382,1414,o),
-(-403,1393,o),
-(-402,1368,cs),
-(-403,1342,o),
-(-382,1321,o),
-(-356,1320,cs)
-);
-}
-);
-width = 0;
-}
-);
-tags = (
-"TODO-opsz"
-);
-unicode = 57623;
-}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresiscaroncomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresiscaroncomb.lc.glyph
index 0000b1e73..ea04d663c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dieresiscaroncomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresiscaroncomb.lc.glyph
@@ -2,388 +2,88 @@
 glyphname = dieresiscaroncomb.lc;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (-590,1292);
-},
-{
-name = mkmktop_acc;
-pos = (-590,1926);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-916,1306,o),
-(-876,1260,o),
-(-802,1260,cs),
-(-727,1260,o),
-(-687,1306,o),
-(-686,1368,cs),
-(-687,1428,o),
-(-727,1478,o),
-(-802,1478,cs),
-(-879,1478,o),
-(-916,1425,o),
-(-916,1368,cs)
-);
+ref = dieresis;
 },
 {
-closed = 1;
-nodes = (
-(-489,1306,o),
-(-448,1257,o),
-(-372,1256,cs),
-(-297,1257,o),
-(-256,1306,o),
-(-256,1364,cs),
-(-256,1425,o),
-(-297,1478,o),
-(-372,1478,cs),
-(-448,1478,o),
-(-489,1425,o),
-(-488,1364,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-904,1830,l),
-(-904,1818,l),
-(-652,1542,l),
-(-530,1542,l),
-(-274,1818,l),
-(-274,1830,l),
-(-446,1830,l),
-(-590,1662,l),
-(-736,1830,l)
-);
+alignment = -1;
+pos = (135,336);
+ref = caron;
 }
 );
-width = 0;
+width = 1200;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-710,1292);
-},
-{
-name = mkmktop_acc;
-pos = (-712,1986);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-1155,1286,o),
-(-1079,1222,o),
-(-992,1222,cs),
-(-905,1222,o),
-(-826,1283,o),
-(-826,1364,cs),
-(-826,1443,o),
-(-902,1507,o),
-(-992,1506,cs),
-(-1079,1507,o),
-(-1155,1443,o),
-(-1154,1364,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-596,1286,o),
-(-521,1222,o),
-(-434,1222,cs),
-(-343,1222,o),
-(-268,1286,o),
-(-268,1364,cs),
-(-268,1443,o),
-(-343,1507,o),
-(-434,1506,cs),
-(-521,1507,o),
-(-596,1443,o),
-(-596,1364,cs)
-);
+ref = dieresis;
 },
 {
-closed = 1;
-nodes = (
-(-1186,1868,l),
-(-1186,1858,l),
-(-832,1570,l),
-(-588,1570,l),
-(-236,1856,l),
-(-236,1868,l),
-(-552,1868,l),
-(-710,1748,l),
-(-864,1868,l)
-);
+alignment = -1;
+pos = (19,363);
+ref = caron;
 }
 );
-width = 24;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-520,1292);
+width = 1330;
 },
 {
-name = mkmktop_acc;
-pos = (-518,1890);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-793,1342,o),
-(-772,1321,o),
-(-746,1320,cs),
-(-721,1321,o),
-(-700,1342,o),
-(-700,1368,cs),
-(-700,1393,o),
-(-721,1414,o),
-(-746,1414,cs),
-(-772,1414,o),
-(-793,1393,o),
-(-792,1368,cs)
-);
+ref = dieresis;
 },
 {
-closed = 1;
-nodes = (
-(-339,1342,o),
-(-318,1321,o),
-(-292,1320,cs),
-(-267,1321,o),
-(-246,1342,o),
-(-246,1368,cs),
-(-246,1393,o),
-(-267,1414,o),
-(-292,1414,cs),
-(-318,1414,o),
-(-339,1393,o),
-(-338,1368,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-794,1804,l),
-(-794,1798,l),
-(-526,1524,l),
-(-514,1524,l),
-(-248,1798,l),
-(-248,1804,l),
-(-302,1804,l),
-(-520,1580,l),
-(-738,1804,l)
-);
+alignment = -1;
+pos = (152,280);
+ref = caron;
 }
 );
-width = 0;
+width = 1164;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-622,1292);
-},
-{
-name = mkmktop_acc;
-pos = (-622,1926);
-}
-);
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-948,1306,o),
-(-908,1260,o),
-(-834,1260,cs),
-(-759,1260,o),
-(-719,1306,o),
-(-718,1368,cs),
-(-719,1428,o),
-(-759,1478,o),
-(-834,1478,cs),
-(-911,1478,o),
-(-948,1425,o),
-(-948,1368,cs)
-);
+ref = dieresis;
 },
 {
-closed = 1;
-nodes = (
-(-521,1306,o),
-(-480,1257,o),
-(-404,1256,cs),
-(-329,1257,o),
-(-288,1306,o),
-(-288,1364,cs),
-(-288,1425,o),
-(-329,1478,o),
-(-404,1478,cs),
-(-480,1478,o),
-(-521,1425,o),
-(-520,1364,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-936,1830,l),
-(-936,1818,l),
-(-684,1542,l),
-(-562,1542,l),
-(-306,1818,l),
-(-306,1830,l),
-(-478,1830,l),
-(-622,1662,l),
-(-768,1830,l)
-);
+alignment = -1;
+pos = (135,343);
+ref = caron;
 }
 );
-width = 0;
+width = 1136;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-726,1292);
-},
-{
-name = mkmktop_acc;
-pos = (-728,1986);
-}
-);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-1171,1286,o),
-(-1095,1222,o),
-(-1008,1222,cs),
-(-921,1222,o),
-(-842,1283,o),
-(-842,1364,cs),
-(-842,1443,o),
-(-918,1507,o),
-(-1008,1506,cs),
-(-1095,1507,o),
-(-1171,1443,o),
-(-1170,1364,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-612,1286,o),
-(-537,1222,o),
-(-450,1222,cs),
-(-359,1222,o),
-(-284,1286,o),
-(-284,1364,cs),
-(-284,1443,o),
-(-359,1507,o),
-(-450,1506,cs),
-(-537,1507,o),
-(-612,1443,o),
-(-612,1364,cs)
-);
+ref = dieresis;
 },
 {
-closed = 1;
-nodes = (
-(-1202,1868,l),
-(-1202,1858,l),
-(-848,1570,l),
-(-604,1570,l),
-(-252,1856,l),
-(-252,1868,l),
-(-568,1868,l),
-(-726,1748,l),
-(-880,1868,l)
-);
+alignment = -1;
+pos = (19,377);
+ref = caron;
 }
 );
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-584,1292);
+width = 1298;
 },
 {
-name = mkmktop_acc;
-pos = (-582,1890);
-}
-);
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-857,1342,o),
-(-836,1321,o),
-(-810,1320,cs),
-(-785,1321,o),
-(-764,1342,o),
-(-764,1368,cs),
-(-764,1393,o),
-(-785,1414,o),
-(-810,1414,cs),
-(-836,1414,o),
-(-857,1393,o),
-(-856,1368,cs)
-);
+ref = dieresis;
 },
 {
-closed = 1;
-nodes = (
-(-403,1342,o),
-(-382,1321,o),
-(-356,1320,cs),
-(-331,1321,o),
-(-310,1342,o),
-(-310,1368,cs),
-(-310,1393,o),
-(-331,1414,o),
-(-356,1414,cs),
-(-382,1414,o),
-(-403,1393,o),
-(-402,1368,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-858,1804,l),
-(-858,1798,l),
-(-590,1524,l),
-(-578,1524,l),
-(-312,1798,l),
-(-312,1804,l),
-(-366,1804,l),
-(-584,1580,l),
-(-802,1804,l)
-);
+alignment = -1;
+pos = (166,323);
+ref = caron;
 }
 );
-width = 0;
+width = 1068;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresiscaroncomb.uc.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresiscaroncomb.uc.glyph
new file mode 100644
index 000000000..4b18b209c
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresiscaroncomb.uc.glyph
@@ -0,0 +1,77 @@
+{
+case = minor;
+color = 4;
+glyphname = dieresiscaroncomb.uc;
+layers = (
+{
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+alignment = 1;
+pos = (0,372);
+ref = dieresiscaroncomb.lc;
+}
+);
+width = 1200;
+},
+{
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+alignment = 1;
+pos = (0,372);
+ref = dieresiscaroncomb.lc;
+}
+);
+width = 1330;
+},
+{
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+alignment = 1;
+pos = (0,372);
+ref = dieresiscaroncomb.lc;
+}
+);
+width = 1164;
+},
+{
+layerId = m007;
+shapes = (
+{
+alignment = 1;
+pos = (0,434);
+ref = dieresiscaroncomb.lc;
+}
+);
+width = 1136;
+},
+{
+layerId = m009;
+shapes = (
+{
+alignment = 1;
+pos = (0,434);
+ref = dieresiscaroncomb.lc;
+}
+);
+width = 1298;
+},
+{
+layerId = m011;
+shapes = (
+{
+alignment = 1;
+pos = (0,434);
+ref = dieresiscaroncomb.lc;
+}
+);
+width = 1068;
+}
+);
+tags = (
+"TODO-opsz"
+);
+unicode = 57623;
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresisgravecomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresisgravecomb.cn.glyph
deleted file mode 100644
index f311dbf8c..000000000
--- a/src/Inter-Roman.glyphspackage/glyphs/dieresisgravecomb.cn.glyph
+++ /dev/null
@@ -1,339 +0,0 @@
-{
-glyphname = dieresisgravecomb.cn;
-layers = (
-{
-anchors = (
-{
-name = _top;
-pos = (-588,1262);
-}
-);
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-824,1630,l),
-(-640,1402,l),
-(-512,1402,l),
-(-640,1630,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-937,1286,o),
-(-899,1236,o),
-(-822,1236,cs),
-(-748,1236,o),
-(-707,1283,o),
-(-706,1344,cs),
-(-707,1408,o),
-(-748,1457,o),
-(-824,1458,cs),
-(-896,1457,o),
-(-937,1408,o),
-(-936,1344,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-468,1283,o),
-(-428,1233,o),
-(-352,1234,cs),
-(-276,1233,o),
-(-239,1286,o),
-(-238,1344,cs),
-(-239,1405,o),
-(-279,1455,o),
-(-352,1454,cs),
-(-428,1455,o),
-(-468,1405,o),
-(-468,1344,cs)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-696,1262);
-}
-);
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-962,1666,l),
-(-776,1498,l),
-(-590,1498,l),
-(-724,1666,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-1069,1289,o),
-(-1002,1236,o),
-(-914,1236,cs),
-(-825,1236,o),
-(-755,1289,o),
-(-754,1362,cs),
-(-755,1428,o),
-(-822,1484,o),
-(-914,1484,cs),
-(-1002,1484,o),
-(-1069,1428,o),
-(-1068,1362,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-641,1289,o),
-(-572,1236,o),
-(-482,1236,cs),
-(-391,1236,o),
-(-327,1292,o),
-(-326,1362,cs),
-(-327,1428,o),
-(-391,1484,o),
-(-482,1484,cs),
-(-572,1484,o),
-(-641,1431,o),
-(-640,1362,cs)
-);
-}
-);
-width = 32;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-524,1262);
-}
-);
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-678,1550,l),
-(-536,1352,l),
-(-490,1352,l),
-(-620,1550,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-707,1298,o),
-(-686,1277,o),
-(-660,1278,cs),
-(-635,1277,o),
-(-614,1298,o),
-(-614,1324,cs),
-(-614,1349,o),
-(-635,1370,o),
-(-660,1370,cs),
-(-686,1370,o),
-(-707,1349,o),
-(-706,1324,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-428,1298,o),
-(-407,1277,o),
-(-382,1278,cs),
-(-356,1277,o),
-(-335,1298,o),
-(-334,1324,cs),
-(-335,1349,o),
-(-356,1370,o),
-(-382,1370,cs),
-(-407,1370,o),
-(-428,1349,o),
-(-428,1324,cs)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-620,1262);
-}
-);
-layerId = m007;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-856,1630,l),
-(-672,1402,l),
-(-544,1402,l),
-(-672,1630,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-969,1286,o),
-(-931,1236,o),
-(-854,1236,cs),
-(-780,1236,o),
-(-739,1283,o),
-(-738,1344,cs),
-(-739,1408,o),
-(-780,1457,o),
-(-856,1458,cs),
-(-928,1457,o),
-(-969,1408,o),
-(-968,1344,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-500,1283,o),
-(-460,1233,o),
-(-384,1234,cs),
-(-308,1233,o),
-(-271,1286,o),
-(-270,1344,cs),
-(-271,1405,o),
-(-311,1455,o),
-(-384,1454,cs),
-(-460,1455,o),
-(-500,1405,o),
-(-500,1344,cs)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-712,1262);
-}
-);
-layerId = m009;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-978,1666,l),
-(-792,1498,l),
-(-606,1498,l),
-(-740,1666,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-1085,1289,o),
-(-1018,1236,o),
-(-930,1236,cs),
-(-841,1236,o),
-(-771,1289,o),
-(-770,1362,cs),
-(-771,1428,o),
-(-838,1484,o),
-(-930,1484,cs),
-(-1018,1484,o),
-(-1085,1428,o),
-(-1084,1362,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-657,1289,o),
-(-588,1236,o),
-(-498,1236,cs),
-(-407,1236,o),
-(-343,1292,o),
-(-342,1362,cs),
-(-343,1428,o),
-(-407,1484,o),
-(-498,1484,cs),
-(-588,1484,o),
-(-657,1431,o),
-(-656,1362,cs)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-588,1262);
-}
-);
-layerId = m011;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-742,1550,l),
-(-600,1352,l),
-(-554,1352,l),
-(-684,1550,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-771,1298,o),
-(-750,1277,o),
-(-724,1278,cs),
-(-699,1277,o),
-(-678,1298,o),
-(-678,1324,cs),
-(-678,1349,o),
-(-699,1370,o),
-(-724,1370,cs),
-(-750,1370,o),
-(-771,1349,o),
-(-770,1324,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-492,1298,o),
-(-471,1277,o),
-(-446,1278,cs),
-(-420,1277,o),
-(-399,1298,o),
-(-398,1324,cs),
-(-399,1349,o),
-(-420,1370,o),
-(-446,1370,cs),
-(-471,1370,o),
-(-492,1349,o),
-(-492,1324,cs)
-);
-}
-);
-width = 0;
-}
-);
-tags = (
-"TODO-opsz"
-);
-unicode = 57636;
-}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresisgravecomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresisgravecomb.lc.glyph
index 5ece5fcc6..852cfb1ab 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dieresisgravecomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresisgravecomb.lc.glyph
@@ -2,358 +2,88 @@
 glyphname = dieresisgravecomb.lc;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (-590,1292);
-},
-{
-name = mkmktop_acc;
-pos = (-590,1940);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-916,1306,o),
-(-876,1260,o),
-(-802,1260,cs),
-(-727,1260,o),
-(-687,1306,o),
-(-686,1368,cs),
-(-687,1428,o),
-(-727,1478,o),
-(-802,1478,cs),
-(-879,1478,o),
-(-916,1425,o),
-(-916,1368,cs)
-);
+ref = dieresis;
 },
 {
-closed = 1;
-nodes = (
-(-489,1306,o),
-(-448,1257,o),
-(-372,1256,cs),
-(-297,1257,o),
-(-256,1306,o),
-(-256,1364,cs),
-(-256,1425,o),
-(-297,1478,o),
-(-372,1478,cs),
-(-448,1478,o),
-(-489,1425,o),
-(-488,1364,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-914,1826,l),
-(-648,1530,l),
-(-478,1530,l),
-(-672,1826,l)
-);
+alignment = -1;
+pos = (46,333);
+ref = grave;
 }
 );
-width = 0;
+width = 1200;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-704,1292);
-},
-{
-name = mkmktop_acc;
-pos = (-704,2010);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-1152,1286,o),
-(-1076,1222,o),
-(-990,1222,cs),
-(-899,1222,o),
-(-823,1286,o),
-(-824,1364,cs),
-(-823,1443,o),
-(-899,1507,o),
-(-990,1506,cs),
-(-1076,1507,o),
-(-1152,1443,o),
-(-1152,1364,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-593,1286,o),
-(-518,1222,o),
-(-428,1222,cs),
-(-340,1222,o),
-(-265,1286,o),
-(-264,1364,cs),
-(-265,1443,o),
-(-340,1507,o),
-(-428,1506,cs),
-(-515,1507,o),
-(-593,1446,o),
-(-594,1364,cs)
-);
+ref = dieresis;
 },
 {
-closed = 1;
-nodes = (
-(-1132,1868,l),
-(-832,1548,l),
-(-530,1548,l),
-(-738,1868,l)
-);
+alignment = -1;
+pos = (53,365);
+ref = grave;
 }
 );
-width = 26;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-524,1292);
+width = 1330;
 },
 {
-name = mkmktop_acc;
-pos = (-524,1900);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-707,1342,o),
-(-686,1321,o),
-(-660,1320,cs),
-(-635,1321,o),
-(-614,1342,o),
-(-614,1368,cs),
-(-614,1393,o),
-(-635,1414,o),
-(-660,1414,cs),
-(-686,1414,o),
-(-707,1393,o),
-(-706,1368,cs)
-);
+ref = dieresis;
 },
 {
-closed = 1;
-nodes = (
-(-428,1342,o),
-(-407,1321,o),
-(-382,1320,cs),
-(-356,1321,o),
-(-335,1342,o),
-(-334,1368,cs),
-(-335,1393,o),
-(-356,1414,o),
-(-382,1414,cs),
-(-407,1414,o),
-(-428,1393,o),
-(-428,1368,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-722,1638,l),
-(-536,1396,l),
-(-490,1396,l),
-(-664,1638,l)
-);
+alignment = -1;
+pos = (88,239);
+ref = grave;
 }
 );
-width = 0;
+width = 1164;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-622,1292);
-},
-{
-name = mkmktop_acc;
-pos = (-622,1940);
-}
-);
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-948,1306,o),
-(-908,1260,o),
-(-834,1260,cs),
-(-759,1260,o),
-(-719,1306,o),
-(-718,1368,cs),
-(-719,1428,o),
-(-759,1478,o),
-(-834,1478,cs),
-(-911,1478,o),
-(-948,1425,o),
-(-948,1368,cs)
-);
+ref = dieresis;
 },
 {
-closed = 1;
-nodes = (
-(-521,1306,o),
-(-480,1257,o),
-(-404,1256,cs),
-(-329,1257,o),
-(-288,1306,o),
-(-288,1364,cs),
-(-288,1425,o),
-(-329,1478,o),
-(-404,1478,cs),
-(-480,1478,o),
-(-521,1425,o),
-(-520,1364,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-946,1826,l),
-(-680,1530,l),
-(-510,1530,l),
-(-704,1826,l)
-);
+alignment = -1;
+pos = (-7,343);
+ref = grave;
 }
 );
-width = 0;
+width = 1136;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-720,1292);
-},
-{
-name = mkmktop_acc;
-pos = (-720,2010);
-}
-);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-1168,1286,o),
-(-1092,1222,o),
-(-1006,1222,cs),
-(-915,1222,o),
-(-839,1286,o),
-(-840,1364,cs),
-(-839,1443,o),
-(-915,1507,o),
-(-1006,1506,cs),
-(-1092,1507,o),
-(-1168,1443,o),
-(-1168,1364,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-609,1286,o),
-(-534,1222,o),
-(-444,1222,cs),
-(-356,1222,o),
-(-281,1286,o),
-(-280,1364,cs),
-(-281,1443,o),
-(-356,1507,o),
-(-444,1506,cs),
-(-531,1507,o),
-(-609,1446,o),
-(-610,1364,cs)
-);
+ref = dieresis;
 },
 {
-closed = 1;
-nodes = (
-(-1148,1868,l),
-(-848,1548,l),
-(-546,1548,l),
-(-754,1868,l)
-);
+alignment = -1;
+pos = (-55,369);
+ref = grave;
 }
 );
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-588,1292);
+width = 1298;
 },
 {
-name = mkmktop_acc;
-pos = (-588,1900);
-}
-);
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-771,1342,o),
-(-750,1321,o),
-(-724,1320,cs),
-(-699,1321,o),
-(-678,1342,o),
-(-678,1368,cs),
-(-678,1393,o),
-(-699,1414,o),
-(-724,1414,cs),
-(-750,1414,o),
-(-771,1393,o),
-(-770,1368,cs)
-);
+ref = dieresis;
 },
 {
-closed = 1;
-nodes = (
-(-492,1342,o),
-(-471,1321,o),
-(-446,1320,cs),
-(-420,1321,o),
-(-399,1342,o),
-(-398,1368,cs),
-(-399,1393,o),
-(-420,1414,o),
-(-446,1414,cs),
-(-471,1414,o),
-(-492,1393,o),
-(-492,1368,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-786,1638,l),
-(-600,1396,l),
-(-554,1396,l),
-(-728,1638,l)
-);
+alignment = -1;
+pos = (32,323);
+ref = grave;
 }
 );
-width = 0;
+width = 1068;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresisgravecomb.uc.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresisgravecomb.uc.glyph
new file mode 100644
index 000000000..e186c9c6e
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresisgravecomb.uc.glyph
@@ -0,0 +1,76 @@
+{
+case = minor;
+glyphname = dieresisgravecomb.uc;
+layers = (
+{
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+alignment = 1;
+pos = (0,372);
+ref = dieresisgravecomb.lc;
+}
+);
+width = 1200;
+},
+{
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+alignment = 1;
+pos = (0,372);
+ref = dieresisgravecomb.lc;
+}
+);
+width = 1330;
+},
+{
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+alignment = 1;
+pos = (0,372);
+ref = dieresisgravecomb.lc;
+}
+);
+width = 1164;
+},
+{
+layerId = m007;
+shapes = (
+{
+alignment = 1;
+pos = (0,434);
+ref = dieresisgravecomb.lc;
+}
+);
+width = 1136;
+},
+{
+layerId = m009;
+shapes = (
+{
+alignment = 1;
+pos = (0,434);
+ref = dieresisgravecomb.lc;
+}
+);
+width = 1298;
+},
+{
+layerId = m011;
+shapes = (
+{
+alignment = 1;
+pos = (0,434);
+ref = dieresisgravecomb.lc;
+}
+);
+width = 1068;
+}
+);
+tags = (
+"TODO-opsz"
+);
+unicode = 57636;
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresismacroncomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresismacroncomb.cn.glyph
deleted file mode 100644
index ec8cb897e..000000000
--- a/src/Inter-Roman.glyphspackage/glyphs/dieresismacroncomb.cn.glyph
+++ /dev/null
@@ -1,185 +0,0 @@
-{
-glyphname = dieresismacroncomb.cn;
-layers = (
-{
-anchors = (
-{
-name = _top;
-pos = (-582,1676);
-}
-);
-guides = (
-{
-pos = (1294,2472);
-},
-{
-angle = 90;
-pos = (-800,2548);
-}
-);
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-shapes = (
-{
-alignment = -1;
-pos = (14,372);
-ref = dieresisnosp;
-},
-{
-alignment = -1;
-pos = (34,744);
-ref = macroncomb;
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-674,1676);
-}
-);
-guides = (
-{
-pos = (1692,2416);
-}
-);
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-shapes = (
-{
-alignment = -1;
-pos = (40,372);
-ref = dieresisnosp;
-},
-{
-alignment = -1;
-pos = (-22,744);
-ref = macroncomb;
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-526,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (-720,2324);
-},
-{
-pos = (622,2392);
-}
-);
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-shapes = (
-{
-pos = (-12,372);
-ref = dieresisnosp;
-},
-{
-alignment = -1;
-pos = (92,656);
-ref = macroncomb;
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-608,1676);
-}
-);
-guides = (
-{
-pos = (1002,2472);
-},
-{
-angle = 90;
-pos = (-1092,2548);
-}
-);
-layerId = m007;
-shapes = (
-{
-alignment = -1;
-pos = (21,414);
-ref = dieresisnosp;
-},
-{
-alignment = -1;
-pos = (40,744);
-ref = macroncomb;
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-688,1676);
-}
-);
-guides = (
-{
-pos = (1596,2416);
-}
-);
-layerId = m009;
-shapes = (
-{
-alignment = -1;
-pos = (42,414);
-ref = dieresisnosp;
-},
-{
-alignment = -1;
-pos = (-20,712);
-ref = macroncomb;
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-592,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (-848,2324);
-},
-{
-pos = (494,2392);
-}
-);
-layerId = m011;
-shapes = (
-{
-pos = (-17,414);
-ref = dieresisnosp;
-},
-{
-alignment = -1;
-pos = (87,656);
-ref = macroncomb;
-}
-);
-width = 0;
-}
-);
-tags = (
-"TODO-opsz"
-);
-unicode = 57624;
-}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresismacroncomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresismacroncomb.lc.glyph
index 6a811cf3e..8a18de3b3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dieresismacroncomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresismacroncomb.lc.glyph
@@ -2,92 +2,97 @@
 glyphname = dieresismacroncomb.lc;
 layers = (
 {
-guides = (
-{
-pos = (354,1984);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
+alignment = 1;
+ref = dieresis;
+},
+{
 alignment = -1;
-pos = (0,-354);
-ref = dieresismacroncomb.cn;
+pos = (0,308);
+ref = macron;
 }
 );
-width = 0;
+width = 1200;
 },
 {
-guides = (
-{
-pos = (656,1948);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
+alignment = 1;
+ref = dieresis;
+},
+{
 alignment = -1;
-pos = (0,-340);
-ref = dieresismacroncomb.cn;
+pos = (0,367);
+ref = macron;
 }
 );
-width = 0;
+width = 1330;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
+alignment = 1;
+ref = dieresis;
+},
+{
 alignment = -1;
-pos = (-128,-326);
-ref = dieresismacroncomb.cn;
+pos = (0,232);
+ref = macron;
 }
 );
-width = 0;
+width = 1164;
 },
 {
-guides = (
-{
-pos = (62,1984);
-}
-);
 layerId = m007;
 shapes = (
 {
+alignment = 1;
+ref = dieresis;
+},
+{
 alignment = -1;
-pos = (0,-354);
-ref = dieresismacroncomb.cn;
+pos = (0,318);
+ref = macron;
 }
 );
-width = 0;
+width = 1136;
 },
 {
-guides = (
-{
-pos = (560,1948);
-}
-);
 layerId = m009;
 shapes = (
 {
+alignment = 1;
+ref = dieresis;
+},
+{
 alignment = -1;
-pos = (0,-340);
-ref = dieresismacroncomb.cn;
+pos = (0,360);
+ref = macron;
 }
 );
-width = 0;
+width = 1298;
 },
 {
 layerId = m011;
 shapes = (
 {
+alignment = 1;
+ref = dieresis;
+},
+{
 alignment = -1;
-pos = (-128,-326);
-ref = dieresismacroncomb.cn;
+pos = (0,250);
+ref = macron;
 }
 );
-width = 0;
+width = 1068;
 }
 );
+metricWidth = dieresis;
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresismacroncomb.uc.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresismacroncomb.uc.glyph
new file mode 100644
index 000000000..fed6c79e3
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresismacroncomb.uc.glyph
@@ -0,0 +1,76 @@
+{
+case = minor;
+glyphname = dieresismacroncomb.uc;
+layers = (
+{
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+alignment = 1;
+pos = (0,372);
+ref = dieresismacroncomb.lc;
+}
+);
+width = 1200;
+},
+{
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+alignment = 1;
+pos = (0,372);
+ref = dieresismacroncomb.lc;
+}
+);
+width = 1330;
+},
+{
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+alignment = 1;
+pos = (0,372);
+ref = dieresismacroncomb.lc;
+}
+);
+width = 1164;
+},
+{
+layerId = m007;
+shapes = (
+{
+alignment = 1;
+pos = (0,434);
+ref = dieresismacroncomb.lc;
+}
+);
+width = 1136;
+},
+{
+layerId = m009;
+shapes = (
+{
+alignment = 1;
+pos = (0,434);
+ref = dieresismacroncomb.lc;
+}
+);
+width = 1298;
+},
+{
+layerId = m011;
+shapes = (
+{
+alignment = 1;
+pos = (0,434);
+ref = dieresismacroncomb.lc;
+}
+);
+width = 1068;
+}
+);
+tags = (
+"TODO-opsz"
+);
+unicode = 57624;
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dlinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/dlinebelow.glyph
index 9853f51f1..2a4075017 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dlinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dlinebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1186,0);
+pos = (1178,0);
 ref = macronsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1312,0);
+pos = (1350,0);
 ref = macronsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1166,0);
+pos = (1135,0);
 ref = macronsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1172,0);
+pos = (1094,0);
 ref = macronsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1304,0);
+pos = (1305,0);
 ref = macronsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1200,0);
+pos = (1059,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dong.glyph b/src/Inter-Roman.glyphspackage/glyphs/dong.glyph
index 8efc9a0d2..8c9f16253 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dong.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dong.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (458,583);
+pos = (458,559);
 ref = crossbar;
 },
 {
@@ -27,7 +27,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (418,583);
+pos = (418,559);
 ref = crossbar;
 },
 {
@@ -45,7 +45,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (522,582);
+pos = (522,559);
 ref = crossbar;
 },
 {
@@ -63,7 +63,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (414,542);
+pos = (414,517);
 ref = crossbar;
 },
 {
@@ -81,7 +81,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (402,541);
+pos = (402,517);
 ref = crossbar;
 },
 {
@@ -99,7 +99,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (578,540);
+pos = (578,517);
 ref = crossbar;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/dotaccent.glyph
index 816219972..c4e6ab0be 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dotaccent.glyph
@@ -6,7 +6,11 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (244,1304);
+pos = (244,1118);
+},
+{
+name = top;
+pos = (244,1536);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -35,7 +39,11 @@ width = 488;
 anchors = (
 {
 name = _top;
-pos = (334,1304);
+pos = (334,1118);
+},
+{
+name = top;
+pos = (334,1600);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -64,12 +72,11 @@ width = 670;
 anchors = (
 {
 name = _top;
-pos = (186,1304);
-}
-);
-guides = (
+pos = (186,1118);
+},
 {
-pos = (752,1880);
+name = top;
+pos = (186,1431);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -77,18 +84,18 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(212,1320,o),
-(232,1342,o),
-(232,1368,cs),
-(232,1393,o),
-(212,1414,o),
-(186,1414,cs),
-(161,1414,o),
-(140,1393,o),
-(140,1368,cs),
-(140,1342,o),
-(161,1320,o),
-(186,1320,cs)
+(212,1337,o),
+(233,1358,o),
+(233,1384,cs),
+(233,1410,o),
+(212,1431,o),
+(186,1431,cs),
+(160,1431,o),
+(139,1410,o),
+(139,1384,cs),
+(139,1358,o),
+(160,1337,o),
+(186,1337,cs)
 );
 }
 );
@@ -98,7 +105,11 @@ width = 372;
 anchors = (
 {
 name = _top;
-pos = (212,1262);
+pos = (212,1056);
+},
+{
+name = top;
+pos = (212,1490);
 }
 );
 layerId = m007;
@@ -106,17 +117,17 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(279,1262,o),
-(334,1314,o),
-(334,1378,cs),
-(334,1442,o),
-(279,1494,o),
+(276,1262,o),
+(328,1314,o),
+(328,1378,cs),
+(328,1442,o),
+(276,1494,o),
 (212,1494,cs),
-(145,1494,o),
-(90,1442,o),
-(90,1378,cs),
-(90,1314,o),
-(145,1262,o),
+(148,1494,o),
+(96,1442,o),
+(96,1378,cs),
+(96,1314,o),
+(148,1262,o),
 (212,1262,cs)
 );
 }
@@ -127,17 +138,11 @@ width = 424;
 anchors = (
 {
 name = _top;
-pos = (320,1262);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (-1171,1500);
+pos = (320,1056);
 },
 {
-pos = (560,1948);
+name = top;
+pos = (320,1505);
 }
 );
 layerId = m009;
@@ -145,18 +150,18 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(417,1166,o),
-(496,1242,o),
-(496,1335,cs),
-(496,1428,o),
-(417,1504,o),
-(320,1504,cs),
-(223,1504,o),
-(144,1428,o),
-(144,1335,cs),
-(144,1242,o),
-(223,1166,o),
-(320,1166,cs)
+(417,1167,o),
+(496,1243,o),
+(496,1336,cs),
+(496,1429,o),
+(417,1505,o),
+(320,1505,cs),
+(223,1505,o),
+(144,1429,o),
+(144,1336,cs),
+(144,1243,o),
+(223,1167,o),
+(320,1167,cs)
 );
 }
 );
@@ -166,12 +171,11 @@ width = 638;
 anchors = (
 {
 name = _top;
-pos = (122,1262);
-}
-);
-guides = (
+pos = (122,1056);
+},
 {
-pos = (624,1880);
+name = top;
+pos = (122,1425);
 }
 );
 layerId = m011;
@@ -179,18 +183,18 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(148,1278,o),
-(168,1300,o),
-(168,1326,cs),
-(168,1351,o),
-(148,1372,o),
-(122,1372,cs),
-(97,1372,o),
-(76,1351,o),
-(76,1326,cs),
-(76,1300,o),
-(97,1278,o),
-(122,1278,cs)
+(148,1331,o),
+(169,1352,o),
+(169,1378,cs),
+(169,1404,o),
+(148,1425,o),
+(122,1425,cs),
+(96,1425,o),
+(75,1404,o),
+(75,1378,cs),
+(75,1352,o),
+(96,1331,o),
+(122,1331,cs)
 );
 }
 );
@@ -285,6 +289,84 @@ nodes = (
 }
 );
 width = 638;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (122,1262);
+},
+{
+name = top;
+pos = (122,1676);
+}
+);
+associatedMasterId = m011;
+background = {
+shapes = (
+{
+pos = (-206,0);
+ref = dieresis;
+}
+);
+};
+layerId = "45113A81-0032-4501-9499-C857C55D8055";
+name = "Apr 10, 23, 09:00";
+shapes = (
+{
+closed = 1;
+nodes = (
+(148,1278,o),
+(168,1300,o),
+(168,1326,cs),
+(168,1351,o),
+(148,1372,o),
+(122,1372,cs),
+(97,1372,o),
+(76,1351,o),
+(76,1326,cs),
+(76,1300,o),
+(97,1278,o),
+(122,1278,cs)
+);
+}
+);
+width = 244;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (212,1262);
+},
+{
+name = top;
+pos = (212,1676);
+}
+);
+associatedMasterId = m007;
+layerId = "9D049C54-B4B8-415A-8C7A-0C0F47ABA28D";
+name = "Apr 10, 23, 10:17";
+shapes = (
+{
+closed = 1;
+nodes = (
+(279,1262,o),
+(334,1314,o),
+(334,1378,cs),
+(334,1442,o),
+(279,1494,o),
+(212,1494,cs),
+(145,1494,o),
+(90,1442,o),
+(90,1378,cs),
+(90,1314,o),
+(145,1262,o),
+(212,1262,cs)
+);
+}
+);
+width = 424;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/dotbelow.glyph
index 7ed832235..8f7aae467 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dotbelow.glyph
@@ -11,9 +11,6 @@ pos = (-606,0);
 );
 guides = (
 {
-pos = (-670,-352);
-},
-{
 pos = (-702,0);
 }
 );
@@ -21,7 +18,7 @@ layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-850,-1672);
+pos = (-850,-1722);
 ref = dotaccent;
 }
 );
@@ -36,25 +33,15 @@ pos = (-536,0);
 );
 guides = (
 {
-pos = (-112,1240);
-},
-{
-pos = (-112,764);
-},
-{
 orientation = center;
 pos = (-702,0);
-},
-{
-orientation = center;
-pos = (-666,-384);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-870,-1684);
+pos = (-870,-1714);
 ref = dotaccent;
 }
 );
@@ -70,10 +57,6 @@ pos = (-558,0);
 guides = (
 {
 orientation = center;
-pos = (-666,-320);
-},
-{
-orientation = center;
 pos = (92,0);
 }
 );
@@ -81,7 +64,7 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-744,-1652);
+pos = (-744,-1650);
 ref = dotaccent;
 }
 );
@@ -96,9 +79,6 @@ pos = (-638,0);
 );
 guides = (
 {
-pos = (-962,-352);
-},
-{
 pos = (-994,0);
 }
 );
@@ -106,7 +86,7 @@ layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-850,-1672);
+pos = (-850,-1700);
 ref = dotaccent;
 }
 );
@@ -121,25 +101,15 @@ pos = (-552,0);
 );
 guides = (
 {
-pos = (-208,1240);
-},
-{
-pos = (-208,764);
-},
-{
 orientation = center;
 pos = (-798,0);
-},
-{
-orientation = center;
-pos = (-762,-384);
 }
 );
 layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-870,-1604);
+pos = (-870,-1616);
 ref = dotaccent;
 }
 );
@@ -162,7 +132,7 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-744,-1628);
+pos = (-744,-1700);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dotmacroncomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/dotmacroncomb.cn.glyph
deleted file mode 100644
index ea972f901..000000000
--- a/src/Inter-Roman.glyphspackage/glyphs/dotmacroncomb.cn.glyph
+++ /dev/null
@@ -1,237 +0,0 @@
-{
-glyphname = dotmacroncomb.cn;
-layers = (
-{
-anchors = (
-{
-name = _top;
-pos = (-590,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (-812,2700);
-}
-);
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-524,1676,o),
-(-468,1728,o),
-(-468,1792,cs),
-(-468,1856,o),
-(-524,1908,o),
-(-590,1908,cs),
-(-657,1908,o),
-(-713,1856,o),
-(-712,1792,cs),
-(-713,1728,o),
-(-657,1676,o),
-(-590,1676,cs)
-);
-},
-{
-alignment = -1;
-pos = (26,744);
-ref = macroncomb;
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-698,1676);
-}
-);
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-600,1620,o),
-(-520,1696,o),
-(-520,1788,cs),
-(-520,1882,o),
-(-600,1957,o),
-(-698,1958,cs),
-(-796,1957,o),
-(-875,1882,o),
-(-876,1788,cs),
-(-875,1696,o),
-(-796,1620,o),
-(-698,1620,cs)
-);
-},
-{
-alignment = -1;
-pos = (-46,744);
-ref = macroncomb;
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-524,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (-720,2228);
-}
-);
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-497,1693,o),
-(-477,1715,o),
-(-478,1740,cs),
-(-477,1766,o),
-(-497,1786,o),
-(-524,1786,cs),
-(-548,1786,o),
-(-570,1766,o),
-(-570,1740,cs),
-(-570,1715,o),
-(-548,1693,o),
-(-524,1694,cs)
-);
-},
-{
-alignment = -1;
-pos = (90,656);
-ref = macroncomb;
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-622,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (-1104,2700);
-}
-);
-layerId = m007;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-556,1676,o),
-(-500,1728,o),
-(-500,1792,cs),
-(-500,1856,o),
-(-556,1908,o),
-(-622,1908,cs),
-(-689,1908,o),
-(-744,1856,o),
-(-744,1792,cs),
-(-744,1728,o),
-(-689,1676,o),
-(-622,1676,cs)
-);
-},
-{
-alignment = -1;
-pos = (26,744);
-ref = macroncomb;
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-720,1676);
-}
-);
-layerId = m009;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-616,1580,o),
-(-536,1656,o),
-(-536,1748,cs),
-(-536,1842,o),
-(-616,1918,o),
-(-714,1918,cs),
-(-812,1918,o),
-(-892,1842,o),
-(-892,1748,cs),
-(-892,1656,o),
-(-812,1580,o),
-(-714,1580,cs)
-);
-},
-{
-alignment = -1;
-pos = (-46,712);
-ref = macroncomb;
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-588,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (-848,2228);
-}
-);
-layerId = m011;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-561,1694,o),
-(-542,1715,o),
-(-542,1740,cs),
-(-542,1766,o),
-(-561,1786,o),
-(-588,1786,cs),
-(-612,1786,o),
-(-634,1766,o),
-(-634,1740,cs),
-(-634,1715,o),
-(-612,1694,o),
-(-588,1694,cs)
-);
-},
-{
-alignment = -1;
-pos = (90,656);
-ref = macroncomb;
-}
-);
-width = 0;
-}
-);
-tags = (
-"TODO-opsz"
-);
-unicode = 57634;
-}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dotmacroncomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/dotmacroncomb.lc.glyph
index 5a2117219..5f3631272 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dotmacroncomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dotmacroncomb.lc.glyph
@@ -2,108 +2,91 @@
 glyphname = dotmacroncomb.lc;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (-590,1304);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
+ref = dotaccent;
+},
+{
 alignment = -1;
-pos = (0,-376);
-ref = dotmacroncomb.cn;
+pos = (-356,308);
+ref = macron;
 }
 );
-width = 0;
+width = 488;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-704,1304);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
+ref = dotaccent;
+},
+{
 alignment = -1;
-pos = (-6,-380);
-ref = dotmacroncomb.cn;
+pos = (-331,367);
+ref = macron;
 }
 );
-width = 0;
+width = 670;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-652,1304);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
+ref = dotaccent;
+},
+{
 alignment = -1;
-pos = (-128,-350);
-ref = dotmacroncomb.cn;
+pos = (-396,232);
+ref = macron;
 }
 );
-width = 0;
+width = 372;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-622,1262);
-}
-);
 layerId = m007;
 shapes = (
 {
+ref = dotaccent;
+},
+{
 alignment = -1;
-pos = (0,-414);
-ref = dotmacroncomb.cn;
+pos = (-356,318);
+ref = macron;
 }
 );
-width = 0;
+width = 424;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-720,1262);
-}
-);
 layerId = m009;
 shapes = (
 {
+ref = dotaccent;
+},
+{
 alignment = -1;
-pos = (-6,-449);
-ref = dotmacroncomb.cn;
+pos = (-329,360);
+ref = macron;
 }
 );
-width = 0;
+width = 638;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-720,1262);
-}
-);
 layerId = m011;
 shapes = (
 {
+ref = dotaccent;
+},
+{
 alignment = -1;
-pos = (-131,-414);
-ref = dotmacroncomb.cn;
+pos = (-412,250);
+ref = macron;
 }
 );
-width = 0;
+width = 244;
 }
 );
+metricWidth = dotaccent;
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dotmacroncomb.uc.glyph b/src/Inter-Roman.glyphspackage/glyphs/dotmacroncomb.uc.glyph
new file mode 100644
index 000000000..e3d1d8431
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/dotmacroncomb.uc.glyph
@@ -0,0 +1,105 @@
+{
+glyphname = dotmacroncomb.uc;
+layers = (
+{
+guides = (
+{
+angle = 90;
+pos = (-812,2700);
+}
+);
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+ref = dotaccent;
+},
+{
+pos = (-356,418);
+ref = macron;
+}
+);
+width = 488;
+},
+{
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+ref = dotaccent;
+},
+{
+pos = (-331,482);
+ref = macron;
+}
+);
+width = 670;
+},
+{
+guides = (
+{
+angle = 90;
+pos = (-720,2228);
+}
+);
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+ref = dotaccent;
+},
+{
+pos = (-396,313);
+ref = macron;
+}
+);
+width = 372;
+},
+{
+layerId = m007;
+shapes = (
+{
+ref = dotaccent;
+},
+{
+pos = (-356,434);
+ref = macron;
+}
+);
+width = 424;
+},
+{
+layerId = m009;
+shapes = (
+{
+ref = dotaccent;
+},
+{
+pos = (-329,449);
+ref = macron;
+}
+);
+width = 638;
+},
+{
+guides = (
+{
+angle = 90;
+pos = (-848,2228);
+}
+);
+layerId = m011;
+shapes = (
+{
+ref = dotaccent;
+},
+{
+pos = (-412,369);
+ref = macron;
+}
+);
+width = 244;
+}
+);
+tags = (
+"TODO-opsz"
+);
+unicode = 57634;
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dzeabkhasiancyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/dzeabkhasiancyrillic.glyph
index 461deb482..57a6a4247 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dzeabkhasiancyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dzeabkhasiancyrillic.glyph
@@ -4,12 +4,6 @@ glyphname = dzeabkhasiancyrillic;
 kernLeft = T.sc;
 layers = (
 {
-anchors = (
-{
-name = top;
-pos = (641,1304);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
@@ -20,12 +14,6 @@ ref = Dzeabkhasiancyrillic;
 width = 1310;
 },
 {
-anchors = (
-{
-name = top;
-pos = (690,1304);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
@@ -36,12 +24,6 @@ ref = Dzeabkhasiancyrillic;
 width = 1382;
 },
 {
-anchors = (
-{
-name = top;
-pos = (614,1304);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
@@ -52,12 +34,6 @@ ref = Dzeabkhasiancyrillic;
 width = 1258;
 },
 {
-anchors = (
-{
-name = top;
-pos = (610,1262);
-}
-);
 layerId = m007;
 shapes = (
 {
@@ -68,12 +44,6 @@ ref = Dzeabkhasiancyrillic;
 width = 1232;
 },
 {
-anchors = (
-{
-name = top;
-pos = (672,1262);
-}
-);
 layerId = m009;
 shapes = (
 {
@@ -84,12 +54,6 @@ ref = Dzeabkhasiancyrillic;
 width = 1344;
 },
 {
-anchors = (
-{
-name = top;
-pos = (550,1262);
-}
-);
 layerId = m011;
 shapes = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/e.glyph b/src/Inter-Roman.glyphspackage/glyphs/e.glyph
index d3ff27c9d..55b2cf77f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/e.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/e.glyph
@@ -20,7 +20,7 @@ pos = (1004,198);
 },
 {
 name = top;
-pos = (590,1304);
+pos = (590,1118);
 }
 );
 background = {
@@ -88,7 +88,7 @@ pos = (968,316);
 },
 {
 name = top;
-pos = (526,1262);
+pos = (526,1056);
 }
 );
 background = {
@@ -192,7 +192,7 @@ pos = (1070,258);
 },
 {
 name = top;
-pos = (600,1304);
+pos = (600,1118);
 }
 );
 background = {
@@ -267,7 +267,7 @@ pos = (1012,316);
 },
 {
 name = top;
-pos = (550,1262);
+pos = (550,1056);
 }
 );
 background = {
@@ -506,7 +506,7 @@ pos = (1180,360);
 },
 {
 name = top;
-pos = (622,1304);
+pos = (622,1118);
 }
 );
 background = {
@@ -581,7 +581,7 @@ pos = (1148,345);
 },
 {
 name = top;
-pos = (599,1262);
+pos = (599,1056);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/eacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/eacute.glyph
index b2ff1a7ec..f28c6495c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/eacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/eacute.glyph
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (246,0);
+pos = (242,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ebreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/ebreve.glyph
index de66fef69..8e2dc701b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ebreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ebreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (140,0);
+pos = (216,0);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (110,0);
+pos = (142,0);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (174,0);
+pos = (238,0);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (122,0);
+pos = (150,0);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (103,0);
+pos = (119,0);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (110,0);
+pos = (174,0);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ecaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/ecaron.glyph
index c0c27ea95..e76eccfab 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ecaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ecaron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (160,16);
+pos = (158,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-31,0);
+pos = (-29,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ecedillabreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/ecedillabreve.glyph
index 54365046a..85e0ca3c4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ecedillabreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ecedillabreve.glyph
@@ -14,7 +14,7 @@ pos = (322,0);
 ref = cedilla;
 },
 {
-pos = (140,0);
+pos = (216,0);
 ref = breve;
 }
 );
@@ -31,7 +31,7 @@ pos = (172,0);
 ref = cedilla;
 },
 {
-pos = (110,0);
+pos = (142,0);
 ref = breve;
 }
 );
@@ -48,7 +48,7 @@ pos = (380,0);
 ref = cedilla;
 },
 {
-pos = (174,0);
+pos = (238,0);
 ref = breve;
 }
 );
@@ -65,7 +65,7 @@ pos = (308,0);
 ref = cedilla;
 },
 {
-pos = (122,0);
+pos = (150,0);
 ref = breve;
 }
 );
@@ -82,7 +82,7 @@ pos = (168,0);
 ref = cedilla;
 },
 {
-pos = (103,0);
+pos = (119,0);
 ref = breve;
 }
 );
@@ -99,7 +99,7 @@ pos = (380,0);
 ref = cedilla;
 },
 {
-pos = (110,0);
+pos = (174,0);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ecircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/ecircumflex.glyph
index 06304e930..a47d4c4e2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ecircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ecircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (134,0);
+pos = (136,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-24,0);
+pos = (-18,0);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (160,0);
+pos = (158,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (116,0);
+pos = (118,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-31,0);
+pos = (-29,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (160,0);
+pos = (158,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexacute.glyph
index 21a502200..3765d5b8d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexacute.glyph
@@ -11,7 +11,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (186,4);
+pos = (136,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -25,7 +25,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (198,-38);
+pos = (-18,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -39,7 +39,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (286,26);
+pos = (158,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -53,7 +53,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (168,-38);
+pos = (118,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -67,7 +67,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (191,-80);
+pos = (-29,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -81,7 +81,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (286,-16);
+pos = (158,0);
 ref = circumflexacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexbelow.glyph
index b000b0bc7..3f6ccc6e3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1182,0);
+pos = (1192,0);
 ref = circumflexsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1296,0);
+pos = (1287,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1102,0);
+pos = (1164,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1164,0);
+pos = (1118,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1289,0);
+pos = (1251,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1102,0);
+pos = (1054,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexdotbelow.glyph
index ffad76695..714baef09 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (134,0);
+pos = (136,0);
 ref = circumflex;
 },
 {
@@ -27,7 +27,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-24,0);
+pos = (-18,0);
 ref = circumflex;
 },
 {
@@ -44,7 +44,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (160,0);
+pos = (158,0);
 ref = circumflex;
 },
 {
@@ -61,7 +61,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (116,0);
+pos = (118,0);
 ref = circumflex;
 },
 {
@@ -78,7 +78,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-31,0);
+pos = (-29,0);
 ref = circumflex;
 },
 {
@@ -95,7 +95,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (160,0);
+pos = (158,0);
 ref = circumflex;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexgrave.glyph
index 931d5df38..19db62682 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexgrave.glyph
@@ -11,7 +11,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-92,22);
+pos = (134,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -25,7 +25,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-176,-52);
+pos = (-30,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -39,7 +39,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (90,64);
+pos = (90,-122);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -53,7 +53,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-110,-20);
+pos = (116,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -67,7 +67,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-183,-94);
+pos = (-33,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -81,7 +81,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (90,22);
+pos = (90,-184);
 ref = circumflexgravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexhookabove.glyph
index 066ee02dc..6062a1a54 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexhookabove.glyph
@@ -11,7 +11,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (126,-16);
+pos = (136,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -25,7 +25,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (112,-38);
+pos = (-18,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -39,7 +39,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (238,-6);
+pos = (158,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -53,7 +53,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (108,-58);
+pos = (118,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -67,7 +67,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (105,-80);
+pos = (-29,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -81,7 +81,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (238,-48);
+pos = (158,0);
 ref = circumflexhookcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ecircumflextilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/ecircumflextilde.glyph
index b086f1782..1bb849ae1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ecircumflextilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ecircumflextilde.glyph
@@ -11,7 +11,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (44,-38);
+pos = (136,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -25,7 +25,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-6,-28);
+pos = (-18,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -39,7 +39,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (160,-42);
+pos = (160,-228);
 ref = circumflextildecomb.cn;
 }
 );
@@ -53,7 +53,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (26,-80);
+pos = (118,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -67,7 +67,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-13,-70);
+pos = (-29,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -81,7 +81,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (160,-84);
+pos = (160,-290);
 ref = circumflextildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/edieresis-cy.glyph b/src/Inter-Roman.glyphspackage/glyphs/edieresis-cy.glyph
index e793ac6ad..e89a5b5a7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/edieresis-cy.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/edieresis-cy.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = ereversedcyrillic;
 },
 {
-pos = (-38,0);
+pos = (-33,0);
 ref = dieresis;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = ereversedcyrillic;
 },
 {
-pos = (91,0);
+pos = (-67,0);
 ref = dieresis;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = ereversedcyrillic;
 },
 {
-pos = (-122,-42);
+pos = (-30,0);
 ref = dieresis;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = ereversedcyrillic;
 },
 {
-pos = (-48,0);
+pos = (-43,0);
 ref = dieresis;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = ereversedcyrillic;
 },
 {
-pos = (98,0);
+pos = (-57,0);
 ref = dieresis;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = ereversedcyrillic;
 },
 {
-pos = (-122,0);
+pos = (-46,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/edieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/edieresis.glyph
index 088227e24..f2579f56a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/edieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/edieresis.glyph
@@ -16,7 +16,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-6,0);
+pos = (-1,0);
 ref = dieresis;
 }
 );
@@ -29,7 +29,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (115,0);
+pos = (-43,0);
 ref = dieresis;
 }
 );
@@ -42,7 +42,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-84,0);
+pos = (8,0);
 ref = dieresis;
 }
 );
@@ -61,7 +61,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-24,0);
+pos = (-19,0);
 ref = dieresis;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (105,0);
+pos = (-50,0);
 ref = dieresis;
 }
 );
@@ -87,7 +87,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-84,0);
+pos = (-8,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ehookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/ehookabove.glyph
index f055898da..bb9ed0dee 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ehookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ehookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1194,26);
+pos = (1187,0);
 ref = hookabovecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1360,-6);
+pos = (1286,0);
 ref = hookabovecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1088,44);
+pos = (1112,0);
 ref = hookabovecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1176,-16);
+pos = (1113,0);
 ref = hookabovecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1353,0);
+pos = (1253,0);
 ref = hookabovecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1088,2);
+pos = (1030,0);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/einvertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/einvertedbreve.glyph
index f4a70cdca..3921fe519 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/einvertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/einvertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1256,0);
+pos = (1197,0);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1262,0);
+pos = (1284,0);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1182,0);
+pos = (1172,0);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1206,-10);
+pos = (1114,0);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1239,0);
+pos = (1249,0);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1118,0);
+pos = (1055,0);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/elcyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/elcyrillic.glyph
index 51fc63368..a0bd5ace1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/elcyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/elcyrillic.glyph
@@ -15,7 +15,7 @@ pos = (1056,0);
 },
 {
 name = top;
-pos = (662,1304);
+pos = (662,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -56,7 +56,7 @@ pos = (1197,0);
 },
 {
 name = top;
-pos = (709,1304);
+pos = (709,1118);
 }
 );
 background = {
@@ -105,7 +105,7 @@ pos = (1028,0);
 },
 {
 name = top;
-pos = (694,1304);
+pos = (694,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -146,7 +146,7 @@ pos = (1024,0);
 },
 {
 name = top;
-pos = (630,1262);
+pos = (630,1056);
 }
 );
 layerId = m007;
@@ -187,7 +187,7 @@ pos = (1189,0);
 },
 {
 name = top;
-pos = (701,1262);
+pos = (701,1056);
 }
 );
 layerId = m009;
@@ -228,7 +228,7 @@ pos = (964,0);
 },
 {
 name = top;
-pos = (630,1262);
+pos = (630,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/emacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/emacron.glyph
index 75bcdf923..51b9a12f4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/emacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/emacron.glyph
@@ -10,7 +10,6 @@ shapes = (
 ref = e;
 },
 {
-pos = (140,0);
 ref = macron;
 }
 );
@@ -23,7 +22,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-36,0);
+pos = (-43,0);
 ref = macron;
 }
 );
@@ -36,7 +35,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (290,0);
+pos = (8,0);
 ref = macron;
 }
 );
@@ -49,7 +48,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (122,-42);
+pos = (-18,0);
 ref = macron;
 }
 );
@@ -62,7 +61,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-43,-42);
+pos = (-50,0);
 ref = macron;
 }
 );
@@ -75,7 +74,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (290,0);
+pos = (-8,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/emacronacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/emacronacute.glyph
index fdda3e53a..c66909ddd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/emacronacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/emacronacute.glyph
@@ -11,7 +11,6 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (978,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -25,7 +24,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (1088,0);
+pos = (-43,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -39,7 +38,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (968,0);
+pos = (8,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -53,7 +52,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (960,-42);
+pos = (-18,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -67,7 +66,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (1081,-42);
+pos = (-50,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -81,7 +80,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (968,-42);
+pos = (-8,0);
 ref = macronacutecomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/emacrongrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/emacrongrave.glyph
index 70f23dc59..84a435feb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/emacrongrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/emacrongrave.glyph
@@ -11,7 +11,6 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (1190,22);
 ref = macrongravecomb.lc;
 }
 );
@@ -25,7 +24,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (1326,4);
+pos = (-43,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -39,7 +38,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (1076,-22);
+pos = (8,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -53,7 +52,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (1172,-20);
+pos = (-18,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -67,7 +66,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (1319,-38);
+pos = (-50,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -81,7 +80,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (1076,-64);
+pos = (-8,0);
 ref = macrongravecomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/encyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/encyrillic.glyph
index 4c05fa293..a9f1d79e0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/encyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/encyrillic.glyph
@@ -10,6 +10,10 @@ pos = (966,0);
 {
 name = lfthook;
 pos = (920,0);
+},
+{
+name = top;
+pos = (582,1118);
 }
 );
 background = {
@@ -60,6 +64,10 @@ pos = (902,0);
 {
 name = lfthook;
 pos = (856,0);
+},
+{
+name = top;
+pos = (518,1056);
 }
 );
 background = {
@@ -110,6 +118,10 @@ pos = (1042,0);
 {
 name = lfthook;
 pos = (872,0);
+},
+{
+name = top;
+pos = (600,1118);
 }
 );
 background = {
@@ -160,6 +172,10 @@ pos = (1010,0);
 {
 name = lfthook;
 pos = (840,0);
+},
+{
+name = top;
+pos = (568,1056);
 }
 );
 background = {
@@ -210,6 +226,10 @@ pos = (1228,0);
 {
 name = lfthook;
 pos = (828,0);
+},
+{
+name = top;
+pos = (665,1118);
 }
 );
 background = {
@@ -260,6 +280,10 @@ pos = (1212,0);
 {
 name = lfthook;
 pos = (812,0);
+},
+{
+name = top;
+pos = (649,1056);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/epsilon.glyph b/src/Inter-Roman.glyphspackage/glyphs/epsilon.glyph
index ff8adefcf..df36f0f3c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/epsilon.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/epsilon.glyph
@@ -7,7 +7,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (562,1304);
+pos = (562,1118);
 }
 );
 guides = (
@@ -85,7 +85,7 @@ width = 1122;
 anchors = (
 {
 name = top;
-pos = (602,1304);
+pos = (602,1118);
 }
 );
 guides = (
@@ -159,7 +159,7 @@ width = 1200;
 anchors = (
 {
 name = top;
-pos = (542,1304);
+pos = (542,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -225,7 +225,7 @@ width = 1078;
 anchors = (
 {
 name = top;
-pos = (530,1304);
+pos = (530,1056);
 }
 );
 guides = (
@@ -303,7 +303,7 @@ width = 1054;
 anchors = (
 {
 name = top;
-pos = (586,1304);
+pos = (586,1056);
 }
 );
 guides = (
@@ -377,7 +377,7 @@ width = 1168;
 anchors = (
 {
 name = top;
-pos = (478,1304);
+pos = (478,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/epsilon1rev.glyph b/src/Inter-Roman.glyphspackage/glyphs/epsilon1rev.glyph
index 0dc5d8f21..9051bb140 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/epsilon1rev.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/epsilon1rev.glyph
@@ -7,7 +7,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (564,1304);
+pos = (564,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -67,13 +67,13 @@ nodes = (
 );
 }
 );
-width = 1180;
+width = 1172;
 },
 {
 anchors = (
 {
 name = top;
-pos = (588,1304);
+pos = (588,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -133,13 +133,13 @@ nodes = (
 );
 }
 );
-width = 1230;
+width = 1222;
 },
 {
 anchors = (
 {
 name = top;
-pos = (546,1304);
+pos = (546,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -199,13 +199,13 @@ nodes = (
 );
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 anchors = (
 {
 name = top;
-pos = (540,1304);
+pos = (540,1056);
 }
 );
 layerId = m007;
@@ -265,13 +265,13 @@ nodes = (
 );
 }
 );
-width = 1124;
+width = 1113;
 },
 {
 anchors = (
 {
 name = top;
-pos = (572,1304);
+pos = (572,1056);
 }
 );
 layerId = m009;
@@ -331,13 +331,13 @@ nodes = (
 );
 }
 );
-width = 1198;
+width = 1192;
 },
 {
 anchors = (
 {
 name = top;
-pos = (490,1304);
+pos = (490,1056);
 }
 );
 layerId = m011;
@@ -397,7 +397,7 @@ nodes = (
 );
 }
 );
-width = 1036;
+width = 1022;
 }
 );
 metricLeft = a;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/epsilontonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/epsilontonos.glyph
index 168b03338..ceace41f4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/epsilontonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/epsilontonos.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (340,0);
+pos = (340,-186);
 ref = tonostop;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (230,22);
+pos = (230,-164);
 ref = tonostop;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (412,-10);
+pos = (412,-196);
 ref = tonostop;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (340,0);
+pos = (340,-248);
 ref = tonostop;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (230,22);
+pos = (230,-226);
 ref = tonostop;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (412,-10);
+pos = (412,-258);
 ref = tonostop;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ereversedcyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/ereversedcyrillic.glyph
index 4f2d26fa9..8cf5e96f3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ereversedcyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ereversedcyrillic.glyph
@@ -6,7 +6,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (568,1304);
+pos = (568,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -58,7 +58,7 @@ width = 1150;
 anchors = (
 {
 name = top;
-pos = (598,1304);
+pos = (598,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -110,7 +110,7 @@ width = 1238;
 anchors = (
 {
 name = top;
-pos = (552,1262);
+pos = (552,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -162,7 +162,7 @@ width = 1126;
 anchors = (
 {
 name = top;
-pos = (526,1262);
+pos = (526,1056);
 }
 );
 layerId = m007;
@@ -214,7 +214,7 @@ width = 1071;
 anchors = (
 {
 name = top;
-pos = (592,1262);
+pos = (592,1056);
 }
 );
 layerId = m009;
@@ -266,7 +266,7 @@ width = 1194;
 anchors = (
 {
 name = top;
-pos = (488,1262);
+pos = (488,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/eta.glyph b/src/Inter-Roman.glyphspackage/glyphs/eta.glyph
index 7de7cf1ab..fed047d07 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/eta.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/eta.glyph
@@ -11,7 +11,7 @@ pos = (244,0);
 },
 {
 name = top;
-pos = (600,1304);
+pos = (600,1118);
 }
 );
 background = {
@@ -60,7 +60,7 @@ pos = (302,0);
 },
 {
 name = top;
-pos = (664,1304);
+pos = (664,1118);
 }
 );
 background = {
@@ -215,7 +215,7 @@ pos = (210,0);
 },
 {
 name = top;
-pos = (582,1304);
+pos = (582,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -257,7 +257,7 @@ pos = (212,0);
 },
 {
 name = top;
-pos = (568,1304);
+pos = (568,1056);
 }
 );
 background = {
@@ -272,27 +272,27 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(297,867,o),
-(419,977,o),
-(582,978,cs),
-(742,977,o),
-(838,873,o),
-(838,698,cs),
+(296,805,o),
+(419,915,o),
+(582,916,cs),
+(742,915,o),
+(838,811,o),
+(838,636,cs),
 (838,-418,l),
 (1010,-418,l),
-(1010,710,ls),
-(1009,995,o),
-(858,1132,o),
-(632,1132,cs),
-(463,1132,o),
-(358,1056,o),
-(306,942,c),
-(290,942,l),
-(290,1118,l),
-(126,1118,l),
+(1010,648,ls),
+(1010,933,o),
+(858,1070,o),
+(632,1070,cs),
+(463,1070,o),
+(358,994,o),
+(306,880,c),
+(290,880,l),
+(290,1056,l),
+(126,1056,l),
 (126,0,l),
 (296,0,l),
-(296,672,ls)
+(296,610,ls)
 );
 }
 );
@@ -357,7 +357,7 @@ pos = (286,0);
 },
 {
 name = top;
-pos = (648,1304);
+pos = (648,1056);
 }
 );
 background = {
@@ -372,27 +372,27 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(487,739,o),
-(551,806,o),
-(650,806,cs),
-(752,806,o),
-(810,739,o),
-(810,628,cs),
+(488,677,o),
+(551,744,o),
+(650,744,cs),
+(752,744,o),
+(810,677,o),
+(810,566,cs),
 (810,-418,l),
 (1212,-418,l),
-(1212,712,ls),
-(1212,957,o),
-(1060,1132,o),
-(822,1132,cs),
-(659,1132,o),
-(528,1047,o),
-(478,904,c),
-(466,904,l),
-(466,1118,l),
-(86,1118,l),
+(1212,650,ls),
+(1212,895,o),
+(1060,1070,o),
+(822,1070,cs),
+(659,1070,o),
+(528,985,o),
+(478,842,c),
+(466,842,l),
+(466,1056,l),
+(86,1056,l),
 (86,0,l),
 (488,0,l),
-(488,628,ls)
+(488,566,ls)
 );
 }
 );
@@ -461,7 +461,7 @@ pos = (146,0);
 },
 {
 name = top;
-pos = (518,1304);
+pos = (518,1056);
 }
 );
 layerId = m011;
@@ -469,27 +469,27 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(180,945,o),
-(323,1085,o),
-(520,1086,cs),
-(719,1085,o),
-(855,948,o),
-(856,750,cs),
+(180,883,o),
+(323,1023,o),
+(520,1024,cs),
+(719,1023,o),
+(856,886,o),
+(856,688,cs),
 (856,-418,l),
 (902,-418,l),
-(902,750,ls),
-(902,975,o),
-(745,1132,o),
-(520,1132,cs),
-(367,1132,o),
-(239,1056,o),
-(186,940,c),
-(180,940,l),
-(180,1118,l),
-(134,1118,l),
+(902,688,ls),
+(902,913,o),
+(745,1070,o),
+(520,1070,cs),
+(367,1070,o),
+(239,994,o),
+(186,878,c),
+(180,878,l),
+(180,1056,l),
+(134,1056,l),
 (134,0,l),
 (180,0,l),
-(180,750,ls)
+(180,688,ls)
 );
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/etatonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/etatonos.glyph
index cfc480d0c..78b0ab87f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/etatonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/etatonos.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (378,0);
+pos = (378,-186);
 ref = tonostop;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (292,22);
+pos = (292,-164);
 ref = tonostop;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (452,-10);
+pos = (452,-196);
 ref = tonostop;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (378,0);
+pos = (378,-248);
 ref = tonostop;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (292,22);
+pos = (292,-226);
 ref = tonostop;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (452,-10);
+pos = (452,-258);
 ref = tonostop;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/etilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/etilde.glyph
index 417c79f8c..eaa618903 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/etilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/etilde.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (80,0);
+pos = (86,0);
 ref = tilde;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/etildebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/etildebelow.glyph
index 41bac8277..3a1df64c5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/etildebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/etildebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1224,0);
+pos = (1200,0);
 ref = tildesubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1342,0);
+pos = (1286,0);
 ref = tildesubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1076,0);
+pos = (1171,0);
 ref = tildesubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1206,0);
+pos = (1118,0);
 ref = tildesubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1319,0);
+pos = (1247,0);
 ref = tildesubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1072,0);
+pos = (1057,0);
 ref = tildesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/eturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/eturn.glyph
index 32f9a4a7d..0bb772d52 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/eturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/eturn.glyph
@@ -19,7 +19,7 @@ pos = (768,0);
 },
 {
 name = top;
-pos = (600,1304);
+pos = (600,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -48,7 +48,7 @@ pos = (962,50);
 },
 {
 name = top;
-pos = (622,1304);
+pos = (622,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -77,7 +77,7 @@ pos = (652,-30);
 },
 {
 name = top;
-pos = (590,1304);
+pos = (590,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -106,7 +106,7 @@ pos = (768,0);
 },
 {
 name = top;
-pos = (600,1304);
+pos = (600,1056);
 }
 );
 layerId = m007;
@@ -135,7 +135,7 @@ pos = (962,50);
 },
 {
 name = top;
-pos = (622,1304);
+pos = (622,1056);
 }
 );
 layerId = m009;
@@ -164,7 +164,7 @@ pos = (652,-30);
 },
 {
 name = top;
-pos = (590,1304);
+pos = (590,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ezhcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/ezhcaron.glyph
index 127873bad..32fc04e1d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ezhcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ezhcaron.glyph
@@ -10,7 +10,7 @@ ref = dzeabkhasiancyrillic;
 },
 {
 alignment = 1;
-pos = (175,0);
+pos = (189,0);
 ref = caron;
 }
 );
@@ -24,7 +24,7 @@ ref = dzeabkhasiancyrillic;
 },
 {
 alignment = 1;
-pos = (44,0);
+pos = (45,0);
 ref = caron;
 }
 );
@@ -38,7 +38,7 @@ ref = dzeabkhasiancyrillic;
 },
 {
 alignment = 1;
-pos = (184,16);
+pos = (197,0);
 ref = caron;
 }
 );
@@ -52,7 +52,7 @@ ref = dzeabkhasiancyrillic;
 },
 {
 alignment = 1;
-pos = (176,0);
+pos = (182,0);
 ref = caron;
 }
 );
@@ -66,7 +66,7 @@ ref = dzeabkhasiancyrillic;
 },
 {
 alignment = 1;
-pos = (42,0);
+pos = (44,0);
 ref = caron;
 }
 );
@@ -80,7 +80,7 @@ ref = dzeabkhasiancyrillic;
 },
 {
 alignment = 1;
-pos = (182,0);
+pos = (197,62);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ezhreversed.glyph b/src/Inter-Roman.glyphspackage/glyphs/ezhreversed.glyph
index b145c7c13..e25a61c04 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ezhreversed.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ezhreversed.glyph
@@ -6,7 +6,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (644,1304);
+pos = (644,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -52,7 +52,7 @@ width = 1310;
 anchors = (
 {
 name = top;
-pos = (692,1304);
+pos = (692,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -98,7 +98,7 @@ width = 1382;
 anchors = (
 {
 name = top;
-pos = (614,1304);
+pos = (614,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -144,7 +144,7 @@ width = 1258;
 anchors = (
 {
 name = top;
-pos = (596,1262);
+pos = (596,1056);
 }
 );
 layerId = m007;
@@ -190,7 +190,7 @@ width = 1232;
 anchors = (
 {
 name = top;
-pos = (674,1262);
+pos = (674,1056);
 }
 );
 layerId = m009;
@@ -236,7 +236,7 @@ width = 1344;
 anchors = (
 {
 name = top;
-pos = (550,1262);
+pos = (550,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/fdotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/fdotaccent.glyph
index f7faaefac..78933d862 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/fdotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/fdotaccent.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = f;
 },
 {
-pos = (152,372);
+pos = (152,434);
 ref = dotaccent;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = f;
 },
 {
-pos = (97,372);
+pos = (97,434);
 ref = dotaccent;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = f;
 },
 {
-pos = (228,372);
+pos = (228,434);
 ref = dotaccent;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = f;
 },
 {
-pos = (138,414);
+pos = (138,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = f;
 },
 {
-pos = (122,414);
+pos = (122,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = f;
 },
 {
-pos = (210,414);
+pos = (210,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/four.ss01.glyph b/src/Inter-Roman.glyphspackage/glyphs/four.ss01.glyph
index 122127ea2..6cda58d51 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/four.ss01.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/four.ss01.glyph
@@ -185,22 +185,6 @@ name = _center;
 pos = (706,745);
 }
 );
-background = {
-shapes = (
-{
-pos = (-4,0);
-ref = four;
-}
-);
-};
-guides = (
-{
-pos = (-88,1240);
-},
-{
-pos = (-88,896);
-}
-);
 layerId = m009;
 shapes = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/franc.glyph b/src/Inter-Roman.glyphspackage/glyphs/franc.glyph
index 0023c5504..98e2019aa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/franc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/franc.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = F;
 },
 {
-pos = (-190,-371);
+pos = (-190,-395);
 ref = crossbar;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = F;
 },
 {
-pos = (-224,-471);
+pos = (-224,-495);
 ref = crossbar;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = F;
 },
 {
-pos = (-169,-312);
+pos = (-169,-335);
 ref = crossbar;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = F;
 },
 {
-pos = (-210,-370);
+pos = (-210,-395);
 ref = crossbar;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = F;
 },
 {
-pos = (-216,-471);
+pos = (-216,-495);
 ref = crossbar;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = F;
 },
 {
-pos = (-169,-312);
+pos = (-169,-335);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/g.glyph b/src/Inter-Roman.glyphspackage/glyphs/g.glyph
index 7c6118307..4b7856f18 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/g.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/g.glyph
@@ -16,7 +16,7 @@ pos = (968,558);
 },
 {
 name = top;
-pos = (596,1304);
+pos = (596,1118);
 },
 {
 name = topr;
@@ -168,7 +168,7 @@ pos = (1010,564);
 },
 {
 name = top;
-pos = (626,1304);
+pos = (626,1118);
 },
 {
 name = topr;
@@ -245,7 +245,7 @@ pos = (930,564);
 },
 {
 name = top;
-pos = (546,1262);
+pos = (546,1056);
 },
 {
 name = topr;
@@ -322,7 +322,7 @@ pos = (1020,568);
 },
 {
 name = top;
-pos = (668,1304);
+pos = (668,1118);
 },
 {
 name = topr;
@@ -590,7 +590,7 @@ pos = (961,568);
 },
 {
 name = top;
-pos = (638,1262);
+pos = (638,1056);
 },
 {
 name = topr;
@@ -820,7 +820,7 @@ pos = (960,528);
 },
 {
 name = top;
-pos = (530,1262);
+pos = (530,1056);
 },
 {
 name = topr;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/g.sc.glyph b/src/Inter-Roman.glyphspackage/glyphs/g.sc.glyph
index 63236b602..2f49e5684 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/g.sc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/g.sc.glyph
@@ -15,7 +15,7 @@ pos = (600,0);
 },
 {
 name = top;
-pos = (603,1256);
+pos = (603,1118);
 },
 {
 name = topr;
@@ -88,7 +88,7 @@ pos = (622,0);
 },
 {
 name = top;
-pos = (626,1256);
+pos = (626,1118);
 },
 {
 name = topr;
@@ -168,7 +168,7 @@ pos = (590,0);
 },
 {
 name = top;
-pos = (590,1259);
+pos = (590,1118);
 },
 {
 name = topr;
@@ -246,7 +246,7 @@ pos = (557,1);
 },
 {
 name = top;
-pos = (557,1196);
+pos = (557,1056);
 },
 {
 name = topr;
@@ -399,7 +399,7 @@ pos = (579,7);
 },
 {
 name = top;
-pos = (583,1195);
+pos = (583,1056);
 },
 {
 name = topr;
@@ -480,7 +480,7 @@ pos = (530,0);
 },
 {
 name = top;
-pos = (530,1262);
+pos = (530,1056);
 },
 {
 name = topr;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/gacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/gacute.glyph
index 29c078710..34cbfc3c4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/gacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/gacute.glyph
@@ -75,7 +75,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (250,0);
+pos = (246,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/gbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/gbreve.glyph
index 29a795496..9eb5a8a89 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/gbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/gbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (166,0);
+pos = (242,0);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (156,0);
+pos = (188,0);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (180,0);
+pos = (244,0);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (118,0);
+pos = (146,0);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (142,0);
+pos = (158,0);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (114,0);
+pos = (178,0);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/gcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/gcaron.glyph
index 5394a194a..69ceca92d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/gcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/gcaron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (166,16);
+pos = (164,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (8,0);
+pos = (10,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/gcircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/gcircumflex.glyph
index c4556e426..39ae5329d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/gcircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/gcircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (160,0);
+pos = (162,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (22,0);
+pos = (28,0);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (166,0);
+pos = (164,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (112,0);
+pos = (114,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (8,0);
+pos = (10,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (164,0);
+pos = (162,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/gcommaaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/gcommaaccent.glyph
index 455e72678..b9001533b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/gcommaaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/gcommaaccent.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (378,106);
+pos = (378,-80);
 ref = commaaccentrotate.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (378,240);
+pos = (378,54);
 ref = commaaccentrotate.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (438,24);
+pos = (438,-162);
 ref = commaaccentrotate.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (330,64);
+pos = (330,-142);
 ref = commaaccentrotate.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (364,198);
+pos = (364,-8);
 ref = commaaccentrotate.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (436,-18);
+pos = (436,-224);
 ref = commaaccentrotate.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ge-cy.glyph b/src/Inter-Roman.glyphspackage/glyphs/ge-cy.glyph
index 8c0e6540a..12ea0bb23 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ge-cy.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ge-cy.glyph
@@ -15,7 +15,7 @@ pos = (328,0);
 },
 {
 name = top;
-pos = (498,1304);
+pos = (498,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -46,7 +46,7 @@ pos = (504,0);
 },
 {
 name = top;
-pos = (520,1304);
+pos = (520,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -77,7 +77,7 @@ pos = (244,0);
 },
 {
 name = top;
-pos = (494,1304);
+pos = (494,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -108,7 +108,7 @@ pos = (296,0);
 },
 {
 name = top;
-pos = (466,1262);
+pos = (466,1056);
 }
 );
 layerId = m007;
@@ -139,7 +139,7 @@ pos = (486,0);
 },
 {
 name = top;
-pos = (504,1262);
+pos = (504,1056);
 }
 );
 layerId = m009;
@@ -170,7 +170,7 @@ pos = (180,0);
 },
 {
 name = top;
-pos = (430,1262);
+pos = (430,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ghestrokecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/ghestrokecyrillic.glyph
index d9ab9f4be..bce70584a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ghestrokecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ghestrokecyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (-216,-163);
+pos = (-216,-187);
 ref = crossbar;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (-216,-99);
+pos = (-216,-123);
 ref = crossbar;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (-202,-164);
+pos = (-202,-187);
 ref = crossbar;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (-236,-162);
+pos = (-236,-187);
 ref = crossbar;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (-208,-155);
+pos = (-208,-179);
 ref = crossbar;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (-202,-164);
+pos = (-202,-187);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/gjecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/gjecyrillic.glyph
index 08bf1d8e3..53f45e641 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/gjecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/gjecyrillic.glyph
@@ -75,7 +75,7 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (150,0);
+pos = (146,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/glottalstopbarrev.glyph b/src/Inter-Roman.glyphspackage/glyphs/glottalstopbarrev.glyph
index 22ed644b9..75cf3d380 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/glottalstopbarrev.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/glottalstopbarrev.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = glottalstoprevinv;
 },
 {
-pos = (110,-511);
+pos = (110,-535);
 ref = crossbar;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = glottalstoprevinv;
 },
 {
-pos = (106,-555);
+pos = (106,-579);
 ref = crossbar;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = glottalstoprevinv;
 },
 {
-pos = (158,-486);
+pos = (158,-509);
 ref = crossbar;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = glottalstoprevinv;
 },
 {
-pos = (90,-510);
+pos = (90,-535);
 ref = crossbar;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = glottalstoprevinv;
 },
 {
-pos = (114,-555);
+pos = (114,-579);
 ref = crossbar;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = glottalstoprevinv;
 },
 {
-pos = (158,-486);
+pos = (158,-509);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/gmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/gmacron.glyph
index d8429bbe1..4784a7daf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/gmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/gmacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (166,0);
+pos = (26,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (10,0);
+pos = (3,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (296,0);
+pos = (14,0);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (118,-42);
+pos = (-22,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (-4,-42);
+pos = (-11,0);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (294,0);
+pos = (-4,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/grave.glyph b/src/Inter-Roman.glyphspackage/glyphs/grave.glyph
index 1849c19ea..9d165bcac 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/grave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/grave.glyph
@@ -6,11 +6,11 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (538,1304);
+pos = (538,1118);
 },
 {
 name = top;
-pos = (538,1676);
+pos = (538,1532);
 }
 );
 guides = (
@@ -37,11 +37,11 @@ width = 890;
 anchors = (
 {
 name = _top;
-pos = (604,1304);
+pos = (604,1118);
 },
 {
 name = top;
-pos = (604,1676);
+pos = (604,1582);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -62,11 +62,11 @@ width = 994;
 anchors = (
 {
 name = _top;
-pos = (494,1304);
+pos = (494,1118);
 },
 {
 name = top;
-pos = (490,1676);
+pos = (490,1594);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -87,17 +87,11 @@ width = 774;
 anchors = (
 {
 name = _top;
-pos = (560,1262);
+pos = (560,1056);
 },
 {
 name = top;
-pos = (560,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (603,1177);
+pos = (560,1490);
 }
 );
 layerId = m007;
@@ -118,11 +112,11 @@ width = 911;
 anchors = (
 {
 name = _top;
-pos = (672,1262);
+pos = (672,1056);
 },
 {
 name = top;
-pos = (672,1676);
+pos = (672,1490);
 }
 );
 guides = (
@@ -149,11 +143,11 @@ width = 1082;
 anchors = (
 {
 name = _top;
-pos = (494,1262);
+pos = (494,1056);
 },
 {
 name = top;
-pos = (490,1676);
+pos = (490,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/h.glyph b/src/Inter-Roman.glyphspackage/glyphs/h.glyph
index 74076a7b7..dd6a47f13 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/h.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/h.glyph
@@ -24,7 +24,7 @@ pos = (884,0);
 },
 {
 name = top;
-pos = (243,1676);
+pos = (243,1490);
 }
 );
 background = {
@@ -34,12 +34,6 @@ ref = n;
 }
 );
 };
-guides = (
-{
-angle = 90;
-pos = (243,1520);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
@@ -91,13 +85,7 @@ pos = (826,0);
 },
 {
 name = top;
-pos = (295,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (295,1696);
+pos = (295,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -216,13 +204,7 @@ pos = (920,0);
 },
 {
 name = top;
-pos = (221,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (221,1836);
+pos = (221,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -276,7 +258,7 @@ pos = (842,0);
 },
 {
 name = top;
-pos = (214,1676);
+pos = (213,1490);
 }
 );
 background = {
@@ -409,13 +391,7 @@ pos = (812,0);
 },
 {
 name = top;
-pos = (286,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (286,1696);
+pos = (286,1490);
 }
 );
 layerId = m009;
@@ -469,7 +445,7 @@ pos = (888,0);
 },
 {
 name = top;
-pos = (157,1676);
+pos = (157,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/h.sc.glyph b/src/Inter-Roman.glyphspackage/glyphs/h.sc.glyph
index de37fd0dc..bfa36d746 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/h.sc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/h.sc.glyph
@@ -12,6 +12,10 @@ pos = (1036,0);
 {
 name = lfthook;
 pos = (866,0);
+},
+{
+name = top;
+pos = (597,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -55,6 +59,10 @@ pos = (1228,0);
 {
 name = lfthook;
 pos = (828,0);
+},
+{
+name = top;
+pos = (665,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -98,6 +106,10 @@ pos = (990,0);
 {
 name = lfthook;
 pos = (944,0);
+},
+{
+name = top;
+pos = (594,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -141,6 +153,10 @@ pos = (1004,0);
 {
 name = lfthook;
 pos = (834,0);
+},
+{
+name = top;
+pos = (565,1056);
 }
 );
 layerId = m007;
@@ -184,6 +200,10 @@ pos = (1212,0);
 {
 name = lfthook;
 pos = (812,0);
+},
+{
+name = top;
+pos = (649,1056);
 }
 );
 background = {
@@ -240,6 +260,10 @@ pos = (926,0);
 {
 name = lfthook;
 pos = (880,0);
+},
+{
+name = top;
+pos = (530,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/hbar.glyph b/src/Inter-Roman.glyphspackage/glyphs/hbar.glyph
index 27da1f5e0..4fcbd93e9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/hbar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/hbar.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-132,583);
+pos = (-132,559);
 ref = crossbar;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-152,583);
+pos = (-152,559);
 ref = crossbar;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-180,582);
+pos = (-180,559);
 ref = crossbar;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-150,542);
+pos = (-150,517);
 ref = crossbar;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-114,541);
+pos = (-114,517);
 ref = crossbar;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-180,540);
+pos = (-180,517);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/hcircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/hcircumflex.glyph
index 95c35bd83..a379b8b0c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/hcircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/hcircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-223,372);
+pos = (-221,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-351,372);
+pos = (-345,372);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-209,372);
+pos = (-211,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-220,414);
+pos = (-219,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-344,414);
+pos = (-342,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-209,414);
+pos = (-211,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/hdieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/hdieresis.glyph
index ba5a5221f..306cc484d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/hdieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/hdieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-363,372);
+pos = (-358,372);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-212,372);
+pos = (-370,372);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-453,372);
+pos = (-361,372);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-360,414);
+pos = (-356,434);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-208,414);
+pos = (-363,434);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-453,414);
+pos = (-377,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/hdotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/hdotaccent.glyph
index fbfaf0728..96e86a01c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/hdotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/hdotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (2,414);
+pos = (1,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-34,414);
+pos = (-34,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (35,414);
+pos = (35,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/hlinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/hlinebelow.glyph
index 7031ab3ba..3b7280b9b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/hlinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/hlinebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1208,0);
+pos = (1200,0);
 ref = macronsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1292,0);
+pos = (1330,0);
 ref = macronsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1188,0);
+pos = (1157,0);
 ref = macronsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1210,0);
+pos = (1132,0);
 ref = macronsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1292,0);
+pos = (1293,0);
 ref = macronsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1204,0);
+pos = (1063,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/hookabovecmb.glyph b/src/Inter-Roman.glyphspackage/glyphs/hookabovecmb.glyph
index 47a8e72c7..d85f1a0ce 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/hookabovecmb.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/hookabovecmb.glyph
@@ -6,30 +6,36 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (-594,1278);
+pos = (-587,1118);
 }
 );
+background = {
+shapes = (
+{
+pos = (-926,0);
+ref = acute;
+}
+);
+};
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 closed = 1;
 nodes = (
-(-518,1314,l),
-(-442,1327,o),
-(-367,1367,o),
-(-366,1466,cs),
-(-367,1583,o),
-(-471,1658,o),
-(-672,1658,c),
-(-678,1548,l),
-(-591,1548,o),
-(-521,1524,o),
-(-520,1472,cs),
-(-521,1425,o),
-(-559,1405,o),
-(-660,1400,c),
-(-660,1242,l),
-(-518,1242,l)
+(-452,1341,o),
+(-416,1400,o),
+(-416,1459,cs),
+(-416,1535,o),
+(-480,1577,o),
+(-594,1577,cs),
+(-749,1577,l),
+(-749,1450,l),
+(-616,1450,ls),
+(-578,1450,o),
+(-570,1430,o),
+(-588,1395,cs),
+(-658,1258,l),
+(-516,1258,l)
 );
 }
 );
@@ -39,62 +45,152 @@ width = 0;
 anchors = (
 {
 name = _top;
-pos = (-738,1310);
+pos = (-664,1118);
+}
+);
+background = {
+shapes = (
+{
+pos = (-1076,0);
+ref = acute;
 }
 );
+};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 closed = 1;
 nodes = (
-(-600,1346,l),
-(-519,1359,o),
-(-441,1402,o),
-(-442,1484,cs),
-(-441,1612,o),
-(-601,1684,o),
-(-898,1684,c),
-(-908,1524,l),
-(-828,1524,o),
-(-769,1516,o),
-(-770,1464,cs),
-(-769,1431,o),
-(-810,1405,o),
-(-914,1402,c),
-(-888,1288,l),
-(-600,1288,l)
-);
-}
-);
-width = 44;
+(-482,1360,o),
+(-430,1437,o),
+(-430,1506,cs),
+(-430,1621,o),
+(-514,1650,o),
+(-664,1650,cs),
+(-849,1650,l),
+(-849,1446,l),
+(-688,1446,ls),
+(-679,1446,o),
+(-676,1440,o),
+(-680,1431,cs),
+(-754,1256,l),
+(-556,1256,l)
+);
+}
+);
+width = 0;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-498,1260);
+pos = (-522,1118);
 }
 );
+background = {
+shapes = (
+{
+pos = (-797,0);
+ref = acute;
+}
+);
+};
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 closed = 1;
 nodes = (
-(-476,1316,l),
-(-384,1324,o),
-(-322,1383,o),
-(-322,1474,cs),
-(-324,1575,o),
-(-392,1642,o),
-(-542,1644,c),
-(-548,1598,l),
-(-428,1596,o),
-(-373,1558,o),
-(-372,1470,cs),
-(-372,1393,o),
-(-411,1364,o),
-(-522,1358,c),
-(-522,1216,l),
+(-401,1408,o),
+(-390,1433,o),
+(-390,1466,cs),
+(-390,1531,o),
+(-442,1578,o),
+(-534,1578,cs),
+(-639,1578,l),
+(-639,1532,l),
+(-534,1532,ls),
+(-439,1532,o),
+(-411,1480,o),
+(-463,1400,cs),
+(-541,1280,l),
+(-495,1280,l)
+);
+}
+);
+width = 0;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (-654,1056);
+}
+);
+background = {
+shapes = (
+{
+pos = (-1063,0);
+ref = acute;
+}
+);
+};
+layerId = m009;
+shapes = (
+{
+closed = 1;
+nodes = (
+(-425,1290,o),
+(-402,1325,o),
+(-402,1394,cs),
+(-402,1500,o),
+(-485,1560,o),
+(-634,1560,cs),
+(-819,1560,l),
+(-819,1350,l),
+(-654,1350,ls),
+(-649,1350,o),
+(-648,1347,o),
+(-650,1343,cs),
+(-757,1164,l),
+(-543,1164,l)
+);
+}
+);
+width = 0;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (-504,1056);
+}
+);
+background = {
+shapes = (
+{
+pos = (-781,0);
+ref = acute;
+}
+);
+};
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(-382,1344,o),
+(-370,1369,o),
+(-370,1402,cs),
+(-370,1467,o),
+(-425,1514,o),
+(-517,1514,cs),
+(-622,1514,l),
+(-622,1468,l),
+(-517,1468,ls),
+(-422,1468,o),
+(-387,1415,o),
+(-442,1336,cs),
+(-526,1216,l),
 (-476,1216,l)
 );
 }
@@ -105,30 +201,70 @@ width = 0;
 anchors = (
 {
 name = _top;
-pos = (-626,1278);
+pos = (-565,1056);
+}
+);
+associatedMasterId = m007;
+layerId = "35411DDE-B01E-4F9A-AA58-ADFF614AB5E6";
+name = "Apr 11, 23, 17:32";
+shapes = (
+{
+closed = 1;
+nodes = (
+(-411,1318,o),
+(-382,1360,o),
+(-382,1419,cs),
+(-382,1508,o),
+(-462,1582,o),
+(-578,1582,cs),
+(-749,1582,l),
+(-749,1442,l),
+(-578,1442,ls),
+(-540,1442,o),
+(-529,1419,o),
+(-546,1387,cs),
+(-631,1232,l),
+(-531,1173,l)
+);
+}
+);
+width = 0;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (-563,1056);
 }
 );
+background = {
+shapes = (
+{
+pos = (-893,0);
+ref = acute;
+}
+);
+};
 layerId = m007;
+name = Display;
 shapes = (
 {
 closed = 1;
 nodes = (
-(-550,1314,l),
-(-474,1327,o),
-(-399,1367,o),
-(-398,1466,cs),
-(-399,1583,o),
-(-503,1658,o),
-(-704,1658,c),
-(-710,1548,l),
-(-623,1548,o),
-(-553,1524,o),
-(-552,1472,cs),
-(-553,1425,o),
-(-591,1405,o),
-(-692,1400,c),
-(-692,1242,l),
-(-550,1242,l)
+(-427,1295,o),
+(-395,1356,o),
+(-395,1415,cs),
+(-395,1491,o),
+(-451,1533,o),
+(-562,1533,cs),
+(-717,1533,l),
+(-717,1406,l),
+(-588,1406,ls),
+(-550,1406,o),
+(-538,1386,o),
+(-556,1351,cs),
+(-626,1216,l),
+(-491,1216,l)
 );
 }
 );
@@ -138,68 +274,145 @@ width = 0;
 anchors = (
 {
 name = _top;
-pos = (-754,1262);
+pos = (-579,1118);
 }
 );
-guides = (
+associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+background = {
+shapes = (
 {
-pos = (0,1164);
+pos = (-805,0);
+ref = acute;
 }
 );
-layerId = m009;
+};
+layerId = "416DAF5F-701C-417F-A2C3-826FA34E6049";
+name = "Apr 11, 23, 17:35";
 shapes = (
 {
 closed = 1;
 nodes = (
-(-616,1222,l),
-(-535,1235,o),
-(-458,1278,o),
-(-458,1360,cs),
-(-458,1488,o),
-(-617,1560,o),
-(-914,1560,c),
-(-924,1400,l),
-(-844,1400,o),
-(-786,1392,o),
-(-786,1340,cs),
-(-786,1307,o),
-(-826,1281,o),
-(-930,1278,c),
-(-904,1164,l),
-(-616,1164,l)
-);
-}
-);
-width = 12;
+(-443,1368,o),
+(-433,1400,o),
+(-433,1428,cs),
+(-433,1493,o),
+(-488,1538,o),
+(-580,1538,cs),
+(-725,1538,l),
+(-725,1492,l),
+(-580,1492,ls),
+(-485,1492,o),
+(-453,1442,o),
+(-502,1360,cs),
+(-573,1242,l),
+(-540,1221,l)
+);
+}
+);
+width = 0;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-562,1260);
+pos = (-646,1056);
 }
 );
-layerId = m011;
+associatedMasterId = m009;
+layerId = "F4970EE5-29C3-4417-A878-39F7813AFBEC";
+name = "Apr 11, 23, 17:36";
+shapes = (
+{
+closed = 1;
+nodes = (
+(-482,1263,o),
+(-426,1325,o),
+(-426,1394,cs),
+(-426,1509,o),
+(-532,1570,o),
+(-682,1570,cs),
+(-867,1570,l),
+(-867,1342,l),
+(-702,1342,ls),
+(-697,1342,o),
+(-696,1339,o),
+(-698,1335,cs),
+(-771,1186,l),
+(-624,1135,l)
+);
+}
+);
+width = 0;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (-664,1118);
+}
+);
+associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+layerId = "177F48AE-D2E3-489C-A0E5-EC6F52D44105";
+name = "Apr 11, 23, 17:38";
+shapes = (
+{
+closed = 1;
+nodes = (
+(-500,1343,o),
+(-444,1405,o),
+(-444,1474,cs),
+(-444,1589,o),
+(-550,1650,o),
+(-700,1650,cs),
+(-885,1650,l),
+(-885,1422,l),
+(-720,1422,ls),
+(-715,1422,o),
+(-714,1419,o),
+(-716,1415,cs),
+(-789,1266,l),
+(-642,1215,l)
+);
+}
+);
+width = 0;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (-563,1056);
+}
+);
+associatedMasterId = m007;
+background = {
+shapes = (
+{
+pos = (-893,0);
+ref = acute;
+}
+);
+};
+layerId = "0A2C4732-518D-4305-858E-0550EAD4FAC6";
+name = "Apr 11, 23, 17:42";
 shapes = (
 {
 closed = 1;
 nodes = (
-(-540,1316,l),
-(-448,1324,o),
-(-386,1383,o),
-(-386,1474,cs),
-(-388,1575,o),
-(-456,1642,o),
-(-606,1644,c),
-(-612,1598,l),
-(-492,1596,o),
-(-437,1558,o),
-(-436,1470,cs),
-(-436,1393,o),
-(-475,1364,o),
-(-586,1358,c),
-(-586,1216,l),
-(-540,1216,l)
+(-420,1299,o),
+(-377,1360,o),
+(-377,1419,cs),
+(-377,1508,o),
+(-446,1542,o),
+(-562,1542,cs),
+(-717,1542,l),
+(-717,1410,l),
+(-584,1410,ls),
+(-546,1410,o),
+(-533,1390,o),
+(-552,1355,cs),
+(-626,1216,l),
+(-484,1216,l)
 );
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/iacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/iacute.glyph
index 00f315767..3e2793d67 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/iacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/iacute.glyph
@@ -75,7 +75,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-123,0);
+pos = (-127,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ibar.glyph b/src/Inter-Roman.glyphspackage/glyphs/ibar.glyph
index f61fe0df8..12c36fc3c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ibar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ibar.glyph
@@ -16,7 +16,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (-216,-127);
+pos = (-216,-151);
 ref = crossbar;
 }
 );
@@ -35,7 +35,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (-220,-111);
+pos = (-220,-135);
 ref = crossbar;
 }
 );
@@ -48,7 +48,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (-204,-140);
+pos = (-204,-163);
 ref = crossbar;
 }
 );
@@ -67,7 +67,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (-234,-126);
+pos = (-234,-151);
 ref = crossbar;
 }
 );
@@ -86,7 +86,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (-210,-127);
+pos = (-210,-151);
 ref = crossbar;
 }
 );
@@ -99,7 +99,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (-203,-140);
+pos = (-203,-163);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ibreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/ibreve.glyph
index 3ce17cc51..f4a74eb75 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ibreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ibreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-216,0);
+pos = (-140,0);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-210,0);
+pos = (-178,0);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-196,0);
+pos = (-132,0);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-215,0);
+pos = (-187,0);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-210,0);
+pos = (-194,0);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-259,0);
+pos = (-195,0);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/icaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/icaron.glyph
index c0dfa86fe..30e0d82d7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/icaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/icaron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-210,16);
+pos = (-212,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-344,0);
+pos = (-342,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/icircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/icircumflex.glyph
index 84c686383..6dc8a6fca 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/icircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/icircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-222,0);
+pos = (-220,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-344,0);
+pos = (-338,0);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-210,0);
+pos = (-212,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-221,0);
+pos = (-219,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-344,0);
+pos = (-342,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-209,0);
+pos = (-211,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/idieresis.double.glyph b/src/Inter-Roman.glyphspackage/glyphs/idieresis.double.glyph
index f8c4e1d26..ea64d4014 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/idieresis.double.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/idieresis.double.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless.double;
 },
 {
-pos = (-88,0);
+pos = (-88,-186);
 ref = dieresis.three;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = idotless.double;
 },
 {
-pos = (-87,0);
+pos = (-87,-186);
 ref = dieresis.three;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = idotless.double;
 },
 {
-pos = (15,0);
+pos = (15,-186);
 ref = dieresis.three;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = idotless.double;
 },
 {
-pos = (-148,0);
+pos = (-148,-206);
 ref = dieresis.three;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = idotless.double;
 },
 {
-pos = (-124,0);
+pos = (-124,-206);
 ref = dieresis.three;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = idotless.double;
 },
 {
-pos = (-113,0);
+pos = (-113,-206);
 ref = dieresis.three;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/idieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/idieresis.glyph
index 799fcff1f..c854d9e2a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/idieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/idieresis.glyph
@@ -20,7 +20,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-362,0);
+pos = (-357,0);
 ref = dieresis;
 }
 );
@@ -33,7 +33,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-205,0);
+pos = (-363,0);
 ref = dieresis;
 }
 );
@@ -46,7 +46,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-454,0);
+pos = (-362,0);
 ref = dieresis;
 }
 );
@@ -65,7 +65,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-361,0);
+pos = (-356,0);
 ref = dieresis;
 }
 );
@@ -78,7 +78,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-208,0);
+pos = (-363,0);
 ref = dieresis;
 }
 );
@@ -91,7 +91,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-453,0);
+pos = (-377,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/idieresisacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/idieresisacute.glyph
index 0cc0cabe8..4485ca9d4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/idieresisacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/idieresisacute.glyph
@@ -17,7 +17,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (838,0);
+pos = (-357,0);
 ref = dieresisacutecomb.lc;
 }
 );
@@ -30,7 +30,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (975,0);
+pos = (-363,0);
 ref = dieresisacutecomb.lc;
 }
 );
@@ -43,7 +43,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (803,0);
+pos = (-362,0);
 ref = dieresisacutecomb.lc;
 }
 );
@@ -63,7 +63,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (769,0);
+pos = (-356,0);
 ref = dieresisacutecomb.lc;
 }
 );
@@ -76,7 +76,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (932,0);
+pos = (-363,0);
 ref = dieresisacutecomb.lc;
 }
 );
@@ -89,7 +89,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (664,0);
+pos = (-377,0);
 ref = dieresisacutecomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/idieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/idieresiscyrillic.glyph
index 119a72daf..82c83bd25 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/idieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/idieresiscyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (-6,0);
+pos = (-1,0);
 ref = dieresis;
 }
 );
@@ -23,7 +23,6 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (158,0);
 ref = dieresis;
 }
 );
@@ -36,7 +35,6 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (-92,0);
 ref = dieresis;
 }
 );
@@ -49,7 +47,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (-6,0);
+pos = (-1,0);
 ref = dieresis;
 }
 );
@@ -62,7 +60,6 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (155,0);
 ref = dieresis;
 }
 );
@@ -75,7 +72,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (-92,0);
+pos = (-16,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/idotless.double.glyph b/src/Inter-Roman.glyphspackage/glyphs/idotless.double.glyph
index c6d181331..0b05c8737 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/idotless.double.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/idotless.double.glyph
@@ -8,7 +8,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (486,1304);
+pos = (486,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -27,7 +27,7 @@ width = 972;
 anchors = (
 {
 name = top;
-pos = (606,1304);
+pos = (606,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -46,7 +46,7 @@ width = 1212;
 anchors = (
 {
 name = top;
-pos = (442,1304);
+pos = (442,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -65,7 +65,7 @@ width = 884;
 anchors = (
 {
 name = top;
-pos = (426,1262);
+pos = (426,1056);
 }
 );
 layerId = m007;
@@ -84,7 +84,7 @@ width = 852;
 anchors = (
 {
 name = top;
-pos = (572,1262);
+pos = (572,1056);
 }
 );
 layerId = m009;
@@ -103,7 +103,7 @@ width = 1144;
 anchors = (
 {
 name = top;
-pos = (314,1262);
+pos = (314,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/idotless.glyph b/src/Inter-Roman.glyphspackage/glyphs/idotless.glyph
index 1a83ec688..88a4ce39e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/idotless.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/idotless.glyph
@@ -19,7 +19,7 @@ pos = (328,0);
 },
 {
 name = top;
-pos = (244,1304);
+pos = (244,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -52,7 +52,7 @@ pos = (504,0);
 },
 {
 name = top;
-pos = (302,1304);
+pos = (302,1118);
 }
 );
 guides = (
@@ -92,7 +92,7 @@ pos = (244,0);
 },
 {
 name = top;
-pos = (220,1304);
+pos = (220,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -125,7 +125,7 @@ pos = (298,0);
 },
 {
 name = top;
-pos = (213,1262);
+pos = (213,1056);
 }
 );
 layerId = m007;
@@ -158,7 +158,7 @@ pos = (486,0);
 },
 {
 name = top;
-pos = (286,1262);
+pos = (286,1056);
 }
 );
 layerId = m009;
@@ -191,7 +191,7 @@ pos = (180,0);
 },
 {
 name = top;
-pos = (157,1262);
+pos = (157,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/iebrevecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/iebrevecyrillic.glyph
index 22472aa2c..3c9f0a775 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/iebrevecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/iebrevecyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (140,0);
+pos = (216,0);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (110,0);
+pos = (142,0);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (174,0);
+pos = (238,0);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (122,0);
+pos = (150,0);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (103,0);
+pos = (119,0);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (110,0);
+pos = (174,0);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ihookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/ihookabove.glyph
index 5a5f33955..bd37c1ff7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ihookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ihookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (838,26);
+pos = (831,0);
 ref = hookabovecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (1040,-6);
+pos = (966,0);
 ref = hookabovecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (718,44);
+pos = (742,0);
 ref = hookabovecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (839,-16);
+pos = (776,0);
 ref = hookabovecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (1040,0);
+pos = (940,0);
 ref = hookabovecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (719,2);
+pos = (661,0);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/iicyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/iicyrillic.glyph
index c8b51b9b4..2782427ad 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/iicyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/iicyrillic.glyph
@@ -11,7 +11,7 @@ pos = (1042,0);
 },
 {
 name = top;
-pos = (600,1304);
+pos = (600,1118);
 }
 );
 background = {
@@ -58,7 +58,7 @@ pos = (1228,0);
 },
 {
 name = top;
-pos = (665,1304);
+pos = (665,1118);
 }
 );
 background = {
@@ -98,7 +98,7 @@ pos = (966,0);
 },
 {
 name = top;
-pos = (582,1304);
+pos = (582,1118);
 }
 );
 background = {
@@ -138,7 +138,7 @@ pos = (1010,0);
 },
 {
 name = top;
-pos = (568,1262);
+pos = (568,1056);
 }
 );
 background = {
@@ -185,7 +185,7 @@ pos = (1212,0);
 },
 {
 name = top;
-pos = (649,1262);
+pos = (649,1056);
 }
 );
 background = {
@@ -225,7 +225,7 @@ pos = (902,0);
 },
 {
 name = top;
-pos = (518,1262);
+pos = (518,1056);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/iinvertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/iinvertedbreve.glyph
index 09394f681..4b2f7b2b9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/iinvertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/iinvertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (900,0);
+pos = (841,0);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (942,0);
+pos = (964,0);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (812,0);
+pos = (802,0);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (869,-10);
+pos = (777,0);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (926,0);
+pos = (936,0);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (749,0);
+pos = (686,0);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/iishortcyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/iishortcyrillic.glyph
index 493a0d119..d8b1671f4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/iishortcyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/iishortcyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (140,0);
+pos = (216,0);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (153,0);
+pos = (185,0);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (166,0);
+pos = (230,0);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (140,0);
+pos = (168,0);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (153,0);
+pos = (169,0);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (102,0);
+pos = (166,0);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ij.glyph b/src/Inter-Roman.glyphspackage/glyphs/ij.glyph
index 5757db442..fb633b517 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ij.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ij.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = i;
 },
 {
-pos = (555,0);
+pos = (486,0);
 ref = j;
 }
 );
-width = 1041;
+width = 972;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = i;
 },
 {
-pos = (687,0);
+pos = (606,0);
 ref = j;
 }
 );
-width = 1293;
+width = 1212;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = i;
 },
 {
-pos = (511,0);
+pos = (442,0);
 ref = j;
 }
 );
-width = 959;
+width = 890;
 },
 {
 layerId = m007;
@@ -62,11 +62,11 @@ shapes = (
 ref = i;
 },
 {
-pos = (641,0);
+pos = (572,0);
 ref = j;
 }
 );
-width = 1215;
+width = 1146;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/imacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/imacron.glyph
index 1ecd8295d..cd42cd604 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/imacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/imacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-216,0);
+pos = (-356,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-356,0);
+pos = (-363,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-80,0);
+pos = (-362,0);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-215,-42);
+pos = (-355,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-356,-42);
+pos = (-363,0);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-79,0);
+pos = (-377,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/imacroncyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/imacroncyrillic.glyph
index 16a07a26a..3ca6228b7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/imacroncyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/imacroncyrillic.glyph
@@ -10,7 +10,6 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (140,0);
 ref = macron;
 }
 );
@@ -23,7 +22,6 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (7,0);
 ref = macron;
 }
 );
@@ -36,7 +34,6 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (282,0);
 ref = macron;
 }
 );
@@ -49,7 +46,6 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (140,-42);
 ref = macron;
 }
 );
@@ -62,7 +58,6 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (7,-42);
 ref = macron;
 }
 );
@@ -75,7 +70,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (282,0);
+pos = (-16,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/iota.glyph b/src/Inter-Roman.glyphspackage/glyphs/iota.glyph
index 2d8c0a12f..0fc4bbc91 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/iota.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/iota.glyph
@@ -7,7 +7,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (236,1304);
+pos = (236,1118);
 }
 );
 guides = (
@@ -46,7 +46,7 @@ width = 544;
 anchors = (
 {
 name = top;
-pos = (334,1304);
+pos = (334,1118);
 }
 );
 guides = (
@@ -88,7 +88,7 @@ width = 734;
 anchors = (
 {
 name = top;
-pos = (222,1304);
+pos = (222,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -121,7 +121,7 @@ width = 442;
 anchors = (
 {
 name = top;
-pos = (204,1304);
+pos = (204,1056);
 }
 );
 guides = (
@@ -149,8 +149,8 @@ nodes = (
 (358,154,o),
 (291,172,o),
 (290,276,c),
-(290,1118,l),
-(120,1118,l)
+(290,1056,l),
+(120,1056,l)
 );
 }
 );
@@ -160,16 +160,7 @@ width = 480;
 anchors = (
 {
 name = top;
-pos = (318,1304);
-}
-);
-guides = (
-{
-pos = (-80,908);
-},
-{
-angle = 90;
-pos = (364,1380);
+pos = (318,1056);
 }
 );
 layerId = m009;
@@ -191,8 +182,8 @@ nodes = (
 (529,294,o),
 (506,320,o),
 (504,398,c),
-(510,1118,l),
-(124,1118,l)
+(504,1056,l),
+(124,1056,l)
 );
 }
 );
@@ -202,7 +193,7 @@ width = 702;
 anchors = (
 {
 name = top;
-pos = (158,1304);
+pos = (158,1056);
 }
 );
 layerId = m011;
@@ -224,8 +215,8 @@ nodes = (
 (222,32,o),
 (180,89,o),
 (180,174,cs),
-(180,1118,l),
-(134,1118,l)
+(180,1056,l),
+(134,1056,l)
 );
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/iotadieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/iotadieresis.glyph
index 713d50575..91a17ecd1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/iotadieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/iotadieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-370,0);
+pos = (-365,0);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-173,0);
+pos = (-331,0);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-452,0);
+pos = (-360,0);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-370,42);
+pos = (-365,0);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-176,42);
+pos = (-331,0);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-452,42);
+pos = (-376,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/iotadieresistonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/iotadieresistonos.glyph
index 97e8cf720..9bcbf275a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/iotadieresistonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/iotadieresistonos.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-320,12);
+pos = (-320,-174);
 ref = dieresistonos;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-282,12);
+pos = (-282,-174);
 ref = dieresistonos;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-298,12);
+pos = (-298,-174);
 ref = dieresistonos;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-320,12);
+pos = (-320,-236);
 ref = dieresistonos;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-282,12);
+pos = (-282,-236);
 ref = dieresistonos;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-298,12);
+pos = (-298,-236);
 ref = dieresistonos;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/iotatonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/iotatonos.glyph
index 9dc5784db..ee0ec75b1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/iotatonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/iotatonos.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (14,0);
+pos = (14,-186);
 ref = tonostop;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-38,22);
+pos = (-38,-164);
 ref = tonostop;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (92,-10);
+pos = (92,-196);
 ref = tonostop;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (14,0);
+pos = (14,-248);
 ref = tonostop;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-38,22);
+pos = (-38,-226);
 ref = tonostop;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (92,-10);
+pos = (92,-258);
 ref = tonostop;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/itilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/itilde.glyph
index 2ca1bd067..7b54410c7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/itilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/itilde.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-290,0);
+pos = (-284,0);
 ref = tilde;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/itildebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/itildebelow.glyph
index 20d3da6e0..6c767b07a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/itildebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/itildebelow.glyph
@@ -16,7 +16,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (868,0);
+pos = (844,0);
 ref = tildesubnosp;
 }
 );
@@ -29,7 +29,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (1026,0);
+pos = (970,0);
 ref = tildesubnosp;
 }
 );
@@ -42,7 +42,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (706,0);
+pos = (801,0);
 ref = tildesubnosp;
 }
 );
@@ -61,7 +61,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (869,0);
+pos = (781,0);
 ref = tildesubnosp;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (1006,0);
+pos = (934,0);
 ref = tildesubnosp;
 }
 );
@@ -87,7 +87,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (703,0);
+pos = (688,0);
 ref = tildesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/izhitsacyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/izhitsacyrillic.glyph
index 2378b3d26..05f350dc5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/izhitsacyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/izhitsacyrillic.glyph
@@ -7,7 +7,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (570,1304);
+pos = (570,1118);
 }
 );
 background = {
@@ -47,7 +47,7 @@ width = 1238;
 anchors = (
 {
 name = top;
-pos = (620,1304);
+pos = (620,1118);
 }
 );
 background = {
@@ -87,7 +87,7 @@ width = 1309;
 anchors = (
 {
 name = top;
-pos = (536,1304);
+pos = (536,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -120,7 +120,7 @@ width = 1266;
 anchors = (
 {
 name = top;
-pos = (532,1262);
+pos = (532,1056);
 }
 );
 background = {
@@ -160,7 +160,7 @@ width = 1166;
 anchors = (
 {
 name = top;
-pos = (602,1262);
+pos = (602,1056);
 }
 );
 background = {
@@ -200,7 +200,7 @@ width = 1234;
 anchors = (
 {
 name = top;
-pos = (471,1262);
+pos = (471,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/j.glyph b/src/Inter-Roman.glyphspackage/glyphs/j.glyph
index 6d12f0939..d692ecb4d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/j.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/j.glyph
@@ -5,44 +5,26 @@ kernLeft = jdotless;
 kernRight = idotless;
 layers = (
 {
-guides = (
-{
-angle = 90;
-pos = (332,2132);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 ref = jdotless;
 },
 {
-pos = (-2,0);
+pos = (-1,0);
 ref = dotaccent;
 }
 );
 width = 486;
 },
 {
-guides = (
-{
-pos = (0,906.125);
-},
-{
-pos = (0,1381.875);
-},
-{
-angle = 90;
-pos = (548,1564);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 ref = jdotless;
 },
 {
-pos = (-32,0);
+pos = (-31,0);
 ref = dotaccent;
 }
 );
@@ -55,19 +37,13 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (40,0);
+pos = (41,0);
 ref = dotaccent;
 }
 );
 width = 448;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (332,2132);
-}
-);
 layerId = m007;
 shapes = (
 {
@@ -81,18 +57,6 @@ ref = dotaccent;
 width = 424;
 },
 {
-guides = (
-{
-pos = (0,906.125);
-},
-{
-pos = (0,1381.875);
-},
-{
-angle = 90;
-pos = (548,1564);
-}
-);
 layerId = m009;
 shapes = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/jcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/jcaron.glyph
index 438148b34..af71444c4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/jcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/jcaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-224,0);
+pos = (-223,0);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-344,0);
+pos = (-343,0);
 ref = caron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-204,16);
+pos = (-205,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-342,0);
+pos = (-340,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/jcircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/jcircumflex.glyph
index a5a7a358e..8f479ae9c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/jcircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/jcircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-224,0);
+pos = (-221,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-344,0);
+pos = (-337,0);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-204,0);
+pos = (-205,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-223,0);
+pos = (-221,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-342,0);
+pos = (-340,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-203,0);
+pos = (-205,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/jcrosstail.ccmp.glyph b/src/Inter-Roman.glyphspackage/glyphs/jcrosstail.ccmp.glyph
index b4e6355da..be4c013e4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/jcrosstail.ccmp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/jcrosstail.ccmp.glyph
@@ -17,12 +17,6 @@ ref = j;
 }
 );
 };
-guides = (
-{
-angle = 90;
-pos = (640,2160);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
@@ -118,30 +112,30 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(253,-419,o),
-(337,-311,o),
-(338,-168,c),
-(338,50,l),
-(290,50,l),
-(290,-168,ls),
-(291,-285,o),
-(228,-372,o),
-(108,-372,cs),
-(20,-372,o),
-(-70,-292,o),
-(-70,-192,cs),
-(-70,-92,o),
-(22,-11,o),
-(140,-12,cs),
-(472,-14,l),
-(472,34,l),
-(140,34,ls),
-(-5,36,o),
-(-116,-66,o),
-(-116,-192,cs),
-(-116,-318,o),
-(-5,-419,o),
-(108,-418,cs)
+(247,-419,o),
+(331,-311,o),
+(332,-168,c),
+(332,50,l),
+(286,50,l),
+(286,-168,ls),
+(286,-285,o),
+(222,-372,o),
+(102,-372,cs),
+(14,-372,o),
+(-76,-292,o),
+(-76,-192,cs),
+(-76,-92,o),
+(16,-12,o),
+(134,-12,cs),
+(466,-12,l),
+(466,34,l),
+(134,34,ls),
+(-11,34,o),
+(-122,-66,o),
+(-122,-192,cs),
+(-122,-318,o),
+(-11,-419,o),
+(102,-418,cs)
 );
 },
 {
@@ -167,41 +161,35 @@ ref = j;
 }
 );
 };
-guides = (
-{
-angle = 90;
-pos = (348,2160);
-}
-);
 layerId = m007;
 shapes = (
 {
 closed = 1;
 nodes = (
-(416,-419,o),
-(521,-265,o),
-(520,-98,cs),
-(520,244,l),
-(350,244,l),
-(350,-116,ls),
-(349,-177,o),
-(314,-262,o),
-(230,-262,cs),
-(169,-262,o),
-(125,-215,o),
-(126,-158,cs),
-(125,-96,o),
-(172,-47,o),
-(242,-46,cs),
-(736,-46,l),
-(736,116,l),
-(242,116,ls),
-(79,116,o),
-(-58,12,o),
-(-58,-154,cs),
-(-58,-303,o),
-(52,-419,o),
-(232,-418,cs)
+(418,-419,o),
+(523,-265,o),
+(522,-98,cs),
+(522,244,l),
+(352,244,l),
+(352,-116,ls),
+(351,-177,o),
+(316,-262,o),
+(232,-262,cs),
+(171,-262,o),
+(127,-215,o),
+(128,-158,cs),
+(127,-96,o),
+(174,-47,o),
+(244,-46,cs),
+(738,-46,l),
+(738,116,l),
+(244,116,ls),
+(81,116,o),
+(-56,12,o),
+(-56,-154,cs),
+(-56,-303,o),
+(54,-419,o),
+(234,-418,cs)
 );
 },
 {
@@ -223,30 +211,30 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(861,-442,o),
-(938,-230,o),
-(938,-18,cs),
-(938,254,l),
+(859,-442,o),
+(936,-230,o),
+(936,-18,cs),
+(936,254,l),
 (536,254,l),
 (536,-126,ls),
 (537,-186,o),
-(535,-221,o),
-(466,-222,cs),
-(422,-221,o),
-(378,-215,o),
-(380,-166,cs),
-(381,-113,o),
-(433,-111,o),
-(478,-110,cs),
-(1244,-110,l),
-(1244,134,l),
-(432,134,ls),
-(175,134,o),
-(55,17,o),
-(56,-152,cs),
-(58,-326,o),
-(183,-442,o),
-(472,-442,cs)
+(533,-221,o),
+(464,-222,cs),
+(420,-221,o),
+(376,-215,o),
+(378,-166,cs),
+(379,-113,o),
+(431,-110,o),
+(476,-110,cs),
+(1242,-110,l),
+(1242,134,l),
+(430,134,ls),
+(173,134,o),
+(53,17,o),
+(54,-152,cs),
+(56,-326,o),
+(181,-442,o),
+(470,-442,cs)
 );
 },
 {
@@ -268,30 +256,30 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(189,-419,o),
-(273,-311,o),
-(274,-168,c),
-(274,50,l),
-(226,50,l),
-(226,-168,ls),
-(227,-285,o),
-(164,-372,o),
-(44,-372,cs),
-(-44,-372,o),
-(-134,-292,o),
-(-134,-192,cs),
-(-134,-92,o),
-(-42,-11,o),
-(76,-12,cs),
-(408,-14,l),
-(408,34,l),
-(76,34,ls),
-(-69,36,o),
-(-180,-66,o),
-(-180,-192,cs),
-(-180,-318,o),
-(-69,-419,o),
-(44,-418,cs)
+(183,-419,o),
+(267,-311,o),
+(268,-168,c),
+(268,50,l),
+(222,50,l),
+(222,-168,ls),
+(222,-285,o),
+(158,-372,o),
+(38,-372,cs),
+(-50,-372,o),
+(-140,-292,o),
+(-140,-192,cs),
+(-140,-92,o),
+(-48,-12,o),
+(70,-12,cs),
+(402,-12,l),
+(402,34,l),
+(70,34,ls),
+(-75,34,o),
+(-186,-66,o),
+(-186,-192,cs),
+(-186,-318,o),
+(-75,-419,o),
+(38,-418,cs)
 );
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/jdotless.glyph b/src/Inter-Roman.glyphspackage/glyphs/jdotless.glyph
index e9e3bafd3..145f0690a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/jdotless.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/jdotless.glyph
@@ -19,7 +19,7 @@ pos = (242,648);
 },
 {
 name = top;
-pos = (242,1304);
+pos = (243,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -60,7 +60,7 @@ pos = (302,686);
 },
 {
 name = top;
-pos = (302,1304);
+pos = (303,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -101,7 +101,7 @@ pos = (226,628);
 },
 {
 name = top;
-pos = (226,1304);
+pos = (227,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -142,7 +142,7 @@ pos = (210,648);
 },
 {
 name = top;
-pos = (211,1262);
+pos = (211,1056);
 }
 );
 background = {
@@ -214,7 +214,7 @@ pos = (288,686);
 },
 {
 name = top;
-pos = (288,1262);
+pos = (288,1056);
 }
 );
 layerId = m009;
@@ -255,7 +255,7 @@ pos = (163,628);
 },
 {
 name = top;
-pos = (163,1262);
+pos = (163,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/jdotlessbar.glyph b/src/Inter-Roman.glyphspackage/glyphs/jdotlessbar.glyph
index f25f7cabb..4f534cfec 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/jdotlessbar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/jdotlessbar.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-218,-73);
+pos = (-218,-97);
 ref = crossbar;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-218,-35);
+pos = (-218,-59);
 ref = crossbar;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-198,-94);
+pos = (-198,-117);
 ref = crossbar;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-238,-72);
+pos = (-238,-97);
 ref = crossbar;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-208,-35);
+pos = (-208,-59);
 ref = crossbar;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-197,-94);
+pos = (-197,-117);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/jhookdblbar.glyph b/src/Inter-Roman.glyphspackage/glyphs/jhookdblbar.glyph
index d8ca47b10..c8ca8cc35 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/jhookdblbar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/jhookdblbar.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-142,-654);
+pos = (-142,-678);
 ref = crossbar;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-147,-613);
+pos = (-147,-637);
 ref = crossbar;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-126,-698);
+pos = (-126,-721);
 ref = crossbar;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-168,-647);
+pos = (-168,-672);
 ref = crossbar;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-208,-613);
+pos = (-208,-637);
 ref = crossbar;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = esh;
 },
 {
-pos = (-126,-698);
+pos = (-126,-721);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/k.base.glyph b/src/Inter-Roman.glyphspackage/glyphs/k.base.glyph
index 8d015471b..9ca387305 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/k.base.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/k.base.glyph
@@ -12,7 +12,7 @@ pos = (576,0);
 },
 {
 name = top;
-pos = (243,1304);
+pos = (243,1118);
 },
 {
 name = topr;
@@ -62,7 +62,7 @@ pos = (628,0);
 },
 {
 name = top;
-pos = (303,1304);
+pos = (303,1118);
 },
 {
 name = topr;
@@ -112,7 +112,7 @@ pos = (538,0);
 },
 {
 name = top;
-pos = (221,1304);
+pos = (221,1118);
 },
 {
 name = topr;
@@ -162,7 +162,7 @@ pos = (546,0);
 },
 {
 name = top;
-pos = (213,1262);
+pos = (213,1056);
 },
 {
 name = topr;
@@ -222,7 +222,7 @@ pos = (612,0);
 },
 {
 name = top;
-pos = (286,1262);
+pos = (286,1056);
 },
 {
 name = topr;
@@ -272,7 +272,7 @@ pos = (474,0);
 },
 {
 name = top;
-pos = (157,1262);
+pos = (157,1056);
 },
 {
 name = topr;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/k.glyph b/src/Inter-Roman.glyphspackage/glyphs/k.glyph
index d48cc6ae0..9f14944f2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/k.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/k.glyph
@@ -12,13 +12,7 @@ pos = (576,0);
 },
 {
 name = top;
-pos = (243,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (336,1872);
+pos = (243,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -64,13 +58,7 @@ pos = (628,0);
 },
 {
 name = top;
-pos = (303,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (416,1952);
+pos = (303,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -116,7 +104,7 @@ pos = (538,0);
 },
 {
 name = top;
-pos = (221,1676);
+pos = (221,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -162,17 +150,7 @@ pos = (546,0);
 },
 {
 name = top;
-pos = (213,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (46,1872);
-},
-{
-angle = 90;
-pos = (-47,1502);
+pos = (213,1490);
 }
 );
 layerId = m007;
@@ -218,17 +196,7 @@ pos = (612,0);
 },
 {
 name = top;
-pos = (286,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (320,1952);
-},
-{
-angle = 90;
-pos = (206,1504);
+pos = (286,1490);
 }
 );
 layerId = m009;
@@ -274,7 +242,7 @@ pos = (474,0);
 },
 {
 name = top;
-pos = (157,1676);
+pos = (157,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/kacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/kacute.glyph
index d16d678b1..de2e78a89 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/kacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/kacute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-138,414);
+pos = (-138,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-124,414);
+pos = (-124,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-123,414);
+pos = (-127,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/kacyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/kacyrillic.glyph
index 3438514fd..c56a26cc7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/kacyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/kacyrillic.glyph
@@ -11,7 +11,7 @@ pos = (994,0);
 },
 {
 name = top;
-pos = (550,1304);
+pos = (550,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -45,7 +45,7 @@ pos = (1186,0);
 },
 {
 name = top;
-pos = (632,1304);
+pos = (632,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -79,7 +79,7 @@ pos = (870,0);
 },
 {
 name = top;
-pos = (486,1304);
+pos = (486,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -113,7 +113,7 @@ pos = (964,0);
 },
 {
 name = top;
-pos = (518,1262);
+pos = (518,1056);
 }
 );
 layerId = m007;
@@ -147,7 +147,7 @@ pos = (1170,0);
 },
 {
 name = top;
-pos = (616,1262);
+pos = (616,1056);
 }
 );
 background = {
@@ -203,7 +203,7 @@ pos = (806,0);
 },
 {
 name = top;
-pos = (422,1304);
+pos = (422,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/kcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/kcaron.glyph
index 9c38ad925..cea4c4a9e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/kcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/kcaron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-209,388);
+pos = (-211,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-221,414);
+pos = (-221,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-344,414);
+pos = (-342,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-211,414);
+pos = (-211,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/kjecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/kjecyrillic.glyph
index abe5e3564..9dfc5f879 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/kjecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/kjecyrillic.glyph
@@ -75,7 +75,7 @@ shapes = (
 ref = kacyrillic;
 },
 {
-pos = (142,42);
+pos = (138,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/klinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/klinebelow.glyph
index b863bd47c..088970c4c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/klinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/klinebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (1182,0);
+pos = (1174,0);
 ref = macronsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (1256,0);
+pos = (1294,0);
 ref = macronsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (1144,0);
+pos = (1113,0);
 ref = macronsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (1184,0);
+pos = (1106,0);
 ref = macronsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (1256,0);
+pos = (1257,0);
 ref = macronsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (1144,0);
+pos = (1003,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/kturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/kturn.glyph
index a272cc0f1..263884df0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/kturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/kturn.glyph
@@ -11,7 +11,7 @@ pos = (872,-372);
 },
 {
 name = top;
-pos = (562,1304);
+pos = (562,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -32,7 +32,7 @@ pos = (942,-372);
 },
 {
 name = top;
-pos = (616,1304);
+pos = (616,1118);
 }
 );
 guides = (
@@ -58,7 +58,7 @@ pos = (776,-372);
 },
 {
 name = top;
-pos = (494,1304);
+pos = (494,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -79,7 +79,7 @@ pos = (872,-372);
 },
 {
 name = top;
-pos = (562,1304);
+pos = (562,1056);
 }
 );
 layerId = m007;
@@ -100,7 +100,7 @@ pos = (942,-372);
 },
 {
 name = top;
-pos = (616,1304);
+pos = (616,1056);
 }
 );
 guides = (
@@ -126,7 +126,7 @@ pos = (776,-372);
 },
 {
 name = top;
-pos = (494,1304);
+pos = (494,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/l.glyph b/src/Inter-Roman.glyphspackage/glyphs/l.glyph
index b26ae37a5..313cee380 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/l.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/l.glyph
@@ -28,7 +28,7 @@ pos = (472,1490);
 },
 {
 name = top;
-pos = (242,1676);
+pos = (243,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -69,7 +69,7 @@ pos = (620,1490);
 },
 {
 name = top;
-pos = (302,1676);
+pos = (303,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -110,7 +110,7 @@ pos = (382,1490);
 },
 {
 name = top;
-pos = (222,1676);
+pos = (221,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -151,7 +151,7 @@ pos = (442,1490);
 },
 {
 name = top;
-pos = (212,1676);
+pos = (213,1490);
 }
 );
 layerId = m007;
@@ -194,7 +194,7 @@ pos = (602,1490);
 },
 {
 name = top;
-pos = (286,1676);
+pos = (286,1490);
 }
 );
 layerId = m009;
@@ -235,7 +235,7 @@ pos = (318,1490);
 },
 {
 name = top;
-pos = (158,1676);
+pos = (157,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/l.ss02.glyph b/src/Inter-Roman.glyphspackage/glyphs/l.ss02.glyph
index 730ccaf17..99f375c61 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/l.ss02.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/l.ss02.glyph
@@ -24,7 +24,7 @@ pos = (472,1490);
 },
 {
 name = top;
-pos = (242,1676);
+pos = (243,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -73,13 +73,7 @@ pos = (620,1490);
 },
 {
 name = top;
-pos = (302,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (416,528);
+pos = (303,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -128,7 +122,7 @@ pos = (382,1490);
 },
 {
 name = top;
-pos = (222,1676);
+pos = (221,1490);
 }
 );
 guides = (
@@ -183,7 +177,7 @@ pos = (444,1490);
 },
 {
 name = top;
-pos = (214,1676);
+pos = (213,1490);
 }
 );
 layerId = m007;
@@ -232,13 +226,7 @@ pos = (604,1490);
 },
 {
 name = top;
-pos = (286,1676);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (320,528);
+pos = (287,1490);
 }
 );
 layerId = m009;
@@ -287,7 +275,7 @@ pos = (318,1490);
 },
 {
 name = top;
-pos = (158,1676);
+pos = (157,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/lacute.glyph
index 61020d30f..43e9afb6e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-110,372);
+pos = (-109,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-88,372);
+pos = (-87,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-58,372);
+pos = (-59,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-139,414);
+pos = (-138,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-124,414);
+pos = (-124,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-122,414);
+pos = (-127,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lacute.ss02.glyph b/src/Inter-Roman.glyphspackage/glyphs/lacute.ss02.glyph
index 0e32f595f..6249ce2b2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lacute.ss02.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lacute.ss02.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (-110,372);
+pos = (-109,372);
 ref = acute;
 }
 );
@@ -26,7 +26,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (-88,372);
+pos = (-87,372);
 ref = acute;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (-58,372);
+pos = (-59,372);
 ref = acute;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (-137,414);
+pos = (-138,434);
 ref = acute;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (-124,414);
+pos = (-123,434);
 ref = acute;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (-122,414);
+pos = (-127,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lambda.glyph b/src/Inter-Roman.glyphspackage/glyphs/lambda.glyph
index e717cf7db..5c182eeac 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lambda.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lambda.glyph
@@ -1,7 +1,15 @@
 {
 glyphname = lambda;
+kernLeft = lambda;
+kernRight = A;
 layers = (
 {
+anchors = (
+{
+name = bar;
+pos = (507,1236);
+}
+);
 background = {
 shapes = (
 {
@@ -96,6 +104,12 @@ nodes = (
 width = 1198;
 },
 {
+anchors = (
+{
+name = bar;
+pos = (593,1158);
+}
+);
 background = {
 shapes = (
 {
@@ -202,6 +216,12 @@ name = hr00;
 width = 1274;
 },
 {
+anchors = (
+{
+name = bar;
+pos = (457,1249);
+}
+);
 background = {
 shapes = (
 {
@@ -261,23 +281,23 @@ nodes = (
 (1001,35,o),
 (990,34,cs),
 (938,35,o),
-(908,76,o),
+(909,76,o),
 (854,226,cs),
 (458,1312,ls),
 (406,1455,o),
-(343,1507,o),
+(343,1510,o),
 (226,1510,cs),
-(195,1511,o),
+(195,1510,o),
 (161,1505,o),
 (128,1496,c),
 (146,1454,l),
 (289,1487,o),
-(361,1447,o),
+(360,1447,o),
 (414,1298,cs),
 (520,1008,l),
 (530,976,l),
 (818,186,ls),
-(875,35,o),
+(873,34,o),
 (916,-12,o),
 (994,-12,cs)
 );
@@ -296,52 +316,12 @@ nodes = (
 width = 1142;
 },
 {
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(1073,-16,o),
-(1100,-12,o),
-(1128,-6,c),
-(1090,146,l),
-(1082,145,o),
-(1062,143,o),
-(1050,142,cs),
-(992,143,o),
-(977,189,o),
-(962,226,cs),
-(578,1266,ls),
-(515,1437,o),
-(410,1519,o),
-(250,1518,cs),
-(192,1519,o),
-(143,1507,o),
-(126,1498,c),
-(168,1346,l),
-(311,1382,o),
-(372,1350,o),
-(434,1196,cs),
-(480,1074,l),
-(532,952,l),
-(800,186,ls),
-(847,49,o),
-(935,-15,o),
-(1048,-16,cs)
-);
-},
+anchors = (
 {
-closed = 1;
-nodes = (
-(256,0,l),
-(552,858,l),
-(576,858,l),
-(506,1184,l),
-(70,0,l)
-);
+name = bar;
+pos = (474,1239);
 }
 );
-};
 layerId = m007;
 shapes = (
 {
@@ -390,54 +370,12 @@ nodes = (
 width = 1134;
 },
 {
-background = {
-shapes = (
+anchors = (
 {
-closed = 1;
-nodes = (
-(1147,-20,o),
-(1214,-9,o),
-(1236,0,c),
-(1216,280,l),
-(1193,276,o),
-(1202,276,o),
-(1192,276,cs),
-(1137,276,o),
-(1118,309,o),
-(1076,416,cs),
-(762,1224,ls),
-(705,1373,o),
-(571,1510,o),
-(332,1510,cs),
-(263,1510,o),
-(207,1498,o),
-(140,1474,c),
-(226,1176,l),
-(391,1228,o),
-(396,1155,o),
-(436,1058,cs),
-(462,998,l),
-(632,570,l),
-(768,180,l),
-(804,96,o),
-(885,-20,o),
-(1086,-20,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(446,0,l),
-(628,536,l,{
-name = hr00;
-}),
-(762,536,l),
-(486,1166,l),
-(38,0,l)
-);
+name = bar;
+pos = (585,1150);
 }
 );
-};
 guides = (
 {
 pos = (-152,1240);
@@ -496,52 +434,12 @@ name = hr00;
 width = 1242;
 },
 {
-background = {
-shapes = (
+anchors = (
 {
-closed = 1;
-nodes = (
-(1016,-12,o),
-(1036,-9,o),
-(1054,-2,c),
-(1034,42,l),
-(1017,38,o),
-(1001,35,o),
-(990,34,cs),
-(938,35,o),
-(909,76,o),
-(854,226,cs),
-(456,1320,ls),
-(402,1464,o),
-(340,1517,o),
-(224,1518,cs),
-(192,1519,o),
-(158,1514,o),
-(126,1506,c),
-(142,1462,l),
-(287,1495,o),
-(356,1455,o),
-(412,1306,cs),
-(520,1008,l),
-(530,976,l),
-(818,186,ls),
-(875,35,o),
-(916,-12,o),
-(994,-12,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(140,0,l),
-(504,1026,l),
-(528,1026,l),
-(494,1128,l),
-(90,0,l)
-);
+name = bar;
+pos = (394,1236);
 }
 );
-};
 layerId = m011;
 shapes = (
 {
@@ -555,23 +453,23 @@ nodes = (
 (937,35,o),
 (926,34,cs),
 (874,35,o),
-(844,76,o),
+(845,76,o),
 (790,226,cs),
 (394,1312,ls),
 (342,1455,o),
-(279,1507,o),
+(279,1510,o),
 (162,1510,cs),
-(131,1511,o),
+(131,1510,o),
 (97,1505,o),
 (64,1496,c),
 (82,1454,l),
 (225,1487,o),
-(297,1447,o),
+(296,1447,o),
 (350,1298,cs),
 (456,1008,l),
 (466,976,l),
 (754,186,ls),
-(811,35,o),
+(809,34,o),
 (852,-12,o),
 (930,-12,cs)
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lambdabar.glyph b/src/Inter-Roman.glyphspackage/glyphs/lambdabar.glyph
index 474da0ea8..162ded7f9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lambdabar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lambdabar.glyph
@@ -1,481 +1,89 @@
 {
 glyphname = lambdabar;
+kernLeft = lambda;
+kernRight = A;
 layers = (
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(194,1230,l),
-(194,1062,l),
-(686,1248,l),
-(686,1420,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(670,1094,l),
-(530,1102,l),
-(110,0,l),
-(332,0,l),
-(616,792,l)
-);
+ref = lambda;
 },
 {
-closed = 1;
-nodes = (
-(315,1510,o),
-(263,1504,o),
-(246,1498,c),
-(246,1346,l),
-(257,1350,o),
-(280,1350,o),
-(292,1350,cs),
-(341,1350,o),
-(377,1329,o),
-(406,1256,cs),
-(518,978,l),
-(826,184,ls),
-(896,3,o),
-(960,-17,o),
-(1080,-18,cs),
-(1111,-17,o),
-(1143,-12,o),
-(1158,-6,c),
-(1152,154,l),
-(1143,154,o),
-(1129,154,o),
-(1118,154,cs),
-(1073,154,o),
-(1049,171,o),
-(1024,236,cs),
-(594,1344,ls),
-(554,1449,o),
-(492,1510,o),
-(344,1510,c)
-);
+ref = _part.lambdabar;
 }
 );
-width = 1292;
-},
-{
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(222,1158,l),
-(222,940,l),
-(870,1128,l),
-(870,1342,l)
-);
+width = 1198;
 },
 {
-closed = 1;
-nodes = (
-(774,1122,l),
-(514,1120,l),
-(108,0,l),
-(510,0,l),
-(706,606,l,{
-name = hr00;
-})
-);
-},
-{
-closed = 1;
-nodes = (
-(385,1571,o),
-(284,1562,o),
-(222,1544,c),
-(232,1266,l),
-(266,1268,o),
-(284,1268,o),
-(302,1268,cs),
-(385,1268,o),
-(432,1236,o),
-(454,1184,cs),
-(568,946,l),
-(826,224,ls),
-(871,105,o),
-(979,-20,o),
-(1182,-20,cs),
-(1238,-20,o),
-(1281,-23,o),
-(1318,-18,c),
-(1320,276,l),
-(1313,276,o),
-(1302,276,o),
-(1286,276,cs),
-(1223,276,o),
-(1188,358,o),
-(1166,408,cs),
-(742,1394,ls),
-(694,1507,o),
-(592,1571,o),
-(440,1570,c)
-);
-}
-);
-};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(222,1158,l),
-(222,940,l),
-(942,1158,l),
-(942,1370,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(774,1122,l),
-(514,1120,l),
-(108,0,l),
-(510,0,l),
-(706,606,l,{
-name = hr00;
-})
-);
+ref = lambda;
 },
 {
-closed = 1;
-nodes = (
-(391,1556,o),
-(289,1548,o),
-(226,1530,c),
-(238,1250,l),
-(272,1254,o),
-(289,1254,o),
-(308,1254,cs),
-(391,1254,o),
-(435,1220,o),
-(460,1170,cs),
-(568,946,l),
-(826,224,ls),
-(871,105,o),
-(979,-20,o),
-(1182,-20,cs),
-(1238,-20,o),
-(1281,-23,o),
-(1318,-18,c),
-(1320,276,l),
-(1313,276,o),
-(1302,276,o),
-(1286,276,cs),
-(1223,276,o),
-(1188,358,o),
-(1166,408,cs),
-(748,1378,ls),
-(699,1492,o),
-(598,1556,o),
-(446,1556,c)
-);
+ref = _part.lambdabar;
 }
 );
-width = 1420;
+width = 1274;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(184,1250,l),
-(184,1198,l),
-(578,1384,l),
-(578,1436,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(544,1084,l),
-(516,1128,l),
-(114,0,l),
-(162,0,l),
-(536,1054,l)
-);
+ref = lambda;
 },
 {
-closed = 1;
-nodes = (
-(218,1511,o),
-(184,1505,o),
-(152,1496,c),
-(168,1454,l),
-(199,1460,o),
-(226,1465,o),
-(250,1464,cs),
-(342,1462,o),
-(396,1415,o),
-(438,1298,cs),
-(542,1006,l),
-(842,186,ls),
-(897,35,o),
-(940,-12,o),
-(1018,-12,cs),
-(1039,-12,o),
-(1059,-9,o),
-(1076,-2,c),
-(1058,42,l),
-(1041,38,o),
-(1024,35,o),
-(1012,34,cs),
-(961,35,o),
-(932,76,o),
-(878,226,cs),
-(482,1312,ls),
-(429,1455,o),
-(367,1507,o),
-(250,1510,cs)
-);
+ref = _part.lambdabar;
 }
 );
-width = 1230;
+width = 1142;
 },
 {
-layerId = m007;
-shapes = (
+guides = (
 {
-closed = 1;
-nodes = (
-(162,1230,l),
-(162,1062,l),
-(654,1248,l),
-(654,1420,l)
-);
+angle = -69.7722;
+pos = (179,1202);
 },
 {
-closed = 1;
-nodes = (
-(638,1094,l),
-(498,1102,l),
-(78,0,l),
-(300,0,l),
-(584,792,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(283,1510,o),
-(231,1504,o),
-(214,1498,c),
-(214,1346,l),
-(225,1350,o),
-(248,1350,o),
-(260,1350,cs),
-(309,1350,o),
-(345,1329,o),
-(374,1256,cs),
-(486,978,l),
-(794,184,ls),
-(864,3,o),
-(928,-17,o),
-(1048,-18,cs),
-(1079,-17,o),
-(1111,-12,o),
-(1126,-6,c),
-(1120,154,l),
-(1111,154,o),
-(1097,154,o),
-(1086,154,cs),
-(1041,154,o),
-(1017,171,o),
-(992,236,cs),
-(562,1344,ls),
-(522,1449,o),
-(460,1510,o),
-(312,1510,c)
-);
+angle = 106.1443;
+pos = (118,1414);
 }
 );
-width = 1228;
-},
-{
-background = {
+layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(222,1158,l),
-(222,940,l),
-(870,1128,l),
-(870,1342,l)
-);
+ref = lambda;
 },
 {
-closed = 1;
-nodes = (
-(774,1122,l),
-(514,1120,l),
-(108,0,l),
-(510,0,l),
-(706,606,l,{
-name = hr00;
-})
+ref = _part.lambdabar;
+}
 );
+width = 1134;
 },
 {
-closed = 1;
-nodes = (
-(385,1571,o),
-(284,1562,o),
-(222,1544,c),
-(232,1266,l),
-(266,1268,o),
-(284,1268,o),
-(302,1268,cs),
-(385,1268,o),
-(432,1236,o),
-(454,1184,cs),
-(568,946,l),
-(826,224,ls),
-(871,105,o),
-(979,-20,o),
-(1182,-20,cs),
-(1238,-20,o),
-(1281,-23,o),
-(1318,-18,c),
-(1320,276,l),
-(1313,276,o),
-(1302,276,o),
-(1286,276,cs),
-(1223,276,o),
-(1188,358,o),
-(1166,408,cs),
-(742,1394,ls),
-(694,1507,o),
-(592,1571,o),
-(440,1570,c)
-);
-}
-);
-};
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(206,1158,l),
-(206,940,l),
-(926,1158,l),
-(926,1370,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(758,1122,l),
-(498,1120,l),
-(92,0,l),
-(494,0,l),
-(690,606,l,{
-name = hr00;
-})
-);
+ref = lambda;
 },
 {
-closed = 1;
-nodes = (
-(375,1556,o),
-(273,1548,o),
-(210,1530,c),
-(222,1250,l),
-(256,1254,o),
-(273,1254,o),
-(292,1254,cs),
-(375,1254,o),
-(419,1220,o),
-(444,1170,cs),
-(552,946,l),
-(810,224,ls),
-(855,105,o),
-(963,-20,o),
-(1166,-20,cs),
-(1222,-20,o),
-(1265,-23,o),
-(1302,-18,c),
-(1304,276,l),
-(1297,276,o),
-(1286,276,o),
-(1270,276,cs),
-(1207,276,o),
-(1172,358,o),
-(1150,408,cs),
-(732,1378,ls),
-(683,1492,o),
-(582,1556,o),
-(430,1556,c)
-);
+ref = _part.lambdabar;
 }
 );
-width = 1388;
+width = 1242;
 },
 {
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(120,1250,l),
-(120,1198,l),
-(514,1384,l),
-(514,1436,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(480,1084,l),
-(452,1128,l),
-(50,0,l),
-(98,0,l),
-(472,1054,l)
-);
+ref = lambda;
 },
 {
-closed = 1;
-nodes = (
-(154,1511,o),
-(120,1505,o),
-(88,1496,c),
-(104,1454,l),
-(135,1460,o),
-(162,1465,o),
-(186,1464,cs),
-(278,1462,o),
-(332,1415,o),
-(374,1298,cs),
-(478,1006,l),
-(778,186,ls),
-(833,35,o),
-(876,-12,o),
-(954,-12,cs),
-(975,-12,o),
-(995,-9,o),
-(1012,-2,c),
-(994,42,l),
-(977,38,o),
-(960,35,o),
-(948,34,cs),
-(897,35,o),
-(868,76,o),
-(814,226,cs),
-(418,1312,ls),
-(365,1455,o),
-(303,1507,o),
-(186,1510,cs)
-);
+ref = _part.lambdabar;
 }
 );
-width = 1102;
+width = 1014;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lbar.glyph b/src/Inter-Roman.glyphspackage/glyphs/lbar.glyph
index 7a509d4f2..cde71894e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lbar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lbar.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-218,47);
+pos = (-218,23);
 ref = crossbar;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-218,47);
+pos = (-218,23);
 ref = crossbar;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-202,46);
+pos = (-202,23);
 ref = crossbar;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-236,48);
+pos = (-236,23);
 ref = crossbar;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-210,47);
+pos = (-210,23);
 ref = crossbar;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-202,46);
+pos = (-202,23);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lbar.ss02.glyph b/src/Inter-Roman.glyphspackage/glyphs/lbar.ss02.glyph
index 10c2992d7..8bc2d0e5c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lbar.ss02.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lbar.ss02.glyph
@@ -13,7 +13,7 @@ ref = l.ss02;
 },
 {
 alignment = 1;
-pos = (-216,47);
+pos = (-216,23);
 ref = crossbar;
 }
 );
@@ -28,7 +28,7 @@ ref = l.ss02;
 },
 {
 alignment = 1;
-pos = (-218,67);
+pos = (-218,43);
 ref = crossbar;
 }
 );
@@ -43,7 +43,7 @@ ref = l.ss02;
 },
 {
 alignment = 1;
-pos = (-202,46);
+pos = (-202,23);
 ref = crossbar;
 }
 );
@@ -58,7 +58,7 @@ ref = l.ss02;
 },
 {
 alignment = 1;
-pos = (-232,48);
+pos = (-232,23);
 ref = crossbar;
 }
 );
@@ -73,7 +73,7 @@ ref = l.ss02;
 },
 {
 alignment = 1;
-pos = (-210,67);
+pos = (-210,43);
 ref = crossbar;
 }
 );
@@ -88,7 +88,7 @@ ref = l.ss02;
 },
 {
 alignment = 1;
-pos = (-202,46);
+pos = (-202,23);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.glyph
index 4ef83eff1..76ee88542 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (824,0);
+pos = (834,0);
 ref = circumflexsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (976,0);
+pos = (967,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (734,0);
+pos = (796,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (826,0);
+pos = (780,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (975,0);
+pos = (937,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (734,0);
+pos = (686,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.ss02.glyph b/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.ss02.glyph
index c469494d1..301b233ab 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.ss02.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.ss02.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (888,0);
+pos = (898,0);
 ref = circumflexsubnosp;
 }
 );
@@ -26,7 +26,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (1032,0);
+pos = (1023,0);
 ref = circumflexsubnosp;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (806,0);
+pos = (868,0);
 ref = circumflexsubnosp;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (892,0);
+pos = (846,0);
 ref = circumflexsubnosp;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (1032,0);
+pos = (994,0);
 ref = circumflexsubnosp;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (806,0);
+pos = (758,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.glyph
index b088fa8ac..431632ffa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.glyph
@@ -14,7 +14,7 @@ pos = (848,0);
 ref = dotbelow;
 },
 {
-pos = (-218,372);
+pos = (-357,372);
 ref = macron;
 }
 );
@@ -31,7 +31,7 @@ pos = (838,0);
 ref = dotbelow;
 },
 {
-pos = (-356,372);
+pos = (-362,372);
 ref = macron;
 }
 );
@@ -48,7 +48,7 @@ pos = (780,0);
 ref = dotbelow;
 },
 {
-pos = (-78,372);
+pos = (-361,372);
 ref = macron;
 }
 );
@@ -65,7 +65,7 @@ pos = (850,0);
 ref = dotbelow;
 },
 {
-pos = (-216,372);
+pos = (-355,434);
 ref = macron;
 }
 );
@@ -82,7 +82,7 @@ pos = (837,0);
 ref = dotbelow;
 },
 {
-pos = (-356,372);
+pos = (-363,434);
 ref = macron;
 }
 );
@@ -99,7 +99,7 @@ pos = (780,0);
 ref = dotbelow;
 },
 {
-pos = (-78,414);
+pos = (-377,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.ss02.glyph b/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.ss02.glyph
index 6691e2879..8de510b1b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.ss02.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.ss02.glyph
@@ -16,7 +16,7 @@ pos = (912,0);
 ref = dotbelow;
 },
 {
-pos = (-218,372);
+pos = (-357,372);
 ref = macron;
 }
 );
@@ -34,7 +34,7 @@ pos = (894,0);
 ref = dotbelow;
 },
 {
-pos = (-356,372);
+pos = (-362,372);
 ref = macron;
 }
 );
@@ -52,7 +52,7 @@ pos = (852,0);
 ref = dotbelow;
 },
 {
-pos = (-78,372);
+pos = (-361,372);
 ref = macron;
 }
 );
@@ -70,7 +70,7 @@ pos = (916,0);
 ref = dotbelow;
 },
 {
-pos = (-214,372);
+pos = (-355,434);
 ref = macron;
 }
 );
@@ -88,7 +88,7 @@ pos = (894,0);
 ref = dotbelow;
 },
 {
-pos = (-356,372);
+pos = (-362,434);
 ref = macron;
 }
 );
@@ -106,7 +106,7 @@ pos = (852,0);
 ref = dotbelow;
 },
 {
-pos = (-78,414);
+pos = (-377,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/llinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/llinebelow.glyph
index 257acde91..6e3f17226 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/llinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/llinebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (848,0);
+pos = (840,0);
 ref = macronsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (930,0);
+pos = (968,0);
 ref = macronsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (828,0);
+pos = (797,0);
 ref = macronsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (850,0);
+pos = (772,0);
 ref = macronsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (929,0);
+pos = (930,0);
 ref = macronsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (828,0);
+pos = (687,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/llinebelow.ss02.glyph b/src/Inter-Roman.glyphspackage/glyphs/llinebelow.ss02.glyph
index de808e575..cd0b47844 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/llinebelow.ss02.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/llinebelow.ss02.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (912,0);
+pos = (904,0);
 ref = macronsubnosp;
 }
 );
@@ -26,7 +26,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (986,0);
+pos = (1024,0);
 ref = macronsubnosp;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (900,0);
+pos = (869,0);
 ref = macronsubnosp;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (916,0);
+pos = (838,0);
 ref = macronsubnosp;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (986,0);
+pos = (987,0);
 ref = macronsubnosp;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (900,0);
+pos = (759,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/longs.glyph b/src/Inter-Roman.glyphspackage/glyphs/longs.glyph
index 434286fa6..91caa16b5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/longs.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/longs.glyph
@@ -13,7 +13,7 @@ pos = (317,768);
 },
 {
 name = top;
-pos = (414,1676);
+pos = (414,1552);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -54,7 +54,7 @@ pos = (317,768);
 },
 {
 name = top;
-pos = (396,1676);
+pos = (396,1552);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -95,7 +95,7 @@ pos = (384,768);
 },
 {
 name = top;
-pos = (441,1676);
+pos = (441,1552);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -138,7 +138,7 @@ pos = (285,768);
 },
 {
 name = top;
-pos = (364,1676);
+pos = (364,1490);
 }
 );
 layerId = m007;
@@ -181,7 +181,7 @@ pos = (368,768);
 },
 {
 name = top;
-pos = (424,1676);
+pos = (424,1490);
 }
 );
 background = {
@@ -252,7 +252,7 @@ pos = (253,745);
 },
 {
 name = top;
-pos = (332,1676);
+pos = (332,1490);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/m.glyph b/src/Inter-Roman.glyphspackage/glyphs/m.glyph
index bf7c4a078..820905ff1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/m.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/m.glyph
@@ -16,7 +16,7 @@ pos = (1452,0);
 },
 {
 name = top;
-pos = (890,1304);
+pos = (890,1118);
 }
 );
 guides = (
@@ -85,7 +85,7 @@ pos = (1428,0);
 },
 {
 name = top;
-pos = (966,1304);
+pos = (966,1118);
 }
 );
 background = {
@@ -162,7 +162,7 @@ pos = (1466,0);
 },
 {
 name = top;
-pos = (856,1304);
+pos = (856,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -364,7 +364,7 @@ pos = (1422,0);
 },
 {
 name = top;
-pos = (860,1262);
+pos = (860,1056);
 }
 );
 guides = (
@@ -433,7 +433,7 @@ pos = (1402,0);
 },
 {
 name = top;
-pos = (944,1262);
+pos = (944,1056);
 }
 );
 background = {
@@ -445,11 +445,6 @@ ref = n;
 };
 guides = (
 {
-orientation = center;
-angle = 90;
-pos = (-3460,32);
-},
-{
 angle = 90;
 pos = (864,1136);
 }
@@ -513,7 +508,7 @@ pos = (1466,0);
 },
 {
 name = top;
-pos = (823,1262);
+pos = (823,1056);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/m.sc.glyph b/src/Inter-Roman.glyphspackage/glyphs/m.sc.glyph
index cad5b912a..c2e13ed27 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/m.sc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/m.sc.glyph
@@ -8,6 +8,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1378,0);
+},
+{
+name = top;
+pos = (768,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -50,6 +54,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1506,0);
+},
+{
+name = top;
+pos = (804,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -92,6 +100,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1260,0);
+},
+{
+name = top;
+pos = (729,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -134,6 +146,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1346,0);
+},
+{
+name = top;
+pos = (736,1056);
 }
 );
 layerId = m007;
@@ -176,6 +192,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1490,0);
+},
+{
+name = top;
+pos = (788,1056);
 }
 );
 layerId = m009;
@@ -218,6 +238,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1196,0);
+},
+{
+name = top;
+pos = (665,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macron.glyph b/src/Inter-Roman.glyphspackage/glyphs/macron.glyph
index fda1162e1..736027285 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macron.glyph
@@ -6,7 +6,11 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (460,1304);
+pos = (600,1118);
+},
+{
+name = top;
+pos = (600,1493);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -14,20 +18,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(120,1490,l),
-(120,1344,l),
-(800,1344,l),
-(800,1490,l)
+(260,1493,l),
+(260,1347,l),
+(940,1347,l),
+(940,1493,l)
 );
 }
 );
-width = 920;
+width = 1200;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (658,1304);
+pos = (665,1118);
+},
+{
+name = top;
+pos = (665,1540);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -35,25 +43,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(294,1490,l),
-(294,1306,l),
-(1022,1306,l),
-(1022,1490,l)
+(301,1540,l),
+(301,1292,l),
+(1029,1292,l),
+(1029,1540,l)
 );
 }
 );
-width = 1314;
+width = 1330;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (300,1304);
-}
-);
-guides = (
+pos = (582,1118);
+},
 {
-pos = (752,1880);
+name = top;
+pos = (582,1407);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -61,20 +68,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(66,1390,l),
-(66,1344,l),
-(532,1344,l),
-(532,1390,l)
+(349,1407,l),
+(349,1361,l),
+(815,1361,l),
+(815,1407,l)
 );
 }
 );
-width = 600;
+width = 1164;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (428,1304);
+pos = (568,1056);
+},
+{
+name = top;
+pos = (568,1451);
 }
 );
 layerId = m007;
@@ -82,58 +93,122 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(88,1490,l),
-(88,1344,l),
-(768,1344,l),
-(768,1490,l)
+(228,1451,l),
+(228,1305,l),
+(908,1305,l),
+(908,1451,l)
 );
 }
 );
-width = 856;
+width = 1136;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (642,1304);
+pos = (534,1056);
+},
+{
+name = top;
+pos = (534,1401);
+}
+);
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(269,1401,l),
+(269,1355,l),
+(799,1355,l),
+(799,1401,l)
+);
+}
+);
+width = 1068;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (649,1056);
+},
+{
+name = top;
+pos = (649,1444);
+}
+);
+associatedMasterId = m009;
+layerId = "1BAA3849-7D00-4363-A971-9D4F515DDB69";
+name = "Apr 11, 23, 10:21";
+shapes = (
+{
+closed = 1;
+nodes = (
+(285,1444,l),
+(285,1228,l),
+(1013,1228,l),
+(1013,1444,l)
+);
+}
+);
+width = 1298;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (649,1056);
+},
+{
+name = top;
+pos = (649,1460);
 }
 );
 layerId = m009;
+name = "Display Black";
 shapes = (
 {
 closed = 1;
 nodes = (
-(278,1490,l),
-(278,1306,l),
-(1006,1306,l),
-(1006,1490,l)
+(285,1460,l),
+(285,1212,l),
+(1013,1212,l),
+(1013,1460,l)
 );
 }
 );
-width = 1282;
+width = 1298;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (236,1262);
+pos = (665,1118);
+},
+{
+name = top;
+pos = (665,1540);
 }
 );
-layerId = m011;
+associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+layerId = "F9CA8E27-72EA-4481-A0D6-1AD8167C0D4E";
+name = "Apr 11, 23, 10:29";
 shapes = (
 {
 closed = 1;
 nodes = (
-(2,1348,l),
-(2,1302,l),
-(468,1302,l),
-(468,1348,l)
+(301,1540,l),
+(301,1292,l),
+(1029,1292,l),
+(1029,1540,l)
 );
 }
 );
-width = 472;
+width = 1330;
 }
 );
+metricWidth = n;
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macronacutecomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/macronacutecomb.cn.glyph
index 6a3d15ebf..145da0a70 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macronacutecomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macronacutecomb.cn.glyph
@@ -1,165 +1,75 @@
 {
+case = minor;
 glyphname = macronacutecomb.cn;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (-378,1676);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-302,1920,l),
-(-56,2142,l),
-(-262,2142,l),
-(-480,1920,l)
-);
-},
-{
-alignment = -1;
-pos = (-838,332);
-ref = macron;
+alignment = 1;
+pos = (0,372);
+ref = macronacutecomb.lc;
 }
 );
-width = 0;
+width = 1200;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-466,1676);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-344,1972,l),
-(-92,2254,l),
-(-420,2254,l),
-(-614,1972,l)
-);
-},
-{
-alignment = -1;
-pos = (-1122,344);
-ref = macron;
+alignment = 1;
+pos = (0,372);
+ref = macronacutecomb.lc;
 }
 );
-width = 0;
+width = 1330;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-372,1676);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-348,1838,l),
-(-164,2024,l),
-(-232,2024,l),
-(-402,1838,l)
-);
-},
-{
-alignment = -1;
-pos = (-672,308);
-ref = macron;
+alignment = 1;
+pos = (0,372);
+ref = macronacutecomb.lc;
 }
 );
-width = 0;
+width = 1164;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-410,1676);
-}
-);
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-334,1920,l),
-(-88,2142,l),
-(-294,2142,l),
-(-512,1920,l)
-);
-},
-{
-alignment = -1;
-pos = (-838,332);
-ref = macron;
+alignment = 1;
+pos = (0,434);
+ref = macronacutecomb.lc;
 }
 );
-width = 0;
+width = 1136;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-482,1676);
-}
-);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-360,1972,l),
-(-108,2254,l),
-(-436,2254,l),
-(-630,1972,l)
-);
-},
-{
-alignment = -1;
-pos = (-1122,344);
-ref = macron;
+alignment = 1;
+pos = (0,434);
+ref = macronacutecomb.lc;
 }
 );
-width = 0;
+width = 1298;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-436,1676);
-}
-);
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-412,1838,l),
-(-228,2024,l),
-(-296,2024,l),
-(-466,1838,l)
-);
-},
-{
-alignment = -1;
-pos = (-672,308);
-ref = macron;
+alignment = 1;
+pos = (0,434);
+ref = macronacutecomb.lc;
 }
 );
-width = 0;
+width = 1068;
 }
 );
 tags = (
 "TODO-opsz"
 );
-unicode = 57590;
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macronacutecomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/macronacutecomb.lc.glyph
index f314b0989..4e84505dc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macronacutecomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macronacutecomb.lc.glyph
@@ -2,164 +2,133 @@
 glyphname = macronacutecomb.lc;
 layers = (
 {
-anchors = (
+background = {
+shapes = (
 {
-name = _top;
-pos = (-378,1304);
+ref = macrongravecomb.lc;
 }
 );
+};
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-320,1606,l),
-(-96,1908,l),
-(-300,1908,l),
-(-480,1606,l)
-);
+ref = macron;
 },
 {
 alignment = -1;
-pos = (-838,-18);
-ref = macron;
+pos = (248,369);
+ref = acute;
 }
 );
-width = 0;
+width = 1200;
 },
 {
-anchors = (
+background = {
+shapes = (
 {
-name = _top;
-pos = (-466,1304);
+ref = macrongravecomb.lc;
 }
 );
+};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-340,1630,l),
-(-78,1908,l),
-(-392,1908,l),
-(-620,1630,l)
-);
+ref = macron;
 },
 {
 alignment = -1;
-pos = (-1122,-30);
-ref = macron;
+pos = (275,369);
+ref = acute;
 }
 );
-width = 0;
+width = 1330;
 },
 {
-anchors = (
+background = {
+shapes = (
 {
-name = _top;
-pos = (-378,1304);
+ref = macrongravecomb.lc;
 }
 );
+};
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-382,1548,l),
-(-116,1862,l),
-(-174,1862,l),
-(-430,1548,l)
-);
+ref = macron;
 },
 {
 alignment = -1;
-pos = (-678,-34);
-ref = macron;
+pos = (302,210);
+ref = acute;
 }
 );
-width = 0;
+width = 1164;
 },
 {
-anchors = (
+background = {
+shapes = (
 {
-name = _top;
-pos = (-410,1304);
+ref = macrongravecomb.lc;
 }
 );
+};
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-352,1606,l),
-(-128,1908,l),
-(-332,1908,l),
-(-512,1606,l)
-);
+ref = macron;
 },
 {
 alignment = -1;
-pos = (-838,-18);
-ref = macron;
+pos = (217,338);
+ref = acute;
 }
 );
-width = 0;
+width = 1136;
 },
 {
-anchors = (
+background = {
+shapes = (
 {
-name = _top;
-pos = (-482,1304);
+ref = macrongravecomb.lc;
 }
 );
+};
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-356,1630,l),
-(-94,1908,l),
-(-408,1908,l),
-(-636,1630,l)
-);
+ref = macron;
 },
 {
 alignment = -1;
-pos = (-1122,-30);
-ref = macron;
+pos = (239,370);
+ref = acute;
 }
 );
-width = 0;
+width = 1298;
 },
 {
-anchors = (
+background = {
+shapes = (
 {
-name = _top;
-pos = (-442,1304);
+ref = macrongravecomb.lc;
 }
 );
+};
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-446,1548,l),
-(-180,1862,l),
-(-238,1862,l),
-(-494,1548,l)
-);
+ref = macron;
 },
 {
 alignment = -1;
-pos = (-678,-34);
-ref = macron;
+pos = (250,274);
+ref = acute;
 }
 );
-width = 0;
+width = 1068;
 }
 );
 tags = (
 "TODO-opsz"
 );
-unicode = 57592;
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macroncomb.glyph b/src/Inter-Roman.glyphspackage/glyphs/macroncomb.glyph
index 6ab7f0f5a..05bd60ba5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macroncomb.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macroncomb.glyph
@@ -3,12 +3,6 @@ color = (250,227,227,1);
 glyphname = macroncomb;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (-616,1304);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
@@ -20,12 +14,6 @@ ref = macron;
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-654,1304);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
@@ -37,12 +25,6 @@ ref = macron;
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-614,1304);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
@@ -54,12 +36,6 @@ ref = macron;
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-648,1304);
-}
-);
 layerId = m007;
 shapes = (
 {
@@ -71,12 +47,6 @@ ref = macron;
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-670,1304);
-}
-);
 layerId = m009;
 shapes = (
 {
@@ -88,12 +58,6 @@ ref = macron;
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-678,1304);
-}
-);
 layerId = m011;
 shapes = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macrondieresiscomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/macrondieresiscomb.cn.glyph
index 901104a44..33b602e8e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macrondieresiscomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macrondieresiscomb.cn.glyph
@@ -1,339 +1,75 @@
 {
+case = minor;
 glyphname = macrondieresiscomb.cn;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (-588,1202);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-928,1350,l),
-(-928,1198,l),
-(-248,1198,l),
-(-248,1350,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-937,1495,o),
-(-896,1449,o),
-(-824,1448,cs),
-(-748,1449,o),
-(-707,1495,o),
-(-706,1556,cs),
-(-707,1617,o),
-(-748,1667,o),
-(-822,1666,cs),
-(-899,1667,o),
-(-937,1615,o),
-(-936,1556,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-468,1492,o),
-(-428,1446,o),
-(-352,1446,cs),
-(-279,1446,o),
-(-239,1492,o),
-(-238,1554,cs),
-(-239,1615,o),
-(-276,1664,o),
-(-352,1664,cs),
-(-428,1664,o),
-(-468,1617,o),
-(-468,1554,cs)
-);
+alignment = 1;
+pos = (0,372);
+ref = macrondieresiscomb.lc;
 }
 );
-width = 0;
+width = 1200;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-696,1330);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-1062,1448,l),
-(-1062,1268,l),
-(-332,1268,l),
-(-332,1448,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-1069,1591,o),
-(-1005,1536,o),
-(-914,1536,cs),
-(-822,1536,o),
-(-755,1591,o),
-(-754,1662,cs),
-(-755,1731,o),
-(-825,1786,o),
-(-914,1786,cs),
-(-1002,1786,o),
-(-1069,1731,o),
-(-1068,1662,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-641,1591,o),
-(-575,1539,o),
-(-482,1538,cs),
-(-394,1539,o),
-(-327,1591,o),
-(-326,1662,cs),
-(-327,1731,o),
-(-394,1786,o),
-(-482,1786,cs),
-(-575,1786,o),
-(-641,1731,o),
-(-640,1662,cs)
-);
+alignment = 1;
+pos = (0,372);
+ref = macrondieresiscomb.lc;
 }
 );
-width = 32;
+width = 1330;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-524,1126);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-754,1216,l),
-(-754,1170,l),
-(-290,1170,l),
-(-290,1216,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-707,1385,o),
-(-686,1364,o),
-(-660,1364,cs),
-(-635,1364,o),
-(-614,1385,o),
-(-614,1410,cs),
-(-614,1436,o),
-(-635,1457,o),
-(-660,1458,cs),
-(-686,1457,o),
-(-707,1436,o),
-(-706,1410,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-428,1385,o),
-(-407,1364,o),
-(-382,1364,cs),
-(-356,1364,o),
-(-335,1385,o),
-(-334,1410,cs),
-(-335,1436,o),
-(-356,1457,o),
-(-382,1458,cs),
-(-407,1457,o),
-(-428,1436,o),
-(-428,1410,cs)
-);
+alignment = 1;
+pos = (0,372);
+ref = macrondieresiscomb.lc;
 }
 );
-width = 0;
+width = 1164;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-620,1202);
-}
-);
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-960,1350,l),
-(-960,1198,l),
-(-280,1198,l),
-(-280,1350,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-969,1495,o),
-(-928,1449,o),
-(-856,1448,cs),
-(-780,1449,o),
-(-739,1495,o),
-(-738,1556,cs),
-(-739,1617,o),
-(-780,1667,o),
-(-854,1666,cs),
-(-931,1667,o),
-(-969,1615,o),
-(-968,1556,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-500,1492,o),
-(-460,1446,o),
-(-384,1446,cs),
-(-311,1446,o),
-(-271,1492,o),
-(-270,1554,cs),
-(-271,1615,o),
-(-308,1664,o),
-(-384,1664,cs),
-(-460,1664,o),
-(-500,1617,o),
-(-500,1554,cs)
-);
+alignment = 1;
+pos = (0,434);
+ref = macrondieresiscomb.lc;
 }
 );
-width = 0;
+width = 1136;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-712,1330);
-}
-);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-1078,1448,l),
-(-1078,1268,l),
-(-348,1268,l),
-(-348,1448,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-1085,1591,o),
-(-1021,1536,o),
-(-930,1536,cs),
-(-838,1536,o),
-(-771,1591,o),
-(-770,1662,cs),
-(-771,1731,o),
-(-841,1786,o),
-(-930,1786,cs),
-(-1018,1786,o),
-(-1085,1731,o),
-(-1084,1662,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-657,1591,o),
-(-591,1539,o),
-(-498,1538,cs),
-(-410,1539,o),
-(-343,1591,o),
-(-342,1662,cs),
-(-343,1731,o),
-(-410,1786,o),
-(-498,1786,cs),
-(-591,1786,o),
-(-657,1731,o),
-(-656,1662,cs)
-);
+alignment = 1;
+pos = (0,434);
+ref = macrondieresiscomb.lc;
 }
 );
-width = 0;
+width = 1298;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-588,1126);
-}
-);
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-818,1216,l),
-(-818,1170,l),
-(-354,1170,l),
-(-354,1216,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-771,1385,o),
-(-750,1364,o),
-(-724,1364,cs),
-(-699,1364,o),
-(-678,1385,o),
-(-678,1410,cs),
-(-678,1436,o),
-(-699,1457,o),
-(-724,1458,cs),
-(-750,1457,o),
-(-771,1436,o),
-(-770,1410,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-492,1385,o),
-(-471,1364,o),
-(-446,1364,cs),
-(-420,1364,o),
-(-399,1385,o),
-(-398,1410,cs),
-(-399,1436,o),
-(-420,1457,o),
-(-446,1458,cs),
-(-471,1457,o),
-(-492,1436,o),
-(-492,1410,cs)
-);
+alignment = 1;
+pos = (0,434);
+ref = macrondieresiscomb.lc;
 }
 );
-width = 0;
+width = 1068;
 }
 );
 tags = (
 "TODO-opsz"
 );
-unicode = 57635;
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macrondieresiscomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/macrondieresiscomb.lc.glyph
index deda0713a..e44601679 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macrondieresiscomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macrondieresiscomb.lc.glyph
@@ -2,181 +2,130 @@
 glyphname = macrondieresiscomb.lc;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (-590,1282);
-},
+background = {
+shapes = (
 {
-name = mkmktop_acc;
-pos = (-590,1870);
+ref = dieresismacroncomb.lc;
 }
 );
+};
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-926,1446,l),
-(-926,1298,l),
-(-242,1298,l),
-(-242,1446,l)
-);
+ref = macron;
 },
 {
-closed = 1;
-nodes = (
-(-916,1597,o),
-(-876,1548,o),
-(-800,1548,cs),
-(-724,1548,o),
-(-687,1600,o),
-(-686,1658,cs),
-(-687,1719,o),
-(-727,1769,o),
-(-800,1768,cs),
-(-876,1769,o),
-(-916,1719,o),
-(-916,1658,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-486,1594,o),
-(-448,1548,o),
-(-372,1548,cs),
-(-297,1548,o),
-(-256,1594,o),
-(-256,1656,cs),
-(-256,1716,o),
-(-297,1766,o),
-(-372,1766,cs),
-(-448,1766,o),
-(-486,1716,o),
-(-486,1656,cs)
-);
+alignment = -1;
+pos = (-1,308);
+ref = dieresis;
 }
 );
-width = 0;
+width = 1200;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-704,1300);
-},
+background = {
+shapes = (
 {
-name = mkmktop_acc;
-pos = (-704,1954);
+ref = dieresismacroncomb.lc;
 }
 );
+};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-1070,1464,l),
-(-1070,1280,l),
-(-340,1280,l),
-(-340,1464,l)
-);
+ref = macron;
 },
 {
-closed = 1;
-nodes = (
-(-1152,1617,o),
-(-1076,1553,o),
-(-990,1554,cs),
-(-899,1553,o),
-(-823,1617,o),
-(-824,1696,cs),
-(-823,1775,o),
-(-899,1839,o),
-(-990,1838,cs),
-(-1076,1839,o),
-(-1152,1775,o),
-(-1152,1696,cs)
+alignment = -1;
+pos = (0,372);
+ref = dieresis;
+}
 );
+width = 1330;
 },
 {
-closed = 1;
-nodes = (
-(-593,1617,o),
-(-515,1553,o),
-(-428,1554,cs),
-(-340,1553,o),
-(-265,1617,o),
-(-264,1696,cs),
-(-265,1777,o),
-(-343,1839,o),
-(-428,1838,cs),
-(-515,1839,o),
-(-593,1777,o),
-(-594,1696,cs)
+background = {
+shapes = (
+{
+ref = dieresismacroncomb.lc;
+}
 );
+};
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+ref = macron;
+},
+{
+alignment = -1;
+pos = (1,232);
+ref = dieresis;
 }
 );
-width = 26;
+width = 1164;
 },
 {
-anchors = (
+background = {
+shapes = (
 {
-name = _top;
-pos = (-524,1274);
+ref = dieresismacroncomb.lc;
+}
+);
+};
+layerId = m007;
+shapes = (
+{
+ref = macron;
 },
 {
-name = mkmktop_acc;
-pos = (-524,1822);
+alignment = -1;
+pos = (-1,318);
+ref = dieresis;
 }
 );
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+width = 1136;
+},
+{
+background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(-754,1362,l),
-(-754,1314,l),
-(-290,1314,l),
-(-290,1362,l)
+ref = dieresismacroncomb.lc;
+}
 );
+};
+layerId = m009;
+shapes = (
+{
+ref = macron;
 },
 {
-closed = 1;
-nodes = (
-(-707,1531,o),
-(-686,1510,o),
-(-660,1510,cs),
-(-635,1510,o),
-(-614,1531,o),
-(-614,1556,cs),
-(-614,1582,o),
-(-635,1603,o),
-(-660,1602,cs),
-(-686,1603,o),
-(-707,1582,o),
-(-706,1556,cs)
+alignment = -1;
+pos = (0,360);
+ref = dieresis;
+}
 );
+width = 1298;
 },
 {
-closed = 1;
-nodes = (
-(-428,1531,o),
-(-407,1510,o),
-(-382,1510,cs),
-(-356,1510,o),
-(-335,1531,o),
-(-334,1556,cs),
-(-335,1582,o),
-(-356,1603,o),
-(-382,1602,cs),
-(-407,1603,o),
-(-428,1582,o),
-(-428,1556,cs)
+background = {
+shapes = (
+{
+ref = dieresismacroncomb.lc;
+}
 );
+};
+layerId = m011;
+shapes = (
+{
+ref = macron;
+},
+{
+alignment = -1;
+pos = (1,250);
+ref = dieresis;
 }
 );
-width = 0;
+width = 1068;
 },
 {
 anchors = (
@@ -189,7 +138,9 @@ name = mkmktop_acc;
 pos = (-622,1870);
 }
 );
-layerId = m007;
+associatedMasterId = m007;
+layerId = "687D779F-AD6F-4666-A24C-183CACE81A8D";
+name = "Apr 8, 23, 11:06";
 shapes = (
 {
 closed = 1;
@@ -236,126 +187,9 @@ nodes = (
 }
 );
 width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-720,1300);
-},
-{
-name = mkmktop_acc;
-pos = (-720,1954);
-}
-);
-layerId = m009;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-1086,1464,l),
-(-1086,1280,l),
-(-356,1280,l),
-(-356,1464,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-1168,1617,o),
-(-1092,1553,o),
-(-1006,1554,cs),
-(-915,1553,o),
-(-839,1617,o),
-(-840,1696,cs),
-(-839,1775,o),
-(-915,1839,o),
-(-1006,1838,cs),
-(-1092,1839,o),
-(-1168,1775,o),
-(-1168,1696,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-609,1617,o),
-(-531,1553,o),
-(-444,1554,cs),
-(-356,1553,o),
-(-281,1617,o),
-(-280,1696,cs),
-(-281,1777,o),
-(-359,1839,o),
-(-444,1838,cs),
-(-531,1839,o),
-(-609,1777,o),
-(-610,1696,cs)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-588,1274);
-},
-{
-name = mkmktop_acc;
-pos = (-588,1822);
-}
-);
-layerId = m011;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-818,1362,l),
-(-818,1314,l),
-(-354,1314,l),
-(-354,1362,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-771,1531,o),
-(-750,1510,o),
-(-724,1510,cs),
-(-699,1510,o),
-(-678,1531,o),
-(-678,1556,cs),
-(-678,1582,o),
-(-699,1603,o),
-(-724,1602,cs),
-(-750,1603,o),
-(-771,1582,o),
-(-770,1556,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-492,1531,o),
-(-471,1510,o),
-(-446,1510,cs),
-(-420,1510,o),
-(-399,1531,o),
-(-398,1556,cs),
-(-399,1582,o),
-(-420,1603,o),
-(-446,1602,cs),
-(-471,1603,o),
-(-492,1582,o),
-(-492,1556,cs)
-);
-}
-);
-width = 0;
 }
 );
+metricWidth = macron;
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macrongravecomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/macrongravecomb.cn.glyph
index 54256696c..b95baafec 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macrongravecomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macrongravecomb.cn.glyph
@@ -1,13 +1,8 @@
 {
+case = minor;
 glyphname = macrongravecomb.cn;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (-378,1676);
-}
-);
 background = {
 shapes = (
 {
@@ -20,79 +15,36 @@ scale = (-1,1);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-274,1920,l),
-(-494,2142,l),
-(-700,2142,l),
-(-452,1920,l)
-);
-},
-{
-alignment = -1;
-pos = (-838,332);
-ref = macron;
+alignment = 1;
+pos = (0,372);
+ref = macrongravecomb.lc;
 }
 );
-width = 0;
+width = 1200;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-290,1676);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-142,1972,l),
-(-336,2254,l),
-(-664,2254,l),
-(-414,1972,l)
-);
-},
-{
-pos = (-948,344);
-ref = macron;
+alignment = 1;
+pos = (0,372);
+ref = macrongravecomb.lc;
 }
 );
-width = 0;
+width = 1330;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-384,1676);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-354,1838,l),
-(-526,2024,l),
-(-592,2024,l),
-(-408,1838,l)
-);
-},
-{
-pos = (-684,308);
-ref = macron;
+alignment = 1;
+pos = (0,372);
+ref = macrongravecomb.lc;
 }
 );
-width = 0;
+width = 1164;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-410,1676);
-}
-);
 background = {
 shapes = (
 {
@@ -105,75 +57,37 @@ scale = (-1,1);
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-306,1920,l),
-(-526,2142,l),
-(-732,2142,l),
-(-484,1920,l)
-);
-},
-{
-alignment = -1;
-pos = (-838,332);
-ref = macron;
+alignment = 1;
+pos = (0,434);
+ref = macrongravecomb.lc;
 }
 );
-width = 0;
+width = 1136;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-306,1676);
-}
-);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-158,1972,l),
-(-352,2254,l),
-(-680,2254,l),
-(-430,1972,l)
-);
-},
-{
-pos = (-948,344);
-ref = macron;
+alignment = 1;
+pos = (0,434);
+ref = macrongravecomb.lc;
 }
 );
-width = 0;
+width = 1298;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-448,1676);
-}
-);
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-418,1838,l),
-(-590,2024,l),
-(-656,2024,l),
-(-472,1838,l)
-);
-},
-{
-pos = (-684,308);
-ref = macron;
+alignment = 1;
+pos = (0,434);
+ref = macrongravecomb.lc;
 }
 );
-width = 0;
+width = 1068;
 }
 );
 tags = (
 "TODO-opsz"
 );
-unicode = 57591;
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macrongravecomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/macrongravecomb.lc.glyph
index 90f8a6b8e..9af1eba91 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macrongravecomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macrongravecomb.lc.glyph
@@ -2,212 +2,91 @@
 glyphname = macrongravecomb.lc;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (-590,1282);
-},
-{
-name = mkmktop_acc;
-pos = (-590,1940);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-478,1530,l),
-(-672,1826,l),
-(-914,1826,l),
-(-646,1530,l)
-);
+ref = macron;
 },
 {
-closed = 1;
-nodes = (
-(-242,1298,l),
-(-242,1446,l),
-(-926,1446,l),
-(-926,1298,l)
-);
+alignment = -1;
+pos = (62,369);
+ref = grave;
 }
 );
-width = 0;
+width = 1200;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-704,1300);
-},
-{
-name = mkmktop_acc;
-pos = (-704,2010);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-526,1548,l),
-(-738,1868,l),
-(-1128,1868,l),
-(-830,1548,l)
-);
+ref = macron;
 },
 {
-closed = 1;
-nodes = (
-(-338,1280,l),
-(-338,1464,l),
-(-1070,1464,l),
-(-1070,1280,l)
-);
+alignment = -1;
+pos = (61,369);
+ref = grave;
 }
 );
-width = 34;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-486,1326);
+width = 1330;
 },
 {
-name = mkmktop_acc;
-pos = (-524,1900);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-456,1490,l),
-(-626,1676,l),
-(-694,1676,l),
-(-510,1490,l)
-);
+ref = macron;
 },
 {
-closed = 1;
-nodes = (
-(-254,1304,l),
-(-254,1350,l),
-(-718,1350,l),
-(-718,1304,l)
-);
+alignment = -1;
+pos = (120,210);
+ref = grave;
 }
 );
-width = 0;
+width = 1164;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-622,1282);
-},
-{
-name = mkmktop_acc;
-pos = (-622,1940);
-}
-);
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-510,1530,l),
-(-704,1826,l),
-(-946,1826,l),
-(-678,1530,l)
-);
+ref = macron;
 },
 {
-closed = 1;
-nodes = (
-(-274,1298,l),
-(-274,1446,l),
-(-958,1446,l),
-(-958,1298,l)
-);
+alignment = -1;
+pos = (8,338);
+ref = grave;
 }
 );
-width = 0;
+width = 1136;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-720,1300);
-},
-{
-name = mkmktop_acc;
-pos = (-720,2010);
-}
-);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-542,1548,l),
-(-754,1868,l),
-(-1144,1868,l),
-(-846,1548,l)
-);
+ref = macron;
 },
 {
-closed = 1;
-nodes = (
-(-354,1280,l),
-(-354,1464,l),
-(-1086,1464,l),
-(-1086,1280,l)
-);
+alignment = -1;
+pos = (-23,370);
+ref = grave;
 }
 );
-width = 2;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-550,1326);
+width = 1298;
 },
 {
-name = mkmktop_acc;
-pos = (-588,1900);
-}
-);
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-520,1490,l),
-(-690,1676,l),
-(-758,1676,l),
-(-574,1490,l)
-);
+ref = macron;
 },
 {
-closed = 1;
-nodes = (
-(-318,1304,l),
-(-318,1350,l),
-(-782,1350,l),
-(-782,1304,l)
-);
+alignment = -1;
+pos = (64,274);
+ref = grave;
 }
 );
-width = 0;
+width = 1068;
 }
 );
 tags = (
 "TODO-opsz"
 );
-unicode = 57593;
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macronsubnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/macronsubnosp.glyph
index ecbb95855..8e4759959 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macronsubnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macronsubnosp.glyph
@@ -6,22 +6,14 @@ layers = (
 anchors = (
 {
 name = _bottom;
-pos = (-606,0);
-}
-);
-guides = (
-{
-pos = (-702,0);
-},
-{
-pos = (-666,-352);
+pos = (-598,0);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-1064,-1672);
+pos = (-1198,-1722);
 ref = macron;
 }
 );
@@ -31,24 +23,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-628,0);
-}
-);
-guides = (
-{
-orientation = center;
-pos = (-702,0);
-},
-{
-orientation = center;
-pos = (-666,-384);
+pos = (-666,0);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-1286,-1678);
+pos = (-1331,-1714);
 ref = macron;
 }
 );
@@ -58,24 +40,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-606,0);
-}
-);
-guides = (
-{
-orientation = center;
-pos = (-664,-320);
-},
-{
-orientation = center;
-pos = (94,0);
+pos = (-575,0);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-904,-1600);
+pos = (-1157,-1650);
 ref = macron;
 }
 );
@@ -85,22 +57,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-638,0);
-}
-);
-guides = (
-{
-pos = (-994,0);
-},
-{
-pos = (-958,-352);
+pos = (-560,0);
 }
 );
 layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-1064,-1672);
+pos = (-1128,-1700);
 ref = macron;
 }
 );
@@ -110,24 +74,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-644,0);
-}
-);
-guides = (
-{
-orientation = center;
-pos = (-798,0);
-},
-{
-orientation = center;
-pos = (-762,-384);
+pos = (-645,0);
 }
 );
 layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1286,-1678);
+pos = (-1294,-1616);
 ref = macron;
 }
 );
@@ -137,24 +91,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-670,0);
-}
-);
-guides = (
-{
-orientation = center;
-pos = (-792,-320);
-},
-{
-orientation = center;
-pos = (-34,0);
+pos = (-529,0);
 }
 );
 layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-904,-1600);
+pos = (-1063,-1700);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macute.glyph b/src/Inter-Roman.glyphspackage/glyphs/macute.glyph
index 8ed1d923b..ef50e2c2b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macute.glyph
@@ -75,7 +75,7 @@ shapes = (
 ref = m;
 },
 {
-pos = (543,0);
+pos = (539,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/mturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/mturn.glyph
index b933f7c24..512e88fda 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/mturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/mturn.glyph
@@ -15,7 +15,7 @@ pos = (1624,0);
 },
 {
 name = top;
-pos = (890,1304);
+pos = (890,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -40,7 +40,7 @@ pos = (1830,0);
 },
 {
 name = top;
-pos = (966,1304);
+pos = (966,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -65,7 +65,7 @@ pos = (1512,0);
 },
 {
 name = top;
-pos = (856,1304);
+pos = (856,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -90,7 +90,7 @@ pos = (1592,0);
 },
 {
 name = top;
-pos = (859,1262);
+pos = (859,1056);
 }
 );
 layerId = m007;
@@ -115,7 +115,7 @@ pos = (1802,0);
 },
 {
 name = top;
-pos = (944,1262);
+pos = (944,1056);
 }
 );
 layerId = m009;
@@ -140,7 +140,7 @@ pos = (1512,0);
 },
 {
 name = top;
-pos = (823,1262);
+pos = (823,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/n.glyph b/src/Inter-Roman.glyphspackage/glyphs/n.glyph
index dad64dac7..b7f7c3bbd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/n.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/n.glyph
@@ -20,7 +20,7 @@ pos = (158,0);
 },
 {
 name = top;
-pos = (600,1304);
+pos = (600,1118);
 },
 {
 name = topr;
@@ -81,7 +81,7 @@ pos = (102,0);
 },
 {
 name = top;
-pos = (664,1304);
+pos = (664,1118);
 },
 {
 name = topr;
@@ -193,7 +193,7 @@ pos = (198,0);
 },
 {
 name = top;
-pos = (584,1304);
+pos = (584,1118);
 },
 {
 name = topr;
@@ -334,7 +334,7 @@ pos = (126,0);
 },
 {
 name = top;
-pos = (568,1262);
+pos = (568,1056);
 },
 {
 name = topr;
@@ -388,7 +388,7 @@ pos = (86,0);
 },
 {
 name = top;
-pos = (648,1262);
+pos = (648,1056);
 },
 {
 name = topr;
@@ -505,7 +505,7 @@ pos = (134,0);
 },
 {
 name = top;
-pos = (536,1262);
+pos = (536,1056);
 },
 {
 name = topr;
@@ -662,6 +662,7 @@ width = 1036;
 }
 );
 metricRight = "=|n";
+note = "aka circumflexbelow";
 tags = (
 "TODO-opsz-thin"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/n.sc.glyph b/src/Inter-Roman.glyphspackage/glyphs/n.sc.glyph
index 0d32c36f9..b9fb30891 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/n.sc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/n.sc.glyph
@@ -15,7 +15,7 @@ pos = (1173,0);
 },
 {
 name = top;
-pos = (664,1304);
+pos = (664,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -52,7 +52,7 @@ pos = (1221,0);
 },
 {
 name = top;
-pos = (664,1304);
+pos = (664,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -89,7 +89,7 @@ pos = (1150,0);
 },
 {
 name = top;
-pos = (674,1304);
+pos = (674,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -126,7 +126,7 @@ pos = (1138,0);
 },
 {
 name = top;
-pos = (637,1262);
+pos = (637,1056);
 }
 );
 layerId = m007;
@@ -163,7 +163,7 @@ pos = (1205,0);
 },
 {
 name = top;
-pos = (648,1262);
+pos = (648,1056);
 }
 );
 layerId = m009;
@@ -200,7 +200,7 @@ pos = (1038,0);
 },
 {
 name = top;
-pos = (586,1262);
+pos = (586,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/nacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/nacute.glyph
index 52266331f..80b9e4cb0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/nacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/nacute.glyph
@@ -75,7 +75,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (256,0);
+pos = (252,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ncaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/ncaron.glyph
index f9d3fd10e..e4ffa4b20 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ncaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ncaron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (154,16);
+pos = (152,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (18,0);
+pos = (20,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ncircumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/ncircumflexbelow.glyph
index ed12f013d..585b1d0b3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ncircumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ncircumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1182,0);
+pos = (1192,0);
 ref = circumflexsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1338,0);
+pos = (1329,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1094,0);
+pos = (1156,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1182,0);
+pos = (1136,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1338,0);
+pos = (1300,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1110,0);
+pos = (1062,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/nine.ss01.glyph b/src/Inter-Roman.glyphspackage/glyphs/nine.ss01.glyph
index 6071c3892..a77f99bfd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/nine.ss01.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/nine.ss01.glyph
@@ -370,54 +370,46 @@ name = _center;
 pos = (671,745);
 }
 );
-guides = (
-{
-pos = (-304,764);
-},
-{
-pos = (-304,1240);
-}
-);
 layerId = m009;
 shapes = (
 {
 closed = 1;
 nodes = (
-(65,684,o),
-(257,489,o),
+(66,684,o),
+(257,488,o),
 (536,488,cs),
-(580,489,o),
+(580,488,o),
 (621,495,o),
 (658,504,c),
 (318,0,l),
 (714,0,l),
 (1066,520,ls),
-(1171,678,o),
-(1241,829,o),
-(1240,998,c),
-(1241,1341,o),
+(1172,677,o),
+(1240,829,o),
+(1240,998,cs),
+(1240,1341,o),
 (956,1510,o),
 (644,1510,cs),
 (307,1510,o),
-(65,1303,o),
+(66,1303,o),
 (66,978,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(455,1117,o),
+(456,1117,o),
 (534,1204,o),
 (648,1204,cs),
 (761,1204,o),
 (842,1117,o),
 (842,994,cs),
 (842,873,o),
-(761,785,o),
+(761,786,o),
 (648,786,cs),
-(534,785,o),
-(455,873,o),
-(456,994,c)
+(534,786,o),
+(456,873,o),
+(456,994,cs)
 );
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/nlinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/nlinebelow.glyph
index 2066ca0de..0ae73976a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/nlinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/nlinebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1206,0);
+pos = (1198,0);
 ref = macronsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1292,0);
+pos = (1330,0);
 ref = macronsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1188,0);
+pos = (1157,0);
 ref = macronsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1206,0);
+pos = (1128,0);
 ref = macronsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1292,0);
+pos = (1293,0);
 ref = macronsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1204,0);
+pos = (1063,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ntilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/ntilde.glyph
index 757be57e7..1aa97bf8a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ntilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ntilde.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (74,0);
+pos = (80,0);
 ref = tilde;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/o.glyph b/src/Inter-Roman.glyphspackage/glyphs/o.glyph
index 35f44f0a3..3db0527cb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/o.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/o.glyph
@@ -16,7 +16,7 @@ pos = (1056,556);
 },
 {
 name = top;
-pos = (594,1304);
+pos = (594,1118);
 },
 {
 name = tophorn;
@@ -74,7 +74,7 @@ pos = (1118,552);
 },
 {
 name = top;
-pos = (610,1304);
+pos = (610,1118);
 },
 {
 name = tophorn;
@@ -132,7 +132,7 @@ pos = (1218,556);
 },
 {
 name = top;
-pos = (640,1304);
+pos = (640,1118);
 },
 {
 name = tophorn;
@@ -190,7 +190,7 @@ pos = (1198,528);
 },
 {
 name = top;
-pos = (622,1262);
+pos = (622,1056);
 },
 {
 name = tophorn;
@@ -386,7 +386,7 @@ pos = (992,528);
 },
 {
 name = top;
-pos = (530,1262);
+pos = (530,1056);
 },
 {
 name = tophorn;
@@ -553,7 +553,7 @@ pos = (1052,526);
 },
 {
 name = top;
-pos = (562,1262);
+pos = (562,1056);
 },
 {
 name = tophorn;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/oacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/oacute.glyph
index 1b5715067..6f99b517a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/oacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/oacute.glyph
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (250,0);
+pos = (246,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/obarreddieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/obarreddieresiscyrillic.glyph
index 5da5c50a5..959d85486 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/obarreddieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/obarreddieresiscyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = fitacyrillic;
 },
 {
-pos = (4,0);
+pos = (9,0);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = fitacyrillic;
 },
 {
-pos = (133,0);
+pos = (-25,0);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = fitacyrillic;
 },
 {
-pos = (-80,0);
+pos = (12,0);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = fitacyrillic;
 },
 {
-pos = (-12,0);
+pos = (-7,0);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = fitacyrillic;
 },
 {
-pos = (128,0);
+pos = (-27,0);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = fitacyrillic;
 },
 {
-pos = (-80,0);
+pos = (-4,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/obreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/obreve.glyph
index 15b148d24..63d8999e3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/obreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/obreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (150,0);
+pos = (226,0);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (128,0);
+pos = (160,0);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (178,0);
+pos = (242,0);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (134,0);
+pos = (162,0);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (126,0);
+pos = (142,0);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (114,0);
+pos = (178,0);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ocaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/ocaron.glyph
index de1b1777c..5fa47448b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ocaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ocaron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (164,16);
+pos = (162,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-8,0);
+pos = (-6,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ocircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/ocircumflex.glyph
index 6cbe55125..23f3c670c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ocircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ocircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (144,0);
+pos = (146,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,6 @@ shapes = (
 ref = o;
 },
 {
-pos = (-6,0);
 ref = circumflex;
 }
 );
@@ -36,7 +35,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (164,0);
+pos = (162,0);
 ref = circumflex;
 }
 );
@@ -49,7 +48,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (128,0);
+pos = (130,0);
 ref = circumflex;
 }
 );
@@ -62,7 +61,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-8,0);
+pos = (-6,0);
 ref = circumflex;
 }
 );
@@ -75,7 +74,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (164,0);
+pos = (162,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ocircumflexacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/ocircumflexacute.glyph
index a1c1b2246..4cabaf6ef 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ocircumflexacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ocircumflexacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (196,4);
+pos = (146,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -23,7 +23,6 @@ shapes = (
 ref = o;
 },
 {
-pos = (216,-38);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -36,7 +35,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (290,26);
+pos = (162,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -49,7 +48,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (180,-38);
+pos = (130,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -62,7 +61,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (214,-80);
+pos = (-6,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -75,7 +74,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (290,-16);
+pos = (162,0);
 ref = circumflexacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ocircumflexdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/ocircumflexdotbelow.glyph
index 2cd6fe72b..1a8af2f57 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ocircumflexdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ocircumflexdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (144,0);
+pos = (146,0);
 ref = circumflex;
 },
 {
@@ -27,7 +27,6 @@ shapes = (
 ref = o;
 },
 {
-pos = (-6,0);
 ref = circumflex;
 },
 {
@@ -44,7 +43,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (164,0);
+pos = (162,0);
 ref = circumflex;
 },
 {
@@ -61,7 +60,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (128,0);
+pos = (130,0);
 ref = circumflex;
 },
 {
@@ -78,7 +77,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-8,0);
+pos = (-6,0);
 ref = circumflex;
 },
 {
@@ -95,7 +94,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (164,0);
+pos = (162,0);
 ref = circumflex;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ocircumflexgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/ocircumflexgrave.glyph
index b95af3af8..828af3fc1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ocircumflexgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ocircumflexgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-82,22);
+pos = (144,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-158,-52);
+pos = (-12,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (94,64);
+pos = (94,-122);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-98,-20);
+pos = (128,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-160,-94);
+pos = (-10,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (94,22);
+pos = (94,-184);
 ref = circumflexgravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ocircumflexhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/ocircumflexhookabove.glyph
index 0951030b8..bd8998c92 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ocircumflexhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ocircumflexhookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (136,-16);
+pos = (146,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -23,7 +23,6 @@ shapes = (
 ref = o;
 },
 {
-pos = (130,-38);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -36,7 +35,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (242,-6);
+pos = (162,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -49,7 +48,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (120,-58);
+pos = (130,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -62,7 +61,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (128,-80);
+pos = (-6,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -75,7 +74,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (242,-48);
+pos = (162,0);
 ref = circumflexhookcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ocircumflextilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/ocircumflextilde.glyph
index 85e84b103..edc5a43da 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ocircumflextilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ocircumflextilde.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (54,-38);
+pos = (146,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -23,7 +23,6 @@ shapes = (
 ref = o;
 },
 {
-pos = (12,-28);
 ref = circumflextildecomb.cn;
 }
 );
@@ -36,7 +35,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (164,-42);
+pos = (164,-228);
 ref = circumflextildecomb.cn;
 }
 );
@@ -49,7 +48,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (38,-80);
+pos = (130,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -62,7 +61,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (10,-70);
+pos = (-6,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -75,7 +74,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (164,-84);
+pos = (164,-290);
 ref = circumflextildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/odieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/odieresis.glyph
index 292077d67..a773b781b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/odieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/odieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (4,0);
+pos = (9,0);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (133,0);
+pos = (-25,0);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-80,0);
+pos = (12,0);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-12,0);
+pos = (-7,0);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (128,0);
+pos = (-27,0);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-80,0);
+pos = (-4,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ohookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/ohookabove.glyph
index 9f6f4fb40..fc8fb19cb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ohookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ohookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1204,26);
+pos = (1197,0);
 ref = hookabovecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1378,-6);
+pos = (1304,0);
 ref = hookabovecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1092,44);
+pos = (1116,0);
 ref = hookabovecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1188,-16);
+pos = (1125,0);
 ref = hookabovecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1376,0);
+pos = (1276,0);
 ref = hookabovecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1092,2);
+pos = (1034,0);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ohorn.glyph b/src/Inter-Roman.glyphspackage/glyphs/ohorn.glyph
index 47de3b718..86d2b63dd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ohorn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ohorn.glyph
@@ -7,10 +7,28 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-ref = o;
+closed = 1;
+nodes = (
+(730,1014,o),
+(865,998,o),
+(984,998,cs),
+(1098,998,o),
+(1154,1054,o),
+(1154,1168,cs),
+(1154,1326,l),
+(994,1326,l),
+(994,1136,ls),
+(994,1125,o),
+(987,1118,o),
+(976,1118,cs),
+(860,1118,o),
+(727,1127,o),
+(611,1132,c),
+(611,1014,l)
+);
 },
 {
-ref = _part.rtophorn.o;
+ref = o;
 }
 );
 width = 1222;
@@ -19,10 +37,28 @@ width = 1222;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-ref = o;
+closed = 1;
+nodes = (
+(750,902,o),
+(860,902,o),
+(970,902,cs),
+(1114,902,o),
+(1244,960,o),
+(1244,1118,cs),
+(1244,1326,l),
+(904,1326,l),
+(904,1150,ls),
+(904,1129,o),
+(891,1118,o),
+(864,1118,cs),
+(811,1118,o),
+(709,1132,o),
+(640,1132,c),
+(640,902,l)
+);
 },
 {
-ref = _part.rtophorn.o;
+ref = o;
 }
 );
 width = 1280;
@@ -31,10 +67,28 @@ width = 1280;
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-ref = o;
+closed = 1;
+nodes = (
+(706,1088,o),
+(820,1076,o),
+(933,1073,cs),
+(1012,1071,o),
+(1056,1116,o),
+(1056,1195,cs),
+(1056,1326,l),
+(1010,1326,l),
+(1010,1195,ls),
+(1010,1141,o),
+(987,1118,o),
+(933,1118,cs),
+(820,1118,o),
+(706,1129,o),
+(593,1134,c),
+(593,1096,l)
+);
 },
 {
-ref = _part.rtophorn.o;
+ref = o;
 }
 );
 width = 1186;
@@ -43,10 +97,28 @@ width = 1186;
 layerId = m007;
 shapes = (
 {
-ref = o;
+closed = 1;
+nodes = (
+(676,944,o),
+(783,944,o),
+(897,944,cs),
+(1011,944,o),
+(1067,992,o),
+(1067,1106,cs),
+(1067,1296,l),
+(907,1296,l),
+(907,1082,ls),
+(907,1071,o),
+(900,1064,o),
+(889,1064,cs),
+(663,1064,o),
+(692,1080,o),
+(562,1080,c),
+(562,944,l)
+);
 },
 {
-ref = _part.rtophorn.o;
+ref = o;
 }
 );
 width = 1124;
@@ -55,10 +127,28 @@ width = 1124;
 layerId = m009;
 shapes = (
 {
-ref = o;
+closed = 1;
+nodes = (
+(733,824,o),
+(845,824,o),
+(956,824,cs),
+(1100,824,o),
+(1238,886,o),
+(1238,1036,cs),
+(1238,1296,l),
+(898,1296,l),
+(898,1088,ls),
+(898,1067,o),
+(887,1057,o),
+(866,1057,cs),
+(804,1057,o),
+(744,1080,o),
+(622,1080,c),
+(622,824,l)
+);
 },
 {
-ref = _part.rtophorn.o;
+ref = o;
 }
 );
 width = 1244;
@@ -67,11 +157,28 @@ width = 1244;
 layerId = m011;
 shapes = (
 {
-ref = o;
+closed = 1;
+nodes = (
+(645,1024,o),
+(761,1011,o),
+(877,1011,cs),
+(956,1011,o),
+(1000,1054,o),
+(1000,1133,cs),
+(1000,1296,l),
+(954,1296,l),
+(954,1133,ls),
+(954,1079,o),
+(931,1056,o),
+(877,1056,cs),
+(761,1056,o),
+(645,1067,o),
+(529,1072,c),
+(529,1030,l)
+);
 },
 {
-pos = (0,-62);
-ref = _part.rtophorn.o;
+ref = o;
 }
 );
 width = 1058;
@@ -148,6 +255,34 @@ ref = o;
 }
 );
 width = 1342;
+},
+{
+associatedMasterId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+layerId = "60DC7E2A-59F9-4457-809D-50DC47FC085B";
+name = "Apr 11, 23, 15:50";
+shapes = (
+{
+ref = o;
+},
+{
+closed = 1;
+nodes = (
+(1030,998,ls),
+(1116,998,o),
+(1170,1052,o),
+(1170,1138,cs),
+(1170,1326,l),
+(1010,1326,l),
+(1010,1138,ls),
+(1010,1125,o),
+(1003,1118,o),
+(990,1118,cs),
+(618,1118,l),
+(618,998,l)
+);
+}
+);
+width = 1222;
 }
 );
 metricLeft = o;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ohornacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/ohornacute.glyph
index faff5d137..b9e85ee1f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ohornacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ohornacute.glyph
@@ -75,7 +75,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (250,0);
+pos = (246,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ohornhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/ohornhookabove.glyph
index 17b4c1ec8..0593e91d2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ohornhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ohornhookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1204,26);
+pos = (1197,0);
 ref = hookabovecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1378,-6);
+pos = (1304,0);
 ref = hookabovecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1092,44);
+pos = (1116,0);
 ref = hookabovecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1188,-16);
+pos = (1125,0);
 ref = hookabovecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1376,0);
+pos = (1276,0);
 ref = hookabovecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1092,2);
+pos = (1034,0);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ohorntilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/ohorntilde.glyph
index b1a763479..75eb2d09c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ohorntilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ohorntilde.glyph
@@ -23,7 +23,8 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (128,0);
+alignment = -1;
+pos = (128,40);
 ref = tilde;
 }
 );
@@ -36,7 +37,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (84,0);
+pos = (90,0);
 ref = tilde;
 }
 );
@@ -62,7 +63,8 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (110,0);
+alignment = -1;
+pos = (110,48);
 ref = tilde;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ohungarumlaut.glyph b/src/Inter-Roman.glyphspackage/glyphs/ohungarumlaut.glyph
index 0e4c45ebc..f460c7129 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ohungarumlaut.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ohungarumlaut.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (258,12);
+pos = (258,-174);
 ref = hungarumlaut;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (250,12);
+pos = (250,-174);
 ref = hungarumlaut;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (266,12);
+pos = (266,-174);
 ref = hungarumlaut;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (242,-30);
+pos = (242,-236);
 ref = hungarumlaut;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (248,-30);
+pos = (248,-236);
 ref = hungarumlaut;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (266,-30);
+pos = (266,-236);
 ref = hungarumlaut;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/oinvertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/oinvertedbreve.glyph
index 14230c597..214621977 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/oinvertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/oinvertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1266,0);
+pos = (1207,0);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1280,0);
+pos = (1302,0);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1186,0);
+pos = (1176,0);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1218,-10);
+pos = (1126,0);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1262,0);
+pos = (1272,0);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1122,0);
+pos = (1059,0);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/omacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/omacron.glyph
index 418317072..4d7bdb40e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/omacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/omacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (150,0);
+pos = (10,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-18,0);
+pos = (-25,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (294,0);
+pos = (12,0);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (134,-42);
+pos = (-6,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-20,-42);
+pos = (-27,0);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (294,0);
+pos = (-4,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/omacronacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/omacronacute.glyph
index 751a8c6a7..b53d5552e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/omacronacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/omacronacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (988,0);
+pos = (10,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1106,0);
+pos = (-25,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (972,0);
+pos = (12,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (972,-42);
+pos = (-6,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1104,-42);
+pos = (-27,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (972,-42);
+pos = (-4,0);
 ref = macronacutecomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/omacrongrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/omacrongrave.glyph
index 5750b32fd..d62ba1b7d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/omacrongrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/omacrongrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1200,22);
+pos = (10,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1344,4);
+pos = (-25,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1080,-22);
+pos = (12,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1184,-20);
+pos = (-6,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1342,-38);
+pos = (-27,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1080,-64);
+pos = (-4,0);
 ref = macrongravecomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/omega.glyph b/src/Inter-Roman.glyphspackage/glyphs/omega.glyph
index 52690a384..2a6f32f10 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/omega.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/omega.glyph
@@ -11,7 +11,7 @@ pos = (812,0);
 },
 {
 name = top;
-pos = (812,1304);
+pos = (812,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -81,7 +81,7 @@ pos = (889,0);
 },
 {
 name = top;
-pos = (889,1304);
+pos = (889,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -151,7 +151,7 @@ pos = (789,0);
 },
 {
 name = top;
-pos = (789,1304);
+pos = (789,1118);
 }
 );
 background = {
@@ -279,7 +279,7 @@ pos = (780,0);
 },
 {
 name = top;
-pos = (780,1262);
+pos = (780,1056);
 }
 );
 layerId = m007;
@@ -349,7 +349,7 @@ pos = (870,0);
 },
 {
 name = top;
-pos = (870,1304);
+pos = (870,1056);
 }
 );
 layerId = m009;
@@ -419,7 +419,7 @@ pos = (725,0);
 },
 {
 name = top;
-pos = (725,1262);
+pos = (725,1056);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/omegatonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/omegatonos.glyph
index e7249d97c..da13864fb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/omegatonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/omegatonos.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (590,0);
+pos = (590,-186);
 ref = tonostop;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (517,22);
+pos = (517,-164);
 ref = tonostop;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (659,-10);
+pos = (659,-196);
 ref = tonostop;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (590,-42);
+pos = (590,-248);
 ref = tonostop;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (514,22);
+pos = (514,-226);
 ref = tonostop;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (659,-52);
+pos = (659,-258);
 ref = tonostop;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/omicrontonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/omicrontonos.glyph
index eb74138c3..5feb4fb70 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/omicrontonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/omicrontonos.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (388,0);
+pos = (388,-186);
 ref = tonostop;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (268,22);
+pos = (268,-164);
 ref = tonostop;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (464,-10);
+pos = (464,-196);
 ref = tonostop;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (372,-42);
+pos = (372,-248);
 ref = tonostop;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (266,-20);
+pos = (266,-226);
 ref = tonostop;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (464,-52);
+pos = (464,-258);
 ref = tonostop;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/oogonekmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/oogonekmacron.glyph
index 66d7697b5..e3f61f701 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/oogonekmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/oogonekmacron.glyph
@@ -11,7 +11,7 @@ ref = oogonek;
 },
 {
 alignment = 1;
-pos = (150,0);
+pos = (10,0);
 ref = macron;
 }
 );
@@ -25,7 +25,7 @@ ref = oogonek;
 },
 {
 alignment = 1;
-pos = (-18,0);
+pos = (-25,0);
 ref = macron;
 }
 );
@@ -39,7 +39,7 @@ ref = oogonek;
 },
 {
 alignment = 1;
-pos = (294,0);
+pos = (12,0);
 ref = macron;
 }
 );
@@ -53,7 +53,7 @@ ref = oogonek;
 },
 {
 alignment = 1;
-pos = (134,-42);
+pos = (-6,0);
 ref = macron;
 }
 );
@@ -67,7 +67,7 @@ ref = oogonek;
 },
 {
 alignment = 1;
-pos = (-20,-42);
+pos = (-27,0);
 ref = macron;
 }
 );
@@ -81,7 +81,7 @@ ref = oogonek;
 },
 {
 alignment = 1;
-pos = (294,0);
+pos = (-4,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/oslashacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/oslashacute.glyph
index cae18fc53..19cd73c8b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/oslashacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/oslashacute.glyph
@@ -75,7 +75,7 @@ shapes = (
 ref = oslash;
 },
 {
-pos = (250,0);
+pos = (246,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/otilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/otilde.glyph
index 11be08a80..dd06da08c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/otilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/otilde.glyph
@@ -37,7 +37,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (84,0);
+pos = (90,0);
 ref = tilde;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/otildeacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/otildeacute.glyph
index f58687df8..d092104cc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/otildeacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/otildeacute.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (936,0);
-ref = tildeacutecomb;
+pos = (98,0);
+ref = tildeacute.lc;
 }
 );
 width = 1222;
@@ -23,8 +23,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (966,0);
-ref = tildeacutecomb;
+pos = (128,0);
+ref = tildeacute.lc;
 }
 );
 width = 1280;
@@ -36,8 +36,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (922,0);
-ref = tildeacutecomb;
+pos = (90,0);
+ref = tildeacute.lc;
 }
 );
 width = 1186;
@@ -49,8 +49,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (920,0);
-ref = tildeacutecomb;
+pos = (82,0);
+ref = tildeacute.lc;
 }
 );
 width = 1124;
@@ -62,8 +62,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (948,0);
-ref = tildeacutecomb;
+pos = (110,0);
+ref = tildeacute.lc;
 }
 );
 width = 1244;
@@ -75,8 +75,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (920,0);
-ref = tildeacutecomb;
+pos = (82,0);
+ref = tildeacute.lc;
 }
 );
 width = 1058;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/otildedieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/otildedieresis.glyph
index 63113fdce..0edc170e2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/otildedieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/otildedieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1200,16);
+pos = (1200,-170);
 ref = tildedieresiscomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1344,6);
+pos = (1344,-180);
 ref = tildedieresiscomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1118,22);
+pos = (1118,-164);
 ref = tildedieresiscomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1184,-26);
+pos = (1184,-232);
 ref = tildedieresiscomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1342,-36);
+pos = (1342,-242);
 ref = tildedieresiscomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1118,-20);
+pos = (1118,-226);
 ref = tildedieresiscomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/p.glyph b/src/Inter-Roman.glyphspackage/glyphs/p.glyph
index a1e7bb405..43770b322 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/p.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/p.glyph
@@ -16,7 +16,7 @@ pos = (222,-162);
 },
 {
 name = top;
-pos = (628,1304);
+pos = (628,1118);
 },
 {
 name = topr;
@@ -132,7 +132,7 @@ pos = (244,-162);
 },
 {
 name = top;
-pos = (658,1304);
+pos = (658,1118);
 },
 {
 name = topr;
@@ -276,7 +276,7 @@ pos = (214,-162);
 },
 {
 name = top;
-pos = (648,1262);
+pos = (648,1056);
 },
 {
 name = topr;
@@ -386,7 +386,7 @@ pos = (300,-162);
 },
 {
 name = top;
-pos = (728,1304);
+pos = (728,1118);
 },
 {
 name = topr;
@@ -530,7 +530,7 @@ pos = (286,-162);
 },
 {
 name = top;
-pos = (639,1262);
+pos = (639,1056);
 },
 {
 name = topr;
@@ -785,7 +785,7 @@ pos = (157,-162);
 },
 {
 name = top;
-pos = (588,1262);
+pos = (588,1056);
 },
 {
 name = topr;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/pacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/pacute.glyph
index 128f125e1..99b8fa57b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/pacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/pacute.glyph
@@ -75,7 +75,7 @@ shapes = (
 ref = p;
 },
 {
-pos = (308,0);
+pos = (304,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/pisymbolgreek.glyph b/src/Inter-Roman.glyphspackage/glyphs/pisymbolgreek.glyph
index fa450ac1e..8cda92cff 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/pisymbolgreek.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/pisymbolgreek.glyph
@@ -9,7 +9,7 @@ pos = (830,0);
 },
 {
 name = top;
-pos = (830,1304);
+pos = (830,1118);
 }
 );
 background = {
@@ -155,7 +155,7 @@ pos = (1042,0);
 },
 {
 name = top;
-pos = (1042,1304);
+pos = (1042,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -234,7 +234,7 @@ pos = (704,0);
 },
 {
 name = top;
-pos = (704,1304);
+pos = (704,1118);
 }
 );
 background = {
@@ -380,7 +380,7 @@ pos = (798,0);
 },
 {
 name = top;
-pos = (798,1304);
+pos = (798,1056);
 }
 );
 background = {
@@ -526,7 +526,7 @@ pos = (1026,0);
 },
 {
 name = top;
-pos = (1026,1304);
+pos = (1026,1056);
 }
 );
 layerId = m009;
@@ -605,7 +605,7 @@ pos = (640,0);
 },
 {
 name = top;
-pos = (640,1304);
+pos = (640,1056);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/q.glyph b/src/Inter-Roman.glyphspackage/glyphs/q.glyph
index f9ccb2cae..eabaa6b4e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/q.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/q.glyph
@@ -7,6 +7,10 @@ layers = (
 {
 anchors = (
 {
+name = top;
+pos = (623,1118);
+},
+{
 name = topr;
 pos = (1088,1118);
 }
@@ -24,6 +28,10 @@ width = 1246;
 {
 anchors = (
 {
+name = top;
+pos = (661,1118);
+},
+{
 name = topr;
 pos = (1220,1118);
 }
@@ -41,6 +49,10 @@ width = 1322;
 {
 anchors = (
 {
+name = top;
+pos = (595,1118);
+},
+{
 name = topr;
 pos = (992,1118);
 }
@@ -58,6 +70,10 @@ width = 1190;
 {
 anchors = (
 {
+name = top;
+pos = (580,1056);
+},
+{
 name = topr;
 pos = (1032,1056);
 }
@@ -75,6 +91,10 @@ width = 1160;
 {
 anchors = (
 {
+name = top;
+pos = (640,1056);
+},
+{
 name = topr;
 pos = (1194,1056);
 }
@@ -169,6 +189,10 @@ width = 1242;
 {
 anchors = (
 {
+name = top;
+pos = (559,1056);
+},
+{
 name = topr;
 pos = (938,1056);
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/r.glyph b/src/Inter-Roman.glyphspackage/glyphs/r.glyph
index 933b5bc5c..3ad4fc2dd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/r.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/r.glyph
@@ -19,7 +19,7 @@ pos = (244,536);
 },
 {
 name = top;
-pos = (422,1304);
+pos = (422,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -67,7 +67,7 @@ pos = (302,536);
 },
 {
 name = top;
-pos = (482,1304);
+pos = (482,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -115,7 +115,7 @@ pos = (222,536);
 },
 {
 name = top;
-pos = (428,1304);
+pos = (428,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -163,7 +163,7 @@ pos = (212,536);
 },
 {
 name = top;
-pos = (367,1262);
+pos = (367,1056);
 }
 );
 layerId = m007;
@@ -402,7 +402,7 @@ pos = (286,528);
 },
 {
 name = top;
-pos = (466,1304);
+pos = (466,1056);
 }
 );
 guides = (
@@ -457,7 +457,7 @@ pos = (158,536);
 },
 {
 name = top;
-pos = (364,1262);
+pos = (364,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/racute.glyph b/src/Inter-Roman.glyphspackage/glyphs/racute.glyph
index ef159bec5..d441ea5b6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/racute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/racute.glyph
@@ -62,7 +62,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (56,42);
+pos = (56,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (84,0);
+pos = (80,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/rcaron.glyph
index 194082cf6..35e0a5cc9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rcaron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (-2,16);
+pos = (-4,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (-164,42);
+pos = (-162,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rdblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/rdblgrave.glyph
index fed4ebef3..964a40c0c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rdblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rdblgrave.glyph
@@ -62,7 +62,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (1092,42);
+pos = (1092,0);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rdotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/rdotaccent.glyph
index 59dd88727..ec27147ff 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rdotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rdotaccent.glyph
@@ -62,7 +62,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (146,42);
+pos = (146,0);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rdotbelowmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/rdotbelowmacron.glyph
index 2cf910f94..e1325c2bd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rdotbelowmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rdotbelowmacron.glyph
@@ -14,7 +14,7 @@ pos = (848,0);
 ref = dotbelow;
 },
 {
-pos = (-38,0);
+pos = (-178,0);
 ref = macron;
 }
 );
@@ -31,7 +31,7 @@ pos = (842,0);
 ref = dotbelow;
 },
 {
-pos = (-176,0);
+pos = (-183,0);
 ref = macron;
 }
 );
@@ -48,7 +48,7 @@ pos = (780,0);
 ref = dotbelow;
 },
 {
-pos = (128,0);
+pos = (-154,0);
 ref = macron;
 }
 );
@@ -65,7 +65,7 @@ pos = (848,0);
 ref = dotbelow;
 },
 {
-pos = (-61,-42);
+pos = (-201,0);
 ref = macron;
 }
 );
@@ -82,7 +82,7 @@ pos = (838,0);
 ref = dotbelow;
 },
 {
-pos = (-176,0);
+pos = (-183,0);
 ref = macron;
 }
 );
@@ -99,7 +99,7 @@ pos = (780,0);
 ref = dotbelow;
 },
 {
-pos = (128,0);
+pos = (-170,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rho.glyph b/src/Inter-Roman.glyphspackage/glyphs/rho.glyph
index b3371c1d4..4d55740b4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rho.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rho.glyph
@@ -11,7 +11,7 @@ pos = (230,-186);
 },
 {
 name = top;
-pos = (600,1304);
+pos = (600,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -62,7 +62,7 @@ pos = (300,-154);
 },
 {
 name = top;
-pos = (640,1304);
+pos = (640,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -113,7 +113,7 @@ pos = (190,-206);
 },
 {
 name = top;
-pos = (564,1304);
+pos = (564,1118);
 }
 );
 background = {
@@ -203,7 +203,7 @@ pos = (198,-186);
 },
 {
 name = top;
-pos = (568,1304);
+pos = (568,1056);
 }
 );
 layerId = m007;
@@ -254,7 +254,7 @@ pos = (284,-154);
 },
 {
 name = top;
-pos = (624,1304);
+pos = (624,1056);
 }
 );
 layerId = m009;
@@ -305,7 +305,7 @@ pos = (126,-206);
 },
 {
 name = top;
-pos = (500,1304);
+pos = (500,1056);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ring.glyph b/src/Inter-Roman.glyphspackage/glyphs/ring.glyph
index 75d1911bf..d8b5821c7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ring.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ring.glyph
@@ -6,7 +6,7 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (320,1304);
+pos = (304,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -14,45 +14,45 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(468,1242,o),
-(582,1350,o),
-(582,1490,cs),
-(582,1629,o),
-(468,1745,o),
-(320,1746,cs),
-(172,1745,o),
-(55,1629,o),
-(56,1490,cs),
-(55,1350,o),
-(172,1242,o),
-(320,1242,cs)
+(449,1189,o),
+(566,1301,o),
+(566,1440,cs),
+(566,1579,o),
+(449,1691,o),
+(304,1691,cs),
+(159,1691,o),
+(42,1579,o),
+(42,1440,cs),
+(42,1301,o),
+(159,1189,o),
+(304,1189,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(239,1353,o),
-(180,1420,o),
-(180,1490,cs),
-(180,1562,o),
-(239,1632,o),
-(320,1632,cs),
-(401,1632,o),
-(460,1562,o),
-(460,1490,cs),
-(460,1420,o),
-(401,1353,o),
-(320,1352,cs)
+(234,1314,o),
+(178,1370,o),
+(178,1440,cs),
+(178,1510,o),
+(234,1566,o),
+(304,1566,cs),
+(374,1566,o),
+(430,1510,o),
+(430,1440,cs),
+(430,1370,o),
+(374,1314,o),
+(304,1314,cs)
 );
 }
 );
-width = 640;
+width = 608;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (442,1304);
+pos = (432,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -60,51 +60,45 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(573,1233,o),
-(681,1338,o),
-(680,1466,cs),
-(681,1594,o),
-(573,1699,o),
-(442,1698,cs),
-(311,1699,o),
-(204,1594,o),
-(204,1466,cs),
-(204,1338,o),
-(311,1233,o),
-(442,1234,cs)
+(589,1199,o),
+(717,1316,o),
+(717,1461,cs),
+(717,1606,o),
+(589,1723,o),
+(432,1723,cs),
+(275,1723,o),
+(147,1606,o),
+(147,1461,cs),
+(147,1316,o),
+(275,1199,o),
+(432,1199,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(389,1375,o),
-(346,1417,o),
-(346,1466,cs),
-(346,1516,o),
-(389,1556,o),
-(442,1556,cs),
-(495,1557,o),
-(538,1516,o),
-(538,1466,cs),
-(538,1417,o),
-(495,1377,o),
-(442,1376,cs)
+(368,1346,o),
+(317,1397,o),
+(317,1461,cs),
+(317,1525,o),
+(368,1576,o),
+(432,1576,cs),
+(496,1576,o),
+(547,1525,o),
+(547,1461,cs),
+(547,1397,o),
+(496,1346,o),
+(432,1346,cs)
 );
 }
 );
-width = 884;
+width = 864;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (244,1304);
-}
-);
-guides = (
-{
-orientation = center;
-pos = (980,1956);
+pos = (240,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -112,35 +106,35 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(337,1257,o),
-(410,1330,o),
-(410,1422,cs),
-(410,1515,o),
-(337,1588,o),
-(244,1588,cs),
-(152,1588,o),
-(79,1515,o),
-(78,1422,cs),
-(79,1330,o),
-(152,1257,o),
-(244,1256,cs)
+(331,1234,o),
+(405,1308,o),
+(405,1399,cs),
+(405,1490,o),
+(331,1564,o),
+(240,1564,cs),
+(149,1564,o),
+(75,1490,o),
+(75,1399,cs),
+(75,1308,o),
+(149,1234,o),
+(240,1234,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(178,1303,o),
-(125,1356,o),
-(126,1422,cs),
-(125,1489,o),
-(177,1542,o),
-(244,1542,cs),
-(311,1542,o),
-(364,1489,o),
-(364,1422,cs),
-(364,1356,o),
-(311,1303,o),
-(244,1304,cs)
+(174,1280,o),
+(121,1333,o),
+(121,1399,cs),
+(121,1465,o),
+(174,1518,o),
+(240,1518,cs),
+(306,1518,o),
+(359,1465,o),
+(359,1399,cs),
+(359,1333,o),
+(306,1280,o),
+(240,1280,cs)
 );
 }
 );
@@ -251,59 +245,7 @@ width = 888;
 anchors = (
 {
 name = _top;
-pos = (288,1304);
-}
-);
-layerId = m007;
-shapes = (
-{
-closed = 1;
-nodes = (
-(436,1242,o),
-(550,1350,o),
-(550,1490,cs),
-(550,1629,o),
-(436,1745,o),
-(288,1746,cs),
-(140,1745,o),
-(23,1629,o),
-(24,1490,cs),
-(23,1350,o),
-(140,1242,o),
-(288,1242,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(207,1353,o),
-(148,1420,o),
-(148,1490,cs),
-(148,1562,o),
-(207,1632,o),
-(288,1632,cs),
-(369,1632,o),
-(428,1562,o),
-(428,1490,cs),
-(428,1420,o),
-(369,1353,o),
-(288,1352,cs)
-);
-}
-);
-width = 576;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (426,1262);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (346,1534);
+pos = (432,1056);
 }
 );
 layerId = m009;
@@ -311,39 +253,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(557,1104,o),
-(664,1208,o),
-(664,1336,cs),
-(664,1464,o),
-(557,1568,o),
-(426,1568,cs),
-(295,1568,o),
-(188,1464,o),
-(188,1336,cs),
-(188,1208,o),
-(295,1104,o),
-(426,1104,cs)
+(586,1137,o),
+(694,1236,o),
+(694,1378,cs),
+(694,1520,o),
+(586,1619,o),
+(432,1619,cs),
+(279,1619,o),
+(170,1520,o),
+(170,1378,cs),
+(170,1236,o),
+(279,1137,o),
+(432,1137,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(376,1246,o),
-(336,1286,o),
-(336,1336,cs),
-(336,1386,o),
-(376,1426,o),
-(426,1426,cs),
-(476,1426,o),
-(516,1386,o),
-(516,1336,cs),
-(516,1286,o),
-(476,1246,o),
-(426,1246,cs)
+(377,1284,o),
+(338,1323,o),
+(338,1378,cs),
+(338,1433,o),
+(377,1472,o),
+(432,1472,cs),
+(487,1472,o),
+(526,1433,o),
+(526,1378,cs),
+(526,1323,o),
+(487,1284,o),
+(432,1284,cs)
 );
 }
 );
-width = 852;
+width = 864;
 },
 {
 anchors = (
@@ -401,13 +343,7 @@ width = 888;
 anchors = (
 {
 name = _top;
-pos = (180,1304);
-}
-);
-guides = (
-{
-orientation = center;
-pos = (428,1956);
+pos = (288,1056);
 }
 );
 layerId = m011;
@@ -415,39 +351,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(273,1257,o),
-(346,1330,o),
-(346,1422,cs),
-(346,1515,o),
-(273,1588,o),
-(180,1588,cs),
-(88,1588,o),
-(15,1515,o),
-(14,1422,cs),
-(15,1330,o),
-(88,1257,o),
-(180,1256,cs)
+(374,1227,o),
+(444,1295,o),
+(444,1378,cs),
+(444,1461,o),
+(374,1529,o),
+(288,1529,cs),
+(202,1529,o),
+(132,1461,o),
+(132,1378,cs),
+(132,1295,o),
+(202,1227,o),
+(288,1227,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(114,1303,o),
-(61,1356,o),
-(62,1422,cs),
-(61,1489,o),
-(113,1542,o),
-(180,1542,cs),
-(247,1542,o),
-(300,1489,o),
-(300,1422,cs),
-(300,1356,o),
-(247,1303,o),
-(180,1304,cs)
+(227,1273,o),
+(178,1320,o),
+(178,1378,cs),
+(178,1436,o),
+(227,1483,o),
+(288,1483,cs),
+(349,1483,o),
+(398,1436,o),
+(398,1378,cs),
+(398,1320,o),
+(349,1273,o),
+(288,1273,cs)
 );
 }
 );
-width = 360;
+width = 576;
 },
 {
 anchors = (
@@ -497,6 +433,443 @@ nodes = (
 }
 );
 width = 488;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (288,1056);
+}
+);
+associatedMasterId = m007;
+layerId = "6B935A78-9D36-4AD9-AFE5-8CFA4B8C2A31";
+name = "Apr 11, 23, 09:23";
+shapes = (
+{
+closed = 1;
+nodes = (
+(433,1126,o),
+(551,1239,o),
+(551,1378,cs),
+(551,1517,o),
+(433,1630,o),
+(288,1630,cs),
+(143,1630,o),
+(25,1517,o),
+(25,1378,cs),
+(25,1239,o),
+(143,1126,o),
+(288,1126,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(211,1238,o),
+(148,1301,o),
+(148,1378,cs),
+(148,1455,o),
+(211,1518,o),
+(288,1518,cs),
+(365,1518,o),
+(428,1455,o),
+(428,1378,cs),
+(428,1301,o),
+(365,1238,o),
+(288,1238,cs)
+);
+}
+);
+width = 576;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (288,1056);
+}
+);
+associatedMasterId = m007;
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(433,1126,o),
+(551,1239,o),
+(551,1378,cs),
+(551,1517,o),
+(433,1630,o),
+(288,1630,cs),
+(143,1630,o),
+(25,1517,o),
+(25,1378,cs),
+(25,1239,o),
+(143,1126,o),
+(288,1126,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(211,1238,o),
+(148,1301,o),
+(148,1378,cs),
+(148,1455,o),
+(211,1518,o),
+(288,1518,cs),
+(365,1518,o),
+(428,1455,o),
+(428,1378,cs),
+(428,1301,o),
+(365,1238,o),
+(288,1238,cs)
+);
+}
+);
+};
+layerId = "C0AC7354-BC1B-4A84-821A-4C1AD617293D";
+name = "Apr 11, 23, 09:23";
+shapes = (
+{
+closed = 1;
+nodes = (
+(422,1146,o),
+(530,1250,o),
+(530,1378,cs),
+(530,1506,o),
+(422,1610,o),
+(288,1610,cs),
+(154,1610,o),
+(46,1506,o),
+(46,1378,cs),
+(46,1250,o),
+(154,1146,o),
+(288,1146,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(222,1258,o),
+(168,1312,o),
+(168,1378,cs),
+(168,1444,o),
+(222,1498,o),
+(288,1498,cs),
+(354,1498,o),
+(408,1444,o),
+(408,1378,cs),
+(408,1312,o),
+(354,1258,o),
+(288,1258,cs)
+);
+}
+);
+width = 576;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (288,1056);
+}
+);
+layerId = m007;
+name = Display;
+shapes = (
+{
+closed = 1;
+nodes = (
+(422,1146,o),
+(530,1250,o),
+(530,1378,cs),
+(530,1506,o),
+(422,1610,o),
+(288,1610,cs),
+(154,1610,o),
+(46,1506,o),
+(46,1378,cs),
+(46,1250,o),
+(154,1146,o),
+(288,1146,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(226,1266,o),
+(176,1316,o),
+(176,1378,cs),
+(176,1440,o),
+(226,1490,o),
+(288,1490,cs),
+(350,1490,o),
+(400,1440,o),
+(400,1378,cs),
+(400,1316,o),
+(350,1266,o),
+(288,1266,cs)
+);
+}
+);
+width = 576;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (320,1304);
+}
+);
+associatedMasterId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+layerId = "386A8A1F-9E9A-473E-867F-BF0EBC7B1E33";
+name = "Apr 11, 23, 09:28";
+shapes = (
+{
+closed = 1;
+nodes = (
+(468,1242,o),
+(582,1350,o),
+(582,1490,cs),
+(582,1629,o),
+(468,1745,o),
+(320,1746,cs),
+(172,1745,o),
+(55,1629,o),
+(56,1490,cs),
+(55,1350,o),
+(172,1242,o),
+(320,1242,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(239,1353,o),
+(180,1420,o),
+(180,1490,cs),
+(180,1562,o),
+(239,1632,o),
+(320,1632,cs),
+(401,1632,o),
+(460,1562,o),
+(460,1490,cs),
+(460,1420,o),
+(401,1353,o),
+(320,1352,cs)
+);
+}
+);
+width = 640;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (288,1056);
+}
+);
+associatedMasterId = m011;
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(422,1146,o),
+(530,1250,o),
+(530,1378,cs),
+(530,1506,o),
+(422,1610,o),
+(288,1610,cs),
+(154,1610,o),
+(46,1506,o),
+(46,1378,cs),
+(46,1250,o),
+(154,1146,o),
+(288,1146,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(226,1266,o),
+(176,1316,o),
+(176,1378,cs),
+(176,1440,o),
+(226,1490,o),
+(288,1490,cs),
+(350,1490,o),
+(400,1440,o),
+(400,1378,cs),
+(400,1316,o),
+(350,1266,o),
+(288,1266,cs)
+);
+}
+);
+};
+layerId = "00A4C936-D916-40F0-9740-01B844FBDFB8";
+name = "Apr 11, 23, 09:38";
+shapes = (
+{
+closed = 1;
+nodes = (
+(393,1195,o),
+(479,1277,o),
+(479,1378,cs),
+(479,1479,o),
+(393,1561,o),
+(288,1561,cs),
+(183,1561,o),
+(97,1479,o),
+(97,1378,cs),
+(97,1277,o),
+(183,1195,o),
+(288,1195,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(208,1241,o),
+(143,1302,o),
+(143,1378,cs),
+(143,1454,o),
+(208,1515,o),
+(288,1515,cs),
+(368,1515,o),
+(433,1454,o),
+(433,1378,cs),
+(433,1302,o),
+(368,1241,o),
+(288,1241,cs)
+);
+}
+);
+width = 576;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (432,1056);
+}
+);
+associatedMasterId = m009;
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(161,1491,o),
+(147,1447,o),
+(147,1400,cs),
+(147,1352,o),
+(161,1308,o),
+(186,1268,cs),
+(211,1228,o),
+(245,1196,o),
+(289,1173,cs),
+(332,1149,o),
+(381,1137,o),
+(433,1137,cs),
+(485,1137,o),
+(533,1149,o),
+(577,1173,cs),
+(620,1196,o),
+(654,1228,o),
+(680,1268,cs),
+(706,1308,o),
+(718,1352,o),
+(718,1400,cs),
+(718,1447,o),
+(706,1491,o),
+(680,1531,cs),
+(654,1571,o),
+(620,1603,o),
+(577,1626,cs),
+(533,1649,o),
+(485,1661,o),
+(433,1661,cs),
+(381,1661,o),
+(332,1649,o),
+(289,1626,cs),
+(245,1603,o),
+(211,1571,o),
+(186,1531,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(537,1460,o),
+(548,1432,o),
+(548,1400,cs),
+(548,1368,o),
+(537,1339,o),
+(514,1318,cs),
+(492,1296,o),
+(465,1285,o),
+(433,1285,cs),
+(401,1285,o),
+(374,1296,o),
+(351,1318,cs),
+(328,1339,o),
+(317,1368,o),
+(317,1400,cs),
+(317,1432,o),
+(328,1460,o),
+(351,1481,cs),
+(374,1503,o),
+(401,1514,o),
+(433,1514,cs),
+(465,1514,o),
+(492,1503,o),
+(514,1481,cs)
+);
+}
+);
+};
+layerId = "EDABBAFF-B454-4B2B-B17C-A674B0BBAC11";
+name = "Apr 11, 23, 09:44";
+shapes = (
+{
+closed = 1;
+nodes = (
+(589,1137,o),
+(717,1254,o),
+(717,1399,cs),
+(717,1544,o),
+(589,1661,o),
+(432,1661,cs),
+(275,1661,o),
+(147,1544,o),
+(147,1399,cs),
+(147,1254,o),
+(275,1137,o),
+(432,1137,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(368,1284,o),
+(317,1335,o),
+(317,1399,cs),
+(317,1463,o),
+(368,1514,o),
+(432,1514,cs),
+(496,1514,o),
+(547,1463,o),
+(547,1399,cs),
+(547,1335,o),
+(496,1284,o),
+(432,1284,cs)
+);
+}
+);
+width = 864;
 }
 );
 note = "recipe: offset curve 30, no auto; then redrawn two circles manually for perfect fit.";
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ring.uc.glyph b/src/Inter-Roman.glyphspackage/glyphs/ring.uc.glyph
index a1c5d1f58..62ed4e774 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ring.uc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ring.uc.glyph
@@ -5,7 +5,7 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (244,1676);
+pos = (240,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -13,45 +13,45 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(337,1562,o),
-(410,1636,o),
-(410,1728,cs),
-(410,1820,o),
-(337,1894,o),
-(244,1894,cs),
-(152,1894,o),
-(79,1820,o),
-(78,1728,cs),
-(79,1636,o),
-(152,1562,o),
-(244,1562,cs)
+(331,1606,o),
+(405,1680,o),
+(405,1771,cs),
+(405,1862,o),
+(331,1936,o),
+(240,1936,cs),
+(149,1936,o),
+(75,1862,o),
+(75,1771,cs),
+(75,1680,o),
+(149,1606,o),
+(240,1606,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(178,1609,o),
-(125,1661,o),
-(126,1728,cs),
-(125,1794,o),
-(177,1847,o),
-(244,1848,cs),
-(311,1847,o),
-(364,1795,o),
-(364,1728,cs),
-(364,1662,o),
-(311,1609,o),
-(244,1608,cs)
+(174,1652,o),
+(121,1705,o),
+(121,1771,cs),
+(121,1837,o),
+(174,1890,o),
+(240,1890,cs),
+(306,1890,o),
+(359,1837,o),
+(359,1771,cs),
+(359,1705,o),
+(306,1652,o),
+(240,1652,cs)
 );
 }
 );
-width = 488;
+width = 480;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (320,1676);
+pos = (304,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -59,45 +59,45 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(436,1591,o),
-(531,1686,o),
-(530,1802,cs),
-(531,1919,o),
-(436,2013,o),
-(320,2014,cs),
-(204,2013,o),
-(109,1919,o),
-(110,1802,cs),
-(109,1686,o),
-(204,1591,o),
-(320,1592,cs)
+(449,1561,o),
+(566,1673,o),
+(566,1812,cs),
+(566,1951,o),
+(449,2063,o),
+(304,2063,cs),
+(159,2063,o),
+(42,1951,o),
+(42,1812,cs),
+(42,1673,o),
+(159,1561,o),
+(304,1561,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(260,1696,o),
-(215,1743,o),
-(216,1802,cs),
-(215,1861,o),
-(260,1908,o),
-(320,1908,cs),
-(380,1908,o),
-(425,1861,o),
-(424,1802,cs),
-(425,1743,o),
-(380,1696,o),
-(320,1696,cs)
+(234,1686,o),
+(178,1742,o),
+(178,1812,cs),
+(178,1882,o),
+(234,1938,o),
+(304,1938,cs),
+(374,1938,o),
+(430,1882,o),
+(430,1812,cs),
+(430,1742,o),
+(374,1686,o),
+(304,1686,cs)
 );
 }
 );
-width = 640;
+width = 608;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (442,1676);
+pos = (432,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -105,39 +105,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(571,1565,o),
-(675,1665,o),
-(674,1790,cs),
-(675,1913,o),
-(571,2013,o),
-(442,2014,cs),
-(313,2013,o),
-(209,1913,o),
-(210,1790,cs),
-(209,1665,o),
-(313,1565,o),
-(442,1566,cs)
+(589,1571,o),
+(717,1688,o),
+(717,1833,cs),
+(717,1978,o),
+(589,2095,o),
+(432,2095,cs),
+(275,2095,o),
+(147,1978,o),
+(147,1833,cs),
+(147,1688,o),
+(275,1571,o),
+(432,1571,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(391,1701,o),
-(349,1741,o),
-(350,1790,cs),
-(349,1837,o),
-(392,1876,o),
-(442,1876,cs),
-(494,1877,o),
-(535,1837,o),
-(536,1790,cs),
-(535,1741,o),
-(492,1703,o),
-(442,1702,cs)
+(368,1718,o),
+(317,1769,o),
+(317,1833,cs),
+(317,1897,o),
+(368,1948,o),
+(432,1948,cs),
+(496,1948,o),
+(547,1897,o),
+(547,1833,cs),
+(547,1769,o),
+(496,1718,o),
+(432,1718,cs)
 );
 }
 );
-width = 884;
+width = 864;
 },
 {
 anchors = (
@@ -239,7 +239,7 @@ width = 884;
 anchors = (
 {
 name = _top;
-pos = (288,1676);
+pos = (288,1490);
 }
 );
 layerId = m007;
@@ -247,35 +247,35 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(404,1591,o),
-(499,1686,o),
-(498,1802,cs),
-(499,1919,o),
-(404,2013,o),
-(288,2014,cs),
-(172,2013,o),
-(77,1919,o),
-(78,1802,cs),
-(77,1686,o),
-(172,1591,o),
-(288,1592,cs)
+(422,1580,o),
+(530,1684,o),
+(530,1812,cs),
+(530,1940,o),
+(422,2044,o),
+(288,2044,cs),
+(154,2044,o),
+(46,1940,o),
+(46,1812,cs),
+(46,1684,o),
+(154,1580,o),
+(288,1580,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(228,1696,o),
-(183,1743,o),
-(184,1802,cs),
-(183,1861,o),
-(228,1908,o),
-(288,1908,cs),
-(348,1908,o),
-(393,1861,o),
-(392,1802,cs),
-(393,1743,o),
-(348,1696,o),
-(288,1696,cs)
+(226,1700,o),
+(176,1750,o),
+(176,1812,cs),
+(176,1874,o),
+(226,1924,o),
+(288,1924,cs),
+(350,1924,o),
+(400,1874,o),
+(400,1812,cs),
+(400,1750,o),
+(350,1700,o),
+(288,1700,cs)
 );
 }
 );
@@ -333,7 +333,7 @@ width = 640;
 anchors = (
 {
 name = _top;
-pos = (426,1676);
+pos = (432,1490);
 }
 );
 layerId = m009;
@@ -341,39 +341,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(555,1565,o),
-(659,1665,o),
-(658,1790,cs),
-(659,1913,o),
-(555,2013,o),
-(426,2014,cs),
-(297,2013,o),
-(193,1913,o),
-(194,1790,cs),
-(193,1665,o),
-(297,1565,o),
-(426,1566,cs)
+(586,1571,o),
+(694,1670,o),
+(694,1812,cs),
+(694,1954,o),
+(586,2053,o),
+(432,2053,cs),
+(279,2053,o),
+(170,1954,o),
+(170,1812,cs),
+(170,1670,o),
+(279,1571,o),
+(432,1571,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(375,1701,o),
-(333,1741,o),
-(334,1790,cs),
-(333,1837,o),
-(376,1876,o),
-(426,1876,cs),
-(478,1877,o),
-(519,1837,o),
-(520,1790,cs),
-(519,1741,o),
-(476,1703,o),
-(426,1702,cs)
+(377,1718,o),
+(338,1757,o),
+(338,1812,cs),
+(338,1867,o),
+(377,1906,o),
+(432,1906,cs),
+(487,1906,o),
+(526,1867,o),
+(526,1812,cs),
+(526,1757,o),
+(487,1718,o),
+(432,1718,cs)
 );
 }
 );
-width = 852;
+width = 864;
 },
 {
 anchors = (
@@ -427,7 +427,7 @@ width = 884;
 anchors = (
 {
 name = _top;
-pos = (180,1676);
+pos = (288,1490);
 }
 );
 layerId = m011;
@@ -435,39 +435,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(273,1562,o),
-(346,1636,o),
-(346,1728,cs),
-(346,1820,o),
-(273,1894,o),
-(180,1894,cs),
-(88,1894,o),
-(15,1820,o),
-(14,1728,cs),
-(15,1636,o),
-(88,1562,o),
-(180,1562,cs)
+(374,1661,o),
+(444,1729,o),
+(444,1812,cs),
+(444,1895,o),
+(374,1963,o),
+(288,1963,cs),
+(202,1963,o),
+(132,1895,o),
+(132,1812,cs),
+(132,1729,o),
+(202,1661,o),
+(288,1661,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(114,1609,o),
-(61,1661,o),
-(62,1728,cs),
-(61,1794,o),
-(113,1847,o),
-(180,1848,cs),
-(247,1847,o),
-(300,1795,o),
-(300,1728,cs),
-(300,1662,o),
-(247,1609,o),
-(180,1608,cs)
+(227,1707,o),
+(178,1754,o),
+(178,1812,cs),
+(178,1870,o),
+(227,1917,o),
+(288,1917,cs),
+(349,1917,o),
+(398,1870,o),
+(398,1812,cs),
+(398,1754,o),
+(349,1707,o),
+(288,1707,cs)
 );
 }
 );
-width = 360;
+width = 578;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ringacute.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/ringacute.cn.glyph
index c4af949b4..63f12c591 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ringacute.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ringacute.cn.glyph
@@ -275,7 +275,6 @@ width = 430;
 tags = (
 "TODO-opsz"
 );
-unicode = 57621;
 userData = {
 interface.gridadjust.original = "{'width': 958, 'leftMargin': 213, 'rightMargin': 92}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ringhalfright.glyph b/src/Inter-Roman.glyphspackage/glyphs/ringhalfright.glyph
index 37af24a0c..2ea8bf68a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ringhalfright.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ringhalfright.glyph
@@ -4,8 +4,8 @@ layers = (
 {
 anchors = (
 {
-name = _rhalfring;
-pos = (160,1152);
+name = _top;
+pos = (146,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -13,35 +13,30 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(192,1111,o),
-(285,1190,o),
-(286,1306,cs),
-(285,1425,o),
-(192,1510,o),
-(78,1510,c),
-(78,1416,l),
-(134,1417,o),
-(180,1370,o),
-(180,1306,cs),
-(180,1248,o),
-(134,1201,o),
-(78,1202,c),
-(78,1112,l)
-);
-}
-);
-width = 360;
+(178,1220,o),
+(272,1298,o),
+(272,1414,cs),
+(272,1533,o),
+(178,1618,o),
+(64,1618,c),
+(64,1524,l),
+(120,1524,o),
+(166,1478,o),
+(166,1414,cs),
+(166,1356,o),
+(120,1310,o),
+(64,1310,c),
+(64,1220,l)
+);
+}
+);
+width = 336;
 },
 {
 anchors = (
 {
-name = _rhalfring;
-pos = (142,1140);
-}
-);
-guides = (
-{
-pos = (406,2016);
+name = _top;
+pos = (155,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -49,30 +44,30 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(160,1108,o),
-(253,1187,o),
-(254,1304,cs),
-(253,1423,o),
-(160,1507,o),
-(46,1506,c),
-(46,1366,l),
-(85,1366,o),
-(113,1340,o),
-(114,1304,cs),
-(113,1270,o),
-(85,1245,o),
-(46,1246,c),
-(46,1108,l)
-);
-}
-);
-width = 332;
+(178,1217,o),
+(272,1299,o),
+(272,1416,cs),
+(272,1535,o),
+(178,1615,o),
+(64,1615,c),
+(64,1475,l),
+(103,1475,o),
+(132,1452,o),
+(132,1416,cs),
+(132,1382,o),
+(103,1355,o),
+(64,1355,c),
+(64,1217,l)
+);
+}
+);
+width = 336;
 },
 {
 anchors = (
 {
-name = _rhalfring;
-pos = (126,1186);
+name = _top;
+pos = (155,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -80,20 +75,20 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(140,1111,o),
-(230,1198,o),
-(230,1310,cs),
-(230,1425,o),
-(142,1510,o),
-(24,1510,c),
-(24,1464,l),
-(116,1463,o),
-(183,1399,o),
-(184,1310,cs),
-(183,1223,o),
-(115,1158,o),
-(24,1158,c),
-(24,1112,l)
+(155,1586,o),
+(218,1523,o),
+(218,1432,cs),
+(218,1341,o),
+(155,1278,o),
+(64,1278,c),
+(64,1232,l),
+(174,1232,o),
+(264,1322,o),
+(264,1432,cs),
+(264,1542,o),
+(174,1632,o),
+(64,1632,c),
+(64,1586,l)
 );
 }
 );
@@ -102,8 +97,8 @@ width = 308;
 {
 anchors = (
 {
-name = _rhalfring;
-pos = (128,1152);
+name = _top;
+pos = (149,1056);
 }
 );
 layerId = m007;
@@ -111,35 +106,30 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(160,1111,o),
-(253,1190,o),
-(254,1306,cs),
-(253,1425,o),
-(160,1510,o),
-(46,1510,c),
-(46,1416,l),
-(102,1417,o),
-(148,1370,o),
-(148,1306,cs),
-(148,1248,o),
-(102,1201,o),
-(46,1202,c),
-(46,1112,l)
-);
-}
-);
-width = 296;
+(174,1178,o),
+(264,1268,o),
+(264,1378,cs),
+(264,1488,o),
+(174,1578,o),
+(64,1578,c),
+(64,1482,l),
+(128,1482,o),
+(168,1442,o),
+(168,1378,cs),
+(168,1314,o),
+(128,1274,o),
+(64,1274,c),
+(64,1178,l)
+);
+}
+);
+width = 328;
 },
 {
 anchors = (
 {
-name = _rhalfring;
-pos = (126,1140);
-}
-);
-guides = (
-{
-pos = (310,2016);
+name = _top;
+pos = (149,1056);
 }
 );
 layerId = m009;
@@ -147,30 +137,30 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(144,1108,o),
-(237,1187,o),
-(238,1304,cs),
-(237,1423,o),
-(144,1507,o),
-(30,1506,c),
-(30,1366,l),
-(69,1366,o),
-(97,1340,o),
-(98,1304,cs),
-(97,1270,o),
-(69,1245,o),
-(30,1246,c),
-(30,1108,l)
-);
-}
-);
-width = 300;
+(108,1444,o),
+(130,1422,o),
+(130,1378,cs),
+(130,1334,o),
+(108,1312,o),
+(64,1312,c),
+(64,1178,l),
+(187,1178,o),
+(264,1255,o),
+(264,1378,cs),
+(264,1501,o),
+(187,1578,o),
+(64,1578,c),
+(64,1444,l)
+);
+}
+);
+width = 328;
 },
 {
 anchors = (
 {
-name = _rhalfring;
-pos = (62,1186);
+name = _top;
+pos = (155,1056);
 }
 );
 layerId = m011;
@@ -178,24 +168,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(76,1111,o),
-(166,1198,o),
-(166,1310,cs),
-(166,1425,o),
-(78,1510,o),
-(-40,1510,c),
-(-40,1464,l),
-(52,1463,o),
-(119,1399,o),
-(120,1310,cs),
-(119,1223,o),
-(51,1158,o),
-(-40,1158,c),
-(-40,1112,l)
-);
-}
-);
-width = 180;
+(155,1532,o),
+(218,1469,o),
+(218,1378,cs),
+(218,1287,o),
+(155,1224,o),
+(64,1224,c),
+(64,1178,l),
+(174,1178,o),
+(264,1268,o),
+(264,1378,cs),
+(264,1488,o),
+(174,1578,o),
+(64,1578,c),
+(64,1532,l)
+);
+}
+);
+width = 328;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ringhalfrightcentered.glyph b/src/Inter-Roman.glyphspackage/glyphs/ringhalfrightcentered.glyph
index a4ab4738a..223001deb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ringhalfrightcentered.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ringhalfrightcentered.glyph
@@ -14,7 +14,7 @@ pos = (0,-566);
 ref = ringhalfright;
 }
 );
-width = 360;
+width = 336;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -25,7 +25,7 @@ pos = (0,-563);
 ref = ringhalfright;
 }
 );
-width = 332;
+width = 336;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -47,7 +47,7 @@ pos = (0,-566);
 ref = ringhalfright;
 }
 );
-width = 296;
+width = 328;
 },
 {
 layerId = m009;
@@ -58,7 +58,7 @@ pos = (0,-563);
 ref = ringhalfright;
 }
 );
-width = 300;
+width = 328;
 },
 {
 layerId = m011;
@@ -69,7 +69,7 @@ pos = (0,-566);
 ref = ringhalfright;
 }
 );
-width = 180;
+width = 328;
 }
 );
 metricLeft = ringhalfright;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ringrighthalfsubnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/ringrighthalfsubnosp.glyph
index 01aebdff0..f95db2ec6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ringrighthalfsubnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ringrighthalfsubnosp.glyph
@@ -16,7 +16,7 @@ width = 0;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (-878,-1594);
+pos = (-798,-1594);
 ref = ringhalfright;
 }
 );
@@ -27,7 +27,7 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-642,-1592);
+pos = (-674,-1592);
 ref = ringhalfright;
 }
 );
@@ -37,7 +37,7 @@ width = 0;
 layerId = m007;
 shapes = (
 {
-pos = (-730,-1592);
+pos = (-682,-1592);
 ref = ringhalfright;
 }
 );
@@ -47,7 +47,7 @@ width = 0;
 layerId = m009;
 shapes = (
 {
-pos = (-878,-1594);
+pos = (-774,-1594);
 ref = ringhalfright;
 }
 );
@@ -58,7 +58,7 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-642,-1592);
+pos = (-578,-1592);
 ref = ringhalfright;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rinvertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/rinvertedbreve.glyph
index 2168ba648..5d459bb86 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rinvertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rinvertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (1078,0);
+pos = (1019,0);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (1122,0);
+pos = (1144,0);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (1020,0);
+pos = (1010,0);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (1023,-10);
+pos = (931,0);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (1106,42);
+pos = (1116,0);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (956,0);
+pos = (893,0);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rlinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/rlinebelow.glyph
index 88ff8dd78..0fc9a1d4a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rlinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rlinebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (848,0);
+pos = (840,0);
 ref = macronsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (934,0);
+pos = (972,0);
 ref = macronsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (828,0);
+pos = (797,0);
 ref = macronsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (848,0);
+pos = (770,0);
 ref = macronsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (930,0);
+pos = (931,0);
 ref = macronsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (828,0);
+pos = (687,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/rturn.glyph
index 36b2670dc..2213c2b91 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rturn.glyph
@@ -14,7 +14,7 @@ pos = (604,0);
 },
 {
 name = top;
-pos = (518,1304);
+pos = (518,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -39,7 +39,7 @@ pos = (786,0);
 },
 {
 name = top;
-pos = (586,1304);
+pos = (586,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -64,7 +64,7 @@ pos = (468,0);
 },
 {
 name = top;
-pos = (444,1304);
+pos = (444,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -89,7 +89,7 @@ pos = (534,0);
 },
 {
 name = top;
-pos = (447,1262);
+pos = (447,1056);
 }
 );
 layerId = m007;
@@ -114,7 +114,7 @@ pos = (766,0);
 },
 {
 name = top;
-pos = (575,1262);
+pos = (575,1056);
 }
 );
 layerId = m009;
@@ -139,7 +139,7 @@ pos = (404,0);
 },
 {
 name = top;
-pos = (381,1262);
+pos = (381,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/s.glyph b/src/Inter-Roman.glyphspackage/glyphs/s.glyph
index ff1079bd2..3d3a9f2d6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/s.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/s.glyph
@@ -8,11 +8,11 @@ layers = (
 anchors = (
 {
 name = bottom;
-pos = (546,0);
+pos = (548,0);
 },
 {
 name = cedilla;
-pos = (544,0);
+pos = (545,0);
 },
 {
 name = rthook;
@@ -20,13 +20,13 @@ pos = (108,268);
 },
 {
 name = top;
-pos = (552,1304);
+pos = (548,1118);
 }
 );
 guides = (
 {
 angle = 90;
-pos = (752,328);
+pos = (548,1202);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -83,11 +83,11 @@ width = 1070;
 anchors = (
 {
 name = bottom;
-pos = (606,0);
+pos = (604,0);
 },
 {
 name = cedilla;
-pos = (614,0);
+pos = (608,0);
 },
 {
 name = rthook;
@@ -95,12 +95,13 @@ pos = (52,360);
 },
 {
 name = top;
-pos = (602,1304);
+pos = (604,1118);
 }
 );
 guides = (
 {
-pos = (-4,2280);
+angle = 90;
+pos = (604,1202);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -157,11 +158,11 @@ width = 1204;
 anchors = (
 {
 name = bottom;
-pos = (514,0);
+pos = (518,0);
 },
 {
 name = cedilla;
-pos = (512,0);
+pos = (516,0);
 },
 {
 name = rthook;
@@ -169,13 +170,13 @@ pos = (136,256);
 },
 {
 name = top;
-pos = (518,1304);
+pos = (518,1118);
 }
 );
 guides = (
 {
 angle = 90;
-pos = (712,1620);
+pos = (518,1202);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -279,11 +280,11 @@ width = 990;
 anchors = (
 {
 name = bottom;
-pos = (514,0);
+pos = (487,0);
 },
 {
 name = cedilla;
-pos = (512,0);
+pos = (494,0);
 },
 {
 name = rthook;
@@ -291,7 +292,13 @@ pos = (76,316);
 },
 {
 name = top;
-pos = (487,1262);
+pos = (487,1056);
+}
+);
+guides = (
+{
+angle = 90;
+pos = (487,1183);
 }
 );
 layerId = m007;
@@ -348,11 +355,11 @@ width = 972;
 anchors = (
 {
 name = bottom;
-pos = (590,0);
+pos = (576,0);
 },
 {
 name = cedilla;
-pos = (598,0);
+pos = (573,0);
 },
 {
 name = rthook;
@@ -360,12 +367,13 @@ pos = (36,345);
 },
 {
 name = top;
-pos = (572,1262);
+pos = (576,1056);
 }
 );
 guides = (
 {
-pos = (-100,2280);
+angle = 90;
+pos = (576,1202);
 }
 );
 layerId = m009;
@@ -617,11 +625,11 @@ width = 1160;
 anchors = (
 {
 name = bottom;
-pos = (460,0);
+pos = (461,0);
 },
 {
 name = cedilla;
-pos = (460,0);
+pos = (453,0);
 },
 {
 name = rthook;
@@ -629,7 +637,7 @@ pos = (80,316);
 },
 {
 name = top;
-pos = (461,1262);
+pos = (461,1056);
 }
 );
 background = {
@@ -681,6 +689,12 @@ nodes = (
 }
 );
 };
+guides = (
+{
+angle = 90;
+pos = (461,1183);
+}
+);
 layerId = m011;
 shapes = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/sacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/sacute.glyph
index 470f297d0..02680c9ff 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/sacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/sacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (200,0);
+pos = (196,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (212,0);
+pos = (214,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (162,0);
+pos = (166,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (181,0);
+pos = (177,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/sacutedotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/sacutedotaccent.glyph
index 456ff273d..77639b0ae 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/sacutedotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/sacutedotaccent.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1142,12);
+pos = (1138,-174);
 ref = acutedotcomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1236,12);
+pos = (1238,-174);
 ref = acutedotcomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1082,12);
+pos = (1082,-174);
 ref = acutedotcomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1109,-30);
+pos = (1109,-236);
 ref = acutedotcomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1222,-30);
+pos = (1226,-236);
 ref = acutedotcomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1089,-30);
+pos = (1089,-236);
 ref = acutedotcomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/scaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/scaron.glyph
index 0e72205e5..b752ab653 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/scaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/scaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (86,0);
+pos = (82,0);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (-44,0);
+pos = (-42,0);
 ref = caron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (88,16);
+pos = (86,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (-58,0);
+pos = (-52,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/scarondotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/scarondotaccent.glyph
index 94ba0fcd2..44202e9e1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/scarondotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/scarondotaccent.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1142,12);
+pos = (1138,-174);
 ref = carondotcomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1312,12);
+pos = (1314,-174);
 ref = carondotcomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1038,12);
+pos = (1038,-174);
 ref = carondotcomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1109,-30);
+pos = (1109,-236);
 ref = carondotcomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1298,-30);
+pos = (1302,-236);
 ref = carondotcomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1045,-30);
+pos = (1045,-236);
 ref = carondotcomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/scedilla.glyph b/src/Inter-Roman.glyphspackage/glyphs/scedilla.glyph
index 1e53cc751..23ec6bf73 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/scedilla.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/scedilla.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (264,0);
+pos = (265,0);
 ref = cedilla;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (158,0);
+pos = (152,0);
 ref = cedilla;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (298,0);
+pos = (302,0);
 ref = cedilla;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (264,0);
+pos = (246,0);
 ref = cedilla;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (158,0);
+pos = (133,0);
 ref = cedilla;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (310,0);
+pos = (303,0);
 ref = cedilla;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/schwadieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/schwadieresiscyrillic.glyph
index bf2fa73e7..8930aa97e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/schwadieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/schwadieresiscyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = schwa;
 },
 {
-pos = (-6,0);
+pos = (-1,0);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = schwa;
 },
 {
-pos = (115,0);
+pos = (-43,0);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = schwa;
 },
 {
-pos = (-84,0);
+pos = (8,0);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = schwa;
 },
 {
-pos = (26,42);
+pos = (31,0);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = schwa;
 },
 {
-pos = (128,42);
+pos = (-27,0);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = schwa;
 },
 {
-pos = (-20,42);
+pos = (56,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/scircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/scircumflex.glyph
index fa8c5135d..3d41530fb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/scircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/scircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (86,0);
+pos = (84,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (-44,0);
+pos = (-36,0);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (88,0);
+pos = (86,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (53,0);
+pos = (55,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (-58,0);
+pos = (-52,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (95,0);
+pos = (93,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/scommaaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/scommaaccent.glyph
index 3a5e0d582..5abad4fce 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/scommaaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/scommaaccent.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (266,0);
+pos = (268,0);
 ref = commaaccent;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (326,0);
+pos = (324,0);
 ref = commaaccent;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (234,0);
+pos = (238,0);
 ref = commaaccent;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (266,0);
+pos = (239,0);
 ref = commaaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (326,0);
+pos = (312,0);
 ref = commaaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (244,0);
+pos = (245,0);
 ref = commaaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/sdotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/sdotaccent.glyph
index 2a3f6092f..fda8b6146 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/sdotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/sdotaccent.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (308,0);
+pos = (304,0);
 ref = dotaccent;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (268,0);
+pos = (270,0);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (252,0);
+pos = (256,0);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/sdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/sdotbelow.glyph
index c493f2246..5b582b9de 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/sdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/sdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1152,0);
+pos = (1154,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1142,0);
+pos = (1140,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1072,0);
+pos = (1076,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1152,0);
+pos = (1125,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1142,0);
+pos = (1128,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1082,0);
+pos = (1083,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/sdotbelowdotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/sdotbelowdotaccent.glyph
index fbd2c88f9..88f54123b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/sdotbelowdotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/sdotbelowdotaccent.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = s;
 },
 {
-pos = (1152,0);
+pos = (1154,0);
 ref = dotbelow;
 },
 {
-pos = (308,0);
+pos = (304,0);
 ref = dotaccent;
 }
 );
@@ -27,11 +27,11 @@ shapes = (
 ref = s;
 },
 {
-pos = (1142,0);
+pos = (1140,0);
 ref = dotbelow;
 },
 {
-pos = (268,0);
+pos = (270,0);
 ref = dotaccent;
 }
 );
@@ -44,7 +44,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1072,0);
+pos = (1076,0);
 ref = dotbelow;
 },
 {
@@ -61,7 +61,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1152,0);
+pos = (1125,0);
 ref = dotbelow;
 },
 {
@@ -78,11 +78,11 @@ shapes = (
 ref = s;
 },
 {
-pos = (1142,0);
+pos = (1128,0);
 ref = dotbelow;
 },
 {
-pos = (252,0);
+pos = (256,0);
 ref = dotaccent;
 }
 );
@@ -95,7 +95,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1082,0);
+pos = (1083,0);
 ref = dotbelow;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/shacyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/shacyrillic.glyph
index 87a487e07..192e84d90 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/shacyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/shacyrillic.glyph
@@ -8,6 +8,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1514,0);
+},
+{
+name = top;
+pos = (836,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -37,6 +41,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1724,0);
+},
+{
+name = top;
+pos = (913,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -66,6 +74,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1396,0);
+},
+{
+name = top;
+pos = (797,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -95,6 +107,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1482,0);
+},
+{
+name = top;
+pos = (804,1056);
 }
 );
 layerId = m007;
@@ -124,6 +140,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1708,0);
+},
+{
+name = top;
+pos = (897,1056);
 }
 );
 layerId = m009;
@@ -153,6 +173,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (1332,0);
+},
+{
+name = top;
+pos = (733,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/six.ss01.glyph b/src/Inter-Roman.glyphspackage/glyphs/six.ss01.glyph
index 8d70c5ad8..198d392ed 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/six.ss01.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/six.ss01.glyph
@@ -1130,14 +1130,6 @@ nodes = (
 }
 );
 };
-guides = (
-{
-pos = (-64,1240);
-},
-{
-pos = (-64,568);
-}
-);
 layerId = m009;
 shapes = (
 {
@@ -1148,17 +1140,17 @@ nodes = (
 (696,-20,cs),
 (1031,-20,o),
 (1276,186,o),
-(1276,512,c),
+(1276,512,cs),
 (1276,806,o),
-(1081,1001,o),
+(1081,1000,o),
 (804,1000,cs),
-(761,1001,o),
+(761,1000,o),
 (720,995,o),
 (682,990,c),
 (1022,1490,l),
 (626,1490,l),
 (274,968,ls),
-(167,812,o),
+(168,811,o),
 (100,660,o),
 (100,492,cs)
 );
@@ -1166,18 +1158,18 @@ nodes = (
 {
 closed = 1;
 nodes = (
-(499,617,o),
+(498,617,o),
 (577,704,o),
 (694,704,cs),
 (804,704,o),
 (886,617,o),
 (886,494,cs),
 (886,372,o),
-(807,285,o),
+(807,286,o),
 (694,286,cs),
-(577,285,o),
-(499,372,o),
-(498,494,c)
+(577,286,o),
+(498,372,o),
+(498,494,cs)
 );
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/slongdotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/slongdotaccent.glyph
index 9e567972a..2a3369047 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/slongdotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/slongdotaccent.glyph
@@ -10,7 +10,7 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (152,372);
+pos = (152,434);
 ref = dotaccent;
 }
 );
@@ -25,7 +25,7 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (107,372);
+pos = (107,434);
 ref = dotaccent;
 }
 );
@@ -40,7 +40,7 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (228,372);
+pos = (228,434);
 ref = dotaccent;
 }
 );
@@ -55,7 +55,7 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (152,414);
+pos = (152,434);
 ref = dotaccent;
 }
 );
@@ -70,7 +70,7 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (104,414);
+pos = (104,434);
 ref = dotaccent;
 }
 );
@@ -85,7 +85,7 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (210,414);
+pos = (210,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/t.glyph b/src/Inter-Roman.glyphspackage/glyphs/t.glyph
index fe047d453..a1261fe01 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/t.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/t.glyph
@@ -56,7 +56,7 @@ width = 830;
 anchors = (
 {
 name = raccent;
-pos = (456,1562);
+pos = (210,1526);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
diff --git a/src/Inter-Roman.glyphspackage/glyphs/t.sc.glyph b/src/Inter-Roman.glyphspackage/glyphs/t.sc.glyph
index c8e7657da..3313b3845 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/t.sc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/t.sc.glyph
@@ -8,6 +8,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (529,0);
+},
+{
+name = top;
+pos = (506,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -33,6 +37,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (465,0);
+},
+{
+name = top;
+pos = (442,1056);
 }
 );
 layerId = m011;
@@ -58,6 +66,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (603,0);
+},
+{
+name = top;
+pos = (517,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -83,6 +95,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (571,0);
+},
+{
+name = top;
+pos = (485,1056);
 }
 );
 layerId = m007;
@@ -108,6 +124,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (774,0);
+},
+{
+name = top;
+pos = (573,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -133,6 +153,10 @@ anchors = (
 {
 name = cyrtic;
 pos = (765,0);
+},
+{
+name = top;
+pos = (565,1056);
 }
 );
 layerId = m009;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/tcaron.glyph
index 3c285c9bf..553461689 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tcaron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (196,72);
+pos = (-50,36);
 ref = commaaccentright.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tcircumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/tcircumflexbelow.glyph
index 883fe9e02..078a2d370 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tcircumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tcircumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (998,0);
+pos = (1008,0);
 ref = circumflexsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (1138,0);
+pos = (1129,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (916,0);
+pos = (978,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (984,0);
+pos = (938,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (1166,0);
+pos = (1128,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (924,0);
+pos = (876,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tdieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/tdieresis.glyph
index c8eb934be..ea48064fe 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tdieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tdieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (-286,186);
+pos = (-284,266);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (-131,238);
+pos = (-290,266);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (-384,186);
+pos = (-291,266);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (-303,228);
+pos = (-298,288);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (-108,280);
+pos = (-263,288);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (-383,228);
+pos = (-307,288);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tdotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/tdotaccent.glyph
index 6c3fb978e..722d8c597 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tdotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tdotaccent.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (76,186);
+pos = (73,266);
 ref = dotaccent;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (42,238);
+pos = (41,266);
 ref = dotaccent;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (104,186);
+pos = (105,266);
 ref = dotaccent;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (59,228);
+pos = (59,288);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (66,280);
+pos = (66,288);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (105,228);
+pos = (105,288);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/thook.glyph b/src/Inter-Roman.glyphspackage/glyphs/thook.glyph
index 4e189854a..360c87ef2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/thook.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/thook.glyph
@@ -11,7 +11,7 @@ pos = (416,0);
 },
 {
 name = top;
-pos = (369,1676);
+pos = (369,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -62,7 +62,7 @@ pos = (464,0);
 },
 {
 name = top;
-pos = (417,1676);
+pos = (417,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -113,7 +113,7 @@ pos = (436,0);
 },
 {
 name = top;
-pos = (353,1676);
+pos = (353,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -164,7 +164,7 @@ pos = (370,0);
 },
 {
 name = top;
-pos = (312,1676);
+pos = (312,1490);
 }
 );
 layerId = m007;
@@ -215,7 +215,7 @@ pos = (476,0);
 },
 {
 name = top;
-pos = (424,1676);
+pos = (424,1490);
 }
 );
 layerId = m009;
@@ -266,7 +266,7 @@ pos = (332,0);
 },
 {
 name = top;
-pos = (294,1676);
+pos = (294,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/three.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/three.1.glyph
index f179f0205..3990dd672 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/three.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/three.1.glyph
@@ -1,4 +1,5 @@
 {
+category = Number;
 color = 9;
 glyphname = three.1;
 kernLeft = three;
@@ -9,6 +10,10 @@ anchors = (
 {
 name = _center;
 pos = (666,745);
+},
+{
+name = top;
+pos = (655,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -55,6 +60,10 @@ anchors = (
 {
 name = _center;
 pos = (706,745);
+},
+{
+name = top;
+pos = (691,1490);
 }
 );
 guides = (
@@ -111,6 +120,10 @@ anchors = (
 {
 name = _center;
 pos = (644,745);
+},
+{
+name = top;
+pos = (629,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -239,6 +252,10 @@ anchors = (
 {
 name = _center;
 pos = (620,745);
+},
+{
+name = top;
+pos = (616,1490);
 }
 );
 background = {
@@ -292,6 +309,10 @@ anchors = (
 {
 name = _center;
 pos = (690,745);
+},
+{
+name = top;
+pos = (672,1490);
 }
 );
 background = {
@@ -379,6 +400,10 @@ anchors = (
 {
 name = _center;
 pos = (580,745);
+},
+{
+name = top;
+pos = (565,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/three.1.tf.glyph b/src/Inter-Roman.glyphspackage/glyphs/three.1.tf.glyph
index 01a7d2e95..ba4130675 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/three.1.tf.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/three.1.tf.glyph
@@ -9,17 +9,16 @@ shapes = (
 ref = three.1;
 }
 );
-width = 1326;
+width = 1310;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (6,0);
 ref = three.1;
 }
 );
-width = 1442;
+width = 1382;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,21 +35,19 @@ width = 1210;
 layerId = m007;
 shapes = (
 {
-pos = (-7,0);
 ref = three.1;
 }
 );
-width = 1262;
+width = 1232;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (17,0);
 ref = three.1;
 }
 );
-width = 1410;
+width = 1344;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/three.glyph b/src/Inter-Roman.glyphspackage/glyphs/three.glyph
index 9bc71bc5f..d81e497fe 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/three.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/three.glyph
@@ -8,6 +8,10 @@ anchors = (
 {
 name = _center;
 pos = (652,745);
+},
+{
+name = top;
+pos = (656,1490);
 }
 );
 background = {
@@ -75,6 +79,10 @@ anchors = (
 {
 name = _center;
 pos = (691,745);
+},
+{
+name = top;
+pos = (688,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -189,6 +197,10 @@ anchors = (
 {
 name = _center;
 pos = (628,745);
+},
+{
+name = top;
+pos = (634,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -331,6 +343,10 @@ anchors = (
 {
 name = _center;
 pos = (616,745);
+},
+{
+name = top;
+pos = (616,1490);
 }
 );
 background = {
@@ -496,6 +512,10 @@ anchors = (
 {
 name = _center;
 pos = (672,745);
+},
+{
+name = top;
+pos = (672,1490);
 }
 );
 layerId = m009;
@@ -555,6 +575,10 @@ anchors = (
 {
 name = _center;
 pos = (564,745);
+},
+{
+name = top;
+pos = (570,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/tilde.glyph
index 8afa16b6d..f7f927540 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tilde.glyph
@@ -6,11 +6,11 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (512,1304);
+pos = (512,1118);
 },
 {
 name = top;
-pos = (512,1676);
+pos = (512,1519);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -18,26 +18,26 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(738,1276,o),
-(794,1356,o),
-(798,1479,c),
-(679,1479,l),
-(672,1423,o),
-(657,1399,o),
-(624,1399,cs),
-(557,1399,o),
-(486,1483,o),
-(384,1483,cs),
-(279,1483,o),
-(230,1396,o),
-(226,1279,c),
-(349,1279,l),
-(351,1316,o),
-(366,1357,o),
-(401,1357,cs),
-(450,1357,o),
-(546,1276,o),
-(642,1276,cs)
+(738,1316,o),
+(794,1396,o),
+(798,1519,c),
+(679,1519,l),
+(672,1463,o),
+(657,1439,o),
+(624,1439,cs),
+(557,1439,o),
+(486,1523,o),
+(384,1523,cs),
+(279,1523,o),
+(230,1436,o),
+(226,1319,c),
+(349,1319,l),
+(351,1356,o),
+(366,1397,o),
+(401,1397,cs),
+(450,1397,o),
+(546,1316,o),
+(642,1316,cs)
 );
 }
 );
@@ -47,11 +47,11 @@ width = 1024;
 anchors = (
 {
 name = _top;
-pos = (512,1304);
+pos = (512,1118);
 },
 {
 name = top;
-pos = (512,1676);
+pos = (514,1570);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -59,26 +59,26 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(796,1248,o),
-(905,1356,o),
-(908,1562,c),
-(712,1562,l),
-(710,1492,o),
-(690,1451,o),
-(634,1451,cs),
-(565,1451,o),
-(514,1568,o),
-(364,1568,cs),
-(226,1568,o),
-(120,1466,o),
-(116,1256,c),
-(314,1256,l),
-(317,1329,o),
-(343,1368,o),
-(390,1368,cs),
-(464,1368,o),
-(508,1248,o),
-(660,1248,cs)
+(796,1256,o),
+(905,1364,o),
+(908,1570,c),
+(712,1570,l),
+(710,1500,o),
+(690,1459,o),
+(634,1459,cs),
+(565,1459,o),
+(514,1576,o),
+(364,1576,cs),
+(226,1576,o),
+(120,1474,o),
+(116,1264,c),
+(314,1264,l),
+(317,1337,o),
+(343,1376,o),
+(390,1376,cs),
+(464,1376,o),
+(508,1256,o),
+(660,1256,cs)
 );
 }
 );
@@ -88,11 +88,11 @@ width = 1024;
 anchors = (
 {
 name = _top;
-pos = (510,1304);
+pos = (504,1118);
 },
 {
 name = top;
-pos = (510,1676);
+pos = (504,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -100,26 +100,26 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(740,1306,o),
-(823,1366,o),
-(844,1454,c),
-(798,1466,l),
-(782,1398,o),
-(718,1353,o),
-(652,1352,cs),
-(545,1353,o),
-(501,1472,o),
-(366,1472,cs),
-(268,1472,o),
-(188,1409,o),
-(174,1318,c),
-(222,1312,l),
-(231,1378,o),
-(291,1425,o),
-(366,1426,cs),
-(490,1425,o),
-(527,1306,o),
-(652,1306,cs)
+(709,1296,o),
+(766,1354,o),
+(782,1449,c),
+(735,1449,l),
+(719,1373,o),
+(682,1342,o),
+(625,1342,cs),
+(543,1342,o),
+(504,1460,o),
+(380,1460,cs),
+(295,1460,o),
+(234,1394,o),
+(226,1303,c),
+(272,1303,l),
+(278,1372,o),
+(322,1414,o),
+(388,1414,cs),
+(480,1414,o),
+(521,1296,o),
+(633,1296,cs)
 );
 }
 );
@@ -162,11 +162,11 @@ width = 852;
 anchors = (
 {
 name = _top;
-pos = (480,1262);
+pos = (480,1056);
 },
 {
 name = top;
-pos = (480,1676);
+pos = (480,1490);
 }
 );
 layerId = m007;
@@ -174,26 +174,26 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(707,1264,o),
-(763,1344,o),
-(767,1467,c),
-(648,1467,l),
-(641,1411,o),
-(626,1387,o),
-(593,1387,cs),
-(526,1387,o),
-(455,1471,o),
-(353,1471,cs),
-(248,1471,o),
-(199,1384,o),
-(195,1267,c),
-(318,1267,l),
-(320,1304,o),
-(335,1345,o),
-(370,1345,cs),
-(419,1345,o),
-(515,1264,o),
-(611,1264,cs)
+(707,1274,o),
+(763,1354,o),
+(767,1477,c),
+(648,1477,l),
+(641,1421,o),
+(626,1397,o),
+(593,1397,cs),
+(526,1397,o),
+(455,1481,o),
+(353,1481,cs),
+(248,1481,o),
+(199,1394,o),
+(195,1277,c),
+(318,1277,l),
+(320,1314,o),
+(335,1355,o),
+(370,1355,cs),
+(419,1355,o),
+(515,1274,o),
+(611,1274,cs)
 );
 }
 );
@@ -203,11 +203,11 @@ width = 960;
 anchors = (
 {
 name = _top;
-pos = (512,1262);
+pos = (512,1056);
 },
 {
 name = top;
-pos = (512,1676);
+pos = (514,1490);
 }
 );
 layerId = m009;
@@ -244,11 +244,11 @@ width = 992;
 anchors = (
 {
 name = _top;
-pos = (448,1262);
+pos = (448,1056);
 },
 {
 name = top;
-pos = (448,1676);
+pos = (448,1490);
 }
 );
 background = {
@@ -285,26 +285,26 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(653,1257,o),
-(710,1315,o),
-(726,1410,c),
-(679,1410,l),
-(663,1334,o),
-(626,1303,o),
-(569,1303,cs),
-(487,1303,o),
-(448,1421,o),
-(324,1421,cs),
-(239,1421,o),
-(178,1355,o),
-(170,1264,c),
-(216,1264,l),
-(222,1333,o),
-(266,1375,o),
-(332,1375,cs),
-(424,1375,o),
-(465,1257,o),
-(577,1257,cs)
+(653,1296,o),
+(710,1354,o),
+(726,1449,c),
+(679,1449,l),
+(663,1373,o),
+(626,1342,o),
+(569,1342,cs),
+(487,1342,o),
+(448,1460,o),
+(324,1460,cs),
+(239,1460,o),
+(178,1394,o),
+(170,1303,c),
+(216,1303,l),
+(222,1372,o),
+(266,1414,o),
+(332,1414,cs),
+(424,1414,o),
+(465,1296,o),
+(577,1296,cs)
 );
 }
 );
@@ -490,6 +490,49 @@ nodes = (
 }
 );
 width = 890;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (510,1118);
+},
+{
+name = top;
+pos = (501,1490);
+}
+);
+associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+layerId = "1B73D356-C97A-4553-9E54-506368659EB8";
+name = "Apr 11, 23, 18:25";
+shapes = (
+{
+closed = 1;
+nodes = (
+(740,1301,o),
+(823,1361,o),
+(844,1449,c),
+(798,1461,l),
+(782,1393,o),
+(718,1348,o),
+(652,1347,cs),
+(545,1348,o),
+(501,1467,o),
+(366,1467,cs),
+(268,1467,o),
+(188,1404,o),
+(174,1313,c),
+(222,1307,l),
+(231,1373,o),
+(291,1420,o),
+(366,1421,cs),
+(490,1420,o),
+(527,1301,o),
+(652,1301,cs)
+);
+}
+);
+width = 1018;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tildeacutecomb.glyph b/src/Inter-Roman.glyphspackage/glyphs/tildeacute.lc.glyph
index 00ea95520..3575accd9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tildeacutecomb.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tildeacute.lc.glyph
@@ -1,101 +1,89 @@
 {
-glyphname = tildeacutecomb;
+glyphname = tildeacute.lc;
 layers = (
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (-838,0);
 ref = tilde;
 },
 {
 alignment = -1;
-pos = (-812,372);
+pos = (169,333);
 ref = acute;
 }
 );
-width = 0;
+width = 1024;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (-838,0);
 ref = tilde;
 },
 {
 alignment = -1;
-pos = (-834,372);
+pos = (130,365);
 ref = acute;
 }
 );
-width = 0;
+width = 1024;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (-838,0);
 ref = tilde;
 },
 {
 alignment = -1;
-pos = (-834,372);
+pos = (209,239);
 ref = acute;
 }
 );
-width = 0;
+width = 1018;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (-838,0);
 ref = tilde;
 },
 {
 alignment = -1;
-pos = (-812,372);
+pos = (147,343);
 ref = acute;
 }
 );
-width = 0;
+width = 960;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (-838,0);
 ref = tilde;
 },
 {
 alignment = -1;
-pos = (-834,372);
+pos = (124,369);
 ref = acute;
 }
 );
-width = 0;
+width = 992;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (-838,0);
 ref = tilde;
 },
 {
 alignment = -1;
-pos = (-834,372);
+pos = (161,323);
 ref = acute;
 }
 );
-width = 0;
+width = 896;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tildeacutecomb.uc.glyph b/src/Inter-Roman.glyphspackage/glyphs/tildeacutecomb.uc.glyph
index a7eaac469..5188a5e20 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tildeacutecomb.uc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tildeacutecomb.uc.glyph
@@ -2,158 +2,88 @@
 glyphname = tildeacutecomb.uc;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (-372,1676);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-348,1838,l),
-(-164,2024,l),
-(-232,2024,l),
-(-402,1838,l)
-);
+ref = tilde;
 },
 {
 alignment = -1;
-pos = (-882,320);
-ref = tilde;
+pos = (209,239);
+ref = acute;
 }
 );
-width = 0;
+width = 1018;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-358,1676);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-302,1944,l),
-(-40,2164,l),
-(-242,2164,l),
-(-454,1944,l)
-);
+ref = tilde;
 },
 {
-pos = (-870,372);
-ref = tilde;
+alignment = -1;
+pos = (169,333);
+ref = acute;
 }
 );
-width = 0;
+width = 1024;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-396,1676);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-286,1972,l),
-(-34,2254,l),
-(-362,2254,l),
-(-556,1972,l)
-);
+ref = tilde;
 },
 {
-pos = (-874,494);
-ref = tilde;
-scale = (0.9346,0.887);
+alignment = -1;
+pos = (130,365);
+ref = acute;
 }
 );
-width = 0;
+width = 1024;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-390,1676);
-}
-);
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-334,1944,l),
-(-72,2164,l),
-(-274,2164,l),
-(-486,1944,l)
-);
+ref = tilde;
 },
 {
-pos = (-870,372);
-ref = tilde;
+alignment = -1;
+pos = (147,343);
+ref = acute;
 }
 );
-width = 0;
+width = 960;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-412,1676);
-}
-);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-302,1972,l),
-(-50,2254,l),
-(-378,2254,l),
-(-572,1972,l)
-);
+ref = tilde;
 },
 {
-pos = (-875,494);
-ref = tilde;
-scale = (0.9346,0.887);
+alignment = -1;
+pos = (124,377);
+ref = acute;
 }
 );
-width = 0;
+width = 992;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-436,1676);
-}
-);
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-412,1838,l),
-(-228,2024,l),
-(-296,2024,l),
-(-466,1838,l)
-);
+ref = tilde;
 },
 {
 alignment = -1;
-pos = (-882,320);
-ref = tilde;
+pos = (161,323);
+ref = acute;
 }
 );
-width = 0;
+width = 896;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tildecomb.glyph b/src/Inter-Roman.glyphspackage/glyphs/tildecomb.glyph
index 77f384e72..8521eee4d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tildecomb.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tildecomb.glyph
@@ -3,17 +3,11 @@ color = (250,227,227,1);
 glyphname = tildecomb;
 layers = (
 {
-guides = (
-{
-angle = 90;
-pos = (-780,2192);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-1022,0);
+pos = (-1102,0);
 ref = tilde;
 }
 );
@@ -30,7 +24,7 @@ layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-1218,0);
+pos = (-1186,0);
 ref = tilde;
 }
 );
@@ -41,24 +35,18 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-902,0);
+pos = (-1094,0);
 ref = tilde;
 }
 );
 width = 0;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (-1072,2192);
-}
-);
 layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-1022,0);
+pos = (-1038,0);
 ref = tilde;
 }
 );
@@ -75,7 +63,7 @@ layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1218,0);
+pos = (-1168,0);
 ref = tilde;
 }
 );
@@ -86,7 +74,7 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-902,0);
+pos = (-982,0);
 ref = tilde;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tildedieresiscomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/tildedieresiscomb.cn.glyph
index 406746a28..f5e1e0e24 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tildedieresiscomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tildedieresiscomb.cn.glyph
@@ -431,5 +431,4 @@ width = 0;
 tags = (
 "TODO-opsz"
 );
-unicode = 57630;
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tildedieresiscomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/tildedieresiscomb.lc.glyph
index 232be1abc..ac111fe5a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tildedieresiscomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tildedieresiscomb.lc.glyph
@@ -455,5 +455,4 @@ width = 0;
 tags = (
 "TODO-opsz"
 );
-unicode = 57605;
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tildemacroncomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/tildemacroncomb.cn.glyph
index dc3be760a..f771e1397 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tildemacroncomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tildemacroncomb.cn.glyph
@@ -281,5 +281,4 @@ width = 0;
 tags = (
 "TODO-opsz"
 );
-unicode = 57637;
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tildemacroncomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/tildemacroncomb.lc.glyph
index 9c081c79f..32ed947d9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tildemacroncomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tildemacroncomb.lc.glyph
@@ -305,5 +305,4 @@ width = 0;
 tags = (
 "TODO-opsz"
 );
-unicode = 57616;
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tildemidnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/tildemidnosp.glyph
index 6ac047b63..ca93ca09a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tildemidnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tildemidnosp.glyph
@@ -7,7 +7,7 @@ layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-1074,-846);
+pos = (-1112,-860);
 ref = tilde;
 }
 );
@@ -18,7 +18,7 @@ layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-1230,-838);
+pos = (-1179,-857);
 ref = tilde;
 }
 );
@@ -29,7 +29,7 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-980,-852);
+pos = (-1091,-824);
 ref = tilde;
 }
 );
@@ -40,7 +40,7 @@ layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-1074,-846);
+pos = (-1050,-846);
 ref = tilde;
 }
 );
@@ -51,7 +51,7 @@ layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1230,-838);
+pos = (-1161,-808);
 ref = tilde;
 }
 );
@@ -62,7 +62,7 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-980,-852);
+pos = (-983,-850);
 ref = tilde;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tildesubnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/tildesubnosp.glyph
index ef3eaf019..e49df3959 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tildesubnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tildesubnosp.glyph
@@ -6,20 +6,14 @@ layers = (
 anchors = (
 {
 name = _bottom;
-pos = (-624,0);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (-864,-996);
+pos = (-600,0);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-1136,-1620);
+pos = (-1112,-1722);
 ref = tilde;
 }
 );
@@ -29,20 +23,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-720,0);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (-992,-1088);
+pos = (-664,0);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-1232,-1676);
+pos = (-1176,-1714);
 ref = tilde;
 }
 );
@@ -52,14 +40,14 @@ width = 30;
 anchors = (
 {
 name = _bottom;
-pos = (-486,0);
+pos = (-581,0);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-994,-1590);
+pos = (-1090,-1650);
 ref = tilde;
 }
 );
@@ -69,20 +57,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-656,0);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (-1156,-996);
+pos = (-568,0);
 }
 );
 layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-1137,-1662);
+pos = (-1049,-1699);
 ref = tilde;
 }
 );
@@ -92,20 +74,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-720,0);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (-1088,-1088);
+pos = (-648,0);
 }
 );
 layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1232,-1602);
+pos = (-1160,-1616);
 ref = tilde;
 }
 );
@@ -115,14 +91,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-546,0);
+pos = (-531,0);
 }
 );
 layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-994,-1633);
+pos = (-979,-1700);
 ref = tilde;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tlinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/tlinebelow.glyph
index 3035f4d1b..fd109129d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tlinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tlinebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (1022,0);
+pos = (1014,0);
 ref = macronsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (1092,0);
+pos = (1130,0);
 ref = macronsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (1010,0);
+pos = (979,0);
 ref = macronsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (1008,0);
+pos = (930,0);
 ref = macronsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (1120,0);
+pos = (1121,0);
 ref = macronsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (1018,0);
+pos = (877,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tonetwo.glyph b/src/Inter-Roman.glyphspackage/glyphs/tonetwo.glyph
index 38ef44566..d99f3a316 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tonetwo.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tonetwo.glyph
@@ -15,7 +15,7 @@ pos = (526,0);
 },
 {
 name = top;
-pos = (518,1304);
+pos = (518,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -80,7 +80,7 @@ pos = (590,0);
 },
 {
 name = top;
-pos = (600,1304);
+pos = (600,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -145,7 +145,7 @@ pos = (498,0);
 },
 {
 name = top;
-pos = (492,1304);
+pos = (492,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -210,7 +210,7 @@ pos = (498,0);
 },
 {
 name = top;
-pos = (490,1262);
+pos = (490,1056);
 }
 );
 layerId = m007;
@@ -275,7 +275,7 @@ pos = (560,0);
 },
 {
 name = top;
-pos = (586,1262);
+pos = (586,1056);
 }
 );
 layerId = m009;
@@ -340,7 +340,7 @@ pos = (455,0);
 },
 {
 name = top;
-pos = (455,1262);
+pos = (455,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tonostop.glyph b/src/Inter-Roman.glyphspackage/glyphs/tonostop.glyph
index e00e72263..baf0f64d2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tonostop.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tonostop.glyph
@@ -131,5 +131,4 @@ width = 198;
 tags = (
 "TODO-opsz"
 );
-unicode = 57641;
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/triagup.glyph b/src/Inter-Roman.glyphspackage/glyphs/triagup.glyph
index abf3204fc..bf1cc0bbf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/triagup.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/triagup.glyph
@@ -1,5 +1,7 @@
 {
 glyphname = triagup;
+kernLeft = A;
+kernRight = A;
 layers = (
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/tturn.glyph
index c81affb8a..10d0bd02b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tturn.glyph
@@ -11,7 +11,7 @@ pos = (426,-268);
 },
 {
 name = top;
-pos = (334,1304);
+pos = (334,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -32,7 +32,7 @@ pos = (452,-268);
 },
 {
 name = top;
-pos = (392,1304);
+pos = (392,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -53,7 +53,7 @@ pos = (422,-268);
 },
 {
 name = top;
-pos = (334,1304);
+pos = (334,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -74,7 +74,7 @@ pos = (426,-268);
 },
 {
 name = top;
-pos = (334,1304);
+pos = (334,1056);
 }
 );
 layerId = m007;
@@ -95,7 +95,7 @@ pos = (452,-268);
 },
 {
 name = top;
-pos = (392,1304);
+pos = (392,1056);
 }
 );
 layerId = m009;
@@ -116,7 +116,7 @@ pos = (297,-288);
 },
 {
 name = top;
-pos = (298,1262);
+pos = (298,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/two.glyph b/src/Inter-Roman.glyphspackage/glyphs/two.glyph
index 211ca426d..b913576c8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/two.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/two.glyph
@@ -12,6 +12,10 @@ pos = (620,745);
 {
 name = cross;
 pos = (840,768);
+},
+{
+name = top;
+pos = (620,1490);
 }
 );
 background = {
@@ -67,6 +71,10 @@ pos = (662,745);
 {
 name = cross;
 pos = (896,818);
+},
+{
+name = top;
+pos = (662,1490);
 }
 );
 guides = (
@@ -122,6 +130,10 @@ pos = (636,745);
 {
 name = cross;
 pos = (814,744);
+},
+{
+name = top;
+pos = (636,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -235,6 +247,10 @@ pos = (581,745);
 {
 name = cross;
 pos = (870,768);
+},
+{
+name = top;
+pos = (581,1490);
 }
 );
 background = {
@@ -290,11 +306,10 @@ pos = (646,745);
 {
 name = cross;
 pos = (910,818);
-}
-);
-guides = (
+},
 {
-pos = (-115,2280);
+name = top;
+pos = (646,1490);
 }
 );
 layerId = m009;
@@ -342,6 +357,10 @@ pos = (572,745);
 {
 name = cross;
 pos = (750,744);
+},
+{
+name = top;
+pos = (572,1490);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/u.glyph b/src/Inter-Roman.glyphspackage/glyphs/u.glyph
index 6e5414b95..02c27890c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/u.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/u.glyph
@@ -20,14 +20,7 @@ pos = (862,1118);
 },
 {
 name = top;
-pos = (596,1304);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (812,1476);
+pos = (596,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -77,7 +70,7 @@ pos = (826,1118);
 },
 {
 name = top;
-pos = (666,1304);
+pos = (666,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -188,7 +181,7 @@ pos = (920,1118);
 },
 {
 name = top;
-pos = (582,1304);
+pos = (582,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -238,7 +231,7 @@ pos = (842,1056);
 },
 {
 name = top;
-pos = (570,1262);
+pos = (570,1056);
 }
 );
 guides = (
@@ -246,10 +239,6 @@ guides = (
 orientation = center;
 angle = 90;
 pos = (-5881,1476);
-},
-{
-angle = 90;
-pos = (310,1058);
 }
 );
 layerId = m007;
@@ -299,7 +288,7 @@ pos = (812,1056);
 },
 {
 name = top;
-pos = (650,1304);
+pos = (650,1056);
 }
 );
 layerId = m009;
@@ -410,7 +399,7 @@ pos = (888,1056);
 },
 {
 name = top;
-pos = (534,1262);
+pos = (534,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/uacute.glyph
index 9c122527e..25918caeb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uacute.glyph
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (240,42);
+pos = (240,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (254,0);
+pos = (250,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ubreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/ubreve.glyph
index ef0fb0cda..d965a30c3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ubreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ubreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (136,0);
+pos = (212,0);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (154,0);
+pos = (186,0);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (166,0);
+pos = (230,0);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (142,0);
+pos = (170,0);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (154,42);
+pos = (170,0);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (118,0);
+pos = (182,0);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ucaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/ucaron.glyph
index 77daf2dea..094e0fd57 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ucaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ucaron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (152,16);
+pos = (150,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (20,42);
+pos = (22,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ucircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/ucircumflex.glyph
index 66c61257c..7262d1e0a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ucircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ucircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (130,0);
+pos = (132,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (20,0);
+pos = (26,0);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (152,0);
+pos = (150,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (136,0);
+pos = (138,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (20,42);
+pos = (22,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (168,0);
+pos = (166,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ucircumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/ucircumflexbelow.glyph
index 6161adfd1..60ac361b3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ucircumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ucircumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1178,0);
+pos = (1188,0);
 ref = circumflexsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1416,0);
+pos = (1407,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1094,0);
+pos = (1156,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1184,0);
+pos = (1138,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1416,0);
+pos = (1378,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1104,0);
+pos = (1056,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/udblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/udblgrave.glyph
index 297225227..9361143db 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/udblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/udblgrave.glyph
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1276,42);
+pos = (1276,0);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/udieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/udieresis.glyph
index 6bb82e0ec..00b3e8b5c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/udieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/udieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (-10,0);
+pos = (-5,0);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (159,0);
+pos = (1,0);
 ref = dieresis;
 }
 );
@@ -36,7 +36,6 @@ shapes = (
 ref = u;
 },
 {
-pos = (-92,0);
 ref = dieresis;
 }
 );
@@ -49,7 +48,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (-4,0);
+pos = (1,0);
 ref = dieresis;
 }
 );
@@ -62,7 +61,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (156,42);
+pos = (1,0);
 ref = dieresis;
 }
 );
@@ -75,7 +74,6 @@ shapes = (
 ref = u;
 },
 {
-pos = (-76,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/udieresisacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/udieresisacute.glyph
index 2645908bd..5269e3cb2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/udieresisacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/udieresisacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1190,0);
+pos = (-5,0);
 ref = dieresisacutecomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1339,0);
+pos = (1,0);
 ref = dieresisacutecomb.lc;
 }
 );
@@ -36,7 +36,6 @@ shapes = (
 ref = u;
 },
 {
-pos = (1165,0);
 ref = dieresisacutecomb.lc;
 }
 );
@@ -49,7 +48,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1126,0);
+pos = (1,0);
 ref = dieresisacutecomb.lc;
 }
 );
@@ -62,7 +61,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1296,42);
+pos = (1,0);
 ref = dieresisacutecomb.lc;
 }
 );
@@ -75,7 +74,6 @@ shapes = (
 ref = u;
 },
 {
-pos = (1041,0);
 ref = dieresisacutecomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/udieresiscaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/udieresiscaron.glyph
index a8dbf2beb..96ad8e904 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/udieresiscaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/udieresiscaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1186,12);
+pos = (-5,0);
 ref = dieresiscaroncomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1376,12);
+pos = (1,0);
 ref = dieresiscaroncomb.lc;
 }
 );
@@ -36,7 +36,6 @@ shapes = (
 ref = u;
 },
 {
-pos = (1102,12);
 ref = dieresiscaroncomb.lc;
 }
 );
@@ -49,7 +48,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1192,-30);
+pos = (1,0);
 ref = dieresiscaroncomb.lc;
 }
 );
@@ -62,7 +61,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1376,12);
+pos = (1,0);
 ref = dieresiscaroncomb.lc;
 }
 );
@@ -75,7 +74,6 @@ shapes = (
 ref = u;
 },
 {
-pos = (1118,-30);
 ref = dieresiscaroncomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/udieresisgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/udieresisgrave.glyph
index 83c8afc43..df139183d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/udieresisgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/udieresisgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1186,12);
+pos = (-5,0);
 ref = dieresisgravecomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1370,12);
+pos = (1,0);
 ref = dieresisgravecomb.lc;
 }
 );
@@ -36,7 +36,6 @@ shapes = (
 ref = u;
 },
 {
-pos = (1106,12);
 ref = dieresisgravecomb.lc;
 }
 );
@@ -49,7 +48,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1192,-30);
+pos = (1,0);
 ref = dieresisgravecomb.lc;
 }
 );
@@ -62,7 +61,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1370,12);
+pos = (1,0);
 ref = dieresisgravecomb.lc;
 }
 );
@@ -75,7 +74,6 @@ shapes = (
 ref = u;
 },
 {
-pos = (1122,-30);
 ref = dieresisgravecomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/udieresismacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/udieresismacron.glyph
index 83144bf35..f1d155b7f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/udieresismacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/udieresismacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1178,-18);
+pos = (-5,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1340,-32);
+pos = (1,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -36,7 +36,6 @@ shapes = (
 ref = u;
 },
 {
-pos = (1236,-46);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -49,7 +48,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1178,-60);
+pos = (1,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -62,7 +61,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1338,-32);
+pos = (1,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -75,7 +74,6 @@ shapes = (
 ref = u;
 },
 {
-pos = (1254,-88);
 ref = dieresismacroncomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ugrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/ugrave.glyph
index 60320561e..2d380ac8c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ugrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ugrave.glyph
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (-22,42);
+pos = (-22,0);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/uhookabove.glyph
index 60f3acaed..a84997be5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uhookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1190,26);
+pos = (1183,0);
 ref = hookabovecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1404,-6);
+pos = (1330,0);
 ref = hookabovecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1080,44);
+pos = (1104,0);
 ref = hookabovecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1196,-16);
+pos = (1133,0);
 ref = hookabovecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1404,42);
+pos = (1304,0);
 ref = hookabovecmb;
 }
 );
@@ -75,11 +75,206 @@ shapes = (
 ref = u;
 },
 {
-pos = (1096,2);
+pos = (1038,0);
 ref = hookabovecmb;
 }
 );
 width = 1068;
+},
+{
+associatedMasterId = m007;
+layerId = "37252B2E-8269-4668-BCC9-0450DD1EC79A";
+name = "Apr 11, 23, 16:57";
+shapes = (
+{
+ref = u;
+},
+{
+closed = 0;
+nodes = (
+(399,1525,l),
+(771,1525,l),
+(573,1205,l)
+);
+}
+);
+width = 1140;
+},
+{
+associatedMasterId = m011;
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(737,1299,o),
+(766,1341,o),
+(766,1400,cs),
+(766,1489,o),
+(686,1563,o),
+(570,1563,cs),
+(399,1563,l),
+(399,1423,l),
+(570,1423,ls),
+(608,1423,o),
+(619,1400,o),
+(602,1368,cs),
+(517,1213,l),
+(617,1154,l)
+);
+}
+);
+};
+layerId = "866F3446-8544-4E2B-8F96-FBB0C3B35E5B";
+name = "Apr 11, 23, 17:08";
+shapes = (
+{
+ref = u;
+},
+{
+closed = 1;
+nodes = (
+(544,1444,ls),
+(639,1444,o),
+(670,1393,o),
+(620,1311,cs),
+(549,1195,l),
+(588,1171,l),
+(659,1287,ls),
+(728,1399,o),
+(675,1490,o),
+(544,1490,cs),
+(398,1490,l),
+(398,1444,l)
+);
+},
+{
+closed = 0;
+nodes = (
+(1336,1183,l),
+(1510,1467,l),
+(1166,1467,l)
+);
+},
+{
+closed = 0;
+nodes = (
+(952,1183,l),
+(1023,1299,ls),
+(1082,1396,o),
+(1041,1467,o),
+(928,1467,cs),
+(782,1467,l)
+);
+}
+);
+width = 1068;
+},
+{
+associatedMasterId = m009;
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(809,1299,o),
+(838,1341,o),
+(838,1400,cs),
+(838,1489,o),
+(758,1563,o),
+(642,1563,cs),
+(471,1563,l),
+(471,1423,l),
+(642,1423,ls),
+(680,1423,o),
+(691,1400,o),
+(674,1368,cs),
+(589,1213,l),
+(689,1154,l)
+);
+}
+);
+};
+layerId = "F1220710-6106-424C-A42D-78741FEB2EE1";
+name = "Apr 11, 23, 17:18";
+shapes = (
+{
+ref = u;
+},
+{
+closed = 1;
+nodes = (
+(632,1390,ls),
+(634,1390,o),
+(635,1389,o),
+(634,1387,cs),
+(559,1234,l),
+(716,1136,l),
+(882,1295,o),
+(928,1373,o),
+(928,1442,cs),
+(928,1557,o),
+(806,1634,o),
+(656,1634,cs),
+(471,1634,l),
+(471,1390,l)
+);
+}
+);
+width = 1298;
+},
+{
+associatedMasterId = m009;
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(809,1299,o),
+(838,1341,o),
+(838,1400,cs),
+(838,1489,o),
+(758,1563,o),
+(642,1563,cs),
+(471,1563,l),
+(471,1423,l),
+(642,1423,ls),
+(680,1423,o),
+(691,1400,o),
+(674,1368,cs),
+(589,1213,l),
+(689,1154,l)
+);
+}
+);
+};
+layerId = "B847271A-3CD0-44E6-A8C2-94E8121AB79C";
+name = "Apr 11, 23, 17:21";
+shapes = (
+{
+closed = 1;
+nodes = (
+(858,1231,o),
+(912,1325,o),
+(912,1394,cs),
+(912,1509,o),
+(806,1570,o),
+(656,1570,cs),
+(471,1570,l),
+(471,1342,l),
+(636,1342,ls),
+(641,1342,o),
+(642,1339,o),
+(640,1335,cs),
+(567,1186,l),
+(716,1096,l)
+);
+},
+{
+ref = u;
+}
+);
+width = 1298;
 }
 );
 unicode = 7911;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uhorn.glyph b/src/Inter-Roman.glyphspackage/glyphs/uhorn.glyph
index 9277e3acb..1eda55b64 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uhorn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uhorn.glyph
@@ -1,7 +1,7 @@
 {
 glyphname = uhorn;
 kernLeft = u;
-kernRight = u;
+kernRight = uhorn;
 layers = (
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -10,76 +10,383 @@ shapes = (
 ref = u;
 },
 {
-pos = (734,-372);
-ref = _part.rtophorn;
+closed = 1;
+nodes = (
+(1048,998,ls),
+(1162,998,o),
+(1218,1054,o),
+(1218,1168,cs),
+(1218,1326,l),
+(1058,1326,l),
+(1058,1136,ls),
+(1058,1125,o),
+(1051,1118,o),
+(1040,1118,cs),
+(862,1118,l),
+(862,998,l)
+);
 }
 );
-width = 1190;
+width = 1248;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-ref = u;
+closed = 1;
+nodes = (
+(1138,878,ls),
+(1282,878,o),
+(1396,952,o),
+(1396,1118,cs),
+(1396,1326,l),
+(1048,1326,l),
+(1048,1150,ls),
+(1048,1129,o),
+(1037,1118,o),
+(1016,1118,cs),
+(826,1118,l),
+(826,878,l)
+);
 },
 {
-pos = (724,-372);
-ref = _part.rtophorn;
+ref = u;
 }
 );
-width = 1330;
+width = 1426;
+},
+{
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(862,247,o),
+(701,152,o),
+(574,152,cs),
+(431,152,o),
+(328,256,o),
+(328,418,cs),
+(328,1118,l),
+(158,1118,l),
+(158,408,ls),
+(158,122,o),
+(308,-14,o),
+(518,-14,cs),
+(687,-14,o),
+(797,76,o),
+(850,190,c),
+(862,190,l),
+(862,0,l),
+(1032,0,l),
+(1032,1118,l),
+(862,1118,l),
+(862,456,ls)
+);
 },
 {
+closed = 1;
+nodes = (
+(1074,1138,ls),
+(1074,1125,o),
+(1067,1118,o),
+(1054,1118,cs),
+(949,1118,l),
+(949,998,l),
+(1094,998,ls),
+(1180,998,o),
+(1234,1052,o),
+(1234,1138,cs),
+(1234,1326,l),
+(1074,1326,l)
+);
+}
+);
+};
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-ref = u;
+closed = 1;
+nodes = (
+(1037,1072,ls),
+(1116,1072,o),
+(1160,1116,o),
+(1160,1195,cs),
+(1160,1326,l),
+(1114,1326,l),
+(1114,1195,ls),
+(1114,1141,o),
+(1091,1118,o),
+(1037,1118,cs),
+(920,1118,l),
+(920,1072,l)
+);
 },
 {
-pos = (722,-372);
-ref = _part.rtophorn;
+ref = u;
 }
 );
-width = 1164;
+width = 1200;
 },
 {
 layerId = m007;
 shapes = (
 {
-ref = u;
+closed = 1;
+nodes = (
+(1016,936,ls),
+(1130,936,o),
+(1186,992,o),
+(1186,1106,cs),
+(1186,1296,l),
+(1026,1296,l),
+(1026,1074,ls),
+(1026,1063,o),
+(1019,1056,o),
+(1008,1056,cs),
+(842,1056,l),
+(842,936,l)
+);
 },
 {
-pos = (714,-434);
-ref = _part.rtophorn;
+ref = u;
 }
 );
-width = 1140;
+width = 1206;
 },
 {
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(925,225,o),
+(797,136,o),
+(643,136,cs),
+(485,136,o),
+(381,229,o),
+(381,412,cs),
+(381,1056,l),
+(211,1056,l),
+(211,400,ls),
+(211,119,o),
+(398,-20,o),
+(611,-20,cs),
+(778,-20,o),
+(879,68,o),
+(925,170,c),
+(929,170,l),
+(929,0,l),
+(1095,0,l),
+(1095,1056,l),
+(925,1056,l),
+(925,438,ls)
+);
+},
+{
+closed = 1;
+nodes = (
+(1133,1074,ls),
+(1133,1063,o),
+(1126,1056,o),
+(1115,1056,cs),
+(1008,1056,l),
+(1008,936,l),
+(1123,936,ls),
+(1237,936,o),
+(1293,992,o),
+(1293,1106,cs),
+(1293,1296,l),
+(1133,1296,l)
+);
+}
+);
+};
 layerId = m009;
 shapes = (
 {
-ref = u;
+closed = 1;
+nodes = (
+(1113,824,ls),
+(1257,824,o),
+(1371,886,o),
+(1371,1036,cs),
+(1371,1296,l),
+(1023,1296,l),
+(1023,1088,ls),
+(1023,1067,o),
+(1012,1056,o),
+(991,1056,cs),
+(812,1056,l),
+(812,824,l)
+);
 },
 {
-pos = (726,-434);
-ref = _part.rtophorn;
+ref = u;
 }
 );
-width = 1298;
+width = 1391;
+},
+{
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(826,225,o),
+(698,136,o),
+(544,136,cs),
+(386,136,o),
+(282,229,o),
+(282,412,cs),
+(282,1056,l),
+(112,1056,l),
+(112,400,ls),
+(112,119,o),
+(299,-20,o),
+(512,-20,cs),
+(679,-20,o),
+(780,68,o),
+(826,170,c),
+(830,170,l),
+(830,0,l),
+(996,0,l),
+(996,1056,l),
+(826,1056,l),
+(826,438,ls)
+);
 },
 {
+closed = 1;
+nodes = (
+(1034,1074,ls),
+(1034,1063,o),
+(1027,1056,o),
+(1016,1056,cs),
+(909,1056,l),
+(909,936,l),
+(1024,936,ls),
+(1138,936,o),
+(1194,992,o),
+(1194,1106,cs),
+(1194,1296,l),
+(1034,1296,l)
+);
+}
+);
+};
 layerId = m011;
 shapes = (
 {
+closed = 1;
+nodes = (
+(997,1010,ls),
+(1076,1010,o),
+(1120,1054,o),
+(1120,1133,cs),
+(1120,1296,l),
+(1074,1296,l),
+(1074,1133,ls),
+(1074,1079,o),
+(1051,1056,o),
+(997,1056,cs),
+(888,1056,l),
+(888,1010,l)
+);
+},
+{
+ref = u;
+}
+);
+width = 1150;
+},
+{
+associatedMasterId = m007;
+layerId = "8AAA7078-49AA-4BD1-8A8F-E124A443ACC1";
+name = "Apr 11, 23, 15:36";
+shapes = (
+{
 ref = u;
 },
 {
-pos = (754,-434);
-ref = _part.rtophorn;
+closed = 1;
+nodes = (
+(1050,1076,ls),
+(1050,1063,o),
+(1043,1056,o),
+(1030,1056,cs),
+(925,1056,l),
+(925,936,l),
+(1070,936,ls),
+(1156,936,o),
+(1210,990,o),
+(1210,1076,cs),
+(1210,1296,l),
+(1050,1296,l)
+);
+}
+);
+width = 1226;
+},
+{
+associatedMasterId = m011;
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(1035,1076,ls),
+(1035,1063,o),
+(1028,1056,o),
+(1015,1056,cs),
+(910,1056,l),
+(910,936,l),
+(1055,936,ls),
+(1141,936,o),
+(1195,990,o),
+(1195,1076,cs),
+(1195,1296,l),
+(1035,1296,l)
+);
+},
+{
+closed = 0;
+nodes = (
+(945,1033,l),
+(1047,1033,ls),
+(1088,1033,o),
+(1106,1052,o),
+(1106,1093,cs),
+(1106,1298,l)
+);
+}
+);
+};
+layerId = "B3314A3C-224C-446A-BE5E-DC0B206F0859";
+name = "Apr 11, 23, 15:39";
+shapes = (
+{
+ref = u;
+},
+{
+closed = 1;
+nodes = (
+(1051,1010,ls),
+(1099,1010,o),
+(1129,1040,o),
+(1129,1088,cs),
+(1129,1296,l),
+(1083,1296,l),
+(1083,1088,ls),
+(1083,1066,o),
+(1073,1056,o),
+(1051,1056,cs),
+(909,1056,l),
+(909,1010,l)
+);
 }
 );
-width = 1068;
+width = 1149;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uhornacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/uhornacute.glyph
index 8382ed267..27eeef41a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uhornacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uhornacute.glyph
@@ -14,7 +14,7 @@ pos = (244,0);
 ref = acute;
 }
 );
-width = 1190;
+width = 1248;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -27,7 +27,7 @@ pos = (276,0);
 ref = acute;
 }
 );
-width = 1330;
+width = 1426;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -40,7 +40,7 @@ pos = (302,0);
 ref = acute;
 }
 );
-width = 1164;
+width = 1200;
 },
 {
 layerId = m007;
@@ -53,7 +53,7 @@ pos = (219,0);
 ref = acute;
 }
 );
-width = 1140;
+width = 1206;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (240,42);
+pos = (240,0);
 ref = acute;
 }
 );
-width = 1298;
+width = 1391;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (254,0);
+pos = (250,0);
 ref = acute;
 }
 );
-width = 1068;
+width = 1150;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uhorndotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/uhorndotbelow.glyph
index 05ce94e28..bc20d7096 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uhorndotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uhorndotbelow.glyph
@@ -14,7 +14,7 @@ pos = (1202,0);
 ref = dotbelow;
 }
 );
-width = 1190;
+width = 1248;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -27,7 +27,7 @@ pos = (1278,0);
 ref = dotbelow;
 }
 );
-width = 1330;
+width = 1426;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -40,7 +40,7 @@ pos = (1140,0);
 ref = dotbelow;
 }
 );
-width = 1164;
+width = 1200;
 },
 {
 layerId = m007;
@@ -53,7 +53,7 @@ pos = (1208,0);
 ref = dotbelow;
 }
 );
-width = 1140;
+width = 1206;
 },
 {
 layerId = m009;
@@ -66,7 +66,7 @@ pos = (1278,0);
 ref = dotbelow;
 }
 );
-width = 1298;
+width = 1391;
 },
 {
 layerId = m011;
@@ -79,7 +79,7 @@ pos = (1150,0);
 ref = dotbelow;
 }
 );
-width = 1068;
+width = 1150;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uhorngrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/uhorngrave.glyph
index dbd560eb0..0ffe7fbed 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uhorngrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uhorngrave.glyph
@@ -14,7 +14,7 @@ pos = (58,0);
 ref = grave;
 }
 );
-width = 1190;
+width = 1248;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -27,7 +27,7 @@ pos = (62,0);
 ref = grave;
 }
 );
-width = 1330;
+width = 1426;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -40,7 +40,7 @@ pos = (88,0);
 ref = grave;
 }
 );
-width = 1164;
+width = 1200;
 },
 {
 layerId = m007;
@@ -53,7 +53,7 @@ pos = (10,0);
 ref = grave;
 }
 );
-width = 1140;
+width = 1206;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (-22,42);
+pos = (-22,0);
 ref = grave;
 }
 );
-width = 1298;
+width = 1391;
 },
 {
 layerId = m011;
@@ -79,7 +79,7 @@ pos = (40,0);
 ref = grave;
 }
 );
-width = 1068;
+width = 1150;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uhornhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/uhornhookabove.glyph
index 68757e6fc..1d001a72d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uhornhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uhornhookabove.glyph
@@ -1,7 +1,7 @@
 {
 glyphname = uhornhookabove;
 kernLeft = u;
-kernRight = u;
+kernRight = uhorn;
 layers = (
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -10,11 +10,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1190,26);
+pos = (1183,0);
 ref = hookabovecmb;
 }
 );
-width = 1190;
+width = 1248;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1404,-6);
+pos = (1330,0);
 ref = hookabovecmb;
 }
 );
-width = 1330;
+width = 1426;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1080,44);
+pos = (1104,0);
 ref = hookabovecmb;
 }
 );
-width = 1164;
+width = 1200;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1196,-16);
+pos = (1133,0);
 ref = hookabovecmb;
 }
 );
-width = 1140;
+width = 1206;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1404,42);
+pos = (1304,0);
 ref = hookabovecmb;
 }
 );
-width = 1298;
+width = 1391;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1096,2);
+pos = (1038,0);
 ref = hookabovecmb;
 }
 );
-width = 1068;
+width = 1150;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uhorntilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/uhorntilde.glyph
index d000872ae..ce4183842 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uhorntilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uhorntilde.glyph
@@ -14,7 +14,7 @@ pos = (84,0);
 ref = tilde;
 }
 );
-width = 1190;
+width = 1248;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -27,7 +27,7 @@ pos = (154,0);
 ref = tilde;
 }
 );
-width = 1330;
+width = 1426;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (72,0);
+pos = (78,0);
 ref = tilde;
 }
 );
-width = 1164;
+width = 1200;
 },
 {
 layerId = m007;
@@ -53,7 +53,7 @@ pos = (90,0);
 ref = tilde;
 }
 );
-width = 1140;
+width = 1206;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (138,42);
+pos = (138,0);
 ref = tilde;
 }
 );
-width = 1298;
+width = 1391;
 },
 {
 layerId = m011;
@@ -79,7 +79,7 @@ pos = (86,0);
 ref = tilde;
 }
 );
-width = 1068;
+width = 1150;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uhungarumlaut.glyph b/src/Inter-Roman.glyphspackage/glyphs/uhungarumlaut.glyph
index a71f06ead..10a6f2d46 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uhungarumlaut.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uhungarumlaut.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (244,12);
+pos = (244,-174);
 ref = hungarumlaut;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (276,12);
+pos = (276,-174);
 ref = hungarumlaut;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (254,12);
+pos = (254,-174);
 ref = hungarumlaut;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (250,-30);
+pos = (250,-236);
 ref = hungarumlaut;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (276,12);
+pos = (276,-236);
 ref = hungarumlaut;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (270,-30);
+pos = (270,-236);
 ref = hungarumlaut;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uhungarumlautcyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/uhungarumlautcyrillic.glyph
index 3c6c20384..28004b477 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uhungarumlautcyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uhungarumlautcyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (218,12);
+pos = (218,-174);
 ref = hungarumlaut;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (226,12);
+pos = (226,-174);
 ref = hungarumlaut;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (208,12);
+pos = (208,-174);
 ref = hungarumlaut;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (212,-30);
+pos = (212,-236);
 ref = hungarumlaut;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (218,12);
+pos = (218,-236);
 ref = hungarumlaut;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (224,-30);
+pos = (224,-236);
 ref = hungarumlaut;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uinvertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/uinvertedbreve.glyph
index a4a8c8d37..9e7e320fa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uinvertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uinvertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1252,0);
+pos = (1193,0);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1306,0);
+pos = (1328,0);
 ref = breveinvnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1174,0);
+pos = (1164,0);
 ref = breveinvnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1226,-10);
+pos = (1134,0);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1290,42);
+pos = (1300,0);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1126,0);
+pos = (1063,0);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/umacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/umacron.glyph
index 1498e6df6..1149c3ef2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/umacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/umacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (136,0);
+pos = (-4,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (8,0);
+pos = (1,0);
 ref = macron;
 }
 );
@@ -36,7 +36,6 @@ shapes = (
 ref = u;
 },
 {
-pos = (282,0);
 ref = macron;
 }
 );
@@ -49,7 +48,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (142,-42);
+pos = (2,0);
 ref = macron;
 }
 );
@@ -62,7 +61,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (8,0);
+pos = (1,0);
 ref = macron;
 }
 );
@@ -75,7 +74,6 @@ shapes = (
 ref = u;
 },
 {
-pos = (298,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/umacroncyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/umacroncyrillic.glyph
index 970ca8908..1c65aaa9b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/umacroncyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/umacroncyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (110,0);
+pos = (-30,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-42,0);
+pos = (-49,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (236,0);
+pos = (-46,0);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (104,-42);
+pos = (-36,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-50,0);
+pos = (-57,0);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (252,0);
+pos = (-46,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/umacrondieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/umacrondieresis.glyph
index eef3a86fa..21e6e195c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/umacrondieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/umacrondieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1186,22);
+pos = (-4,0);
 ref = macrondieresiscomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1370,4);
+pos = (1,0);
 ref = macrondieresiscomb.lc;
 }
 );
@@ -36,7 +36,6 @@ shapes = (
 ref = u;
 },
 {
-pos = (1106,30);
 ref = macrondieresiscomb.lc;
 }
 );
@@ -49,7 +48,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1192,-20);
+pos = (2,0);
 ref = macrondieresiscomb.lc;
 }
 );
@@ -62,7 +61,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1370,4);
+pos = (1,0);
 ref = macrondieresiscomb.lc;
 }
 );
@@ -75,7 +74,6 @@ shapes = (
 ref = u;
 },
 {
-pos = (1122,-12);
 ref = macrondieresiscomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni012F_.ccmp.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni012F_.ccmp.glyph
index 9fc5b83b2..0d2dbe8a1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni012F_.ccmp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni012F_.ccmp.glyph
@@ -10,12 +10,6 @@ name = bottom;
 pos = (244,-466);
 }
 );
-guides = (
-{
-angle = 90;
-pos = (336,1612);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
@@ -74,12 +68,6 @@ name = bottom;
 pos = (244,-466);
 }
 );
-guides = (
-{
-angle = 90;
-pos = (336,1612);
-}
-);
 layerId = m007;
 shapes = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni01F_8.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni01F_8.glyph
index 50562083c..7e08dfa58 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni01F_8.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni01F_8.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (182,414);
+pos = (182,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (86,414);
+pos = (86,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (232,414);
+pos = (232,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni021E_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni021E_.glyph
index 72f7af778..9937f6a74 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni021E_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni021E_.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (324,388);
+pos = (322,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (300,416);
+pos = (291,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (114,414);
+pos = (116,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (322,414);
+pos = (322,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni021F_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni021F_.glyph
index 720ca61f9..cd67ad22c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni021F_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni021F_.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-209,388);
+pos = (-211,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-220,414);
+pos = (-221,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-344,414);
+pos = (-342,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-211,414);
+pos = (-211,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0226.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0226.glyph
index 7a9c043aa..98f113d4d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0226.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0226.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (456,414);
+pos = (456,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (448,414);
+pos = (448,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (464,414);
+pos = (464,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0227.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0227.glyph
index 558a3298d..fa94761bd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0227.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0227.glyph
@@ -14,7 +14,7 @@ pos = (352,0);
 ref = dotaccent;
 }
 );
-width = 1156;
+width = 1148;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -49,11 +49,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (340,0);
+pos = (320,0);
 ref = dotaccent;
 }
 );
-width = 1060;
+width = 1049;
 },
 {
 layerId = m009;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni022A_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni022A_.glyph
index dcd1e0d03..777d10d22 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni022A_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni022A_.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1363,0);
-ref = dieresismacroncomb.cn;
+pos = (180,0);
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1560;
@@ -23,8 +23,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1488,0);
-ref = dieresismacroncomb.cn;
+pos = (149,0);
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1292,0);
-ref = dieresismacroncomb.cn;
+pos = (184,0);
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1530;
@@ -49,8 +49,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1375,0);
-ref = dieresismacroncomb.cn;
+pos = (198,0);
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1534;
@@ -62,8 +62,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1452,0);
-ref = dieresismacroncomb.cn;
+pos = (115,0);
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1294,0);
-ref = dieresismacroncomb.cn;
+pos = (168,0);
+ref = dieresismacroncomb.uc;
 }
 );
 width = 1402;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni022B_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni022B_.glyph
index d188dae11..d8c397671 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni022B_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni022B_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1192,-18);
+pos = (9,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1314,-32);
+pos = (-25,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1248,-46);
+pos = (12,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1170,-60);
+pos = (-7,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1310,-74);
+pos = (-27,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1250,-88);
+pos = (-4,0);
 ref = dieresismacroncomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni022C_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni022C_.glyph
index 4a8c6362c..1cdb60c2a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni022C_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni022C_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1369,414);
+pos = (1369,228);
 ref = tildemacroncomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1510,428);
+pos = (1510,242);
 ref = tildemacroncomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1290,404);
+pos = (1290,218);
 ref = tildemacroncomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1387,414);
+pos = (1387,228);
 ref = tildemacroncomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1476,428);
+pos = (1476,242);
 ref = tildemacroncomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1290,404);
+pos = (1290,218);
 ref = tildemacroncomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni022D_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni022D_.glyph
index eeb230aa2..ce6f7a4e1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni022D_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni022D_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1200,16);
+pos = (1200,-170);
 ref = tildemacroncomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1342,6);
+pos = (1342,-180);
 ref = tildemacroncomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1118,22);
+pos = (1118,-164);
 ref = tildemacroncomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1184,-26);
+pos = (1184,-232);
 ref = tildemacroncomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1340,-36);
+pos = (1340,-242);
 ref = tildemacroncomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1118,-20);
+pos = (1118,-226);
 ref = tildemacroncomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni022E_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni022E_.glyph
index b2ba20723..a161c4914 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni022E_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni022E_.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (555,414);
+pos = (555,434);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (444,414);
+pos = (444,434);
 ref = dotaccent;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (580,414);
+pos = (580,434);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0230.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0230.glyph
index a360efe3f..4fbac79d1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0230.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0230.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1371,0);
-ref = dotmacroncomb.cn;
+pos = (537,372);
+ref = dotmacroncomb.uc;
 }
 );
 width = 1560;
@@ -23,8 +23,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1512,0);
-ref = dotmacroncomb.cn;
+pos = (480,372);
+ref = dotmacroncomb.uc;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1290,0);
-ref = dotmacroncomb.cn;
+pos = (580,372);
+ref = dotmacroncomb.uc;
 }
 );
 width = 1530;
@@ -49,8 +49,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1389,0);
-ref = dotmacroncomb.cn;
+pos = (555,434);
+ref = dotmacroncomb.uc;
 }
 );
 width = 1534;
@@ -62,8 +62,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1484,0);
-ref = dotmacroncomb.cn;
+pos = (444,434);
+ref = dotmacroncomb.uc;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1290,0);
-ref = dotmacroncomb.cn;
+pos = (580,434);
+ref = dotmacroncomb.uc;
 }
 );
 width = 1402;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0231.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0231.glyph
index 62d7b9fb0..afc6bb58a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0231.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0231.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1200,0);
+pos = (366,0);
 ref = dotmacroncomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1344,0);
+pos = (306,0);
 ref = dotmacroncomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1246,0);
+pos = (408,0);
 ref = dotmacroncomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1184,0);
+pos = (350,0);
 ref = dotmacroncomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1342,0);
+pos = (302,0);
 ref = dotmacroncomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1250,0);
+pos = (408,0);
 ref = dotmacroncomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0232.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0232.glyph
index fabce52ec..4d955219a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0232.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0232.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (220,372);
+pos = (80,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (136,372);
+pos = (129,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (324,372);
+pos = (42,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (220,372);
+pos = (80,434);
 ref = macron;
 }
 );
@@ -62,11 +62,11 @@ shapes = (
 ref = Y;
 },
 {
-pos = (124,372);
+pos = (99,434);
 ref = macron;
 }
 );
-width = 1534;
+width = 1496;
 },
 {
 layerId = m011;
@@ -75,7 +75,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (342,414);
+pos = (44,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0233.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0233.glyph
index 58055a988..e76f3eeec 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0233.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0233.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (110,0);
+pos = (-30,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-42,0);
+pos = (-49,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (236,0);
+pos = (-46,0);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (104,-42);
+pos = (-36,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-50,0);
+pos = (-57,0);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (252,0);
+pos = (-46,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0248.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0248.glyph
index ad4c3cac9..0d41a062c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0248.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0248.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (380,163);
+pos = (380,139);
 ref = crossbar;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (384,163);
+pos = (384,139);
 ref = crossbar;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (384,162);
+pos = (384,139);
 ref = crossbar;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (360,164);
+pos = (360,139);
 ref = crossbar;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (386,163);
+pos = (386,139);
 ref = crossbar;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (384,162);
+pos = (384,139);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0249.ccmp.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0249.ccmp.glyph
index ab0ea614f..dab014091 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0249.ccmp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0249.ccmp.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-218,-73);
+pos = (-218,-97);
 ref = crossbar;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-218,-35);
+pos = (-218,-59);
 ref = crossbar;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-198,-94);
+pos = (-198,-117);
 ref = crossbar;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-238,-72);
+pos = (-238,-97);
 ref = crossbar;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-208,-35);
+pos = (-208,-59);
 ref = crossbar;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-197,-94);
+pos = (-197,-117);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0249.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0249.glyph
index 12541329d..e7acd626c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0249.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0249.glyph
@@ -11,7 +11,7 @@ alignment = 1;
 ref = uni0249.ccmp;
 },
 {
-pos = (-2,0);
+pos = (-1,0);
 ref = dotaccent;
 }
 );
@@ -25,7 +25,7 @@ alignment = 1;
 ref = uni0249.ccmp;
 },
 {
-pos = (-32,0);
+pos = (-31,0);
 ref = dotaccent;
 }
 );
@@ -39,7 +39,7 @@ alignment = 1;
 ref = uni0249.ccmp;
 },
 {
-pos = (40,0);
+pos = (41,0);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni024D_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni024D_.glyph
index b8bca209f..8944ac213 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni024D_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni024D_.glyph
@@ -11,7 +11,7 @@ ref = r;
 },
 {
 alignment = 1;
-pos = (-216,-185);
+pos = (-216,-209);
 ref = crossbar;
 }
 );
@@ -25,7 +25,7 @@ ref = r;
 },
 {
 alignment = 1;
-pos = (-218,-185);
+pos = (-218,-209);
 ref = crossbar;
 }
 );
@@ -39,7 +39,7 @@ ref = r;
 },
 {
 alignment = 1;
-pos = (-202,-186);
+pos = (-202,-209);
 ref = crossbar;
 }
 );
@@ -53,7 +53,7 @@ ref = r;
 },
 {
 alignment = 1;
-pos = (-236,-184);
+pos = (-236,-209);
 ref = crossbar;
 }
 );
@@ -67,7 +67,7 @@ ref = r;
 },
 {
 alignment = 1;
-pos = (-210,-193);
+pos = (-210,-217);
 ref = crossbar;
 }
 );
@@ -81,7 +81,7 @@ ref = r;
 },
 {
 alignment = 1;
-pos = (-202,-186);
+pos = (-202,-209);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0268.ccmp.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0268.ccmp.glyph
index 7c0284203..aeafa46c3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0268.ccmp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0268.ccmp.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-216,-127);
+pos = (-216,-151);
 ref = crossbar;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-220,-111);
+pos = (-220,-135);
 ref = crossbar;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-204,-140);
+pos = (-204,-163);
 ref = crossbar;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-234,-126);
+pos = (-234,-151);
 ref = crossbar;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-210,-127);
+pos = (-210,-151);
 ref = crossbar;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-203,-140);
+pos = (-203,-163);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0357.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0357.glyph
index f0f35391f..6f0771ddf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0357.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0357.glyph
@@ -16,7 +16,7 @@ width = 0;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (-882,0);
+pos = (-826,0);
 ref = ringhalfright;
 }
 );
@@ -37,7 +37,7 @@ width = 0;
 layerId = m007;
 shapes = (
 {
-pos = (-730,0);
+pos = (-714,0);
 ref = ringhalfright;
 }
 );
@@ -47,7 +47,7 @@ width = 0;
 layerId = m009;
 shapes = (
 {
-pos = (-882,0);
+pos = (-786,0);
 ref = ringhalfright;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni037D_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni037D_.glyph
index 0342f2998..ac5a017a7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni037D_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni037D_.glyph
@@ -13,7 +13,7 @@ pos = (540,559);
 },
 {
 name = top;
-pos = (544,1304);
+pos = (544,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -81,7 +81,7 @@ pos = (598,559);
 },
 {
 name = top;
-pos = (596,1304);
+pos = (596,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -149,7 +149,7 @@ pos = (526,559);
 },
 {
 name = top;
-pos = (538,1304);
+pos = (538,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -217,7 +217,7 @@ pos = (509,528);
 },
 {
 name = top;
-pos = (509,1262);
+pos = (509,1056);
 }
 );
 layerId = m007;
@@ -285,7 +285,7 @@ pos = (576,528);
 },
 {
 name = top;
-pos = (588,1262);
+pos = (588,1056);
 }
 );
 layerId = m009;
@@ -353,7 +353,7 @@ pos = (462,555);
 },
 {
 name = top;
-pos = (474,1304);
+pos = (474,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni03F_C_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni03F_C_.glyph
index 130df32e1..8e821af2f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni03F_C_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni03F_C_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (-230,-907);
+pos = (-230,-931);
 ref = crossbar;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (-220,-875);
+pos = (-220,-899);
 ref = crossbar;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (-234,-928);
+pos = (-234,-951);
 ref = crossbar;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (-250,-906);
+pos = (-250,-931);
 ref = crossbar;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (-212,-875);
+pos = (-212,-899);
 ref = crossbar;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (-234,-928);
+pos = (-234,-951);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0400.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0400.glyph
index ba586b204..af79a8bb5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0400.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0400.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (36,414);
+pos = (36,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-42,414);
+pos = (-42,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (76,414);
+pos = (76,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni040D_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni040D_.glyph
index 9548f21e5..47f27d0e5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni040D_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni040D_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (236,372);
+pos = (234,372);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (134,372);
+pos = (136,372);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (170,414);
+pos = (176,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (82,414);
+pos = (84,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (232,414);
+pos = (232,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni048A_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni048A_.glyph
index 9191c86a7..fcfef8a00 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni048A_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni048A_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (314,372);
+pos = (388,372);
 ref = breve;
 },
 {
@@ -28,7 +28,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (226,372);
+pos = (260,372);
 ref = breve;
 },
 {
@@ -45,7 +45,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (374,372);
+pos = (438,372);
 ref = breve;
 },
 {
@@ -62,7 +62,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (302,414);
+pos = (336,434);
 ref = breve;
 },
 {
@@ -80,7 +80,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (258,414);
+pos = (276,434);
 ref = breve;
 },
 {
@@ -97,7 +97,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (310,414);
+pos = (374,434);
 ref = breve;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni048B_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni048B_.glyph
index 4b925b924..640d94e20 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni048B_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni048B_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (140,0);
+pos = (216,0);
 ref = breve;
 },
 {
@@ -27,7 +27,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (153,0);
+pos = (185,0);
 ref = breve;
 },
 {
@@ -44,7 +44,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (166,0);
+pos = (230,0);
 ref = breve;
 },
 {
@@ -61,7 +61,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (140,0);
+pos = (168,0);
 ref = breve;
 },
 {
@@ -78,7 +78,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (153,0);
+pos = (169,0);
 ref = breve;
 },
 {
@@ -95,7 +95,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (102,0);
+pos = (166,0);
 ref = breve;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni04E_C_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni04E_C_.glyph
index 7cf847c04..8f7f4c297 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni04E_C_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni04E_C_.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = afii10047;
 },
 {
-pos = (80,372);
+pos = (85,372);
 ref = dieresis;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = afii10047;
 },
 {
-pos = (229,372);
+pos = (71,372);
 ref = dieresis;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = afii10047;
 },
 {
-pos = (-14,372);
+pos = (78,372);
 ref = dieresis;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = afii10047;
 },
 {
-pos = (80,414);
+pos = (85,434);
 ref = dieresis;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = afii10047;
 },
 {
-pos = (192,414);
+pos = (37,434);
 ref = dieresis;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = afii10047;
 },
 {
-pos = (-14,414);
+pos = (62,434);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni04F_A_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni04F_A_.glyph
index c7b498032..7d3612395 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni04F_A_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni04F_A_.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (-190,47);
+pos = (-190,23);
 ref = crossbar;
 },
 {
@@ -26,7 +26,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (-224,67);
+pos = (-224,43);
 ref = crossbar;
 },
 {
@@ -43,7 +43,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (-169,34);
+pos = (-169,11);
 ref = crossbar;
 },
 {
@@ -60,7 +60,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (-210,48);
+pos = (-210,23);
 ref = crossbar;
 },
 {
@@ -77,7 +77,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (-216,59);
+pos = (-216,35);
 ref = crossbar;
 },
 {
@@ -94,7 +94,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (-169,34);
+pos = (-169,11);
 ref = crossbar;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni04F_B_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni04F_B_.glyph
index 43aafa4ba..f738fa662 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni04F_B_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni04F_B_.glyph
@@ -11,7 +11,7 @@ ref = "ge-cy";
 },
 {
 alignment = 1;
-pos = (-216,-163);
+pos = (-216,-187);
 ref = crossbar;
 },
 {
@@ -30,7 +30,7 @@ ref = "ge-cy";
 },
 {
 alignment = 1;
-pos = (-216,-99);
+pos = (-216,-123);
 ref = crossbar;
 },
 {
@@ -49,7 +49,7 @@ ref = "ge-cy";
 },
 {
 alignment = 1;
-pos = (-202,-164);
+pos = (-202,-187);
 ref = crossbar;
 },
 {
@@ -68,7 +68,7 @@ ref = "ge-cy";
 },
 {
 alignment = 1;
-pos = (-236,-162);
+pos = (-236,-187);
 ref = crossbar;
 },
 {
@@ -87,7 +87,7 @@ ref = "ge-cy";
 },
 {
 alignment = 1;
-pos = (-208,-155);
+pos = (-208,-179);
 ref = crossbar;
 },
 {
@@ -106,7 +106,7 @@ ref = "ge-cy";
 },
 {
 alignment = 1;
-pos = (-202,-164);
+pos = (-202,-187);
 ref = crossbar;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1E_2D_.ccmp.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1E_2D_.ccmp.glyph
index 6fa3a6bb7..a9d9501f7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1E_2D_.ccmp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1E_2D_.ccmp.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (868,0);
+pos = (844,0);
 ref = tildesubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (1026,0);
+pos = (970,0);
 ref = tildesubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (706,0);
+pos = (801,0);
 ref = tildesubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (869,0);
+pos = (781,0);
 ref = tildesubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (1006,0);
+pos = (934,0);
 ref = tildesubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (703,0);
+pos = (688,0);
 ref = tildesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_00.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_00.glyph
index 74378d94b..8c04762d4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_00.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_00.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (372,122);
+pos = (372,-64);
 ref = uni1FBD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (462,122);
+pos = (462,-64);
 ref = uni1FBD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (320,122);
+pos = (320,-64);
 ref = uni1FBD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (348,80);
+pos = (348,-126);
 ref = uni1FBD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (482,80);
+pos = (482,-126);
 ref = uni1FBD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (312,80);
+pos = (312,-126);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_01.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_01.glyph
index a409b7dca..1cd3968b1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_01.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_01.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (336,128);
+pos = (336,-58);
 ref = uni1FFE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (248,128);
+pos = (248,-58);
 ref = uni1FFE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (392,128);
+pos = (392,-58);
 ref = uni1FFE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (312,86);
+pos = (312,-120);
 ref = uni1FFE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (268,86);
+pos = (268,-120);
 ref = uni1FFE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (384,86);
+pos = (384,-120);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_02.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_02.glyph
index 6362f175e..d22d718bd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_02.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_02.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (150,122);
+pos = (150,-64);
 ref = uni1FCD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (92,122);
+pos = (92,-64);
 ref = uni1FCD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (236,122);
+pos = (236,-64);
 ref = uni1FCD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (126,80);
+pos = (126,-126);
 ref = uni1FCD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (112,80);
+pos = (112,-126);
 ref = uni1FCD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (228,80);
+pos = (228,-126);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_03.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_03.glyph
index 93e1801e6..456efe326 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_03.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_03.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (112,128);
+pos = (112,-58);
 ref = uni1FDD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (190,126);
+pos = (190,-60);
 ref = uni1FDD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (250,128);
+pos = (250,-58);
 ref = uni1FDD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (88,86);
+pos = (88,-120);
 ref = uni1FDD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (210,84);
+pos = (210,-122);
 ref = uni1FDD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (242,86);
+pos = (242,-120);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_04.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_04.glyph
index 14f0164d9..c2ec58b9f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_04.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_04.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (226,128);
+pos = (226,-58);
 ref = uni1FCE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (164,128);
+pos = (164,-58);
 ref = uni1FCE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (362,128);
+pos = (362,-58);
 ref = uni1FCE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (202,86);
+pos = (202,-120);
 ref = uni1FCE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (184,86);
+pos = (184,-120);
 ref = uni1FCE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (354,86);
+pos = (354,-120);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_05.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_05.glyph
index c2402abb7..d221a068f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_05.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_05.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (182,128);
+pos = (182,-58);
 ref = uni1FDE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (170,126);
+pos = (170,-60);
 ref = uni1FDE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (286,128);
+pos = (286,-58);
 ref = uni1FDE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (158,86);
+pos = (158,-120);
 ref = uni1FDE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (190,84);
+pos = (190,-122);
 ref = uni1FDE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (278,86);
+pos = (278,-120);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_06.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_06.glyph
index 2a722fd9d..bb39fecef 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_06.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_06.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (260,122);
+pos = (260,-64);
 ref = uni1FCF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (266,122);
+pos = (266,-64);
 ref = uni1FCF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (274,122);
+pos = (274,-64);
 ref = uni1FCF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (236,80);
+pos = (236,-126);
 ref = uni1FCF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (286,80);
+pos = (286,-126);
 ref = uni1FCF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (266,80);
+pos = (266,-126);
 ref = uni1FCF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_07.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_07.glyph
index 93b192acd..df043abda 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_07.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_07.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (234,122);
+pos = (234,-64);
 ref = uni1FDF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (190,122);
+pos = (190,-64);
 ref = uni1FDF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (264,122);
+pos = (264,-64);
 ref = uni1FDF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (210,80);
+pos = (210,-126);
 ref = uni1FDF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (210,80);
+pos = (210,-126);
 ref = uni1FDF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (256,80);
+pos = (256,-126);
 ref = uni1FDF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_10.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_10.glyph
index 5d02a1457..79ea75667 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_10.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_10.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (324,122);
+pos = (324,-64);
 ref = uni1FBD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (434,122);
+pos = (434,-64);
 ref = uni1FBD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (260,122);
+pos = (260,-64);
 ref = uni1FBD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (324,122);
+pos = (324,-126);
 ref = uni1FBD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (434,122);
+pos = (434,-126);
 ref = uni1FBD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (260,122);
+pos = (260,-126);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_11.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_11.glyph
index bb5445f1e..0af5b718d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_11.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_11.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (288,128);
+pos = (288,-58);
 ref = uni1FFE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (220,128);
+pos = (220,-58);
 ref = uni1FFE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (332,128);
+pos = (332,-58);
 ref = uni1FFE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (288,128);
+pos = (288,-120);
 ref = uni1FFE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (220,128);
+pos = (220,-120);
 ref = uni1FFE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (332,128);
+pos = (332,-120);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_12.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_12.glyph
index d7bd0e078..2ea8f9fc2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_12.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_12.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (102,122);
+pos = (102,-64);
 ref = uni1FCD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (64,122);
+pos = (64,-64);
 ref = uni1FCD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (176,122);
+pos = (176,-64);
 ref = uni1FCD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (102,122);
+pos = (102,-126);
 ref = uni1FCD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (64,122);
+pos = (64,-126);
 ref = uni1FCD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (176,122);
+pos = (176,-126);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_13.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_13.glyph
index c5ae07694..706c0316f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_13.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_13.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (64,128);
+pos = (64,-58);
 ref = uni1FDD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (162,126);
+pos = (162,-60);
 ref = uni1FDD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (190,128);
+pos = (190,-58);
 ref = uni1FDD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (64,128);
+pos = (64,-120);
 ref = uni1FDD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (162,126);
+pos = (162,-122);
 ref = uni1FDD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (190,128);
+pos = (190,-120);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_14.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_14.glyph
index 517564507..b8ab1c547 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_14.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_14.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (178,128);
+pos = (178,-58);
 ref = uni1FCE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (136,128);
+pos = (136,-58);
 ref = uni1FCE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (302,128);
+pos = (302,-58);
 ref = uni1FCE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (178,128);
+pos = (178,-120);
 ref = uni1FCE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (136,128);
+pos = (136,-120);
 ref = uni1FCE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (302,128);
+pos = (302,-120);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_15.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_15.glyph
index 74a525a33..663cf70cf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_15.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_15.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (134,128);
+pos = (134,-58);
 ref = uni1FDE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (142,126);
+pos = (142,-60);
 ref = uni1FDE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (226,128);
+pos = (226,-58);
 ref = uni1FDE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (134,128);
+pos = (134,-120);
 ref = uni1FDE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (142,126);
+pos = (142,-122);
 ref = uni1FDE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (226,128);
+pos = (226,-120);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_20.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_20.glyph
index 290f83242..2feafb2d2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_20.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_20.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (362,122);
+pos = (362,-64);
 ref = uni1FBD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (496,122);
+pos = (496,-64);
 ref = uni1FBD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (300,122);
+pos = (300,-64);
 ref = uni1FBD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (362,122);
+pos = (362,-126);
 ref = uni1FBD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (496,122);
+pos = (496,-126);
 ref = uni1FBD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (300,122);
+pos = (300,-126);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_21.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_21.glyph
index b19c3a77c..f35c8385d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_21.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_21.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (326,128);
+pos = (326,-58);
 ref = uni1FFE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (282,128);
+pos = (282,-58);
 ref = uni1FFE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (372,128);
+pos = (372,-58);
 ref = uni1FFE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (326,128);
+pos = (326,-120);
 ref = uni1FFE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (282,128);
+pos = (282,-120);
 ref = uni1FFE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (372,128);
+pos = (372,-120);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_22.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_22.glyph
index 68f01434c..b8ed25119 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_22.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_22.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (140,122);
+pos = (140,-64);
 ref = uni1FCD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (126,122);
+pos = (126,-64);
 ref = uni1FCD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (216,122);
+pos = (216,-64);
 ref = uni1FCD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (140,122);
+pos = (140,-126);
 ref = uni1FCD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (126,122);
+pos = (126,-126);
 ref = uni1FCD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (216,122);
+pos = (216,-126);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_23.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_23.glyph
index f6cef5544..20e7745cd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_23.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_23.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (102,128);
+pos = (102,-58);
 ref = uni1FDD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (224,126);
+pos = (224,-60);
 ref = uni1FDD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (230,128);
+pos = (230,-58);
 ref = uni1FDD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (102,128);
+pos = (102,-120);
 ref = uni1FDD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (224,126);
+pos = (224,-122);
 ref = uni1FDD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (230,128);
+pos = (230,-120);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_24.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_24.glyph
index 7c9820ce4..44e3b4ebb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_24.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_24.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (216,128);
+pos = (216,-58);
 ref = uni1FCE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (198,128);
+pos = (198,-58);
 ref = uni1FCE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (342,128);
+pos = (342,-58);
 ref = uni1FCE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (216,128);
+pos = (216,-120);
 ref = uni1FCE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (198,128);
+pos = (198,-120);
 ref = uni1FCE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (342,128);
+pos = (342,-120);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_25.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_25.glyph
index 77f2b8de5..ff4f84174 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_25.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_25.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (172,128);
+pos = (172,-58);
 ref = uni1FDE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (204,126);
+pos = (204,-60);
 ref = uni1FDE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (266,128);
+pos = (266,-58);
 ref = uni1FDE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (172,128);
+pos = (172,-120);
 ref = uni1FDE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (204,126);
+pos = (204,-122);
 ref = uni1FDE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (266,128);
+pos = (266,-120);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_26.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_26.glyph
index 12a3fe8a4..e4a942344 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_26.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_26.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (250,122);
+pos = (250,-64);
 ref = uni1FCF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (300,122);
+pos = (300,-64);
 ref = uni1FCF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (254,122);
+pos = (254,-64);
 ref = uni1FCF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (250,122);
+pos = (250,-126);
 ref = uni1FCF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (300,122);
+pos = (300,-126);
 ref = uni1FCF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (254,122);
+pos = (254,-126);
 ref = uni1FCF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_27.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_27.glyph
index 0c0e4d186..f02a98466 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_27.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_27.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (224,122);
+pos = (224,-64);
 ref = uni1FDF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (224,122);
+pos = (224,-64);
 ref = uni1FDF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (244,122);
+pos = (244,-64);
 ref = uni1FDF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (224,122);
+pos = (224,-126);
 ref = uni1FDF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (224,122);
+pos = (224,-126);
 ref = uni1FDF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (244,122);
+pos = (244,-126);
 ref = uni1FDF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_30.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_30.glyph
index 476283d85..5f49f1283 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_30.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_30.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-2,122);
+pos = (-2,-64);
 ref = uni1FBD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (166,122);
+pos = (166,-64);
 ref = uni1FBD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-60,122);
+pos = (-60,-64);
 ref = uni1FBD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-2,122);
+pos = (-2,-126);
 ref = uni1FBD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (166,122);
+pos = (166,-126);
 ref = uni1FBD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-60,122);
+pos = (-60,-126);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_31.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_31.glyph
index 7d7530745..a93860598 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_31.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_31.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-38,128);
+pos = (-38,-58);
 ref = uni1FFE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-48,128);
+pos = (-48,-58);
 ref = uni1FFE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (12,128);
+pos = (12,-58);
 ref = uni1FFE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-38,128);
+pos = (-38,-120);
 ref = uni1FFE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-48,128);
+pos = (-48,-120);
 ref = uni1FFE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (12,128);
+pos = (12,-120);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_32.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_32.glyph
index f17900c1c..28fb1cadf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_32.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_32.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-224,122);
+pos = (-224,-64);
 ref = uni1FCD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-204,122);
+pos = (-204,-64);
 ref = uni1FCD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-144,122);
+pos = (-144,-64);
 ref = uni1FCD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-224,122);
+pos = (-224,-126);
 ref = uni1FCD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-204,122);
+pos = (-204,-126);
 ref = uni1FCD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-144,122);
+pos = (-144,-126);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_33.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_33.glyph
index 75b944ad1..4c511c62d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_33.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_33.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-262,128);
+pos = (-262,-58);
 ref = uni1FDD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-106,126);
+pos = (-106,-60);
 ref = uni1FDD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-130,128);
+pos = (-130,-58);
 ref = uni1FDD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-262,128);
+pos = (-262,-120);
 ref = uni1FDD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-106,126);
+pos = (-106,-122);
 ref = uni1FDD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-130,128);
+pos = (-130,-120);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_34.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_34.glyph
index fa48d462e..4b98d78d5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_34.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_34.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-148,128);
+pos = (-148,-58);
 ref = uni1FCE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-132,128);
+pos = (-132,-58);
 ref = uni1FCE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-18,128);
+pos = (-18,-58);
 ref = uni1FCE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-148,128);
+pos = (-148,-120);
 ref = uni1FCE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-132,128);
+pos = (-132,-120);
 ref = uni1FCE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-18,128);
+pos = (-18,-120);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_35.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_35.glyph
index 752e7015b..a2ec2b4b0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_35.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_35.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-192,128);
+pos = (-192,-58);
 ref = uni1FDE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-126,126);
+pos = (-126,-60);
 ref = uni1FDE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-94,128);
+pos = (-94,-58);
 ref = uni1FDE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-192,128);
+pos = (-192,-120);
 ref = uni1FDE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-126,126);
+pos = (-126,-122);
 ref = uni1FDE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-94,128);
+pos = (-94,-120);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_36.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_36.glyph
index ec2e57982..460a3405e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_36.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_36.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-114,122);
+pos = (-114,-64);
 ref = uni1FCF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-30,122);
+pos = (-30,-64);
 ref = uni1FCF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-106,122);
+pos = (-106,-64);
 ref = uni1FCF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-114,122);
+pos = (-114,-126);
 ref = uni1FCF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-30,122);
+pos = (-30,-126);
 ref = uni1FCF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-106,122);
+pos = (-106,-126);
 ref = uni1FCF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_37.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_37.glyph
index dc6e2afb2..a099c90eb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_37.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_37.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-140,122);
+pos = (-140,-64);
 ref = uni1FDF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-106,122);
+pos = (-106,-64);
 ref = uni1FDF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-116,122);
+pos = (-116,-64);
 ref = uni1FDF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-140,122);
+pos = (-140,-126);
 ref = uni1FDF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-106,122);
+pos = (-106,-126);
 ref = uni1FDF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-116,122);
+pos = (-116,-126);
 ref = uni1FDF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_40.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_40.glyph
index 0cb21a588..9880981b3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_40.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_40.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (372,122);
+pos = (372,-64);
 ref = uni1FBD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (472,122);
+pos = (472,-64);
 ref = uni1FBD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (312,122);
+pos = (312,-64);
 ref = uni1FBD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (356,80);
+pos = (356,-126);
 ref = uni1FBD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (470,80);
+pos = (470,-126);
 ref = uni1FBD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (312,80);
+pos = (312,-126);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_41.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_41.glyph
index c1f06139f..85c966ef3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_41.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_41.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (336,128);
+pos = (336,-58);
 ref = uni1FFE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (258,128);
+pos = (258,-58);
 ref = uni1FFE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (384,128);
+pos = (384,-58);
 ref = uni1FFE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (320,86);
+pos = (320,-120);
 ref = uni1FFE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (256,86);
+pos = (256,-120);
 ref = uni1FFE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (384,86);
+pos = (384,-120);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_42.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_42.glyph
index e3eb44925..998862251 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_42.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_42.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (150,122);
+pos = (150,-64);
 ref = uni1FCD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (102,122);
+pos = (102,-64);
 ref = uni1FCD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (228,122);
+pos = (228,-64);
 ref = uni1FCD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (134,80);
+pos = (134,-126);
 ref = uni1FCD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (100,80);
+pos = (100,-126);
 ref = uni1FCD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (228,80);
+pos = (228,-126);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_43.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_43.glyph
index 15a2412fe..dedf94e31 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_43.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_43.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (112,128);
+pos = (112,-58);
 ref = uni1FDD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (200,126);
+pos = (200,-60);
 ref = uni1FDD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (242,128);
+pos = (242,-58);
 ref = uni1FDD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (96,86);
+pos = (96,-120);
 ref = uni1FDD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (198,84);
+pos = (198,-122);
 ref = uni1FDD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (242,86);
+pos = (242,-120);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_44.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_44.glyph
index 420150e86..d3d3d9153 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_44.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_44.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (226,128);
+pos = (226,-58);
 ref = uni1FCE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (174,128);
+pos = (174,-58);
 ref = uni1FCE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (354,128);
+pos = (354,-58);
 ref = uni1FCE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (210,86);
+pos = (210,-120);
 ref = uni1FCE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (172,86);
+pos = (172,-120);
 ref = uni1FCE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (354,86);
+pos = (354,-120);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_45.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_45.glyph
index a3e3aea96..f5e87c908 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_45.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_45.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (182,128);
+pos = (182,-58);
 ref = uni1FDE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (180,126);
+pos = (180,-60);
 ref = uni1FDE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (278,128);
+pos = (278,-58);
 ref = uni1FDE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (166,86);
+pos = (166,-120);
 ref = uni1FDE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (178,84);
+pos = (178,-122);
 ref = uni1FDE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (278,86);
+pos = (278,-120);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_50.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_50.glyph
index bdbb70059..a10cc1c5f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_50.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_50.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (336,122);
+pos = (336,-64);
 ref = uni1FBD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (420,122);
+pos = (420,-64);
 ref = uni1FBD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (296,122);
+pos = (296,-64);
 ref = uni1FBD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (338,122);
+pos = (338,-126);
 ref = uni1FBD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (420,122);
+pos = (420,-126);
 ref = uni1FBD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (296,122);
+pos = (296,-126);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_51.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_51.glyph
index 8b2ab6b11..60a5ab385 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_51.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_51.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (300,128);
+pos = (300,-58);
 ref = uni1FFE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (206,128);
+pos = (206,-58);
 ref = uni1FFE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (368,128);
+pos = (368,-58);
 ref = uni1FFE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (302,128);
+pos = (302,-120);
 ref = uni1FFE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (206,128);
+pos = (206,-120);
 ref = uni1FFE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (368,128);
+pos = (368,-120);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_52.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_52.glyph
index 0015b2682..acc6f7dc8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_52.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_52.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (114,122);
+pos = (114,-64);
 ref = uni1FCD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (50,122);
+pos = (50,-64);
 ref = uni1FCD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (212,122);
+pos = (212,-64);
 ref = uni1FCD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (116,122);
+pos = (116,-126);
 ref = uni1FCD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (50,122);
+pos = (50,-126);
 ref = uni1FCD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (212,122);
+pos = (212,-126);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_53.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_53.glyph
index b080e0fc6..d4dc83dc3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_53.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_53.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (76,128);
+pos = (76,-58);
 ref = uni1FDD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (148,126);
+pos = (148,-60);
 ref = uni1FDD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (226,128);
+pos = (226,-58);
 ref = uni1FDD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (78,128);
+pos = (78,-120);
 ref = uni1FDD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (148,126);
+pos = (148,-122);
 ref = uni1FDD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (226,128);
+pos = (226,-120);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_54.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_54.glyph
index 5a1aaeb6d..005ce3a3c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_54.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_54.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (190,128);
+pos = (190,-58);
 ref = uni1FCE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (122,128);
+pos = (122,-58);
 ref = uni1FCE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (338,128);
+pos = (338,-58);
 ref = uni1FCE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (192,128);
+pos = (192,-120);
 ref = uni1FCE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (122,128);
+pos = (122,-120);
 ref = uni1FCE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (338,128);
+pos = (338,-120);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_55.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_55.glyph
index 0431da2c9..3bff69831 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_55.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_55.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (146,128);
+pos = (146,-58);
 ref = uni1FDE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (128,126);
+pos = (128,-60);
 ref = uni1FDE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (262,128);
+pos = (262,-58);
 ref = uni1FDE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (148,128);
+pos = (148,-120);
 ref = uni1FDE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (128,126);
+pos = (128,-122);
 ref = uni1FDE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (262,128);
+pos = (262,-120);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_56.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_56.glyph
index ef109d62c..b6ade54b8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_56.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_56.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (224,122);
+pos = (224,-64);
 ref = uni1FCF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (224,122);
+pos = (224,-64);
 ref = uni1FCF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (250,122);
+pos = (250,-64);
 ref = uni1FCF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (226,122);
+pos = (226,-126);
 ref = uni1FCF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (224,122);
+pos = (224,-126);
 ref = uni1FCF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (250,122);
+pos = (250,-126);
 ref = uni1FCF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_57.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_57.glyph
index 553b8d887..7e2ff136e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_57.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_57.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (198,122);
+pos = (198,-64);
 ref = uni1FDF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (148,122);
+pos = (148,-64);
 ref = uni1FDF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (240,122);
+pos = (240,-64);
 ref = uni1FDF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (200,122);
+pos = (200,-126);
 ref = uni1FDF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (148,122);
+pos = (148,-126);
 ref = uni1FDF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (240,122);
+pos = (240,-126);
 ref = uni1FDF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_60.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_60.glyph
index a24096a1f..f803555cb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_60.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_60.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (574,122);
+pos = (574,-64);
 ref = uni1FBD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (721,122);
+pos = (721,-64);
 ref = uni1FBD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (507,122);
+pos = (507,-64);
 ref = uni1FBD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (574,80);
+pos = (574,-126);
 ref = uni1FBD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (718,122);
+pos = (718,-126);
 ref = uni1FBD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (507,80);
+pos = (507,-126);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_61.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_61.glyph
index a44800e6a..cceaead29 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_61.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_61.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (538,128);
+pos = (538,-58);
 ref = uni1FFE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (507,128);
+pos = (507,-58);
 ref = uni1FFE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (579,128);
+pos = (579,-58);
 ref = uni1FFE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (538,86);
+pos = (538,-120);
 ref = uni1FFE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (504,128);
+pos = (504,-120);
 ref = uni1FFE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (579,86);
+pos = (579,-120);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_62.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_62.glyph
index 4352bd845..9dc921741 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_62.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_62.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (352,122);
+pos = (352,-64);
 ref = uni1FCD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (351,122);
+pos = (351,-64);
 ref = uni1FCD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (423,122);
+pos = (423,-64);
 ref = uni1FCD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (352,80);
+pos = (352,-126);
 ref = uni1FCD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (348,122);
+pos = (348,-126);
 ref = uni1FCD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (423,80);
+pos = (423,-126);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_63.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_63.glyph
index ec8177315..eec372240 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_63.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_63.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (314,128);
+pos = (314,-58);
 ref = uni1FDD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (449,126);
+pos = (449,-60);
 ref = uni1FDD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (437,128);
+pos = (437,-58);
 ref = uni1FDD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (314,86);
+pos = (314,-120);
 ref = uni1FDD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (446,126);
+pos = (446,-122);
 ref = uni1FDD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (437,86);
+pos = (437,-120);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_64.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_64.glyph
index 759793b2d..d16f02423 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_64.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_64.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (428,128);
+pos = (428,-58);
 ref = uni1FCE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (423,128);
+pos = (423,-58);
 ref = uni1FCE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (549,128);
+pos = (549,-58);
 ref = uni1FCE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (428,86);
+pos = (428,-120);
 ref = uni1FCE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (420,128);
+pos = (420,-120);
 ref = uni1FCE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (549,86);
+pos = (549,-120);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_65.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_65.glyph
index d3d3e1ff9..14e08a5d8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_65.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_65.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (384,128);
+pos = (384,-58);
 ref = uni1FDE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (429,126);
+pos = (429,-60);
 ref = uni1FDE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (473,128);
+pos = (473,-58);
 ref = uni1FDE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (384,86);
+pos = (384,-120);
 ref = uni1FDE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (426,126);
+pos = (426,-122);
 ref = uni1FDE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (473,86);
+pos = (473,-120);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_66.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_66.glyph
index 6f7c3466f..4878b00b2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_66.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_66.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (462,122);
+pos = (462,-64);
 ref = uni1FCF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (525,122);
+pos = (525,-64);
 ref = uni1FCF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (461,122);
+pos = (461,-64);
 ref = uni1FCF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (462,80);
+pos = (462,-126);
 ref = uni1FCF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (522,122);
+pos = (522,-126);
 ref = uni1FCF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (461,80);
+pos = (461,-126);
 ref = uni1FCF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_67.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_67.glyph
index 610dc68b1..f32b0ba42 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_67.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_67.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (436,122);
+pos = (436,-64);
 ref = uni1FDF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (449,122);
+pos = (449,-64);
 ref = uni1FDF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (451,122);
+pos = (451,-64);
 ref = uni1FDF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (436,80);
+pos = (436,-126);
 ref = uni1FDF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (446,122);
+pos = (446,-126);
 ref = uni1FDF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (451,80);
+pos = (451,-126);
 ref = uni1FDF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_70.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_70.glyph
index c5cc4dce2..5d6ef5ea8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_70.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_70.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (252,108);
+pos = (252,-78);
 ref = uni1FEF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (226,122);
+pos = (226,-64);
 ref = uni1FEF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (316,100);
+pos = (316,-86);
 ref = uni1FEF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (228,66);
+pos = (228,-140);
 ref = uni1FEF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (246,80);
+pos = (246,-126);
 ref = uni1FEF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (308,58);
+pos = (308,-148);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_71.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_71.glyph
index 73aa97311..1812bce02 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_71.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_71.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (336,0);
+pos = (336,-186);
 ref = uni1FFD;
 }
 );
@@ -22,7 +22,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (306,0);
+pos = (306,-186);
 ref = uni1FFD;
 }
 );
@@ -35,7 +35,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (360,0);
+pos = (360,-186);
 ref = uni1FFD;
 }
 );
@@ -48,7 +48,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (312,-42);
+pos = (312,-248);
 ref = uni1FFD;
 }
 );
@@ -61,7 +61,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (326,-42);
+pos = (326,-248);
 ref = uni1FFD;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (352,-42);
+pos = (352,-248);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_72.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_72.glyph
index 41d0635df..084bea028 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_72.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_72.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (204,108);
+pos = (204,-78);
 ref = uni1FEF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (198,122);
+pos = (198,-64);
 ref = uni1FEF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (256,100);
+pos = (256,-86);
 ref = uni1FEF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (204,108);
+pos = (204,-140);
 ref = uni1FEF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (198,122);
+pos = (198,-126);
 ref = uni1FEF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (256,100);
+pos = (256,-148);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_73.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_73.glyph
index 40624b111..095962fab 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_73.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_73.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (288,0);
+pos = (288,-186);
 ref = uni1FFD;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (278,0);
+pos = (278,-186);
 ref = uni1FFD;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (300,0);
+pos = (300,-186);
 ref = uni1FFD;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (288,0);
+pos = (288,-248);
 ref = uni1FFD;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (278,0);
+pos = (278,-248);
 ref = uni1FFD;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (300,0);
+pos = (300,-248);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_74.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_74.glyph
index 145830b0b..e12bb47c2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_74.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_74.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (242,108);
+pos = (242,-78);
 ref = uni1FEF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (260,122);
+pos = (260,-64);
 ref = uni1FEF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (296,100);
+pos = (296,-86);
 ref = uni1FEF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (242,108);
+pos = (242,-140);
 ref = uni1FEF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (260,122);
+pos = (260,-126);
 ref = uni1FEF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (296,100);
+pos = (296,-148);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_75.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_75.glyph
index 64bb0098f..7423f1ff8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_75.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_75.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (326,0);
+pos = (326,-186);
 ref = uni1FFD;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (340,0);
+pos = (340,-186);
 ref = uni1FFD;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (340,0);
+pos = (340,-186);
 ref = uni1FFD;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (326,0);
+pos = (326,-248);
 ref = uni1FFD;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (340,0);
+pos = (340,-248);
 ref = uni1FFD;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (340,0);
+pos = (340,-248);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_76.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_76.glyph
index e1f3ac010..5913de190 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_76.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_76.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-122,108);
+pos = (-122,-78);
 ref = uni1FEF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-70,122);
+pos = (-70,-64);
 ref = uni1FEF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-64,100);
+pos = (-64,-86);
 ref = uni1FEF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-122,108);
+pos = (-122,-140);
 ref = uni1FEF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-70,122);
+pos = (-70,-126);
 ref = uni1FEF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-64,100);
+pos = (-64,-148);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_77.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_77.glyph
index 3752ac915..136f75e5e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_77.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_77.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-38,0);
+pos = (-38,-186);
 ref = uni1FFD;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (10,0);
+pos = (10,-186);
 ref = uni1FFD;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-20,0);
+pos = (-20,-186);
 ref = uni1FFD;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-38,0);
+pos = (-38,-248);
 ref = uni1FFD;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (10,0);
+pos = (10,-248);
 ref = uni1FFD;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-20,0);
+pos = (-20,-248);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_78.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_78.glyph
index d49fcea7d..04a91de41 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_78.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_78.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (252,108);
+pos = (252,-78);
 ref = uni1FEF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (236,122);
+pos = (236,-64);
 ref = uni1FEF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (308,100);
+pos = (308,-86);
 ref = uni1FEF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (236,66);
+pos = (236,-140);
 ref = uni1FEF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (234,80);
+pos = (234,-126);
 ref = uni1FEF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (308,58);
+pos = (308,-148);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_79.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_79.glyph
index 1139ca341..d3430eb6b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_79.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_79.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (336,0);
+pos = (336,-186);
 ref = uni1FFD;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (316,0);
+pos = (316,-186);
 ref = uni1FFD;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (352,0);
+pos = (352,-186);
 ref = uni1FFD;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (320,-42);
+pos = (320,-248);
 ref = uni1FFD;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (314,-42);
+pos = (314,-248);
 ref = uni1FFD;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (352,-42);
+pos = (352,-248);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_7A_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_7A_.glyph
index b902ee9c3..0692b1745 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_7A_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_7A_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (216,108);
+pos = (216,-78);
 ref = uni1FEF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (184,122);
+pos = (184,-64);
 ref = uni1FEF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (292,100);
+pos = (292,-86);
 ref = uni1FEF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (218,108);
+pos = (218,-140);
 ref = uni1FEF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (184,122);
+pos = (184,-126);
 ref = uni1FEF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (292,100);
+pos = (292,-148);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_7B_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_7B_.glyph
index 4beea9616..d6a28db79 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_7B_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_7B_.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (300,0);
+pos = (300,-186);
 ref = uni1FFD;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (264,0);
+pos = (264,-186);
 ref = uni1FFD;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (336,0);
+pos = (336,-186);
 ref = uni1FFD;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (302,0);
+pos = (302,-248);
 ref = uni1FFD;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (264,0);
+pos = (264,-248);
 ref = uni1FFD;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (336,0);
+pos = (336,-248);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_7C_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_7C_.glyph
index 5d67668cb..70113770b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_7C_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_7C_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (454,108);
+pos = (454,-78);
 ref = uni1FEF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (485,122);
+pos = (485,-64);
 ref = uni1FEF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (503,100);
+pos = (503,-86);
 ref = uni1FEF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (454,66);
+pos = (454,-140);
 ref = uni1FEF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (482,122);
+pos = (482,-126);
 ref = uni1FEF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (503,58);
+pos = (503,-148);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_7D_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_7D_.glyph
index 7ec42e377..34b20add1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_7D_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_7D_.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (538,0);
+pos = (538,-186);
 ref = uni1FFD;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (565,0);
+pos = (565,-186);
 ref = uni1FFD;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (547,0);
+pos = (547,-186);
 ref = uni1FFD;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (538,-42);
+pos = (538,-248);
 ref = uni1FFD;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (562,0);
+pos = (562,-248);
 ref = uni1FFD;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (547,-42);
+pos = (547,-248);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_80.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_80.glyph
index d4a5909f6..b93ba8041 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_80.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_80.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (372,122);
+pos = (372,-64);
 ref = uni1FBD;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (462,122);
+pos = (462,-64);
 ref = uni1FBD;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (320,122);
+pos = (320,-64);
 ref = uni1FBD;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (348,80);
+pos = (348,-126);
 ref = uni1FBD;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (482,80);
+pos = (482,-126);
 ref = uni1FBD;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (312,80);
+pos = (312,-126);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_81.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_81.glyph
index 0bff718d9..350dc2a9e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_81.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_81.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (336,128);
+pos = (336,-58);
 ref = uni1FFE;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (248,128);
+pos = (248,-58);
 ref = uni1FFE;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (392,128);
+pos = (392,-58);
 ref = uni1FFE;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (312,86);
+pos = (312,-120);
 ref = uni1FFE;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (268,86);
+pos = (268,-120);
 ref = uni1FFE;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (384,86);
+pos = (384,-120);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_82.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_82.glyph
index ebce47748..cf34c0c70 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_82.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_82.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (150,122);
+pos = (150,-64);
 ref = uni1FCD;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (92,122);
+pos = (92,-64);
 ref = uni1FCD;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (236,122);
+pos = (236,-64);
 ref = uni1FCD;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (126,80);
+pos = (126,-126);
 ref = uni1FCD;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (112,80);
+pos = (112,-126);
 ref = uni1FCD;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (228,80);
+pos = (228,-126);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_83.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_83.glyph
index a8668b56a..f2f77c7d5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_83.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_83.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (112,128);
+pos = (112,-58);
 ref = uni1FDD;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (190,126);
+pos = (190,-60);
 ref = uni1FDD;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (250,128);
+pos = (250,-58);
 ref = uni1FDD;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (88,86);
+pos = (88,-120);
 ref = uni1FDD;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (210,84);
+pos = (210,-122);
 ref = uni1FDD;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (242,86);
+pos = (242,-120);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_84.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_84.glyph
index 81f1d91c5..2dcf0b413 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_84.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_84.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (226,128);
+pos = (226,-58);
 ref = uni1FCE;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (164,128);
+pos = (164,-58);
 ref = uni1FCE;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (362,128);
+pos = (362,-58);
 ref = uni1FCE;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (202,86);
+pos = (202,-120);
 ref = uni1FCE;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (184,86);
+pos = (184,-120);
 ref = uni1FCE;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (354,86);
+pos = (354,-120);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_85.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_85.glyph
index 6ffa2cdbf..565699e3c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_85.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_85.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (182,128);
+pos = (182,-58);
 ref = uni1FDE;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (170,126);
+pos = (170,-60);
 ref = uni1FDE;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (286,128);
+pos = (286,-58);
 ref = uni1FDE;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (158,86);
+pos = (158,-120);
 ref = uni1FDE;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (190,84);
+pos = (190,-122);
 ref = uni1FDE;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (278,86);
+pos = (278,-120);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_86.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_86.glyph
index 101ac408c..3a84ac0be 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_86.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_86.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (260,122);
+pos = (260,-64);
 ref = uni1FCF;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (266,122);
+pos = (266,-64);
 ref = uni1FCF;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (274,122);
+pos = (274,-64);
 ref = uni1FCF;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (236,80);
+pos = (236,-126);
 ref = uni1FCF;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (286,80);
+pos = (286,-126);
 ref = uni1FCF;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (266,80);
+pos = (266,-126);
 ref = uni1FCF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_87.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_87.glyph
index 8b38dc1eb..eff195faf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_87.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_87.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (234,122);
+pos = (234,-64);
 ref = uni1FDF;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (190,122);
+pos = (190,-64);
 ref = uni1FDF;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (264,122);
+pos = (264,-64);
 ref = uni1FDF;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (210,80);
+pos = (210,-126);
 ref = uni1FDF;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (210,80);
+pos = (210,-126);
 ref = uni1FDF;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (256,80);
+pos = (256,-126);
 ref = uni1FDF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_90.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_90.glyph
index f7b7064e8..104352c8d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_90.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_90.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (362,122);
+pos = (362,-64);
 ref = uni1FBD;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (496,122);
+pos = (496,-64);
 ref = uni1FBD;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (300,122);
+pos = (300,-64);
 ref = uni1FBD;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (362,122);
+pos = (362,-126);
 ref = uni1FBD;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (496,122);
+pos = (496,-126);
 ref = uni1FBD;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (300,122);
+pos = (300,-126);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_91.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_91.glyph
index 1158af7c5..b004f683d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_91.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_91.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (326,128);
+pos = (326,-58);
 ref = uni1FFE;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (282,128);
+pos = (282,-58);
 ref = uni1FFE;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (372,128);
+pos = (372,-58);
 ref = uni1FFE;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (326,128);
+pos = (326,-120);
 ref = uni1FFE;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (282,128);
+pos = (282,-120);
 ref = uni1FFE;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (372,128);
+pos = (372,-120);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_92.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_92.glyph
index 6ad3bd94d..210b13bd2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_92.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_92.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (140,122);
+pos = (140,-64);
 ref = uni1FCD;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (126,122);
+pos = (126,-64);
 ref = uni1FCD;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (216,122);
+pos = (216,-64);
 ref = uni1FCD;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (140,122);
+pos = (140,-126);
 ref = uni1FCD;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (126,122);
+pos = (126,-126);
 ref = uni1FCD;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (216,122);
+pos = (216,-126);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_93.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_93.glyph
index 74f34ffda..b50495884 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_93.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_93.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (102,128);
+pos = (102,-58);
 ref = uni1FDD;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (224,126);
+pos = (224,-60);
 ref = uni1FDD;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (230,128);
+pos = (230,-58);
 ref = uni1FDD;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (102,128);
+pos = (102,-120);
 ref = uni1FDD;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (224,126);
+pos = (224,-122);
 ref = uni1FDD;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (230,128);
+pos = (230,-120);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_94.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_94.glyph
index 81cc5900c..0c9b5e410 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_94.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_94.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (216,128);
+pos = (216,-58);
 ref = uni1FCE;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (198,128);
+pos = (198,-58);
 ref = uni1FCE;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (342,128);
+pos = (342,-58);
 ref = uni1FCE;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (216,128);
+pos = (216,-120);
 ref = uni1FCE;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (198,128);
+pos = (198,-120);
 ref = uni1FCE;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (342,128);
+pos = (342,-120);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_95.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_95.glyph
index 8bda3bc0c..e0462aa13 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_95.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_95.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (172,128);
+pos = (172,-58);
 ref = uni1FDE;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (204,126);
+pos = (204,-60);
 ref = uni1FDE;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (266,128);
+pos = (266,-58);
 ref = uni1FDE;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (172,128);
+pos = (172,-120);
 ref = uni1FDE;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (204,126);
+pos = (204,-122);
 ref = uni1FDE;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (266,128);
+pos = (266,-120);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_96.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_96.glyph
index f029f9e5b..7701b7cbc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_96.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_96.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (250,122);
+pos = (250,-64);
 ref = uni1FCF;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (300,122);
+pos = (300,-64);
 ref = uni1FCF;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (254,122);
+pos = (254,-64);
 ref = uni1FCF;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (250,122);
+pos = (250,-126);
 ref = uni1FCF;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (300,122);
+pos = (300,-126);
 ref = uni1FCF;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (254,122);
+pos = (254,-126);
 ref = uni1FCF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_97.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_97.glyph
index 6eafd29b5..430189025 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_97.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_97.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (224,122);
+pos = (224,-64);
 ref = uni1FDF;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (224,122);
+pos = (224,-64);
 ref = uni1FDF;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (244,122);
+pos = (244,-64);
 ref = uni1FDF;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (224,122);
+pos = (224,-126);
 ref = uni1FDF;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (224,122);
+pos = (224,-126);
 ref = uni1FDF;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (244,122);
+pos = (244,-126);
 ref = uni1FDF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_98.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_98.glyph
index 8a72b06d6..6135f12d4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_98.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_98.glyph
@@ -61,7 +61,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (530,0);
+pos = (531,0);
 ref = uni1FBE;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_99.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_99.glyph
index 2b0de35d8..676349b7d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_99.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_99.glyph
@@ -64,7 +64,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (530,0);
+pos = (531,0);
 ref = uni1FBE;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_9A_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_9A_.glyph
index 91551cb9d..efd6bb68a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_9A_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_9A_.glyph
@@ -64,7 +64,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (530,0);
+pos = (531,0);
 ref = uni1FBE;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_9B_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_9B_.glyph
index 431d863cd..c219d27cc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_9B_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_9B_.glyph
@@ -64,7 +64,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (530,0);
+pos = (531,0);
 ref = uni1FBE;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_9C_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_9C_.glyph
index 1ca09f484..5c2cfd435 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_9C_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_9C_.glyph
@@ -64,7 +64,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (530,0);
+pos = (531,0);
 ref = uni1FBE;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_9D_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_9D_.glyph
index d80cf54dd..ebf6e78de 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_9D_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_9D_.glyph
@@ -64,7 +64,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (530,0);
+pos = (531,0);
 ref = uni1FBE;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_9E_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_9E_.glyph
index 7646d57d5..52d90e022 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_9E_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_9E_.glyph
@@ -64,7 +64,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (530,0);
+pos = (531,0);
 ref = uni1FBE;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_9F_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_9F_.glyph
index 84c5dfa09..4e51575fd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_9F_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_9F_.glyph
@@ -64,7 +64,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (530,0);
+pos = (531,0);
 ref = uni1FBE;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_0.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_0.glyph
index f8e898bd2..8901a8e6f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_0.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_0.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (574,122);
+pos = (574,-64);
 ref = uni1FBD;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (721,122);
+pos = (721,-64);
 ref = uni1FBD;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (507,122);
+pos = (507,-64);
 ref = uni1FBD;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (574,80);
+pos = (574,-126);
 ref = uni1FBD;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (718,122);
+pos = (718,-126);
 ref = uni1FBD;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (507,80);
+pos = (507,-126);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_1.glyph
index ee84a2548..75a6a7751 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_1.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (538,128);
+pos = (538,-58);
 ref = uni1FFE;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (507,128);
+pos = (507,-58);
 ref = uni1FFE;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (579,128);
+pos = (579,-58);
 ref = uni1FFE;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (538,86);
+pos = (538,-120);
 ref = uni1FFE;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (504,128);
+pos = (504,-120);
 ref = uni1FFE;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (579,86);
+pos = (579,-120);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_2.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_2.glyph
index 4eb9d39a0..1ca9304c9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_2.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_2.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (352,122);
+pos = (352,-64);
 ref = uni1FCD;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (351,122);
+pos = (351,-64);
 ref = uni1FCD;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (423,122);
+pos = (423,-64);
 ref = uni1FCD;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (352,80);
+pos = (352,-126);
 ref = uni1FCD;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (348,122);
+pos = (348,-126);
 ref = uni1FCD;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (423,80);
+pos = (423,-126);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_3.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_3.glyph
index 84d8a0890..751855203 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_3.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_3.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (314,128);
+pos = (314,-58);
 ref = uni1FDD;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (449,126);
+pos = (449,-60);
 ref = uni1FDD;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (437,128);
+pos = (437,-58);
 ref = uni1FDD;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (314,86);
+pos = (314,-120);
 ref = uni1FDD;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (446,126);
+pos = (446,-122);
 ref = uni1FDD;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (437,86);
+pos = (437,-120);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_4.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_4.glyph
index c8d002423..ef109eb03 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_4.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_4.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (428,128);
+pos = (428,-58);
 ref = uni1FCE;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (423,128);
+pos = (423,-58);
 ref = uni1FCE;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (549,128);
+pos = (549,-58);
 ref = uni1FCE;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (428,86);
+pos = (428,-120);
 ref = uni1FCE;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (420,128);
+pos = (420,-120);
 ref = uni1FCE;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (549,86);
+pos = (549,-120);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_5.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_5.glyph
index 1e5113d46..fefe0aca4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_5.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_5.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (384,128);
+pos = (384,-58);
 ref = uni1FDE;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (429,126);
+pos = (429,-60);
 ref = uni1FDE;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (473,128);
+pos = (473,-58);
 ref = uni1FDE;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (384,86);
+pos = (384,-120);
 ref = uni1FDE;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (426,126);
+pos = (426,-122);
 ref = uni1FDE;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (473,86);
+pos = (473,-120);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_6.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_6.glyph
index 40b84a37a..45e747bff 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_6.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_6.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (462,122);
+pos = (462,-64);
 ref = uni1FCF;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (525,122);
+pos = (525,-64);
 ref = uni1FCF;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (461,122);
+pos = (461,-64);
 ref = uni1FCF;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (462,80);
+pos = (462,-126);
 ref = uni1FCF;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (522,122);
+pos = (522,-126);
 ref = uni1FCF;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (461,80);
+pos = (461,-126);
 ref = uni1FCF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_7.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_7.glyph
index 059cf1d3d..182e1b804 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_7.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_7.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (436,122);
+pos = (436,-64);
 ref = uni1FDF;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (449,122);
+pos = (449,-64);
 ref = uni1FDF;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (451,122);
+pos = (451,-64);
 ref = uni1FDF;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (436,80);
+pos = (436,-126);
 ref = uni1FDF;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (446,122);
+pos = (446,-126);
 ref = uni1FDF;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (451,80);
+pos = (451,-126);
 ref = uni1FDF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_0.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_0.glyph
index d1db3d070..236dae0a8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_0.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_0.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (150,0);
+pos = (226,0);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (118,0);
+pos = (150,0);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (186,0);
+pos = (250,0);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (126,0);
+pos = (154,0);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (138,0);
+pos = (154,0);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (114,0);
+pos = (178,0);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_1.glyph
index 7009bf3e3..737186ce3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_1.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (150,0);
+pos = (10,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (-28,0);
+pos = (-35,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (302,0);
+pos = (20,0);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (126,-42);
+pos = (-14,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (-8,-42);
+pos = (-15,0);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (294,0);
+pos = (-4,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_2.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_2.glyph
index 595a3149d..4e0d3dfaf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_2.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_2.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (252,108);
+pos = (252,-78);
 ref = uni1FEF;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (226,122);
+pos = (226,-64);
 ref = uni1FEF;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (316,100);
+pos = (316,-86);
 ref = uni1FEF;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (228,66);
+pos = (228,-140);
 ref = uni1FEF;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (246,80);
+pos = (246,-126);
 ref = uni1FEF;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (308,58);
+pos = (308,-148);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_4.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_4.glyph
index e5e7f4685..59e899859 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_4.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_4.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (336,0);
+pos = (336,-186);
 ref = uni1FFD;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (306,0);
+pos = (306,-186);
 ref = uni1FFD;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (360,0);
+pos = (360,-186);
 ref = uni1FFD;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (312,-42);
+pos = (312,-248);
 ref = uni1FFD;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (326,-42);
+pos = (326,-248);
 ref = uni1FFD;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (352,-42);
+pos = (352,-248);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_6.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_6.glyph
index af864e732..c78c6adaf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_6.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_6.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (150,0);
+pos = (98,0);
 ref = uni1FC0;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (114,0);
+pos = (118,0);
 ref = uni1FC0;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (174,0);
+pos = (98,0);
 ref = uni1FC0;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (126,-42);
+pos = (74,0);
 ref = uni1FC0;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (134,-42);
+pos = (122,0);
 ref = uni1FC0;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (166,-42);
+pos = (82,0);
 ref = uni1FC0;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_7.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_7.glyph
index 3c3c22622..49b95f6d1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_7.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_7.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (150,0);
+pos = (98,0);
 ref = uni1FC0;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (114,0);
+pos = (118,0);
 ref = uni1FC0;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (174,0);
+pos = (98,0);
 ref = uni1FC0;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (126,-42);
+pos = (74,0);
 ref = uni1FC0;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (134,-42);
+pos = (122,0);
 ref = uni1FC0;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (166,-42);
+pos = (82,0);
 ref = uni1FC0;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_8.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_8.glyph
index db0b8bc01..df38e5211 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_8.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_8.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (232,372);
+pos = (308,372);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (302,372);
+pos = (334,372);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (216,372);
+pos = (280,372);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (240,414);
+pos = (268,434);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (272,414);
+pos = (288,434);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (170,414);
+pos = (234,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_9.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_9.glyph
index fcb74d2b9..09d15b2b2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_9.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_9.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (232,372);
+pos = (92,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (156,372);
+pos = (149,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (332,372);
+pos = (50,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (240,372);
+pos = (100,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (126,372);
+pos = (119,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (350,414);
+pos = (52,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_0.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_0.glyph
index e5ef15bf9..90aa5f568 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_0.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_0.glyph
@@ -3,106 +3,58 @@ color = (204,240,242,1);
 glyphname = uni1FC0;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (460,1304);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (-52,122);
 ref = tilde;
 }
 );
-width = 920;
+width = 1024;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (516,1304);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (4,122);
 ref = tilde;
 }
 );
-width = 1032;
+width = 1024;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (428,1304);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (-82,122);
 ref = tilde;
 }
 );
-width = 856;
+width = 1018;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (428,1304);
-}
-);
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (-52,122);
 ref = tilde;
 }
 );
-width = 856;
+width = 960;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (500,1304);
-}
-);
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (4,122);
 ref = tilde;
 }
 );
-width = 1000;
+width = 992;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (364,1304);
-}
-);
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (-82,122);
 ref = tilde;
 }
 );
-width = 728;
+width = 896;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_2.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_2.glyph
index 8c69d8bdf..6ed667423 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_2.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_2.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (242,108);
+pos = (242,-78);
 ref = uni1FEF;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (260,122);
+pos = (260,-64);
 ref = uni1FEF;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (296,100);
+pos = (296,-86);
 ref = uni1FEF;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (242,108);
+pos = (242,-140);
 ref = uni1FEF;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (260,122);
+pos = (260,-126);
 ref = uni1FEF;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (296,100);
+pos = (296,-148);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_4.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_4.glyph
index f49e88ab6..cdb0550cc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_4.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_4.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (326,0);
+pos = (326,-186);
 ref = uni1FFD;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (340,0);
+pos = (340,-186);
 ref = uni1FFD;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (340,0);
+pos = (340,-186);
 ref = uni1FFD;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (326,0);
+pos = (326,-248);
 ref = uni1FFD;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (340,0);
+pos = (340,-248);
 ref = uni1FFD;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (340,0);
+pos = (340,-248);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_6.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_6.glyph
index 53789a10e..5f569f295 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_6.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_6.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (140,0);
+pos = (88,0);
 ref = uni1FC0;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (148,0);
+pos = (152,0);
 ref = uni1FC0;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (154,0);
+pos = (78,0);
 ref = uni1FC0;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (140,0);
+pos = (88,0);
 ref = uni1FC0;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (148,0);
+pos = (136,0);
 ref = uni1FC0;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (154,0);
+pos = (70,0);
 ref = uni1FC0;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_7.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_7.glyph
index 8df340040..bfa6fed01 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_7.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_7.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (140,0);
+pos = (88,0);
 ref = uni1FC0;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (148,0);
+pos = (152,0);
 ref = uni1FC0;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (154,0);
+pos = (78,0);
 ref = uni1FC0;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (140,0);
+pos = (88,0);
 ref = uni1FC0;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (148,0);
+pos = (136,0);
 ref = uni1FC0;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (154,0);
+pos = (70,0);
 ref = uni1FC0;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_C_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_C_.glyph
index a71440a65..03d0b1cdb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_C_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_C_.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (530,0);
+pos = (531,0);
 ref = uni1FBE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_D_.tonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_D_.tonos.glyph
index 5f360859d..4c2f7dada 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_D_.tonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_D_.tonos.glyph
@@ -104,7 +104,6 @@ width = 714;
 tags = (
 "TODO-opsz"
 );
-unicode = 57595;
 userData = {
 interface.gridadjust.original = "{'width': 1119, 'leftMargin': 131, 'rightMargin': 121}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_E_.tonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_E_.tonos.glyph
index 3851c2127..c7a4ab5b3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_E_.tonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_E_.tonos.glyph
@@ -104,7 +104,6 @@ width = 712;
 tags = (
 "TODO-opsz"
 );
-unicode = 57597;
 userData = {
 interface.gridadjust.original = "{'width': 1078.0, 'leftMargin': 131, 'rightMargin': 121.0}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_F_.tonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_F_.tonos.glyph
index 312d0e5a6..5409dba7f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_F_.tonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_F_.tonos.glyph
@@ -104,7 +104,6 @@ width = 544;
 tags = (
 "TODO-opsz"
 );
-unicode = 57599;
 userData = {
 interface.gridadjust.original = "{'width': 1071, 'leftMargin': 155, 'rightMargin': 151}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_0.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_0.glyph
index 486523b53..20231f031 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_0.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_0.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-224,0);
+pos = (-148,0);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-178,0);
+pos = (-146,0);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-194,0);
+pos = (-130,0);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-224,42);
+pos = (-196,0);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-178,42);
+pos = (-162,0);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-258,42);
+pos = (-194,0);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_1.glyph
index 90e84cea4..98ce30769 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_1.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-224,0);
+pos = (-364,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-324,0);
+pos = (-331,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-78,0);
+pos = (-360,0);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-224,0);
+pos = (-364,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-324,0);
+pos = (-331,0);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-78,42);
+pos = (-376,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_2.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_2.glyph
index aea3817b3..fb3c114a0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_2.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_2.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-220,122);
+pos = (-220,-64);
 ref = uni1FED;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-190,122);
+pos = (-190,-64);
 ref = uni1FED;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-80,122);
+pos = (-80,-64);
 ref = uni1FED;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-220,122);
+pos = (-220,-126);
 ref = uni1FED;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-190,122);
+pos = (-190,-126);
 ref = uni1FED;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-80,122);
+pos = (-80,-126);
 ref = uni1FED;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_3.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_3.glyph
index 3346c0ac5..973222fbd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_3.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_3.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-200,122);
+pos = (-200,-64);
 ref = uni1FEE;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-196,122);
+pos = (-196,-64);
 ref = uni1FEE;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-82,122);
+pos = (-82,-64);
 ref = uni1FEE;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-200,122);
+pos = (-200,-126);
 ref = uni1FEE;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-196,122);
+pos = (-196,-126);
 ref = uni1FEE;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-82,122);
+pos = (-82,-126);
 ref = uni1FEE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_6.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_6.glyph
index 45236c596..a4a695eee 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_6.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_6.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-224,0);
+pos = (-276,0);
 ref = uni1FC0;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-182,0);
+pos = (-178,0);
 ref = uni1FC0;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-206,0);
+pos = (-282,0);
 ref = uni1FC0;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-224,0);
+pos = (-276,0);
 ref = uni1FC0;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-182,0);
+pos = (-194,0);
 ref = uni1FC0;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-206,0);
+pos = (-290,0);
 ref = uni1FC0;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_7.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_7.glyph
index 50ee1eb06..e7aedefe3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_7.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_7.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-220,122);
+pos = (-220,-64);
 ref = uni1FC1;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-178,122);
+pos = (-178,-64);
 ref = uni1FC1;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-150,122);
+pos = (-150,-64);
 ref = uni1FC1;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-220,122);
+pos = (-220,-126);
 ref = uni1FC1;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-178,122);
+pos = (-178,-126);
 ref = uni1FC1;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-150,122);
+pos = (-150,-126);
 ref = uni1FC1;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_8.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_8.1.glyph
index 550ea5528..2d439578e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_8.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_8.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-6,372);
+pos = (69,372);
 ref = breve;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (6,372);
+pos = (39,372);
 ref = breve;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-56,372);
+pos = (8,372);
 ref = breve;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-6,414);
+pos = (21,434);
 ref = breve;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (10,414);
+pos = (21,434);
 ref = breve;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-124,414);
+pos = (-60,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_8.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_8.glyph
index 66161429c..c72dfaf7d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_8.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_8.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-190,372);
+pos = (-114,372);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-212,372);
+pos = (-180,372);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-160,372);
+pos = (-96,372);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-190,414);
+pos = (-162,434);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-208,414);
+pos = (-192,434);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-224,414);
+pos = (-160,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.1.glyph
index 4c2c552be..8403ed1c8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-6,372);
+pos = (-147,372);
 ref = macron;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-140,372);
+pos = (-146,372);
 ref = macron;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (60,372);
+pos = (-222,372);
 ref = macron;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-6,372);
+pos = (-147,434);
 ref = macron;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-136,372);
+pos = (-148,434);
 ref = macron;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (56,414);
+pos = (-242,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.glyph
index 8a9d52907..cc2523587 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-190,372);
+pos = (-330,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-358,372);
+pos = (-365,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-44,372);
+pos = (-326,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-190,372);
+pos = (-330,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-354,372);
+pos = (-361,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-44,414);
+pos = (-342,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_D_.tonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_D_.tonos.glyph
index 7f1845845..118e2cf09 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_D_.tonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_D_.tonos.glyph
@@ -104,7 +104,6 @@ width = 878;
 tags = (
 "TODO-opsz"
 );
-unicode = 57596;
 userData = {
 interface.gridadjust.original = "{'width': 1064, 'leftMargin': 158, 'rightMargin': 121}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_E_.tonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_E_.tonos.glyph
index 0d8c042a8..5fe4cf83b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_E_.tonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_E_.tonos.glyph
@@ -104,7 +104,6 @@ width = 714;
 tags = (
 "TODO-opsz"
 );
-unicode = 57598;
 userData = {
 interface.gridadjust.original = "{'width': 1133.0, 'leftMargin': 158, 'rightMargin': 121.0}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_F_.tonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_F_.tonos.glyph
index 74552d21a..2dd3fd7da 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_F_.tonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_F_.tonos.glyph
@@ -116,7 +116,6 @@ width = 544;
 tags = (
 "TODO-opsz"
 );
-unicode = 57600;
 userData = {
 interface.gridadjust.original = "{'width': 1071, 'leftMargin': 155, 'rightMargin': 151}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_0.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_0.glyph
index a9152c4a2..0ddd79b0a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_0.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_0.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (114,0);
+pos = (190,0);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (76,0);
+pos = (108,0);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (162,0);
+pos = (226,0);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (116,42);
+pos = (144,0);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (76,42);
+pos = (92,0);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (98,42);
+pos = (162,0);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_1.glyph
index cfbf4f16e..f0cd009c5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_1.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (114,0);
+pos = (-26,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-70,0);
+pos = (-77,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (278,0);
+pos = (-4,0);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (116,0);
+pos = (-24,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-70,0);
+pos = (-77,0);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (278,42);
+pos = (-20,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_2.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_2.glyph
index a9cdada1f..e4bcf12dc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_2.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_2.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (118,122);
+pos = (118,-64);
 ref = uni1FED;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (64,122);
+pos = (64,-64);
 ref = uni1FED;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (276,122);
+pos = (276,-64);
 ref = uni1FED;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (120,122);
+pos = (120,-126);
 ref = uni1FED;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (64,122);
+pos = (64,-126);
 ref = uni1FED;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (276,122);
+pos = (276,-126);
 ref = uni1FED;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_3.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_3.glyph
index 8b24b861c..468653bf9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_3.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_3.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (138,122);
+pos = (138,-64);
 ref = uni1FEE;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (58,122);
+pos = (58,-64);
 ref = uni1FEE;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (274,122);
+pos = (274,-64);
 ref = uni1FEE;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (140,122);
+pos = (140,-126);
 ref = uni1FEE;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (58,122);
+pos = (58,-126);
 ref = uni1FEE;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (274,122);
+pos = (274,-126);
 ref = uni1FEE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_4.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_4.glyph
index 53d736045..4921ea91a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_4.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_4.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (362,122);
+pos = (362,-64);
 ref = uni1FBD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (472,122);
+pos = (472,-64);
 ref = uni1FBD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (282,122);
+pos = (282,-64);
 ref = uni1FBD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (362,122);
+pos = (362,-126);
 ref = uni1FBD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (472,122);
+pos = (472,-126);
 ref = uni1FBD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (282,122);
+pos = (282,-126);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_5.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_5.glyph
index 8525b746c..463ae7590 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_5.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_5.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (326,128);
+pos = (326,-58);
 ref = uni1FFE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (258,128);
+pos = (258,-58);
 ref = uni1FFE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (354,128);
+pos = (354,-58);
 ref = uni1FFE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (326,128);
+pos = (326,-120);
 ref = uni1FFE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (258,128);
+pos = (258,-120);
 ref = uni1FFE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (354,128);
+pos = (354,-120);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_6.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_6.glyph
index f049cafec..f408293ee 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_6.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_6.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (114,0);
+pos = (62,0);
 ref = uni1FC0;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (72,0);
+pos = (76,0);
 ref = uni1FC0;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (150,0);
+pos = (74,0);
 ref = uni1FC0;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (116,0);
+pos = (64,0);
 ref = uni1FC0;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (72,0);
+pos = (60,0);
 ref = uni1FC0;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (150,0);
+pos = (66,0);
 ref = uni1FC0;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_7.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_7.glyph
index bfbb844a6..72a97bd5b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_7.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_7.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (118,122);
+pos = (118,-64);
 ref = uni1FC1;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (76,122);
+pos = (76,-64);
 ref = uni1FC1;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (206,122);
+pos = (206,-64);
 ref = uni1FC1;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (120,122);
+pos = (120,-126);
 ref = uni1FC1;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (76,122);
+pos = (76,-126);
 ref = uni1FC1;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (206,122);
+pos = (206,-126);
 ref = uni1FC1;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_8.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_8.glyph
index 3bd3824a1..7f67c2374 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_8.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_8.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (220,372);
+pos = (296,372);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (282,372);
+pos = (314,372);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (208,372);
+pos = (272,372);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (220,414);
+pos = (248,434);
 ref = breve;
 }
 );
@@ -62,11 +62,11 @@ shapes = (
 ref = Y;
 },
 {
-pos = (270,414);
+pos = (268,434);
 ref = breve;
 }
 );
-width = 1534;
+width = 1496;
 },
 {
 layerId = m011;
@@ -75,7 +75,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (162,414);
+pos = (226,434);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_9.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_9.glyph
index ea4a87aba..59f307cc7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_9.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_9.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (220,372);
+pos = (80,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (136,372);
+pos = (129,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (324,372);
+pos = (42,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (220,372);
+pos = (80,434);
 ref = macron;
 }
 );
@@ -62,11 +62,11 @@ shapes = (
 ref = Y;
 },
 {
-pos = (124,372);
+pos = (99,434);
 ref = macron;
 }
 );
-width = 1534;
+width = 1496;
 },
 {
 layerId = m011;
@@ -75,7 +75,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (342,414);
+pos = (44,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_F_.tonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_F_.tonos.glyph
index 20ec85706..877388e06 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_F_.tonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_F_.tonos.glyph
@@ -106,7 +106,6 @@ width = 356;
 tags = (
 "TODO-opsz"
 );
-unicode = 57601;
 userData = {
 interface.gridadjust.original = "{'width': 707, 'leftMargin': 142, 'rightMargin': 121}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_2.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_2.glyph
index 678ffb690..9e9f333a9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_2.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_2.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (454,108);
+pos = (454,-78);
 ref = uni1FEF;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (485,122);
+pos = (485,-64);
 ref = uni1FEF;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (503,100);
+pos = (503,-86);
 ref = uni1FEF;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (454,66);
+pos = (454,-140);
 ref = uni1FEF;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (482,122);
+pos = (482,-126);
 ref = uni1FEF;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (503,58);
+pos = (503,-148);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_4.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_4.glyph
index 1b3f3ce4a..db556e7aa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_4.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_4.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (538,0);
+pos = (538,-186);
 ref = uni1FFD;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (565,0);
+pos = (565,-186);
 ref = uni1FFD;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (547,0);
+pos = (547,-186);
 ref = uni1FFD;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (538,-42);
+pos = (538,-248);
 ref = uni1FFD;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (562,0);
+pos = (562,-248);
 ref = uni1FFD;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (547,-42);
+pos = (547,-248);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_6.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_6.glyph
index c3220ab32..9c67e519d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_6.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_6.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (352,0);
+pos = (300,0);
 ref = uni1FC0;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (373,0);
+pos = (377,0);
 ref = uni1FC0;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (361,0);
+pos = (285,0);
 ref = uni1FC0;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (352,-42);
+pos = (300,0);
 ref = uni1FC0;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (370,0);
+pos = (358,0);
 ref = uni1FC0;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (361,-42);
+pos = (277,0);
 ref = uni1FC0;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_7.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_7.glyph
index e4a0535a4..dd2bbe330 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_7.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_7.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (352,0);
+pos = (300,0);
 ref = uni1FC0;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (373,0);
+pos = (377,0);
 ref = uni1FC0;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (361,0);
+pos = (285,0);
 ref = uni1FC0;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (352,-42);
+pos = (300,0);
 ref = uni1FC0;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (370,0);
+pos = (358,0);
 ref = uni1FC0;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (361,-42);
+pos = (277,0);
 ref = uni1FC0;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_D_.tonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_D_.tonos.glyph
index 0a51665d6..e384ea8f5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_D_.tonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_D_.tonos.glyph
@@ -102,7 +102,6 @@ width = 358;
 tags = (
 "TODO-opsz"
 );
-unicode = 57602;
 userData = {
 interface.gridadjust.original = "{'width': 707, 'leftMargin': 142, 'rightMargin': 121}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_E_.tonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_E_.tonos.glyph
index 4fed6b030..3edc4b406 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_E_.tonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_E_.tonos.glyph
@@ -104,7 +104,6 @@ width = 350;
 tags = (
 "TODO-opsz"
 );
-unicode = 57594;
 userData = {
 interface.gridadjust.original = "{'width': 718, 'leftMargin': 131, 'rightMargin': 228}";
 "interface.width-adjustments" = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/upW_hiteT_riangle.glyph b/src/Inter-Roman.glyphspackage/glyphs/upW_hiteT_riangle.glyph
index 8fe3c8d16..7abd09aee 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/upW_hiteT_riangle.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/upW_hiteT_riangle.glyph
@@ -1,5 +1,7 @@
 {
 glyphname = upWhiteTriangle;
+kernLeft = A;
+kernRight = A;
 layers = (
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
diff --git a/src/Inter-Roman.glyphspackage/glyphs/upsilon.glyph b/src/Inter-Roman.glyphspackage/glyphs/upsilon.glyph
index 8a150a25d..ec4bb8a4d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/upsilon.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/upsilon.glyph
@@ -7,7 +7,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (574,1304);
+pos = (574,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -46,7 +46,7 @@ width = 1200;
 anchors = (
 {
 name = top;
-pos = (588,1304);
+pos = (588,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -85,7 +85,7 @@ width = 1210;
 anchors = (
 {
 name = top;
-pos = (578,1304);
+pos = (578,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -124,7 +124,7 @@ width = 1206;
 anchors = (
 {
 name = top;
-pos = (544,1304);
+pos = (544,1056);
 }
 );
 layerId = m007;
@@ -163,7 +163,7 @@ width = 1140;
 anchors = (
 {
 name = top;
-pos = (572,1304);
+pos = (572,1056);
 }
 );
 layerId = m009;
@@ -202,7 +202,7 @@ width = 1178;
 anchors = (
 {
 name = top;
-pos = (514,1304);
+pos = (514,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/upsilondieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/upsilondieresis.glyph
index c2a56119d..f6cf8cb22 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/upsilondieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/upsilondieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-32,0);
+pos = (-27,0);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (81,0);
+pos = (-77,0);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-96,0);
+pos = (-4,0);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-30,42);
+pos = (-25,0);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (78,42);
+pos = (-77,0);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-96,42);
+pos = (-20,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/upsilondieresistonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/upsilondieresistonos.glyph
index 8b4710ca4..9e91d5238 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/upsilondieresistonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/upsilondieresistonos.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (18,12);
+pos = (18,-174);
 ref = dieresistonos;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-28,12);
+pos = (-28,-174);
 ref = dieresistonos;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (58,12);
+pos = (58,-174);
 ref = dieresistonos;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (20,12);
+pos = (20,-236);
 ref = dieresistonos;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-28,12);
+pos = (-28,-236);
 ref = dieresistonos;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (58,12);
+pos = (58,-236);
 ref = dieresistonos;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/upsilontonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/upsilontonos.glyph
index e4514651a..8e8a60291 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/upsilontonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/upsilontonos.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (352,0);
+pos = (352,-186);
 ref = tonostop;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (216,22);
+pos = (216,-164);
 ref = tonostop;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (448,-10);
+pos = (448,-196);
 ref = tonostop;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (354,0);
+pos = (354,-248);
 ref = tonostop;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (216,22);
+pos = (216,-226);
 ref = tonostop;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (448,-10);
+pos = (448,-258);
 ref = tonostop;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uring.glyph b/src/Inter-Roman.glyphspackage/glyphs/uring.glyph
index 2e33ee95c..66d05275f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uring.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uring.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (276,0);
+pos = (292,0);
 ref = ring;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (224,0);
+pos = (234,0);
 ref = ring;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (338,0);
+pos = (342,0);
 ref = ring;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (282,-42);
+pos = (282,0);
 ref = ring;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (224,42);
+pos = (218,0);
 ref = ring;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (354,-42);
+pos = (246,0);
 ref = ring;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ushortcyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/ushortcyrillic.glyph
index bdc3b6419..2d64153c5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ushortcyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ushortcyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (110,0);
+pos = (186,0);
 ref = breve;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (104,0);
+pos = (136,0);
 ref = breve;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (120,0);
+pos = (184,0);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (104,0);
+pos = (132,0);
 ref = breve;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (96,42);
+pos = (112,0);
 ref = breve;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (72,0);
+pos = (136,0);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ustraightstrokecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/ustraightstrokecyrillic.glyph
index 6b4fd9725..a0513d5a3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ustraightstrokecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ustraightstrokecyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = gamma;
 },
 {
-pos = (110,-788);
+pos = (110,-812);
 ref = crossbar;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = gamma;
 },
 {
-pos = (100,-829);
+pos = (100,-853);
 ref = crossbar;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = gamma;
 },
 {
-pos = (113,-744);
+pos = (113,-767);
 ref = crossbar;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = gamma;
 },
 {
-pos = (84,-793);
+pos = (84,-818);
 ref = crossbar;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = gamma;
 },
 {
-pos = (100,-829);
+pos = (100,-853);
 ref = crossbar;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = gamma;
 },
 {
-pos = (113,-744);
+pos = (113,-767);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/utilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/utilde.glyph
index 8f8683057..951dae7bb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/utilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/utilde.glyph
@@ -37,7 +37,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (72,0);
+pos = (78,0);
 ref = tilde;
 }
 );
@@ -64,7 +64,7 @@ ref = u;
 },
 {
 alignment = 1;
-pos = (138,42);
+pos = (138,0);
 ref = tilde;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/utildeacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/utildeacute.glyph
index d5f19e97c..51a28b1c1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/utildeacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/utildeacute.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (922,0);
-ref = tildeacutecomb;
+pos = (84,0);
+ref = tildeacute.lc;
 }
 );
 width = 1190;
@@ -23,8 +23,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (992,0);
-ref = tildeacutecomb;
+pos = (154,0);
+ref = tildeacute.lc;
 }
 );
 width = 1330;
@@ -36,8 +36,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (910,0);
-ref = tildeacutecomb;
+pos = (78,0);
+ref = tildeacute.lc;
 }
 );
 width = 1164;
@@ -49,8 +49,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (928,0);
-ref = tildeacutecomb;
+pos = (90,0);
+ref = tildeacute.lc;
 }
 );
 width = 1140;
@@ -62,8 +62,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (976,42);
-ref = tildeacutecomb;
+pos = (138,0);
+ref = tildeacute.lc;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (924,0);
-ref = tildeacutecomb;
+pos = (86,0);
+ref = tildeacute.lc;
 }
 );
 width = 1068;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/utildebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/utildebelow.glyph
index 7ffaf9e35..da927a4a9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/utildebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/utildebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1220,0);
+pos = (1196,0);
 ref = tildesubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1462,0);
+pos = (1406,0);
 ref = tildesubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1068,0);
+pos = (1163,0);
 ref = tildesubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1226,0);
+pos = (1138,0);
 ref = tildesubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1446,0);
+pos = (1374,0);
 ref = tildesubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1074,0);
+pos = (1059,0);
 ref = tildesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/v.glyph b/src/Inter-Roman.glyphspackage/glyphs/v.glyph
index b040f868b..771e093f7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/v.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/v.glyph
@@ -12,14 +12,7 @@ pos = (570,0);
 },
 {
 name = top;
-pos = (570,1304);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (776,360);
+pos = (570,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -48,7 +41,7 @@ pos = (620,0);
 },
 {
 name = top;
-pos = (620,1304);
+pos = (620,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -77,7 +70,7 @@ pos = (534,0);
 },
 {
 name = top;
-pos = (534,1304);
+pos = (534,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -106,7 +99,7 @@ pos = (532,0);
 },
 {
 name = top;
-pos = (532,1262);
+pos = (532,1056);
 }
 );
 layerId = m007;
@@ -135,7 +128,7 @@ pos = (596,0);
 },
 {
 name = top;
-pos = (596,1262);
+pos = (596,1056);
 }
 );
 background = {
@@ -181,7 +174,7 @@ pos = (488,0);
 },
 {
 name = top;
-pos = (488,1262);
+pos = (488,1056);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/vtilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/vtilde.glyph
index f95f34f1a..06c3c3e47 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/vtilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/vtilde.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = v;
 },
 {
-pos = (24,0);
+pos = (30,0);
 ref = tilde;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/vturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/vturn.glyph
index 5540f9661..aa58a46d5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/vturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/vturn.glyph
@@ -1,5 +1,7 @@
 {
 glyphname = vturn;
+kernLeft = A;
+kernRight = A;
 layers = (
 {
 anchors = (
@@ -9,7 +11,7 @@ pos = (570,0);
 },
 {
 name = top;
-pos = (570,1304);
+pos = (570,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -30,7 +32,7 @@ pos = (620,0);
 },
 {
 name = top;
-pos = (620,1304);
+pos = (620,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -47,11 +49,11 @@ width = 1240;
 anchors = (
 {
 name = bottom;
-pos = (536,0);
+pos = (534,0);
 },
 {
 name = top;
-pos = (536,1304);
+pos = (534,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -68,11 +70,11 @@ width = 1068;
 anchors = (
 {
 name = bottom;
-pos = (570,0);
+pos = (532,0);
 },
 {
 name = top;
-pos = (570,1304);
+pos = (532,1056);
 }
 );
 layerId = m007;
@@ -89,11 +91,11 @@ width = 1064;
 anchors = (
 {
 name = bottom;
-pos = (620,0);
+pos = (596,0);
 },
 {
 name = top;
-pos = (620,1304);
+pos = (596,1056);
 }
 );
 layerId = m009;
@@ -110,11 +112,11 @@ width = 1192;
 anchors = (
 {
 name = bottom;
-pos = (536,0);
+pos = (488,0);
 },
 {
 name = top;
-pos = (536,1304);
+pos = (488,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/w.glyph b/src/Inter-Roman.glyphspackage/glyphs/w.glyph
index 10480f735..60a53dc8e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/w.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/w.glyph
@@ -12,7 +12,7 @@ pos = (832,0);
 },
 {
 name = top;
-pos = (832,1304);
+pos = (832,1118);
 }
 );
 guides = (
@@ -56,7 +56,7 @@ pos = (888,0);
 },
 {
 name = top;
-pos = (896,1304);
+pos = (896,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -93,7 +93,7 @@ pos = (808,0);
 },
 {
 name = top;
-pos = (808,1304);
+pos = (808,1118);
 }
 );
 guides = (
@@ -207,7 +207,7 @@ pos = (762,0);
 },
 {
 name = top;
-pos = (762,1262);
+pos = (762,1056);
 }
 );
 guides = (
@@ -253,7 +253,7 @@ pos = (864,0);
 },
 {
 name = top;
-pos = (864,1262);
+pos = (864,1056);
 }
 );
 layerId = m009;
@@ -292,7 +292,7 @@ pos = (744,0);
 },
 {
 name = top;
-pos = (744,1262);
+pos = (744,1056);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/wacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/wacute.glyph
index b0ea2a428..3985d109e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/wacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/wacute.glyph
@@ -75,7 +75,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (464,0);
+pos = (460,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/warningS_ign.glyph b/src/Inter-Roman.glyphspackage/glyphs/warningS_ign.glyph
index 34bdebfde..5afa69c98 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/warningS_ign.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/warningS_ign.glyph
@@ -1,5 +1,7 @@
 {
 glyphname = warningSign;
+kernLeft = A;
+kernRight = A;
 layers = (
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
diff --git a/src/Inter-Roman.glyphspackage/glyphs/wcircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/wcircumflex.glyph
index 98b1b4cc0..3f568a14e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/wcircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/wcircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (366,0);
+pos = (368,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (250,0);
+pos = (256,0);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (378,0);
+pos = (376,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (328,0);
+pos = (330,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (234,0);
+pos = (236,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (378,0);
+pos = (376,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/wdieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/wdieresis.glyph
index 53d323b5b..bc17aadf2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/wdieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/wdieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (226,0);
+pos = (231,0);
 ref = dieresis;
 }
 );
@@ -24,7 +24,7 @@ ref = w;
 },
 {
 alignment = 1;
-pos = (389,0);
+pos = (231,0);
 ref = dieresis;
 }
 );
@@ -38,7 +38,7 @@ ref = w;
 },
 {
 alignment = 1;
-pos = (134,0);
+pos = (226,0);
 ref = dieresis;
 }
 );
@@ -51,7 +51,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (188,0);
+pos = (193,0);
 ref = dieresis;
 }
 );
@@ -65,7 +65,7 @@ ref = w;
 },
 {
 alignment = 1;
-pos = (370,0);
+pos = (215,0);
 ref = dieresis;
 }
 );
@@ -79,7 +79,7 @@ ref = w;
 },
 {
 alignment = 1;
-pos = (134,0);
+pos = (210,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/wring.glyph b/src/Inter-Roman.glyphspackage/glyphs/wring.glyph
index 27dc8187a..0c8d5b54e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/wring.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/wring.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (512,0);
+pos = (528,0);
 ref = ring;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (454,0);
+pos = (464,0);
 ref = ring;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (564,0);
+pos = (568,0);
 ref = ring;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (474,-42);
+pos = (474,0);
 ref = ring;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (438,0);
+pos = (432,0);
 ref = ring;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (564,-42);
+pos = (456,0);
 ref = ring;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/wturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/wturn.glyph
index 1b911127a..054e7c4cb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/wturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/wturn.glyph
@@ -9,7 +9,7 @@ pos = (832,0);
 },
 {
 name = top;
-pos = (832,1304);
+pos = (832,1118);
 }
 );
 guides = (
@@ -36,7 +36,7 @@ pos = (888,0);
 },
 {
 name = top;
-pos = (896,1304);
+pos = (896,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -57,7 +57,7 @@ pos = (808,0);
 },
 {
 name = top;
-pos = (808,1304);
+pos = (808,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -78,7 +78,7 @@ pos = (832,0);
 },
 {
 name = top;
-pos = (832,1304);
+pos = (832,1056);
 }
 );
 guides = (
@@ -105,7 +105,7 @@ pos = (888,0);
 },
 {
 name = top;
-pos = (896,1304);
+pos = (896,1056);
 }
 );
 layerId = m009;
@@ -126,7 +126,7 @@ pos = (808,0);
 },
 {
 name = top;
-pos = (808,1304);
+pos = (808,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/x.glyph b/src/Inter-Roman.glyphspackage/glyphs/x.glyph
index df2f1c13a..cdce49fcc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/x.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/x.glyph
@@ -24,7 +24,7 @@ pos = (786,0);
 },
 {
 name = top;
-pos = (512,1304);
+pos = (512,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -246,7 +246,7 @@ pos = (862,0);
 },
 {
 name = top;
-pos = (552,1304);
+pos = (552,1118);
 }
 );
 guides = (
@@ -298,7 +298,7 @@ pos = (978,0);
 },
 {
 name = top;
-pos = (610,1304);
+pos = (610,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -343,7 +343,7 @@ pos = (808,0);
 },
 {
 name = top;
-pos = (498,1262);
+pos = (498,1056);
 }
 );
 background = {
@@ -405,7 +405,7 @@ pos = (941,0);
 },
 {
 name = top;
-pos = (574,1262);
+pos = (574,1056);
 }
 );
 guides = (
@@ -458,7 +458,7 @@ pos = (756,0);
 },
 {
 name = top;
-pos = (482,1262);
+pos = (482,1056);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/xdieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/xdieresis.glyph
index 7898ce2d1..0d952250c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/xdieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/xdieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = x;
 },
 {
-pos = (-54,0);
+pos = (-49,0);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = x;
 },
 {
-pos = (103,0);
+pos = (-55,0);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = x;
 },
 {
-pos = (-162,0);
+pos = (-70,0);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = x;
 },
 {
-pos = (-76,0);
+pos = (-71,0);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = x;
 },
 {
-pos = (80,0);
+pos = (-75,0);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = x;
 },
 {
-pos = (-128,0);
+pos = (-52,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/y.glyph b/src/Inter-Roman.glyphspackage/glyphs/y.glyph
index 69bb228b7..664d78d53 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/y.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/y.glyph
@@ -16,7 +16,7 @@ pos = (655,0);
 },
 {
 name = top;
-pos = (570,1304);
+pos = (570,1118);
 }
 );
 background = {
@@ -74,7 +74,7 @@ pos = (851,0);
 },
 {
 name = top;
-pos = (616,1304);
+pos = (616,1118);
 }
 );
 background = {
@@ -125,7 +125,7 @@ pos = (567,0);
 },
 {
 name = top;
-pos = (536,1304);
+pos = (536,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -169,7 +169,7 @@ pos = (617,0);
 },
 {
 name = top;
-pos = (532,1262);
+pos = (532,1056);
 }
 );
 guides = (
@@ -375,7 +375,7 @@ pos = (820,0);
 },
 {
 name = top;
-pos = (592,1304);
+pos = (592,1056);
 }
 );
 background = {
@@ -411,12 +411,6 @@ nodes = (
 }
 );
 };
-guides = (
-{
-angle = 70.5144;
-pos = (294,0);
-}
-);
 layerId = m009;
 name = "Black Display";
 shapes = (
@@ -546,7 +540,7 @@ pos = (514,0);
 },
 {
 name = top;
-pos = (488,1262);
+pos = (488,1056);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/yacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/yacute.glyph
index 20ccbdf55..20e93b93e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/yacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/yacute.glyph
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (182,42);
+pos = (182,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (208,0);
+pos = (204,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ycircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/ycircumflex.glyph
index 5aa298144..62a02ef13 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ycircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ycircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (104,0);
+pos = (106,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-30,0);
+pos = (-24,0);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (106,0);
+pos = (104,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (98,0);
+pos = (100,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-38,42);
+pos = (-36,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (122,0);
+pos = (120,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ydieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/ydieresis.glyph
index b2c312d80..4e85fea70 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ydieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ydieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-36,0);
+pos = (-31,0);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (109,0);
+pos = (-49,0);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-138,0);
+pos = (-46,0);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-42,0);
+pos = (-37,0);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (98,42);
+pos = (-57,0);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-122,0);
+pos = (-46,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ydotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/ydotaccent.glyph
index 6f8a2e715..70fafb5f1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ydotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ydotaccent.glyph
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (272,42);
+pos = (272,0);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/yericyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/yericyrillic.glyph
index cdb78afcd..4b60a3a85 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/yericyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/yericyrillic.glyph
@@ -7,7 +7,7 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (749,1304);
+pos = (749,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -27,7 +27,7 @@ width = 1498;
 anchors = (
 {
 name = top;
-pos = (887,1304);
+pos = (887,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -47,7 +47,7 @@ width = 1774;
 anchors = (
 {
 name = top;
-pos = (639,1304);
+pos = (639,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -67,7 +67,7 @@ width = 1278;
 anchors = (
 {
 name = top;
-pos = (699,1262);
+pos = (699,1056);
 }
 );
 layerId = m007;
@@ -87,7 +87,7 @@ width = 1398;
 anchors = (
 {
 name = top;
-pos = (809,1262);
+pos = (809,1056);
 }
 );
 layerId = m009;
@@ -107,7 +107,7 @@ width = 1618;
 anchors = (
 {
 name = top;
-pos = (553,1262);
+pos = (553,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/yerudieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/yerudieresiscyrillic.glyph
index c3983fddf..bc4801fba 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/yerudieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/yerudieresiscyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = yericyrillic;
 },
 {
-pos = (143,0);
+pos = (148,0);
 ref = dieresis;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = yericyrillic;
 },
 {
-pos = (380,0);
+pos = (222,0);
 ref = dieresis;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = yericyrillic;
 },
 {
-pos = (-35,0);
+pos = (57,0);
 ref = dieresis;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = yericyrillic;
 },
 {
-pos = (125,0);
+pos = (130,0);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = yericyrillic;
 },
 {
-pos = (315,0);
+pos = (160,0);
 ref = dieresis;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = yericyrillic;
 },
 {
-pos = (-57,0);
+pos = (19,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ygrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/ygrave.glyph
index 9e061c5f4..795fd66b5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ygrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ygrave.glyph
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-80,42);
+pos = (-80,0);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/yhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/yhookabove.glyph
index 2302c2912..2bf114c26 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/yhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/yhookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (1164,26);
+pos = (1157,0);
 ref = hookabovecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (1354,-6);
+pos = (1280,0);
 ref = hookabovecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (1034,44);
+pos = (1058,0);
 ref = hookabovecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (1158,-16);
+pos = (1095,0);
 ref = hookabovecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (1346,42);
+pos = (1246,0);
 ref = hookabovecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (1050,2);
+pos = (1015,0);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/yring.glyph b/src/Inter-Roman.glyphspackage/glyphs/yring.glyph
index 9b925b41c..6bdb29373 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/yring.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/yring.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (250,0);
+pos = (266,0);
 ref = ring;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (174,0);
+pos = (184,0);
 ref = ring;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (292,0);
+pos = (296,0);
 ref = ring;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (244,-42);
+pos = (244,0);
 ref = ring;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (166,42);
+pos = (160,0);
 ref = ring;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (308,-42);
+pos = (200,0);
 ref = ring;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ytilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/ytilde.glyph
index b452a0f8f..f89b82228 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ytilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ytilde.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (26,0);
+pos = (32,0);
 ref = tilde;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (80,42);
+pos = (80,0);
 ref = tilde;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/yturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/yturn.glyph
index 242b1aa4c..bbf07bf80 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/yturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/yturn.glyph
@@ -11,7 +11,7 @@ pos = (570,0);
 },
 {
 name = top;
-pos = (782,1630);
+pos = (782,1536);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -32,7 +32,7 @@ pos = (622,0);
 },
 {
 name = top;
-pos = (834,1630);
+pos = (834,1536);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -53,7 +53,7 @@ pos = (536,0);
 },
 {
 name = top;
-pos = (792,1630);
+pos = (792,1536);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -74,7 +74,7 @@ pos = (570,0);
 },
 {
 name = top;
-pos = (782,1630);
+pos = (782,1474);
 }
 );
 layerId = m007;
@@ -95,7 +95,7 @@ pos = (622,0);
 },
 {
 name = top;
-pos = (834,1630);
+pos = (834,1474);
 }
 );
 layerId = m009;
@@ -116,7 +116,7 @@ pos = (536,0);
 },
 {
 name = top;
-pos = (792,1630);
+pos = (792,1472);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/yuslittlecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/yuslittlecyrillic.glyph
index 39e0d903e..38bff1709 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/yuslittlecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/yuslittlecyrillic.glyph
@@ -1,5 +1,7 @@
 {
 glyphname = yuslittlecyrillic;
+kernLeft = A;
+kernRight = A;
 layers = (
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
diff --git a/src/Inter-Roman.glyphspackage/glyphs/z.glyph b/src/Inter-Roman.glyphspackage/glyphs/z.glyph
index f7add3424..8a9ed68cc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/z.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/z.glyph
@@ -20,7 +20,7 @@ pos = (552,558);
 },
 {
 name = top;
-pos = (552,1304);
+pos = (552,1118);
 }
 );
 guides = (
@@ -71,7 +71,7 @@ pos = (602,558);
 },
 {
 name = top;
-pos = (606,1304);
+pos = (606,1118);
 }
 );
 guides = (
@@ -130,7 +130,7 @@ pos = (520,558);
 },
 {
 name = top;
-pos = (520,1304);
+pos = (520,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -171,7 +171,7 @@ pos = (512,558);
 },
 {
 name = top;
-pos = (488,1262);
+pos = (488,1056);
 }
 );
 layerId = m007;
@@ -212,7 +212,7 @@ pos = (575,528);
 },
 {
 name = top;
-pos = (572,1262);
+pos = (572,1056);
 }
 );
 background = {
@@ -285,7 +285,7 @@ pos = (455,528);
 },
 {
 name = top;
-pos = (459,1262);
+pos = (459,1056);
 }
 );
 background = {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/zacute.glyph
index 6468ffc6d..64f30ddbd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zacute.glyph
@@ -75,7 +75,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (179,0);
+pos = (175,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/zcaron.glyph
index 96c7aa3ab..53b4ce040 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zcaron.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (90,16);
+pos = (88,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (-58,0);
+pos = (-56,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zcircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/zcircumflex.glyph
index eb8432da2..13578f10c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zcircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zcircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (86,0);
+pos = (88,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (-40,0);
+pos = (-34,0);
 ref = circumflex;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (90,0);
+pos = (88,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (54,0);
+pos = (56,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (-58,0);
+pos = (-56,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (93,0);
+pos = (91,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/zecyrillic.glyph
index 367ee3fea..f08cfe1a7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zecyrillic.glyph
@@ -11,7 +11,7 @@ pos = (521,0);
 },
 {
 name = top;
-pos = (521,1304);
+pos = (521,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -82,7 +82,7 @@ pos = (558,0);
 },
 {
 name = top;
-pos = (558,1304);
+pos = (558,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -208,7 +208,7 @@ pos = (497,0);
 },
 {
 name = top;
-pos = (497,1304);
+pos = (497,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -360,7 +360,7 @@ pos = (478,0);
 },
 {
 name = top;
-pos = (478,1262);
+pos = (478,1056);
 }
 );
 layerId = m007;
@@ -486,7 +486,7 @@ pos = (548,0);
 },
 {
 name = top;
-pos = (548,1262);
+pos = (548,1056);
 }
 );
 layerId = m009;
@@ -557,7 +557,7 @@ pos = (450,0);
 },
 {
 name = top;
-pos = (450,1262);
+pos = (450,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zedieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/zedieresiscyrillic.glyph
index 56b84bf1e..cc6227b4e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zedieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zedieresiscyrillic.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = zecyrillic;
 },
 {
-pos = (-85,0);
+pos = (-80,0);
 ref = dieresis;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = zecyrillic;
 },
 {
-pos = (51,0);
+pos = (-107,0);
 ref = dieresis;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = zecyrillic;
 },
 {
-pos = (-177,0);
+pos = (-85,0);
 ref = dieresis;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = zecyrillic;
 },
 {
-pos = (-96,0);
+pos = (-91,0);
 ref = dieresis;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = zecyrillic;
 },
 {
-pos = (54,0);
+pos = (-101,0);
 ref = dieresis;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = zecyrillic;
 },
 {
-pos = (-160,0);
+pos = (-84,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zero.glyph b/src/Inter-Roman.glyphspackage/glyphs/zero.glyph
index 376ae1d41..353065d14 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zero.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zero.glyph
@@ -12,6 +12,10 @@ pos = (605,745);
 {
 name = center;
 pos = (605,745);
+},
+{
+name = top;
+pos = (605,1490);
 }
 );
 guides = (
@@ -141,6 +145,10 @@ pos = (541,745);
 {
 name = center;
 pos = (541,745);
+},
+{
+name = top;
+pos = (541,1490);
 }
 );
 guides = (
@@ -270,6 +278,10 @@ pos = (640,745);
 {
 name = center;
 pos = (640,745);
+},
+{
+name = top;
+pos = (640,1490);
 }
 );
 guides = (
@@ -327,6 +339,10 @@ pos = (628,745);
 {
 name = center;
 pos = (628,745);
+},
+{
+name = top;
+pos = (628,1490);
 }
 );
 guides = (
@@ -388,6 +404,10 @@ pos = (748,745);
 {
 name = center;
 pos = (748,745);
+},
+{
+name = top;
+pos = (748,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -488,6 +508,10 @@ pos = (698,745);
 {
 name = center;
 pos = (698,745);
+},
+{
+name = top;
+pos = (698,1490);
 }
 );
 layerId = m009;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zhebrevecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/zhebrevecyrillic.glyph
index 3700535e7..53124153e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zhebrevecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zhebrevecyrillic.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (386,0);
+pos = (462,0);
 ref = breve;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (423,0);
+pos = (455,0);
 ref = breve;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (389,0);
+pos = (453,0);
 ref = breve;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (368,0);
+pos = (396,0);
 ref = breve;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (408,0);
+pos = (424,0);
 ref = breve;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (301,42);
+pos = (365,0);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zhecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/zhecyrillic.glyph
index 9e33f61c2..37e6fe50d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zhecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zhecyrillic.glyph
@@ -11,7 +11,7 @@ pos = (1540,0);
 },
 {
 name = top;
-pos = (846,1304);
+pos = (846,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -54,7 +54,7 @@ pos = (1780,0);
 },
 {
 name = top;
-pos = (935,1304);
+pos = (935,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -97,7 +97,7 @@ pos = (1442,0);
 },
 {
 name = top;
-pos = (805,1304);
+pos = (805,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -140,7 +140,7 @@ pos = (1490,0);
 },
 {
 name = top;
-pos = (796,1262);
+pos = (796,1056);
 }
 );
 layerId = m007;
@@ -183,7 +183,7 @@ pos = (1748,0);
 },
 {
 name = top;
-pos = (904,1262);
+pos = (904,1056);
 }
 );
 layerId = m009;
@@ -226,7 +226,7 @@ pos = (1354,0);
 },
 {
 name = top;
-pos = (717,1304);
+pos = (717,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zhedieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/zhedieresiscyrillic.glyph
index 9d35b3b5d..b8b9b8735 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zhedieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zhedieresiscyrillic.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (240,0);
+pos = (245,0);
 ref = dieresis;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (428,0);
+pos = (270,0);
 ref = dieresis;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (131,0);
+pos = (223,0);
 ref = dieresis;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (222,0);
+pos = (227,0);
 ref = dieresis;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (410,0);
+pos = (255,0);
 ref = dieresis;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (107,42);
+pos = (183,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zlinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/zlinebelow.glyph
index 75c5cea98..da1eb5028 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zlinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zlinebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (1152,0);
+pos = (1144,0);
 ref = macronsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (1238,0);
+pos = (1276,0);
 ref = macronsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (1110,0);
+pos = (1079,0);
 ref = macronsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (1127,0);
+pos = (1049,0);
 ref = macronsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (1218,0);
+pos = (1219,0);
 ref = macronsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (1127,0);
+pos = (986,0);
 ref = macronsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/order.plist b/src/Inter-Roman.glyphspackage/order.plist
index 512e9e0de..697f465a3 100644
--- a/src/Inter-Roman.glyphspackage/order.plist
+++ b/src/Inter-Roman.glyphspackage/order.plist
@@ -1639,7 +1639,6 @@ dieresis,
 dieresis.three,
 circumflex,
 tilde,
-casetilde.cn,
 macron,
 breve,
 cyrillicbreve,
@@ -2328,6 +2327,15 @@ uni1FC1,
 uni1FEF,
 uni1FFD,
 uni1FC0,
+uni1FFE.tonos,
+uni1FCD.tonos,
+uni1FDD.tonos,
+uni1FCE.tonos,
+uni1FDE.tonos,
+uni1FCF.tonos,
+uni1FDF.tonos,
+uni1FEF.tonos,
+uni1FFD.tonos,
 uniFE20,
 uniFE21,
 uniFE27,
@@ -2450,6 +2458,10 @@ uniFE2A,
 uniFE2B,
 uniFE2C,
 uniFE2D,
+macronacutecomb.cn,
+macrongravecomb.cn,
+macronacutecomb.lc,
+macrongravecomb.lc,
 slashshortcomb.uc,
 firsttonechinese,
 secondtonechinese,
@@ -2463,6 +2475,7 @@ ogonek.a,
 ogonek.e,
 ogonek.o,
 ogonek.y,
+breveinv.cn,
 acutelowmod,
 colontriangularhalfmod,
 colontriangularmod,
@@ -2480,24 +2493,7 @@ uni2DFF,
 uni0268.ccmp,
 uni2071.ccmp,
 uni02B2.ccmp,
-macronacutecomb.cn,
-macrongravecomb.cn,
-macronacutecomb.lc,
-macrongravecomb.lc,
-uni1FFE.tonos,
-uni1FCD.tonos,
-uni1FDD.tonos,
-uni1FCE.tonos,
-uni1FDE.tonos,
-uni1FCF.tonos,
-uni1FDF.tonos,
-uni1FEF.tonos,
-uni1FFD.tonos,
-crossbar,
-acutedotcomb.lc,
-tildedieresiscomb.lc,
 dieresisacutecomb.lc,
-carondotcomb.lc,
 caronnosp,
 caronsubnosp,
 ascript_uni02DE,
@@ -2506,43 +2502,48 @@ dotmacroncomb.lc,
 dieresismacroncomb.lc,
 dieresisgravecomb.lc,
 largerighthook,
-tildemacroncomb.lc,
 macrondieresiscomb.lc,
-tildeacutecomb,
+tildeacute.lc,
 dieresiscaroncomb.lc,
-_part.cyrtic_hook,
-ringacute.cn,
-circumflexgravecomb.cn,
-dieresiscaroncomb.cn,
-dieresismacroncomb.cn,
-carondotcomb.cn,
-breveacutecomb.cn,
-acutedotcomb.cn,
-brevegravecomb.cn,
-tildedieresiscomb.cn,
-circumflexhookcomb.cn,
-brevetildecomb.cn,
-dieresisacutecomb.cn,
-dotmacroncomb.cn,
-macrondieresiscomb.cn,
-dieresisgravecomb.cn,
-tildemacroncomb.cn,
-circumflextildecomb.cn,
-brevehookcomb.cn,
-commaaccentrotate.cn,
-tonostop,
+dieresiscaroncomb.uc,
+dieresismacroncomb.uc,
+dieresisacutecomb.uc,
+dotmacroncomb.uc,
+dieresisgravecomb.uc,
 tildeacutecomb.uc,
-circumflexacutecomb.cn,
 pecyrillicturn,
+crossbar,
+crossbar_left_long,
+tonostop,
 _part.crossbar_compact,
 _part.crossbar_compact_rext,
 _part.crossbar_vert,
 _part.cyrtail,
 _part.cyrtic,
 _part.cyrtic_center,
+_part.cyrtic_hook,
 _tildecross.cn,
+acutedotcomb.cn,
+acutedotcomb.lc,
+breveacutecomb.cn,
+brevegravecomb.cn,
+brevehookcomb.cn,
+brevetildecomb.cn,
+carondotcomb.cn,
+carondotcomb.lc,
+circumflexacutecomb.cn,
+circumflexgravecomb.cn,
+circumflexhookcomb.cn,
+circumflextildecomb.cn,
 commaaccentright.cn,
+commaaccentrotate.cn,
 koronisaccentleft.cn,
+macrondieresiscomb.cn,
+ringacute.cn,
+tildedieresiscomb.cn,
+tildedieresiscomb.lc,
+tildemacroncomb.cn,
+tildemacroncomb.lc,
 _part.bottom_lfthook,
 _part.bottom_lfthook2_uc,
 _part.bottom_lfthook_t,
@@ -2559,9 +2560,9 @@ _part.brackquill_left,
 _part.brackquill_right,
 _part.curl_sw,
 _part.divfrac,
+_part.lambdabar,
 _part.q_big,
 _part.rtopbar,
-_part.rtophorn,
 _part.top_left_hook,
 _part.top_r_hook,
 _part.top_r_hook_C,
@@ -2569,6 +2570,5 @@ _part.top_r_hook_G,
 _part.top_r_hook_c,
 _part.top_r_hook_g_sc,
 _part.topbar,
-_part.zeroslash,
-_part.rtophorn.o
+_part.zeroslash
 )
\ No newline at end of file
diff --git a/src/features/ccmp.fea b/src/features/ccmp.fea
index f97a76558..638cb58ee 100644
--- a/src/features/ccmp.fea
+++ b/src/features/ccmp.fea
@@ -2,9 +2,9 @@
   gravecomb acutecomb tildecomb brevetildecomb.cn brevehookcomb.cn
   breveacutecomb.cn circumflextildecomb.cn circumflexhookcomb.cn
   circumflexgravecomb.cn circumflexacutecomb.cn brevegravecomb.cn
-  macroncomb dieresismacroncomb.cn dieresisacutecomb.cn
-  dieresiscaroncomb.cn dieresisgravecomb.cn dotmacroncomb.cn
-  tildeacutecomb macrongravecomb.cn macronacutecomb.cn
+  macroncomb dieresismacroncomb.uc dieresisacutecomb.uc
+  dieresiscaroncomb.uc dieresisgravecomb.uc dotmacroncomb.uc
+  tildeacutecomb.uc macrongravecomb.cn macronacutecomb.cn
   macrondieresiscomb.cn acutedotcomb.cn carondotcomb.cn
   tildemacroncomb.cn tildedieresiscomb.cn circumflexnosp overscorenosp
   brevenosp dotnosp dieresisnosp hookabovecmb ringnosp acutedblnosp caroncmb
@@ -340,24 +340,24 @@ lookup ccmp03 {
   sub o caroncmb by ocaron;
   sub U caroncmb by Ucaron;
   sub u caroncmb by ucaron;
-  #sub U dieresismacroncomb.cn by uni01D5;
+  #sub U dieresismacroncomb.uc by uni01D5;
   sub U dieresisnosp macroncomb by Udieresismacron;
-  sub u dieresismacroncomb.cn by udieresismacron;
-  #sub U dieresisacutecomb.cn by uni01D7;
+  sub u dieresismacroncomb.uc by udieresismacron;
+  #sub U dieresisacutecomb.uc by uni01D7;
   sub U dieresisnosp acutecomb by Udieresisacute;
-  sub u dieresisacutecomb.cn by udieresisacute;
-  #sub U dieresiscaroncomb.cn by uni01D9;
+  sub u dieresisacutecomb.uc by udieresisacute;
+  #sub U dieresiscaroncomb.uc by uni01D9;
   sub U dieresisnosp caroncmb by Udieresiscaron;
-  sub u dieresiscaroncomb.cn by udieresiscaron;
-  #sub U dieresisgravecomb.cn by uni01DB;
+  sub u dieresiscaroncomb.uc by udieresiscaron;
+  #sub U dieresisgravecomb.uc by uni01DB;
   sub U dieresisnosp gravecomb by Udieresisgrave;
-  sub u dieresisgravecomb.cn by udieresisgrave;
-  #sub A dieresismacroncomb.cn by uni01DE;
+  sub u dieresisgravecomb.uc by udieresisgrave;
+  #sub A dieresismacroncomb.uc by uni01DE;
   sub A dieresisnosp macroncomb by Adieresismacron;
-  sub a dieresismacroncomb.cn by adieresismacron;
-  #sub A dotmacroncomb.cn by uni01E0;
+  sub a dieresismacroncomb.uc by adieresismacron;
+  #sub A dotmacroncomb.uc by uni01E0;
   sub A dotnosp macroncomb by Adotmacron;
-  sub a dotmacroncomb.cn by adotmacron;
+  sub a dotmacroncomb.uc by adotmacron;
   sub AE macroncomb by AEmacron;
   sub ae macroncomb by aemacron;
   sub G caroncmb by Gcaron;
@@ -400,17 +400,17 @@ lookup ccmp03 {
   sub a dotnosp by uni0227;
   sub E cedillanosp by uni0228;
   sub e cedillanosp by uni0229;
-  #sub O dieresismacroncomb.cn by uni022A;
+  #sub O dieresismacroncomb.uc by uni022A;
   sub O dieresisnosp macroncomb by uni022A;
-  sub o dieresismacroncomb.cn by uni022B;
+  sub o dieresismacroncomb.uc by uni022B;
   #sub O tildemacroncomb.cn by uni022C;
   sub O tildecomb macroncomb by uni022C;
   sub o tildemacroncomb.cn by uni022D;
   sub O dotnosp by uni022E;
   sub o dotnosp by uni022F;
-  #sub O dotmacroncomb.cn by uni0230;
+  #sub O dotmacroncomb.uc by uni0230;
   sub O dotnosp macroncomb by uni0230;
-  sub o dotmacroncomb.cn by uni0231;
+  sub o dotmacroncomb.uc by uni0231;
   sub Y macroncomb by uni0232;
   sub y macroncomb by uni0233;
   sub Upsilonhooksymbol acutecomb by Upsilonacutehooksymbolgreek;
@@ -455,9 +455,9 @@ lookup ccmp03 {
   sub h brevesubnosp by hbrevebelow;
   sub I tildesubnosp by Itildebelow;
   sub i tildesubnosp by itildebelow;
-  #sub I dieresisacutecomb.cn by Idieresisacute;
+  #sub I dieresisacutecomb.uc by Idieresisacute;
   sub I dieresisnosp acutecomb by Idieresisacute;
-  sub idotless dieresisacutecomb.cn by idieresisacute;
+  sub idotless dieresisacutecomb.uc by idieresisacute;
   sub K acutecomb by Kacute;
   sub k acutecomb by kacute;
   sub K dotbelow by Kdotbelow;
@@ -484,9 +484,9 @@ lookup ccmp03 {
   sub n macronsubnosp by nlinebelow;
   sub N circumflexsubnosp by Ncircumflexbelow;
   sub n circumflexsubnosp by ncircumflexbelow;
-  #sub O tildeacutecomb.cn by uni1E4C;
+  #sub O tildeacutecomb.uc by uni1E4C;
   sub O tildecomb acutecomb by Otildeacute;
-  sub o tildeacutecomb by otildeacute;
+  sub o tildeacutecomb.uc by otildeacute;
   #sub O tildedieresiscomb.cn by uni1E4E;
   sub O tildecomb dieresisnosp by Otildedieresis;
   sub o tildedieresiscomb.cn by otildedieresis;
@@ -530,9 +530,9 @@ lookup ccmp03 {
   sub u tildesubnosp by utildebelow;
   sub U circumflexsubnosp by Ucircumflexbelow;
   sub u circumflexsubnosp by ucircumflexbelow;
-  #sub U tildeacutecomb.cn by uni1E78;
+  #sub U tildeacutecomb.uc by uni1E78;
   sub U tildecomb acutecomb by Utildeacute;
-  sub u tildeacutecomb by utildeacute;
+  sub u tildeacutecomb.uc by utildeacute;
   #sub U macrondieresiscomb.cn by uni1E7A;
   sub U macroncomb dieresisnosp by Umacrondieresis;
   sub u macrondieresiscomb.cn by umacrondieresis;