ohorn on top

151 files changed, 1664 insertions, 1263 deletions

diff --git a/src/Inter.glyphspackage/fontinfo.plist b/src/Inter.glyphspackage/fontinfo.plist
index 990a0b260..5ae1b60a2 100644
--- a/src/Inter.glyphspackage/fontinfo.plist
+++ b/src/Inter.glyphspackage/fontinfo.plist
@@ -86,7 +86,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 uni04C9 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 Idieresis Idieresisacute 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 afii10056 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 afii10056.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 afii10026 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 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 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 uni0224 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 b bbar btopbar bhook bdotaccent bdotbelow blinebelow c uni023C chook ccurl ccedilla cacute ccircumflex cdotaccent ccaron ccedillaacute sigmalunatesymbolgreek escyrillic d dcroat drthook dhook dtopbar uni0221 dcaron ddotaccent ddotbelow dlinebelow dcedilla dcircumflexbelow dz dzaltone dzcaron dzcurl 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 _part.f_base f slongstroke slongdotaccent fdotaccent feng g ghook gbar gcircumflex gbreve gdotaccent gcommaaccent gcaron gacute gmacron h hcedilla tshecyrillic djecyrillic hhook henghook hv hturn hturnlthook hturnhook2 hbar hcircumflex uni021F hdotaccent hdotbelow hdieresis hbrevebelow hlinebelow shhacyrillic i idotless idieresis idieresisacute 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 yicyrillic ij j jcrosstail.ccmp jcrosstail jcircumflex jcaron yotgreek jecyrillic lj k khook kcommaaccent kcaron kacute kdotbelow klinebelow kturn 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 m mhook mturn mturndescend macute mdotaccent mdotbelow n ntilde nrthook eng ncurl nlfthook nlegrightlong nacute ncommaaccent ncaron uni01F9 ndotaccent ndotbelow nlinebelow ncircumflexbelow nj 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 ukcyrillic p uni048F phook pacute pdotaccent ercyrillic q qhook qrthook Q_rthook r rrthook uni024D rturn rturnrthook rfishhookrev rfishhook rdescend racute rcommaaccent rcaron rdblgrave rinvertedbreve rdotaccent rdotbelow rdotbelowmacron rlinebelow r.1 rrthook.1 uni024D.1 rdescend.1 racute.1 rcommaaccent.1 rcaron.1 rdblgrave.1 rinvertedbreve.1 rdotaccent.1 rdotbelow.1 rdotbelowmacron.1 rlinebelow.1 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 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 z zbar zhook uni0240 zrthook zacute zdotaccent zcaron zcircumflex zdotbelow zlinebelow zcurl 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 afii10041 Chedescendercyrillic Cheverticalstrokecyrillic Shhacyrillic afii10060 afii10042 afii10043 afii10044 afii10045 afii10046 afii10058 afii10059 afii10047 afii10048 afii10049 Ghemiddlehookcyrillic Pemiddlehookcyrillic afii10053 Haabkhasiancyrillic Cheabkhasiancyrillic Schwacyrillic Dzeabkhasiancyrillic afii10148 afii10051 eth thorn 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 gecyrillic gheupturncyrillic uni04FB decyrillic zhecyrillic zhedescendercyrillic zecyrillic iicyrillic uni048B kacyrillic kahookcyrillic kadescendercyrillic kaverticalstrokecyrillic kabashkircyrillic elcyrillic uni04C6 uni052F emcyrillic uni04CE encyrillic endescendercyrillic enghecyrillic enhookcyrillic uni04CA pecyrillic tecyrillic efcyrillic uni04FD hadescendercyrillic tsecyrillic dzhecyrillic checyrillic chedescendercyrillic cheverticalstrokecyrillic shacyrillic shchacyrillic softsigncyrillic hardsigncyrillic yericyrillic uni048D 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 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 apostrophemod quotesingle quotedbl quotedblleft quotedblright quotedblbase quotesinglbase prime doubleprime tripleprime quadrupleprime primerev doubleprimerev tripleprimerev primemod doubleprimemod comma period ellipsis twodotleader colon colon.case uniEE01 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 zero.dnomf one.dnomf two.dnomf three.dnomf four.dnomf five.dnomf six.dnomf seven.dnomf eight.dnomf nine.dnomf 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 zero.frac one.frac two.frac three.frac four.frac five.frac six.frac seven.frac eight.frac nine.frac onehalf onethird onequarter threequarters fivesixths onefraction seveneighths oneeighth fiveeighths threeeighths percent perthousand pertenthousand uni214D cadauna careof accountof addresssubject acute hungarumlaut grave tonos dieresis casedieresis.cn circumflex tilde casetilde.cn macron breve cyrillicbreve dotaccent ring ring.uc caron dieresistonos cedilla ogonek commaaccent acutecomb acutedblnosp gravecomb dblgravecmb macroncomb dieresisnosp brevenosp breveinvnosp hook 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 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 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 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 Gsmallcap Gsmallcaphook Ismallcap Lsmallcap Nsmallcap OEsmallcap Rsmallcap Rsmallcapinv Ysmallcap ascript ascriptturn babygamma cstretch deltaturn erev esh eshcurl eshlooprev eshshortrev 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 longs tesh thook tonefive tonesix ts uni0223 uni0238 uni0239 uni0242 uni0299 uni029C uni02AB uni02AC uni1E9D uni1E9F uni1EFB uni1EFD uni1EFF uni2184 upsilonlatin vscript wynn uni2094 Rturnsuper finaltsadi hhooksuper rturnsuper exclam1 pipe pipedbl pipedblbar uniA7FF afii10020 afii10052 uni04F6 Ghestrokecyrillic afii10061 afii10033 afii10034 afii10035 afii10036 afii10062 afii10039 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 gjecyrillic uni04F7 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 uni04ED 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 uni204A uni204E uni2050 uni2051 uni2053 uni2054 uni2055 uni2056 uni2058 uni2059 uni205A uni205B uni205C uni205D uni205E verticalbardbl hyphen__ hyphennobreak underscoredbl quotereversed quotedblreversed 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 uni2052 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 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 firsttonechinese secondtonechinese fourthtonechinese uni02EA uni02EB acutelowmod colontriangularhalfmod colontriangularmod commareversedmod commaturnedmod glottalstopmod glottalstopreversedmod gravelowmod linevert macronsub ringhalfleft ringhalfright verticallinelowmod Omegaroundcyrillic omegaroundcyrillic Omegatitlocyrillic omegatitlocyrillic Otcyrillic otcyrillic 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 cyrillichook 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 _tildecross.cn commaaccentright.cn cyrillictail.cn cyrillictic.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 uni04C9 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 Idieresis Idieresisacute 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 afii10056 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 afii10056.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 afii10026 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 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 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 uni0224 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 b bbar btopbar bhook bdotaccent bdotbelow blinebelow c uni023C chook ccurl ccedilla cacute ccircumflex cdotaccent ccaron ccedillaacute sigmalunatesymbolgreek escyrillic d dcroat drthook dhook dtopbar uni0221 dcaron ddotaccent ddotbelow dlinebelow dcedilla dcircumflexbelow dz dzaltone dzcaron dzcurl 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 _part.f_base f slongstroke slongdotaccent fdotaccent feng g ghook gbar gcircumflex gbreve gdotaccent gcommaaccent gcaron gacute gmacron h hcedilla tshecyrillic djecyrillic hhook henghook hv hturn hturnlthook hturnhook2 hbar hcircumflex uni021F hdotaccent hdotbelow hdieresis hbrevebelow hlinebelow shhacyrillic i idotless idieresis idieresisacute 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 yicyrillic ij j jcrosstail.ccmp jcrosstail jcircumflex jcaron yotgreek jecyrillic lj k khook kcommaaccent kcaron kacute kdotbelow klinebelow kturn 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 m mhook mturn mturndescend macute mdotaccent mdotbelow n ntilde nrthook eng ncurl nlfthook nlegrightlong nacute ncommaaccent ncaron uni01F9 ndotaccent ndotbelow nlinebelow ncircumflexbelow nj 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 ukcyrillic p uni048F phook pacute pdotaccent ercyrillic q qhook qrthook Q_rthook r rrthook uni024D rturn rturnrthook rfishhookrev rfishhook rdescend racute rcommaaccent rcaron rdblgrave rinvertedbreve rdotaccent rdotbelow rdotbelowmacron rlinebelow r.1 rrthook.1 uni024D.1 rdescend.1 racute.1 rcommaaccent.1 rcaron.1 rdblgrave.1 rinvertedbreve.1 rdotaccent.1 rdotbelow.1 rdotbelowmacron.1 rlinebelow.1 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 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 z zbar zhook uni0240 zrthook zacute zdotaccent zcaron zcircumflex zdotbelow zlinebelow zcurl 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 afii10041 Chedescendercyrillic Cheverticalstrokecyrillic Shhacyrillic afii10060 afii10042 afii10043 afii10044 afii10045 afii10046 afii10058 afii10059 afii10047 afii10048 afii10049 Ghemiddlehookcyrillic Pemiddlehookcyrillic afii10053 Haabkhasiancyrillic Cheabkhasiancyrillic Schwacyrillic Dzeabkhasiancyrillic afii10148 afii10051 eth thorn 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 gecyrillic gheupturncyrillic uni04FB decyrillic zhecyrillic zhedescendercyrillic zecyrillic iicyrillic uni048B kacyrillic kahookcyrillic kadescendercyrillic kaverticalstrokecyrillic kabashkircyrillic elcyrillic uni04C6 uni052F emcyrillic uni04CE encyrillic endescendercyrillic enghecyrillic enhookcyrillic uni04CA pecyrillic tecyrillic efcyrillic uni04FD hadescendercyrillic tsecyrillic dzhecyrillic checyrillic chedescendercyrillic cheverticalstrokecyrillic shacyrillic shchacyrillic softsigncyrillic hardsigncyrillic yericyrillic uni048D 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 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 apostrophemod quotesingle quotedbl quotedblleft quotedblright quotedblbase quotesinglbase prime doubleprime tripleprime quadrupleprime primerev doubleprimerev tripleprimerev primemod doubleprimemod comma period ellipsis twodotleader colon colon.case uniEE01 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 zero.dnomf one.dnomf two.dnomf three.dnomf four.dnomf five.dnomf six.dnomf seven.dnomf eight.dnomf nine.dnomf 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 zero.frac one.frac two.frac three.frac four.frac five.frac six.frac seven.frac eight.frac nine.frac onehalf onethird onequarter threequarters fivesixths onefraction seveneighths oneeighth fiveeighths threeeighths percent perthousand pertenthousand uni214D cadauna careof accountof addresssubject acute hungarumlaut grave tonos dieresis casedieresis.cn circumflex tilde casetilde.cn macron breve cyrillicbreve dotaccent ring ring.uc caron dieresistonos cedilla ogonek commaaccent acutecomb acutedblnosp gravecomb dblgravecmb macroncomb dieresisnosp brevenosp breveinvnosp 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 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 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 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 Gsmallcap Gsmallcaphook Ismallcap Lsmallcap Nsmallcap OEsmallcap Rsmallcap Rsmallcapinv Ysmallcap ascript ascriptturn babygamma cstretch deltaturn erev esh eshcurl eshlooprev eshshortrev 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 longs tesh thook tonefive tonesix ts uni0223 uni0238 uni0239 uni0242 uni0299 uni029C uni02AB uni02AC uni1E9D uni1E9F uni1EFB uni1EFD uni1EFF uni2184 upsilonlatin vscript wynn uni2094 Rturnsuper finaltsadi hhooksuper rturnsuper exclam1 pipe pipedbl pipedblbar uniA7FF afii10020 afii10052 uni04F6 Ghestrokecyrillic afii10061 afii10033 afii10034 afii10035 afii10036 afii10062 afii10039 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 gjecyrillic uni04F7 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 uni04ED 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 uni204A uni204E uni2050 uni2051 uni2053 uni2054 uni2055 uni2056 uni2058 uni2059 uni205A uni205B uni205C uni205D uni205E verticalbardbl hyphen__ hyphennobreak underscoredbl quotereversed quotedblreversed 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 uni2052 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 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 firsttonechinese secondtonechinese fourthtonechinese uni02EA uni02EB acutelowmod colontriangularhalfmod colontriangularmod commareversedmod commaturnedmod glottalstopmod glottalstopreversedmod gravelowmod linevert macronsub ringhalfleft ringhalfright verticallinelowmod Omegaroundcyrillic omegaroundcyrillic Omegatitlocyrillic omegatitlocyrillic Otcyrillic otcyrillic 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 cyrillichook 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 hookabovecmb _tildecross.cn commaaccentright.cn cyrillictail.cn cyrillictic.cn koronisaccentleft.cn";
 name = All;
 }
 );
@@ -1760,7 +1760,7 @@ macroncomb,
 dieresisnosp,
 brevenosp,
 breveinvnosp,
-hook,
+hookabovecmb,
 circumflexnosp,
 caroncmb,
 tildecomb,
@@ -2675,7 +2675,7 @@ stemValues = (
 );
 userData = {
 GSCornerRadius = 250;
-GSOffsetHorizontal = 32;
+GSOffsetHorizontal = 23;
 GSOffsetKeepCompatible = 1;
 GSOffsetMakeStroke = 1;
 GSOffsetPosition = 1;
@@ -2904,10 +2904,6 @@ name = "Cap height";
 pos = (0,1490);
 },
 {
-name = "Curve Overflow";
-pos = (0,1510);
-},
-{
 locked = 1;
 name = "Top anchors";
 pos = (0,1304);
@@ -2924,7 +2920,7 @@ metricValues = (
 pos = 1984;
 },
 {
-over = 32;
+over = 24;
 pos = 1490;
 },
 {
@@ -3721,7 +3717,7 @@ metricValues = (
 pos = 1984;
 },
 {
-over = 32;
+over = 24;
 pos = 1490;
 },
 {
@@ -3827,9 +3823,6 @@ pos = (632,1676);
 pos = (542,1132);
 },
 {
-pos = (1216,1510);
-},
-{
 locked = 1;
 pos = (594,-418);
 },
@@ -4098,9 +4091,6 @@ name = "Cap height";
 pos = (0,1490);
 },
 {
-pos = (1288,1510);
-},
-{
 locked = 1;
 name = "Top anchors";
 pos = (0,1262);
@@ -12470,9 +12460,9 @@ underscore = -81.45454;
 "@MMK_R_A" = -186.18182;
 "@MMK_R_C" = 0;
 "@MMK_R_J" = -139.63637;
-"@MMK_R_o" = -81.45454;
 "@MMK_R_comma" = -81.45454;
 "@MMK_R_m" = -11.63636;
+"@MMK_R_o" = -81.45454;
 "@MMK_R_quotedblbase" = -244.36363;
 "@MMK_R_u" = -69.81818;
 "@MMK_R_v" = -69.81818;
@@ -12527,11 +12517,11 @@ underscore = -104.72727;
 "@MMK_L_K" = {
 "@MMK_R_C" = -69.81818;
 "@MMK_R_approxequal" = -69.81818;
-"@MMK_R_o" = -81.45454;
 "@MMK_R_guillemetleft" = -104.72727;
 "@MMK_R_hyphen" = -221.09091;
 "@MMK_R_idieresis" = 174.54546;
 "@MMK_R_idotless" = 69.81818;
+"@MMK_R_o" = -81.45454;
 "@MMK_R_registered" = -30.54545;
 "@MMK_R_u" = -69.81818;
 "@MMK_R_v" = -81.45454;
@@ -12587,9 +12577,9 @@ underscore = -81.45454;
 "@MMK_L_P" = {
 "@MMK_R_A" = -151.27272;
 "@MMK_R_J" = -197.81818;
-"@MMK_R_o" = -11.63636;
 "@MMK_R_comma" = -81.45454;
 "@MMK_R_hyphen" = -93.09091;
+"@MMK_R_o" = -11.63636;
 "@MMK_R_quotedblbase" = -290.90909;
 "@MMK_R_zero.subs" = -162.90909;
 ampersand = -69.81818;
@@ -12599,8 +12589,8 @@ period = -69.81818;
 "@MMK_L_R" = {
 "@MMK_R_V" = -34.90909;
 "@MMK_R_Y" = -49.45454;
-"@MMK_R_o" = -11.63636;
 "@MMK_R_idieresis" = 93.09091;
+"@MMK_R_o" = -11.63636;
 };
 "@MMK_L_S" = {
 "@MMK_R_idieresis" = 93.09091;
@@ -12611,7 +12601,6 @@ period = -69.81818;
 "@MMK_R_J" = -186.18182;
 "@MMK_R_T.sc" = -128;
 "@MMK_R_a" = -230;
-"@MMK_R_o" = -260;
 "@MMK_R_colon" = -69.81818;
 "@MMK_R_comma" = -69.81818;
 "@MMK_R_guillemetleft" = -267.63635;
@@ -12620,6 +12609,7 @@ period = -69.81818;
 "@MMK_R_idblgrave" = 261.81818;
 "@MMK_R_idieresis" = 186.18182;
 "@MMK_R_m" = -116.36364;
+"@MMK_R_o" = -260;
 "@MMK_R_quotedblbase" = -244.36363;
 "@MMK_R_s" = -151.27272;
 "@MMK_R_v" = -128;
@@ -12656,11 +12646,11 @@ zrthook = -81.45454;
 "@MMK_L_T.sc" = {
 "@MMK_R_T" = -128;
 "@MMK_R_a" = -58.18182;
-"@MMK_R_o" = -58.18182;
 "@MMK_R_comma" = -186.18182;
 "@MMK_R_elcyrillic" = -93.09091;
 "@MMK_R_guillemetleft" = -81.45454;
 "@MMK_R_hyphen" = -58.18182;
+"@MMK_R_o" = -58.18182;
 "@MMK_R_quotedblbase" = -244.36363;
 "@MMK_R_zero.subs" = -81.45454;
 integral = -116.36364;
@@ -12674,12 +12664,12 @@ vturn = -87.27273;
 "@MMK_R_J" = -197.81818;
 "@MMK_R_a" = -104.72727;
 "@MMK_R_approxequal" = -128;
-"@MMK_R_o" = -104.72727;
 "@MMK_R_colon" = -128;
 "@MMK_R_comma" = -197.81818;
 "@MMK_R_guillemetleft" = -116.36364;
 "@MMK_R_hyphen" = -104.72727;
 "@MMK_R_idieresis" = 174.54546;
+"@MMK_R_o" = -104.72727;
 "@MMK_R_quotedblbase" = -232.72728;
 "@MMK_R_s" = -93.09091;
 "@MMK_R_zero.subs" = -197.81818;
@@ -12702,12 +12692,12 @@ underscore = -162.90909;
 "@MMK_R_J" = -128;
 "@MMK_R_a" = -104.72727;
 "@MMK_R_approxequal" = -128;
-"@MMK_R_o" = -104.72727;
 "@MMK_R_colon" = -104.72727;
 "@MMK_R_comma" = -197.81818;
 "@MMK_R_guillemetleft" = -116.36364;
 "@MMK_R_hyphen" = -104.72727;
 "@MMK_R_m" = -69.81818;
+"@MMK_R_o" = -104.72727;
 "@MMK_R_quotedblbase" = -221.09091;
 "@MMK_R_s" = -69.81818;
 "@MMK_R_zero.subs" = -186.18182;
@@ -12720,9 +12710,9 @@ periodcentered = -69.81818;
 "@MMK_L_X" = {
 "@MMK_R_C" = -23.27273;
 "@MMK_R_approxequal" = -104.72727;
-"@MMK_R_o" = -58.18182;
 "@MMK_R_guillemetleft" = -81.45454;
 "@MMK_R_hyphen" = -139.63637;
+"@MMK_R_o" = -58.18182;
 "@MMK_R_registered" = -14.54545;
 asterisk.case = -93.09091;
 idblgrave = 81.45454;
@@ -12736,7 +12726,6 @@ periodcentered = -93.09091;
 "@MMK_R_T" = 93.09091;
 "@MMK_R_a" = -145.45454;
 "@MMK_R_approxequal" = -197.81818;
-"@MMK_R_o" = -157.09091;
 "@MMK_R_colon" = -128;
 "@MMK_R_comma" = -69.81818;
 "@MMK_R_guillemetleft" = -186.18182;
@@ -12744,6 +12733,7 @@ periodcentered = -93.09091;
 "@MMK_R_hyphen" = -162.90909;
 "@MMK_R_idotless" = 0;
 "@MMK_R_m" = -81.45454;
+"@MMK_R_o" = -157.09091;
 "@MMK_R_quotedblbase" = -221.09091;
 "@MMK_R_registered" = -17.45455;
 "@MMK_R_s" = -139.63637;
@@ -12836,27 +12826,6 @@ ampersand = -69.81818;
 four = -93.09091;
 underscore = -139.63637;
 };
-"@MMK_L_o" = {
-"@MMK_R_A" = -69.81818;
-"@MMK_R_T" = -81.45454;
-"@MMK_R_T.sc" = -81.45454;
-"@MMK_R_V" = -104.72727;
-"@MMK_R_W" = -104.72727;
-"@MMK_R_X" = -58.18182;
-"@MMK_R_Y" = -174.54546;
-"@MMK_R_dagger" = -69.81818;
-"@MMK_R_parenright" = -23.27273;
-"@MMK_R_quotedblleft" = -128;
-"@MMK_R_registered" = -23.27273;
-"@MMK_R_v" = -40.72727;
-"@MMK_R_w" = -37.81818;
-"@MMK_R_x" = -46.54546;
-Trthook = -162.90909;
-Yhook = -104.72727;
-idblgrave = 69.81818;
-jcrosstail = -93.09091;
-uni023E = -162.90909;
-};
 "@MMK_L_b.sups" = {
 "@MMK_R_parenright.sups" = -15.27273;
 "@MMK_R_w.sups" = -25.45455;
@@ -12878,27 +12847,6 @@ hardsigncyrillic = -69.81818;
 "@MMK_R_w" = -58.18182;
 "@MMK_R_x" = -46.54546;
 };
-"@MMK_L_o" = {
-"@MMK_R_A" = -69.81818;
-"@MMK_R_T" = -81.45454;
-"@MMK_R_T.sc" = -81.45454;
-"@MMK_R_V" = -104.72727;
-"@MMK_R_W" = -104.72727;
-"@MMK_R_X" = -58.18182;
-"@MMK_R_Y" = -174.54546;
-"@MMK_R_dagger" = -69.81818;
-"@MMK_R_parenright" = -23.27273;
-"@MMK_R_quotedblleft" = -128;
-"@MMK_R_registered" = -23.27273;
-"@MMK_R_v" = -40.72727;
-"@MMK_R_w" = -37.81818;
-"@MMK_R_x" = -46.54546;
-Trthook = -162.90909;
-Yhook = -104.72727;
-idblgrave = 69.81818;
-jcrosstail = -93.09091;
-uni023E = -162.90909;
-};
 "@MMK_L_c.sups" = {
 "@MMK_R_x.sups" = -8;
 };
@@ -12985,27 +12933,6 @@ underscore = 93.09091;
 Psi = -174.54546;
 tau = -69.81818;
 };
-"@MMK_L_o" = {
-"@MMK_R_A" = -69.81818;
-"@MMK_R_T" = -81.45454;
-"@MMK_R_T.sc" = -81.45454;
-"@MMK_R_V" = -104.72727;
-"@MMK_R_W" = -104.72727;
-"@MMK_R_X" = -58.18182;
-"@MMK_R_Y" = -174.54546;
-"@MMK_R_dagger" = -69.81818;
-"@MMK_R_parenright" = -23.27273;
-"@MMK_R_quotedblleft" = -128;
-"@MMK_R_registered" = -23.27273;
-"@MMK_R_v" = -40.72727;
-"@MMK_R_w" = -37.81818;
-"@MMK_R_x" = -46.54546;
-Trthook = -162.90909;
-Yhook = -104.72727;
-idblgrave = 69.81818;
-jcrosstail = -93.09091;
-uni023E = -162.90909;
-};
 "@MMK_L_e.sups" = {
 "@MMK_R_x.sups" = -19.63636;
 };
@@ -13038,12 +12965,12 @@ Psi = -93.09091;
 "@MMK_R_Y" = 20.36364;
 "@MMK_R_a" = -32;
 "@MMK_R_bullet" = -46.54546;
-"@MMK_R_o" = -46.54546;
 "@MMK_R_comma" = -116.36364;
 "@MMK_R_eight.sups" = 46.54546;
 "@MMK_R_guillemetleft" = -81.45454;
 "@MMK_R_hyphen" = -58.18182;
 "@MMK_R_idieresis" = 209.45454;
+"@MMK_R_o" = -46.54546;
 "@MMK_R_quotedblbase" = -186.18182;
 "@MMK_R_s" = -46.54546;
 "@MMK_R_slash" = -58.18182;
@@ -13227,9 +13154,9 @@ underscore = -69.81818;
 };
 "@MMK_L_k" = {
 "@MMK_R_T" = -116.36364;
-"@MMK_R_o" = -46.54546;
 "@MMK_R_guillemetleft" = -104.72727;
 "@MMK_R_hyphen" = -93.09091;
+"@MMK_R_o" = -46.54546;
 four = -93.09091;
 less = -174.54546;
 logicalnot = -139.63637;
@@ -13257,6 +13184,27 @@ seven.dnomf = -24.72727;
 "@MMK_L_nine.sups" = {
 seven.sups = -26.90909;
 };
+"@MMK_L_o" = {
+"@MMK_R_A" = -69.81818;
+"@MMK_R_T" = -81.45454;
+"@MMK_R_T.sc" = -81.45454;
+"@MMK_R_V" = -104.72727;
+"@MMK_R_W" = -104.72727;
+"@MMK_R_X" = -58.18182;
+"@MMK_R_Y" = -174.54546;
+"@MMK_R_dagger" = -69.81818;
+"@MMK_R_parenright" = -23.27273;
+"@MMK_R_quotedblleft" = -128;
+"@MMK_R_registered" = -23.27273;
+"@MMK_R_v" = -40.72727;
+"@MMK_R_w" = -37.81818;
+"@MMK_R_x" = -46.54546;
+Trthook = -162.90909;
+Yhook = -104.72727;
+idblgrave = 69.81818;
+jcrosstail = -93.09091;
+uni023E = -162.90909;
+};
 "@MMK_L_ohorn" = {
 "@MMK_R_comma" = -93.09091;
 };
@@ -13269,8 +13217,8 @@ Psi = -174.54546;
 "@MMK_R_quotedblbase" = -93.09091;
 };
 "@MMK_L_parenleft" = {
-"@MMK_R_o" = -23.27273;
 "@MMK_R_jdotless" = 58.18182;
+"@MMK_R_o" = -23.27273;
 idblgrave = 93.09091;
 llinebelow = 69.81818;
 rlinebelow.1 = 69.81818;
@@ -13344,7 +13292,6 @@ slash = -197.81818;
 "@MMK_R_J" = -256;
 "@MMK_R_a" = -116.36364;
 "@MMK_R_approxequal" = -116.36364;
-"@MMK_R_o" = -128;
 "@MMK_R_colon" = -116.36364;
 "@MMK_R_comma" = -203.63637;
 "@MMK_R_deltagreek" = -128;
@@ -13355,6 +13302,7 @@ slash = -197.81818;
 "@MMK_R_iotadieresisgreek" = -128;
 "@MMK_R_m" = -43.63636;
 "@MMK_R_nine.1" = -23.27273;
+"@MMK_R_o" = -128;
 "@MMK_R_omegagreek" = -128;
 "@MMK_R_psigreek" = -81.45454;
 "@MMK_R_quotedblbase" = -384;
@@ -13388,11 +13336,11 @@ zeta = -128;
 "@MMK_R_T" = -116.36364;
 "@MMK_R_Z" = -69.81818;
 "@MMK_R_a.sups" = 69.81818;
-"@MMK_R_o" = -34.90909;
 "@MMK_R_comma" = -128;
 "@MMK_R_eight.sups" = 93.09091;
 "@MMK_R_f" = 69.81818;
 "@MMK_R_hyphen" = -81.45454;
+"@MMK_R_o" = -34.90909;
 "@MMK_R_quotedblbase" = -162.90909;
 "@MMK_R_quotedblright" = 34.90909;
 "@MMK_R_t" = 69.81818;
@@ -13418,8 +13366,8 @@ slash = -69.81818;
 "@MMK_R_X" = -14.54545;
 "@MMK_R_Y" = -17.45455;
 "@MMK_R_a" = -23.27273;
-"@MMK_R_o" = -58.18182;
 "@MMK_R_four" = -101.81818;
+"@MMK_R_o" = -58.18182;
 "@MMK_R_s" = -23.27273;
 "@MMK_R_six.1" = -34.90909;
 ampersand = -69.81818;
@@ -13459,10 +13407,10 @@ underscore = -93.09091;
 "@MMK_R_W" = -20.36364;
 "@MMK_R_Y" = -32;
 "@MMK_R_bullet" = -23.27273;
-"@MMK_R_o" = -11.63636;
 "@MMK_R_four" = -29.09091;
 "@MMK_R_hyphen" = -40.72727;
 "@MMK_R_jdotless" = 0;
+"@MMK_R_o" = -11.63636;
 "@MMK_R_quotedblleft" = -81.45454;
 "@MMK_R_quotedblright" = 58.18182;
 "@MMK_R_s" = -20.36364;
@@ -13503,11 +13451,11 @@ uni023E = -151.27272;
 "@MMK_R_Y" = -69.81818;
 "@MMK_R_a" = -34.90909;
 "@MMK_R_approxequal" = -81.45454;
-"@MMK_R_o" = -40.72727;
 "@MMK_R_comma" = -69.81818;
 "@MMK_R_elcyrillic" = -93.09091;
 "@MMK_R_guillemetleft" = -81.45454;
 "@MMK_R_idieresis" = 81.45454;
+"@MMK_R_o" = -40.72727;
 "@MMK_R_quotedblbase" = -162.90909;
 "@MMK_R_quotedblright" = 72.72727;
 "@MMK_R_zero.subs" = -104.72727;
@@ -13540,9 +13488,9 @@ uni023E = -128;
 "@MMK_R_J" = -116.36364;
 "@MMK_R_T" = -104.72727;
 "@MMK_R_Z" = -69.81818;
-"@MMK_R_o" = -37.81818;
 "@MMK_R_comma" = -151.27272;
 "@MMK_R_guillemetleft" = -69.81818;
+"@MMK_R_o" = -37.81818;
 "@MMK_R_quotedblbase" = -162.90909;
 "@MMK_R_quotedblright" = 87.27273;
 Trthook = -128;
@@ -13555,9 +13503,9 @@ uni023E = -128;
 "@MMK_L_x" = {
 "@MMK_R_T" = -128;
 "@MMK_R_approxequal" = -69.81818;
-"@MMK_R_o" = -46.54546;
 "@MMK_R_guillemetleft" = -69.81818;
 "@MMK_R_hyphen" = -46.54546;
+"@MMK_R_o" = -46.54546;
 };
 "@MMK_L_x.sups" = {
 "@MMK_R_c.sups" = -31.27273;
@@ -14697,7 +14645,6 @@ seven = {
 "@MMK_R_Alphagreek" = -221.09091;
 "@MMK_R_J" = -197.81818;
 "@MMK_R_a" = -93.09091;
-"@MMK_R_o" = -104.72727;
 "@MMK_R_colon" = -69.81818;
 "@MMK_R_comma" = -256;
 "@MMK_R_deltagreek" = -104.72727;
@@ -14705,6 +14652,7 @@ seven = {
 "@MMK_R_guillemetleft" = -128;
 "@MMK_R_idieresis" = 186.18182;
 "@MMK_R_iotadieresisgreek" = -104.72727;
+"@MMK_R_o" = -104.72727;
 "@MMK_R_omegagreek" = -104.72727;
 "@MMK_R_quotedblbase" = -290.90909;
 "@MMK_R_s" = -81.45454;
diff --git a/src/Inter.glyphspackage/glyphs/A_E_acute.glyph b/src/Inter.glyphspackage/glyphs/A_E_acute.glyph
index f4a6f4943..e37e61f2b 100644
--- a/src/Inter.glyphspackage/glyphs/A_E_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/A_E_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (838,372);
+pos = (990,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/A_acute.glyph b/src/Inter.glyphspackage/glyphs/A_acute.glyph
index 0475a9f3e..f15e8a395 100644
--- a/src/Inter.glyphspackage/glyphs/A_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/A_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (206,372);
+pos = (358,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/A_grave.glyph b/src/Inter.glyphspackage/glyphs/A_grave.glyph
index a5c5c2abe..bcb3c86a6 100644
--- a/src/Inter.glyphspackage/glyphs/A_grave.glyph
+++ b/src/Inter.glyphspackage/glyphs/A_grave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (72,372);
+pos = (136,372);
 ref = grave;
 }
 );
@@ -124,7 +124,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (198,372);
+pos = (198,414);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/A_hookabove.glyph b/src/Inter.glyphspackage/glyphs/A_hookabove.glyph
index e5b5f3114..ad19e3a54 100644
--- a/src/Inter.glyphspackage/glyphs/A_hookabove.glyph
+++ b/src/Inter.glyphspackage/glyphs/A_hookabove.glyph
@@ -11,7 +11,7 @@ ref = A;
 },
 {
 pos = (1286,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1384;
@@ -24,7 +24,7 @@ ref = A;
 },
 {
 pos = (1552,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1630;
@@ -37,7 +37,7 @@ ref = A;
 },
 {
 pos = (1352,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1384;
@@ -50,7 +50,7 @@ ref = A;
 },
 {
 pos = (1614,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1630;
@@ -63,7 +63,7 @@ ref = A;
 },
 {
 pos = (1130,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1262;
@@ -76,7 +76,7 @@ ref = A;
 },
 {
 pos = (1198,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1262;
@@ -89,7 +89,7 @@ ref = A;
 },
 {
 pos = (1294,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1336;
@@ -102,7 +102,7 @@ ref = A;
 },
 {
 pos = (1352,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1320;
@@ -114,8 +114,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1552,366);
-ref = hook;
+pos = (1552,414);
+ref = hookabovecmb;
 }
 );
 width = 1598;
@@ -128,7 +128,7 @@ ref = A;
 },
 {
 pos = (1614,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1598;
@@ -141,7 +141,7 @@ ref = A;
 },
 {
 pos = (1130,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1134;
@@ -154,7 +154,7 @@ ref = A;
 },
 {
 pos = (1198,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1134;
diff --git a/src/Inter.glyphspackage/glyphs/C_acute.glyph b/src/Inter.glyphspackage/glyphs/C_acute.glyph
index d57cbe17f..f9f784b9e 100644
--- a/src/Inter.glyphspackage/glyphs/C_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/C_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (294,372);
+pos = (446,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/C_cedillaacute.glyph b/src/Inter.glyphspackage/glyphs/C_cedillaacute.glyph
index dc925da72..ec16cf3d7 100644
--- a/src/Inter.glyphspackage/glyphs/C_cedillaacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/C_cedillaacute.glyph
@@ -14,7 +14,7 @@ pos = (500,-12);
 ref = cedilla;
 },
 {
-pos = (294,372);
+pos = (446,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/E_acute.glyph b/src/Inter.glyphspackage/glyphs/E_acute.glyph
index 46748cb6b..1f28c0954 100644
--- a/src/Inter.glyphspackage/glyphs/E_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/E_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (142,372);
+pos = (294,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/E_grave.glyph b/src/Inter.glyphspackage/glyphs/E_grave.glyph
index 2b6836950..9114decc4 100644
--- a/src/Inter.glyphspackage/glyphs/E_grave.glyph
+++ b/src/Inter.glyphspackage/glyphs/E_grave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (8,372);
+pos = (72,372);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (30,372);
+pos = (30,414);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/E_hookabove.glyph b/src/Inter.glyphspackage/glyphs/E_hookabove.glyph
index da955d8e9..9f09e6560 100644
--- a/src/Inter.glyphspackage/glyphs/E_hookabove.glyph
+++ b/src/Inter.glyphspackage/glyphs/E_hookabove.glyph
@@ -11,7 +11,7 @@ ref = E;
 },
 {
 pos = (1222,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1224;
@@ -24,7 +24,7 @@ ref = E;
 },
 {
 pos = (1376,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1274;
@@ -37,7 +37,7 @@ ref = E;
 },
 {
 pos = (1288,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1224;
@@ -50,7 +50,7 @@ ref = E;
 },
 {
 pos = (1438,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1274;
@@ -63,7 +63,7 @@ ref = E;
 },
 {
 pos = (1132,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1196;
@@ -76,7 +76,7 @@ ref = E;
 },
 {
 pos = (1198,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1196;
@@ -89,7 +89,7 @@ ref = E;
 },
 {
 pos = (1222,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1160;
@@ -102,7 +102,7 @@ ref = E;
 },
 {
 pos = (1293,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1165;
@@ -114,8 +114,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (1384,366);
-ref = hook;
+pos = (1384,414);
+ref = hookabovecmb;
 }
 );
 width = 1260;
@@ -128,7 +128,7 @@ ref = E;
 },
 {
 pos = (1445,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1249;
@@ -141,7 +141,7 @@ ref = E;
 },
 {
 pos = (1132,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1068;
@@ -154,7 +154,7 @@ ref = E;
 },
 {
 pos = (1198,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1068;
diff --git a/src/Inter.glyphspackage/glyphs/G_acute.1.glyph b/src/Inter.glyphspackage/glyphs/G_acute.1.glyph
index ccd99b85e..6bd4b40e6 100644
--- a/src/Inter.glyphspackage/glyphs/G_acute.1.glyph
+++ b/src/Inter.glyphspackage/glyphs/G_acute.1.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = G.1;
 },
 {
-pos = (250,372);
+pos = (476,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/G_acute.glyph b/src/Inter.glyphspackage/glyphs/G_acute.glyph
index 337f64e76..c3b60fe1e 100644
--- a/src/Inter.glyphspackage/glyphs/G_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/G_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (288,372);
+pos = (440,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/I_acute.1.glyph b/src/Inter.glyphspackage/glyphs/I_acute.1.glyph
index 0fe06510b..149891b6c 100644
--- a/src/Inter.glyphspackage/glyphs/I_acute.1.glyph
+++ b/src/Inter.glyphspackage/glyphs/I_acute.1.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-32,372);
+pos = (120,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/I_acute.glyph b/src/Inter.glyphspackage/glyphs/I_acute.glyph
index b40d9340a..40065df68 100644
--- a/src/Inter.glyphspackage/glyphs/I_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/I_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-216,372);
+pos = (-64,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/I_grave.1.glyph b/src/Inter.glyphspackage/glyphs/I_grave.1.glyph
index 9783b62ce..99a8f3ad0 100644
--- a/src/Inter.glyphspackage/glyphs/I_grave.1.glyph
+++ b/src/Inter.glyphspackage/glyphs/I_grave.1.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-166,372);
+pos = (-102,372);
 ref = grave;
 }
 );
@@ -113,7 +113,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-94,372);
+pos = (-94,414);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/I_grave.glyph b/src/Inter.glyphspackage/glyphs/I_grave.glyph
index da7e40452..f937b8df5 100644
--- a/src/Inter.glyphspackage/glyphs/I_grave.glyph
+++ b/src/Inter.glyphspackage/glyphs/I_grave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-350,372);
+pos = (-286,372);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-312,372);
+pos = (-312,414);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/I_hookabove.1.glyph b/src/Inter.glyphspackage/glyphs/I_hookabove.1.glyph
index b5bfaf826..f307f2401 100644
--- a/src/Inter.glyphspackage/glyphs/I_hookabove.1.glyph
+++ b/src/Inter.glyphspackage/glyphs/I_hookabove.1.glyph
@@ -10,7 +10,7 @@ ref = I.1;
 },
 {
 pos = (1048,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 908;
@@ -23,7 +23,7 @@ ref = I.1;
 },
 {
 pos = (1112,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 908;
@@ -36,7 +36,7 @@ ref = I.1;
 },
 {
 pos = (1256,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1032;
@@ -49,7 +49,7 @@ ref = I.1;
 },
 {
 pos = (1318,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1032;
@@ -62,7 +62,7 @@ ref = I.1;
 },
 {
 pos = (856,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 716;
@@ -75,7 +75,7 @@ ref = I.1;
 },
 {
 pos = (923,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 716;
@@ -88,7 +88,7 @@ ref = I.1;
 },
 {
 pos = (1048,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 844;
@@ -101,7 +101,7 @@ ref = I.1;
 },
 {
 pos = (1117,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 844;
@@ -113,8 +113,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (1260,366);
-ref = hook;
+pos = (1260,414);
+ref = hookabovecmb;
 }
 );
 width = 1000;
@@ -127,7 +127,7 @@ ref = I.1;
 },
 {
 pos = (1325,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1000;
@@ -140,7 +140,7 @@ ref = I.1;
 },
 {
 pos = (856,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 588;
@@ -153,7 +153,7 @@ ref = I.1;
 },
 {
 pos = (923,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 588;
diff --git a/src/Inter.glyphspackage/glyphs/I_hookabove.glyph b/src/Inter.glyphspackage/glyphs/I_hookabove.glyph
index efb909170..bffdc15ea 100644
--- a/src/Inter.glyphspackage/glyphs/I_hookabove.glyph
+++ b/src/Inter.glyphspackage/glyphs/I_hookabove.glyph
@@ -11,7 +11,7 @@ ref = I;
 },
 {
 pos = (864,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 540;
@@ -24,7 +24,7 @@ ref = I;
 },
 {
 pos = (1038,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 596;
@@ -37,7 +37,7 @@ ref = I;
 },
 {
 pos = (928,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 541;
@@ -50,7 +50,7 @@ ref = I;
 },
 {
 pos = (1100,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 597;
@@ -63,7 +63,7 @@ ref = I;
 },
 {
 pos = (754,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 512;
@@ -76,7 +76,7 @@ ref = I;
 },
 {
 pos = (822,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 511;
@@ -89,7 +89,7 @@ ref = I;
 },
 {
 pos = (864,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 476;
@@ -102,7 +102,7 @@ ref = I;
 },
 {
 pos = (933,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 476;
@@ -114,8 +114,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (1042,366);
-ref = hook;
+pos = (1042,414);
+ref = hookabovecmb;
 }
 );
 width = 576;
@@ -128,7 +128,7 @@ ref = I;
 },
 {
 pos = (1107,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 566;
@@ -141,7 +141,7 @@ ref = I;
 },
 {
 pos = (754,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 384;
@@ -154,7 +154,7 @@ ref = I;
 },
 {
 pos = (822,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 383;
diff --git a/src/Inter.glyphspackage/glyphs/K_acute.glyph b/src/Inter.glyphspackage/glyphs/K_acute.glyph
index 61b190504..d9339232e 100644
--- a/src/Inter.glyphspackage/glyphs/K_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/K_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (188,372);
+pos = (340,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/L_acute.glyph b/src/Inter.glyphspackage/glyphs/L_acute.glyph
index e0420bd64..706e21680 100644
--- a/src/Inter.glyphspackage/glyphs/L_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/L_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-216,372);
+pos = (-64,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/M_acute.glyph b/src/Inter.glyphspackage/glyphs/M_acute.glyph
index 0c1c3ff56..4d1c437c5 100644
--- a/src/Inter.glyphspackage/glyphs/M_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/M_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (424,372);
+pos = (576,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/N_acute.glyph b/src/Inter.glyphspackage/glyphs/N_acute.glyph
index 39026e201..61ef9c7be 100644
--- a/src/Inter.glyphspackage/glyphs/N_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/N_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (284,372);
+pos = (436,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/O_.glyph b/src/Inter.glyphspackage/glyphs/O_.glyph
index 42da9fc32..c5a53b59a 100644
--- a/src/Inter.glyphspackage/glyphs/O_.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_.glyph
@@ -21,6 +21,10 @@ pos = (222,1490);
 {
 name = top;
 pos = (766,1676);
+},
+{
+name = tophorn;
+pos = (766,1510);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -28,6 +32,9 @@ shapes = (
 {
 closed = 1;
 nodes = (
+(1132,-20,o),
+(1382,289,o),
+(1382,744,cs),
 (1382,1200,o),
 (1132,1510,o),
 (766,1510,cs),
@@ -36,18 +43,12 @@ nodes = (
 (148,744,cs),
 (148,291,o),
 (397,-20,o),
-(766,-20,cs),
-(1132,-20,o),
-(1382,289,o),
-(1382,744,cs)
+(766,-20,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(1336,317,o),
-(1104,26,o),
-(766,26,cs),
 (423,26,o),
 (194,320,o),
 (194,744,cs),
@@ -56,7 +57,10 @@ nodes = (
 (766,1464,cs),
 (1104,1464,o),
 (1336,1172,o),
-(1336,744,cs)
+(1336,744,cs),
+(1336,317,o),
+(1104,26,o),
+(766,26,cs)
 );
 }
 );
@@ -79,6 +83,10 @@ pos = (158,1490);
 {
 name = top;
 pos = (702,1676);
+},
+{
+name = tophorn;
+pos = (702,1510);
 }
 );
 layerId = m011;
@@ -86,6 +94,9 @@ shapes = (
 {
 closed = 1;
 nodes = (
+(1068,-20,o),
+(1318,289,o),
+(1318,744,cs),
 (1318,1200,o),
 (1068,1510,o),
 (702,1510,cs),
@@ -94,18 +105,12 @@ nodes = (
 (84,744,cs),
 (84,291,o),
 (333,-20,o),
-(702,-20,cs),
-(1068,-20,o),
-(1318,289,o),
-(1318,744,cs)
+(702,-20,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(1272,317,o),
-(1040,26,o),
-(702,26,cs),
 (359,26,o),
 (130,320,o),
 (130,744,cs),
@@ -114,7 +119,10 @@ nodes = (
 (702,1464,cs),
 (1040,1464,o),
 (1272,1172,o),
-(1272,744,cs)
+(1272,744,cs),
+(1272,317,o),
+(1040,26,o),
+(702,26,cs)
 );
 }
 );
@@ -137,6 +145,10 @@ pos = (198,1490);
 {
 name = top;
 pos = (781,1676);
+},
+{
+name = tophorn;
+pos = (781,1510);
 }
 );
 guides = (
@@ -154,6 +166,9 @@ shapes = (
 {
 closed = 1;
 nodes = (
+(1162,-20,o),
+(1438,273,o),
+(1438,744,cs),
 (1438,1216,o),
 (1162,1510,o),
 (781,1510,cs),
@@ -162,18 +177,12 @@ nodes = (
 (122,744,cs),
 (122,273,o),
 (400,-20,o),
-(781,-20,cs),
-(1162,-20,o),
-(1438,273,o),
-(1438,744,cs)
+(781,-20,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(1264,358,o),
-(1051,148,o),
-(781,148,cs),
 (510,148,o),
 (296,358,o),
 (296,744,cs),
@@ -182,7 +191,10 @@ nodes = (
 (781,1342,cs),
 (1051,1342,o),
 (1264,1132,o),
-(1264,744,cs)
+(1264,744,cs),
+(1264,358,o),
+(1051,148,o),
+(781,148,cs)
 );
 }
 );
@@ -205,6 +217,10 @@ pos = (166,1490);
 {
 name = top;
 pos = (764,1676);
+},
+{
+name = tophorn;
+pos = (764,1514);
 }
 );
 guides = (
@@ -218,6 +234,9 @@ shapes = (
 {
 closed = 1;
 nodes = (
+(1159,-24,o),
+(1438,297,o),
+(1438,744,cs),
 (1438,1193,o),
 (1159,1514,o),
 (764,1514,cs),
@@ -226,18 +245,12 @@ nodes = (
 (90,744,cs),
 (90,297,o),
 (369,-24,o),
-(764,-24,cs),
-(1159,-24,o),
-(1438,297,o),
-(1438,744,cs)
+(764,-24,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(1264,358,o),
-(1034,144,o),
-(764,144,cs),
 (493,144,o),
 (264,358,o),
 (264,744,cs),
@@ -246,7 +259,10 @@ nodes = (
 (764,1346,cs),
 (1034,1346,o),
 (1264,1132,o),
-(1264,744,cs)
+(1264,744,cs),
+(1264,358,o),
+(1034,144,o),
+(764,144,cs)
 );
 }
 );
@@ -401,6 +417,10 @@ pos = (172,1490);
 {
 name = top;
 pos = (814,1676);
+},
+{
+name = tophorn;
+pos = (814,1510);
 }
 );
 guides = (
@@ -415,6 +435,9 @@ shapes = (
 {
 closed = 1;
 nodes = (
+(1219,-20,o),
+(1538,247,o),
+(1538,744,cs),
 (1538,1242,o),
 (1219,1510,o),
 (814,1510,cs),
@@ -423,18 +446,12 @@ nodes = (
 (90,744,cs),
 (90,250,o),
 (407,-20,o),
-(814,-20,cs),
-(1219,-20,o),
-(1538,247,o),
-(1538,744,cs)
+(814,-20,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(1122,477,o),
-(1015,332,o),
-(814,332,cs),
 (614,332,o),
 (506,477,o),
 (506,744,cs),
@@ -443,7 +460,10 @@ nodes = (
 (814,1158,cs),
 (1015,1158,o),
 (1122,1012,o),
-(1122,744,cs)
+(1122,744,cs),
+(1122,477,o),
+(1015,332,o),
+(814,332,cs)
 );
 }
 );
@@ -466,6 +486,10 @@ pos = (156,1490);
 {
 name = top;
 pos = (798,1676);
+},
+{
+name = tophorn;
+pos = (798,1514);
 }
 );
 guides = (
@@ -485,6 +509,9 @@ shapes = (
 {
 closed = 1;
 nodes = (
+(1203,-24,o),
+(1522,247,o),
+(1522,744,cs),
 (1522,1242,o),
 (1203,1514,o),
 (798,1514,cs),
@@ -493,18 +520,12 @@ nodes = (
 (74,744,cs),
 (74,250,o),
 (391,-24,o),
-(798,-24,cs),
-(1203,-24,o),
-(1522,247,o),
-(1522,744,cs)
+(798,-24,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(1102,487,o),
-(994,336,o),
-(798,336,cs),
 (603,336,o),
 (494,487,o),
 (494,744,cs),
@@ -513,7 +534,10 @@ nodes = (
 (798,1154,cs),
 (994,1154,o),
 (1102,1002,o),
-(1102,744,cs)
+(1102,744,cs),
+(1102,487,o),
+(994,336,o),
+(798,336,cs)
 );
 }
 );
@@ -603,6 +627,10 @@ pos = (372,1490);
 {
 name = top;
 pos = (946,1676);
+},
+{
+name = tophorn;
+pos = (922,1510);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -610,6 +638,9 @@ shapes = (
 {
 closed = 1;
 nodes = (
+(1035,-20,o),
+(1337,289,o),
+(1410,744,cs),
 (1489,1202,o),
 (1287,1510,o),
 (922,1510,cs),
@@ -618,18 +649,12 @@ nodes = (
 (178,744,cs),
 (104,291,o),
 (295,-20,o),
-(670,-20,cs),
-(1035,-20,o),
-(1337,289,o),
-(1410,744,cs)
+(670,-20,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(1297,319,o),
-(1012,26,o),
-(666,26,cs),
 (325,26,o),
 (152,313,o),
 (224,744,cs),
@@ -638,7 +663,10 @@ nodes = (
 (926,1464,cs),
 (1261,1463,o),
 (1436,1178,o),
-(1364,744,cs)
+(1364,744,cs),
+(1297,319,o),
+(1012,26,o),
+(666,26,cs)
 );
 }
 );
@@ -661,6 +689,10 @@ pos = (308,1490);
 {
 name = top;
 pos = (882,1676);
+},
+{
+name = tophorn;
+pos = (858,1510);
 }
 );
 layerId = m012;
@@ -668,6 +700,9 @@ shapes = (
 {
 closed = 1;
 nodes = (
+(971,-20,o),
+(1273,289,o),
+(1346,744,cs),
 (1425,1202,o),
 (1223,1510,o),
 (858,1510,cs),
@@ -676,18 +711,12 @@ nodes = (
 (114,744,cs),
 (40,291,o),
 (231,-20,o),
-(606,-20,cs),
-(971,-20,o),
-(1273,289,o),
-(1346,744,cs)
+(606,-20,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(1233,319,o),
-(948,26,o),
-(602,26,cs),
 (261,26,o),
 (88,313,o),
 (160,744,cs),
@@ -696,7 +725,10 @@ nodes = (
 (862,1464,cs),
 (1197,1463,o),
 (1372,1178,o),
-(1300,744,cs)
+(1300,744,cs),
+(1233,319,o),
+(948,26,o),
+(602,26,cs)
 );
 }
 );
@@ -719,6 +751,10 @@ pos = (328,1490);
 {
 name = top;
 pos = (962,1676);
+},
+{
+name = tophorn;
+pos = (928,1510);
 }
 );
 guides = (
@@ -736,6 +772,9 @@ shapes = (
 {
 closed = 1;
 nodes = (
+(1071,-20,o),
+(1388,268,o),
+(1466,734,c),
 (1545,1210,o),
 (1312,1510,o),
 (928,1510,cs),
@@ -744,18 +783,12 @@ nodes = (
 (154,756,c),
 (76,279,o),
 (308,-20,o),
-(696,-20,cs),
-(1071,-20,o),
-(1388,268,o),
-(1466,734,c)
+(696,-20,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(1231,364,o),
-(977,148,o),
-(702,148,cs),
 (436,148,o),
 (262,352,o),
 (326,734,c),
@@ -764,7 +797,10 @@ nodes = (
 (920,1342,cs),
 (1184,1341,o),
 (1359,1137,o),
-(1294,756,c)
+(1294,756,c),
+(1231,364,o),
+(977,148,o),
+(702,148,cs)
 );
 }
 );
@@ -865,6 +901,10 @@ pos = (296,1490);
 {
 name = top;
 pos = (930,1676);
+},
+{
+name = tophorn;
+pos = (896,1510);
 }
 );
 guides = (
@@ -882,6 +922,9 @@ shapes = (
 {
 closed = 1;
 nodes = (
+(1039,-20,o),
+(1356,268,o),
+(1434,734,c),
 (1513,1210,o),
 (1280,1510,o),
 (896,1510,cs),
@@ -890,18 +933,12 @@ nodes = (
 (122,756,c),
 (44,279,o),
 (276,-20,o),
-(664,-20,cs),
-(1039,-20,o),
-(1356,268,o),
-(1434,734,c)
+(664,-20,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(1199,364,o),
-(945,148,o),
-(670,148,cs),
 (404,148,o),
 (230,352,o),
 (294,734,c),
@@ -910,7 +947,10 @@ nodes = (
 (888,1342,cs),
 (1152,1341,o),
 (1327,1137,o),
-(1262,756,c)
+(1262,756,c),
+(1199,364,o),
+(945,148,o),
+(670,148,cs)
 );
 }
 );
@@ -1011,6 +1051,10 @@ pos = (326,1490);
 {
 name = top;
 pos = (1000,1676);
+},
+{
+name = tophorn;
+pos = (952,1510);
 }
 );
 background = {
@@ -1066,6 +1110,9 @@ shapes = (
 {
 closed = 1;
 nodes = (
+(1135,-20,o),
+(1484,233,o),
+(1566,718,cs),
 (1649,1228,o),
 (1367,1510,o),
 (952,1510,cs),
@@ -1074,18 +1121,12 @@ nodes = (
 (126,766,cs),
 (41,259,o),
 (323,-20,o),
-(742,-20,cs),
-(1135,-20,o),
-(1484,233,o),
-(1566,718,cs)
+(742,-20,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(1111,489,o),
-(969,332,o),
-(756,332,cs),
 (570,332,o),
 (486,460,o),
 (532,718,cs),
@@ -1094,7 +1135,10 @@ nodes = (
 (936,1158,cs),
 (1126,1158,o),
 (1199,1021,o),
-(1158,766,cs)
+(1158,766,cs),
+(1111,489,o),
+(969,332,o),
+(756,332,cs)
 );
 }
 );
@@ -1182,59 +1226,25 @@ width = 1536;
 anchors = (
 {
 name = bottom;
-pos = (706,0);
+pos = (711,0);
 },
 {
 name = ogonek;
-pos = (914,6);
+pos = (920,6);
 },
 {
 name = tonos;
-pos = (310,1490);
+pos = (315,1490);
 },
 {
 name = top;
-pos = (984,1676);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(1649,1228,o),
-(1367,1510,o),
-(952,1510,cs),
-(556,1510,o),
-(204,1251,o),
-(126,766,cs),
-(41,259,o),
-(323,-20,o),
-(742,-20,cs),
-(1135,-20,o),
-(1484,233,o),
-(1566,718,cs)
-);
+pos = (988,1676);
 },
 {
-closed = 1;
-nodes = (
-(1111,489,o),
-(969,332,o),
-(756,332,cs),
-(570,332,o),
-(486,460,o),
-(532,718,cs),
-(576,995,o),
-(721,1158,o),
-(936,1158,cs),
-(1126,1158,o),
-(1199,1021,o),
-(1158,766,cs)
-);
+name = tophorn;
+pos = (941,1514);
 }
 );
-};
 guides = (
 {
 angle = 90;
@@ -1250,39 +1260,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1633,1228,o),
-(1351,1510,o),
-(936,1510,cs),
-(540,1510,o),
-(188,1251,o),
-(110,766,cs),
-(25,259,o),
-(307,-20,o),
-(726,-20,cs),
-(1119,-20,o),
-(1468,233,o),
-(1550,718,cs)
+(1122,-24,o),
+(1473,234,o),
+(1553,718,cs),
+(1638,1229,o),
+(1356,1514,o),
+(941,1514,cs),
+(544,1514,o),
+(194,1255,o),
+(114,770,cs),
+(30,263,o),
+(310,-24,o),
+(727,-24,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(1095,489,o),
-(953,332,o),
-(740,332,cs),
-(554,332,o),
-(470,460,o),
-(516,718,cs),
-(560,995,o),
-(705,1158,o),
-(920,1158,cs),
-(1110,1158,o),
-(1183,1021,o),
-(1142,766,cs)
+(561,336,o),
+(485,474,o),
+(525,718,cs),
+(570,989,o),
+(717,1154,o),
+(922,1154,cs),
+(1108,1154,o),
+(1183,1015,o),
+(1142,770,cs),
+(1097,500,o),
+(952,336,o),
+(746,336,cs)
 );
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 anchors = (
diff --git a/src/Inter.glyphspackage/glyphs/O_acute.glyph b/src/Inter.glyphspackage/glyphs/O_acute.glyph
index ec0861df9..74badae29 100644
--- a/src/Inter.glyphspackage/glyphs/O_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (295,372);
+pos = (447,372);
 ref = acute;
 }
 );
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (368,372);
+pos = (372,372);
 ref = acute;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_barreddieresiscyrillic.glyph b/src/Inter.glyphspackage/glyphs/O_barreddieresiscyrillic.glyph
index 6cf064eb1..34b3151ae 100644
--- a/src/Inter.glyphspackage/glyphs/O_barreddieresiscyrillic.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_barreddieresiscyrillic.glyph
@@ -127,7 +127,7 @@ shapes = (
 ref = afii10147;
 },
 {
-pos = (312,32);
+pos = (316,32);
 ref = casedieresis.cn;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/O_breve.glyph b/src/Inter.glyphspackage/glyphs/O_breve.glyph
index eae76b696..86dad3566 100644
--- a/src/Inter.glyphspackage/glyphs/O_breve.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_breve.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (360,372);
+pos = (364,372);
 ref = breve;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_caron.glyph b/src/Inter.glyphspackage/glyphs/O_caron.glyph
index 05d515b19..5c8d48bc4 100644
--- a/src/Inter.glyphspackage/glyphs/O_caron.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_caron.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (230,372);
+pos = (234,372);
 ref = caron;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_circumflex.glyph b/src/Inter.glyphspackage/glyphs/O_circumflex.glyph
index df6102175..0ae601def 100644
--- a/src/Inter.glyphspackage/glyphs/O_circumflex.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_circumflex.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (230,372);
+pos = (234,372);
 ref = circumflex;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_circumflexacute.glyph b/src/Inter.glyphspackage/glyphs/O_circumflexacute.glyph
index ee7427f45..b72c97756 100644
--- a/src/Inter.glyphspackage/glyphs/O_circumflexacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_circumflexacute.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (444,326);
+pos = (448,326);
 ref = circumflexacutecomb.cn;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_circumflexdotbelow.glyph b/src/Inter.glyphspackage/glyphs/O_circumflexdotbelow.glyph
index 1703d9bce..f74675e52 100644
--- a/src/Inter.glyphspackage/glyphs/O_circumflexdotbelow.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_circumflexdotbelow.glyph
@@ -163,15 +163,15 @@ shapes = (
 ref = O;
 },
 {
-pos = (230,372);
+pos = (234,372);
 ref = circumflex;
 },
 {
-pos = (1352,0);
+pos = (1357,0);
 ref = dotbelow;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_circumflexgrave.glyph b/src/Inter.glyphspackage/glyphs/O_circumflexgrave.glyph
index 9ac0e3559..045e29031 100644
--- a/src/Inter.glyphspackage/glyphs/O_circumflexgrave.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_circumflexgrave.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (72,320);
+pos = (76,320);
 ref = circumflexgravecomb.cn;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_circumflexhookabove.glyph b/src/Inter.glyphspackage/glyphs/O_circumflexhookabove.glyph
index a3bccc28a..5b2f26f59 100644
--- a/src/Inter.glyphspackage/glyphs/O_circumflexhookabove.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_circumflexhookabove.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (360,334);
+pos = (364,334);
 ref = circumflexhookcomb.cn;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_circumflextilde.glyph b/src/Inter.glyphspackage/glyphs/O_circumflextilde.glyph
index c55155150..248885725 100644
--- a/src/Inter.glyphspackage/glyphs/O_circumflextilde.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_circumflextilde.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (244,344);
+pos = (248,344);
 ref = circumflextildecomb.cn;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_dblgrave.glyph b/src/Inter.glyphspackage/glyphs/O_dblgrave.glyph
index fec56cc41..3e987d8ca 100644
--- a/src/Inter.glyphspackage/glyphs/O_dblgrave.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_dblgrave.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (1486,372);
+pos = (1490,372);
 ref = dblgravecmb;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_dieresis.glyph b/src/Inter.glyphspackage/glyphs/O_dieresis.glyph
index 7a01fb1cf..28c856fb1 100644
--- a/src/Inter.glyphspackage/glyphs/O_dieresis.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_dieresis.glyph
@@ -147,11 +147,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (312,32);
+pos = (316,32);
 ref = casedieresis.cn;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_dieresiscyrillic.glyph b/src/Inter.glyphspackage/glyphs/O_dieresiscyrillic.glyph
index dd66960f2..11444fc16 100644
--- a/src/Inter.glyphspackage/glyphs/O_dieresiscyrillic.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_dieresiscyrillic.glyph
@@ -91,7 +91,7 @@ shapes = (
 ref = Odieresis;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_dotbelow.glyph b/src/Inter.glyphspackage/glyphs/O_dotbelow.glyph
index 19fa5a01c..ca50dffb6 100644
--- a/src/Inter.glyphspackage/glyphs/O_dotbelow.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_dotbelow.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (1352,0);
+pos = (1357,0);
 ref = dotbelow;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_grave.glyph b/src/Inter.glyphspackage/glyphs/O_grave.glyph
index 7e8d67669..e1ec63f5e 100644
--- a/src/Inter.glyphspackage/glyphs/O_grave.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_grave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (161,372);
+pos = (225,372);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (198,372);
+pos = (198,414);
 ref = grave;
 }
 );
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (262,372);
+pos = (266,372);
 ref = grave;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_hookabove.glyph b/src/Inter.glyphspackage/glyphs/O_hookabove.glyph
index 886a0392b..5af215e49 100644
--- a/src/Inter.glyphspackage/glyphs/O_hookabove.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_hookabove.glyph
@@ -11,7 +11,7 @@ ref = O;
 },
 {
 pos = (1375,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1560;
@@ -24,7 +24,7 @@ ref = O;
 },
 {
 pos = (1552,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1630;
@@ -37,7 +37,7 @@ ref = O;
 },
 {
 pos = (1436,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1560;
@@ -50,7 +50,7 @@ ref = O;
 },
 {
 pos = (1614,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1630;
@@ -63,7 +63,7 @@ ref = O;
 },
 {
 pos = (1264,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1530;
@@ -76,7 +76,7 @@ ref = O;
 },
 {
 pos = (1326,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1530;
@@ -89,7 +89,7 @@ ref = O;
 },
 {
 pos = (1390,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1528;
@@ -102,7 +102,7 @@ ref = O;
 },
 {
 pos = (1436,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1496;
@@ -114,8 +114,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1552,366);
-ref = hook;
+pos = (1552,414);
+ref = hookabovecmb;
 }
 );
 width = 1596;
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (1614,366);
-ref = hook;
+pos = (1618,366);
+ref = hookabovecmb;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
@@ -141,7 +141,7 @@ ref = O;
 },
 {
 pos = (1264,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1402;
@@ -154,7 +154,7 @@ ref = O;
 },
 {
 pos = (1326,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1402;
diff --git a/src/Inter.glyphspackage/glyphs/O_horn.glyph b/src/Inter.glyphspackage/glyphs/O_horn.glyph
index 1edd1248e..98fa95d9b 100644
--- a/src/Inter.glyphspackage/glyphs/O_horn.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_horn.glyph
@@ -7,73 +7,27 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(1385,1428,o),
-(1318,1329,o),
-(1166,1330,c),
-(1166,1186,l),
-(1425,1187,o),
-(1556,1335,o),
-(1556,1598,c),
-(1384,1598,l)
-);
-},
-{
 ref = O;
-}
-);
-width = 1586;
-},
-{
-guides = (
-{
-angle = 90;
-pos = (1024,1568);
-}
-);
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-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)
-);
 },
 {
-ref = O;
+pos = (652,0);
+ref = _part.otophorn;
 }
 );
-width = 1720;
+width = 1560;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-closed = 1;
-nodes = (
-(1531,1428,o),
-(1448,1329,o),
-(1298,1330,c),
-(1274,1186,l),
-(1532,1187,o),
-(1687,1335,o),
-(1730,1598,c),
-(1560,1598,l)
-);
+ref = O;
 },
 {
-ref = O;
+pos = (643,0);
+ref = _part.otophorn;
 }
 );
-width = 1586;
+width = 1560;
 },
 {
 guides = (
@@ -85,113 +39,66 @@ pos = (1288,1568);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-closed = 1;
-nodes = (
-(1609,1350,o),
-(1563,1239,o),
-(1428,1240,c),
-(1400,1068,l),
-(1671,1068,o),
-(1810,1242,o),
-(1858,1538,c),
-(1640,1538,l)
-);
+ref = O;
 },
 {
-ref = O;
+pos = (667,0);
+ref = _part.otophorn;
 }
 );
-width = 1720;
+width = 1630;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(1367,1444,o),
-(1319,1380,o),
-(1166,1342,c),
-(1166,1294,l),
-(1344,1332,o),
-(1415,1420,o),
-(1414,1602,c),
-(1368,1602,l)
-);
+ref = O;
 },
 {
-alignment = -1;
-ref = O;
+pos = (638,0);
+ref = _part.otophorn;
 }
 );
-width = 1506;
+width = 1530;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-closed = 1;
-nodes = (
-(1511,1441,o),
-(1441,1380,o),
-(1296,1342,c),
-(1294,1294,l),
-(1468,1335,o),
-(1552,1408,o),
-(1592,1602,c),
-(1546,1602,l)
-);
+ref = O;
 },
 {
-alignment = -1;
-ref = O;
+pos = (637,0);
+ref = _part.otophorn;
 }
 );
-width = 1506;
+width = 1530;
 },
 {
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1353,1428,o),
-(1286,1329,o),
-(1134,1330,c),
-(1134,1186,l),
-(1393,1187,o),
-(1524,1335,o),
-(1524,1598,c),
-(1352,1598,l)
-);
+ref = O;
 },
 {
-ref = O;
+pos = (636,0);
+ref = _part.otophorn;
 }
 );
-width = 1522;
+width = 1528;
 },
 {
 layerId = m008;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1499,1428,o),
-(1416,1329,o),
-(1266,1330,c),
-(1242,1186,l),
-(1500,1187,o),
-(1655,1335,o),
-(1698,1598,c),
-(1528,1598,l)
-);
+ref = O;
 },
 {
-ref = O;
+pos = (605,-4);
+ref = _part.otophorn;
 }
 );
-width = 1522;
+width = 1496;
 },
 {
 guides = (
@@ -203,23 +110,14 @@ pos = (928,1568);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1462,1350,o),
-(1433,1239,o),
-(1298,1240,c),
-(1298,1068,l),
-(1569,1068,o),
-(1680,1242,o),
-(1680,1538,c),
-(1462,1538,l)
-);
+ref = O;
 },
 {
-ref = O;
+pos = (670,0);
+ref = _part.otophorn;
 }
 );
-width = 1688;
+width = 1596;
 },
 {
 guides = (
@@ -231,69 +129,136 @@ pos = (1256,1568);
 layerId = m010;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1593,1350,o),
-(1547,1239,o),
-(1412,1240,c),
-(1384,1068,l),
-(1655,1068,o),
-(1794,1242,o),
-(1842,1538,c),
-(1624,1538,l)
+ref = O;
+},
+{
+pos = (650,0);
+ref = _part.otophorn;
+}
 );
+width = 1596;
 },
 {
+layerId = m011;
+shapes = (
+{
 ref = O;
+},
+{
+pos = (574,0);
+ref = _part.otophorn;
 }
 );
-width = 1688;
+width = 1402;
 },
 {
-layerId = m011;
+layerId = m012;
+shapes = (
+{
+ref = O;
+},
+{
+pos = (573,0);
+ref = _part.otophorn;
+}
+);
+width = 1402;
+},
+{
+associatedMasterId = m007;
+layerId = "ADF8826B-23CC-4554-9D75-93CCA8077E3E";
+name = "Jun 4, 22, 09:23";
 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)
+(1353,1428,o),
+(1286,1329,o),
+(1134,1330,c),
+(1134,1186,l),
+(1393,1187,o),
+(1524,1335,o),
+(1524,1598,c),
+(1352,1598,l)
 );
 },
 {
-alignment = -1;
 ref = O;
 }
 );
-width = 1378;
+width = 1522;
 },
 {
-layerId = m012;
+associatedMasterId = m007;
+layerId = "18FFD3A4-FA40-411E-904E-38B7D12C45F6";
+name = "Jun 4, 22, 09:25";
+shapes = (
+{
+ref = O;
+},
+{
+pos = (1528,0);
+ref = _part.rtophorn;
+}
+);
+width = 2248;
+},
+{
+associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+guides = (
+{
+angle = 90;
+pos = (814,1568);
+}
+);
+layerId = "B6E533A3-34FC-4B43-B8CB-424549AE8CAF";
+name = "Jun 4, 22, 09:39";
 shapes = (
 {
+ref = O;
+},
+{
 closed = 1;
 nodes = (
-(1447,1441,o),
-(1377,1380,o),
-(1232,1342,c),
-(1230,1294,l),
-(1404,1335,o),
-(1488,1408,o),
-(1528,1602,c),
-(1482,1602,l)
+(930,1325,ls),
+(1084,1342,o),
+(1187,1374,o),
+(1261,1426,cs),
+(1369,1502,o),
+(1422,1626,o),
+(1422,1804,c),
+(1121,1804,l),
+(1117,1679,o),
+(1094,1611,o),
+(1041,1569,cs),
+(995,1532,o),
+(919,1512,o),
+(814,1510,c),
+(814,1312,l)
+);
+}
 );
+width = 1630;
 },
 {
-alignment = -1;
+guides = (
+{
+angle = 90;
+pos = (814,1568);
+}
+);
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+name = Black;
+shapes = (
+{
 ref = O;
+},
+{
+pos = (686,0);
+ref = _part.otophorn;
 }
 );
-width = 1378;
+width = 1630;
 }
 );
 metricLeft = O;
diff --git a/src/Inter.glyphspackage/glyphs/O_hornacute.glyph b/src/Inter.glyphspackage/glyphs/O_hornacute.glyph
index b36ba149d..828257031 100644
--- a/src/Inter.glyphspackage/glyphs/O_hornacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_hornacute.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (295,372);
+pos = (447,372);
 ref = acute;
 }
 );
-width = 1586;
+width = 1560;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (304,372);
+pos = (424,372);
 ref = acute;
 }
 );
-width = 1720;
+width = 1630;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -36,11 +36,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (352,372);
+pos = (505,372);
 ref = acute;
 }
 );
-width = 1586;
+width = 1560;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -49,11 +49,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (368,372);
+pos = (487,372);
 ref = acute;
 }
 );
-width = 1720;
+width = 1630;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -62,11 +62,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (260,372);
+pos = (486,372);
 ref = acute;
 }
 );
-width = 1506;
+width = 1530;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -75,11 +75,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (316,372);
+pos = (539,372);
 ref = acute;
 }
 );
-width = 1506;
+width = 1530;
 },
 {
 layerId = m007;
@@ -88,11 +88,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (310,414);
+pos = (413,414);
 ref = acute;
 }
 );
-width = 1522;
+width = 1528;
 },
 {
 layerId = m008;
@@ -101,11 +101,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (352,372);
+pos = (457,414);
 ref = acute;
 }
 );
-width = 1522;
+width = 1496;
 },
 {
 layerId = m009;
@@ -114,11 +114,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (304,414);
+pos = (388,414);
 ref = acute;
 }
 );
-width = 1688;
+width = 1596;
 },
 {
 layerId = m010;
@@ -127,11 +127,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (368,372);
+pos = (456,414);
 ref = acute;
 }
 );
-width = 1688;
+width = 1596;
 },
 {
 layerId = m011;
@@ -140,11 +140,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (260,372);
+pos = (422,372);
 ref = acute;
 }
 );
-width = 1378;
+width = 1402;
 },
 {
 layerId = m012;
@@ -153,11 +153,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (316,372);
+pos = (475,372);
 ref = acute;
 }
 );
-width = 1378;
+width = 1402;
 }
 );
 unicode = 7898;
diff --git a/src/Inter.glyphspackage/glyphs/O_horndotbelow.glyph b/src/Inter.glyphspackage/glyphs/O_horndotbelow.glyph
index e2195b5bb..db8dc6432 100644
--- a/src/Inter.glyphspackage/glyphs/O_horndotbelow.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_horndotbelow.glyph
@@ -14,7 +14,7 @@ pos = (1387,0);
 ref = dotbelow;
 }
 );
-width = 1586;
+width = 1560;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -27,7 +27,7 @@ pos = (1350,0);
 ref = dotbelow;
 }
 );
-width = 1720;
+width = 1630;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -40,7 +40,7 @@ pos = (1394,6);
 ref = dotbelow;
 }
 );
-width = 1586;
+width = 1560;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -53,7 +53,7 @@ pos = (1352,0);
 ref = dotbelow;
 }
 );
-width = 1720;
+width = 1630;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -66,7 +66,7 @@ pos = (1324,0);
 ref = dotbelow;
 }
 );
-width = 1506;
+width = 1530;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -79,7 +79,7 @@ pos = (1324,0);
 ref = dotbelow;
 }
 );
-width = 1506;
+width = 1530;
 },
 {
 layerId = m007;
@@ -92,7 +92,7 @@ pos = (1402,0);
 ref = dotbelow;
 }
 );
-width = 1522;
+width = 1528;
 },
 {
 layerId = m008;
@@ -105,7 +105,7 @@ pos = (1394,6);
 ref = dotbelow;
 }
 );
-width = 1522;
+width = 1496;
 },
 {
 layerId = m009;
@@ -118,7 +118,7 @@ pos = (1350,0);
 ref = dotbelow;
 }
 );
-width = 1688;
+width = 1596;
 },
 {
 layerId = m010;
@@ -127,11 +127,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1352,0);
+pos = (1357,0);
 ref = dotbelow;
 }
 );
-width = 1688;
+width = 1596;
 },
 {
 layerId = m011;
@@ -144,7 +144,7 @@ pos = (1324,0);
 ref = dotbelow;
 }
 );
-width = 1378;
+width = 1402;
 },
 {
 layerId = m012;
@@ -157,7 +157,7 @@ pos = (1324,0);
 ref = dotbelow;
 }
 );
-width = 1378;
+width = 1402;
 }
 );
 unicode = 7906;
diff --git a/src/Inter.glyphspackage/glyphs/O_horngrave.glyph b/src/Inter.glyphspackage/glyphs/O_horngrave.glyph
index 8ad48953e..c07df0b4c 100644
--- a/src/Inter.glyphspackage/glyphs/O_horngrave.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_horngrave.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (161,372);
+pos = (225,372);
 ref = grave;
 }
 );
-width = 1586;
+width = 1560;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (198,372);
+pos = (210,372);
 ref = grave;
 }
 );
-width = 1720;
+width = 1630;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -36,11 +36,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (220,372);
+pos = (285,372);
 ref = grave;
 }
 );
-width = 1586;
+width = 1560;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -49,11 +49,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (262,372);
+pos = (273,372);
 ref = grave;
 }
 );
-width = 1720;
+width = 1630;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -62,11 +62,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (160,372);
+pos = (272,372);
 ref = grave;
 }
 );
-width = 1506;
+width = 1530;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -75,11 +75,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (218,372);
+pos = (333,372);
 ref = grave;
 }
 );
-width = 1506;
+width = 1530;
 },
 {
 layerId = m007;
@@ -88,11 +88,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (176,372);
+pos = (204,414);
 ref = grave;
 }
 );
-width = 1522;
+width = 1528;
 },
 {
 layerId = m008;
@@ -101,11 +101,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (220,372);
+pos = (248,414);
 ref = grave;
 }
 );
-width = 1522;
+width = 1496;
 },
 {
 layerId = m009;
@@ -114,11 +114,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (198,372);
+pos = (126,414);
 ref = grave;
 }
 );
-width = 1688;
+width = 1596;
 },
 {
 layerId = m010;
@@ -127,11 +127,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (262,372);
+pos = (194,414);
 ref = grave;
 }
 );
-width = 1688;
+width = 1596;
 },
 {
 layerId = m011;
@@ -140,11 +140,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (160,372);
+pos = (208,372);
 ref = grave;
 }
 );
-width = 1378;
+width = 1402;
 },
 {
 layerId = m012;
@@ -153,11 +153,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (218,372);
+pos = (269,372);
 ref = grave;
 }
 );
-width = 1378;
+width = 1402;
 }
 );
 unicode = 7900;
diff --git a/src/Inter.glyphspackage/glyphs/O_hornhookabove.glyph b/src/Inter.glyphspackage/glyphs/O_hornhookabove.glyph
index c7379ba5e..8ebedac28 100644
--- a/src/Inter.glyphspackage/glyphs/O_hornhookabove.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_hornhookabove.glyph
@@ -11,10 +11,10 @@ ref = Ohorn;
 },
 {
 pos = (1375,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
-width = 1586;
+width = 1560;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -24,10 +24,10 @@ ref = Ohorn;
 },
 {
 pos = (1552,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
-width = 1720;
+width = 1630;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -37,10 +37,10 @@ ref = Ohorn;
 },
 {
 pos = (1436,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
-width = 1586;
+width = 1560;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -50,10 +50,10 @@ ref = Ohorn;
 },
 {
 pos = (1614,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
-width = 1720;
+width = 1630;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -63,10 +63,10 @@ ref = Ohorn;
 },
 {
 pos = (1264,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
-width = 1506;
+width = 1530;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -76,10 +76,10 @@ ref = Ohorn;
 },
 {
 pos = (1326,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
-width = 1506;
+width = 1530;
 },
 {
 layerId = m007;
@@ -89,10 +89,10 @@ ref = Ohorn;
 },
 {
 pos = (1390,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
-width = 1522;
+width = 1528;
 },
 {
 layerId = m008;
@@ -102,10 +102,10 @@ ref = Ohorn;
 },
 {
 pos = (1436,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
-width = 1522;
+width = 1496;
 },
 {
 layerId = m009;
@@ -114,11 +114,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1552,366);
-ref = hook;
+pos = (1552,414);
+ref = hookabovecmb;
 }
 );
-width = 1688;
+width = 1596;
 },
 {
 layerId = m010;
@@ -127,11 +127,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1614,366);
-ref = hook;
+pos = (1618,366);
+ref = hookabovecmb;
 }
 );
-width = 1688;
+width = 1596;
 },
 {
 layerId = m011;
@@ -141,10 +141,10 @@ ref = Ohorn;
 },
 {
 pos = (1264,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
-width = 1378;
+width = 1402;
 },
 {
 layerId = m012;
@@ -154,10 +154,10 @@ ref = Ohorn;
 },
 {
 pos = (1326,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
-width = 1378;
+width = 1402;
 }
 );
 unicode = 7902;
diff --git a/src/Inter.glyphspackage/glyphs/O_horntilde.glyph b/src/Inter.glyphspackage/glyphs/O_horntilde.glyph
index f97dbc62d..4a7e864c7 100644
--- a/src/Inter.glyphspackage/glyphs/O_horntilde.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_horntilde.glyph
@@ -14,7 +14,7 @@ pos = (269,372);
 ref = tilde;
 }
 );
-width = 1586;
+width = 1560;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -27,7 +27,7 @@ pos = (302,372);
 ref = tilde;
 }
 );
-width = 1720;
+width = 1630;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -40,7 +40,7 @@ pos = (328,372);
 ref = tilde;
 }
 );
-width = 1586;
+width = 1560;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -53,7 +53,7 @@ pos = (366,372);
 ref = tilde;
 }
 );
-width = 1720;
+width = 1630;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -66,7 +66,7 @@ pos = (256,372);
 ref = tilde;
 }
 );
-width = 1506;
+width = 1530;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -79,7 +79,7 @@ pos = (314,372);
 ref = tilde;
 }
 );
-width = 1506;
+width = 1530;
 },
 {
 layerId = m007;
@@ -92,7 +92,7 @@ pos = (284,372);
 ref = tilde;
 }
 );
-width = 1522;
+width = 1528;
 },
 {
 layerId = m008;
@@ -105,7 +105,7 @@ pos = (328,372);
 ref = tilde;
 }
 );
-width = 1522;
+width = 1496;
 },
 {
 layerId = m009;
@@ -118,7 +118,7 @@ pos = (302,372);
 ref = tilde;
 }
 );
-width = 1688;
+width = 1596;
 },
 {
 layerId = m010;
@@ -127,11 +127,11 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (366,372);
+pos = (370,372);
 ref = tilde;
 }
 );
-width = 1688;
+width = 1596;
 },
 {
 layerId = m011;
@@ -144,7 +144,7 @@ pos = (256,372);
 ref = tilde;
 }
 );
-width = 1378;
+width = 1402;
 },
 {
 layerId = m012;
@@ -157,7 +157,7 @@ pos = (314,372);
 ref = tilde;
 }
 );
-width = 1378;
+width = 1402;
 }
 );
 unicode = 7904;
diff --git a/src/Inter.glyphspackage/glyphs/O_hungarumlaut.glyph b/src/Inter.glyphspackage/glyphs/O_hungarumlaut.glyph
index 31e942156..08621bfa3 100644
--- a/src/Inter.glyphspackage/glyphs/O_hungarumlaut.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_hungarumlaut.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (488,384);
+pos = (492,384);
 ref = hungarumlaut;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_invertedbreve.glyph b/src/Inter.glyphspackage/glyphs/O_invertedbreve.glyph
index 9fc3c20b7..bc0dfa9fd 100644
--- a/src/Inter.glyphspackage/glyphs/O_invertedbreve.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_invertedbreve.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (1544,530);
+pos = (1548,530);
 ref = breveinvnosp;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_macron.glyph b/src/Inter.glyphspackage/glyphs/O_macron.glyph
index f0ed456c0..18a45d579 100644
--- a/src/Inter.glyphspackage/glyphs/O_macron.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_macron.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (218,372);
+pos = (222,372);
 ref = macron;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_macronacute.glyph b/src/Inter.glyphspackage/glyphs/O_macronacute.glyph
index f14dc6847..9622ba48a 100644
--- a/src/Inter.glyphspackage/glyphs/O_macronacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_macronacute.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (1280,0);
+pos = (1284,0);
 ref = macronacutecomb.cn;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_macrongrave.glyph b/src/Inter.glyphspackage/glyphs/O_macrongrave.glyph
index a291531be..9e5f333c0 100644
--- a/src/Inter.glyphspackage/glyphs/O_macrongrave.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_macrongrave.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (1106,0);
+pos = (1110,0);
 ref = macrongravecomb.cn;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_micron.glyph b/src/Inter.glyphspackage/glyphs/O_micron.glyph
index 8f07fea92..63e2f0a7f 100644
--- a/src/Inter.glyphspackage/glyphs/O_micron.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_micron.glyph
@@ -91,7 +91,7 @@ shapes = (
 ref = O;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_ogonek.glyph b/src/Inter.glyphspackage/glyphs/O_ogonek.glyph
index 252d545c6..e03720410 100644
--- a/src/Inter.glyphspackage/glyphs/O_ogonek.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_ogonek.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (508,6);
+pos = (514,6);
 ref = ogonek;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_ogonekmacron.glyph b/src/Inter.glyphspackage/glyphs/O_ogonekmacron.glyph
index 1287bd777..fbc6d6f63 100644
--- a/src/Inter.glyphspackage/glyphs/O_ogonekmacron.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_ogonekmacron.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = Oogonek;
 },
 {
-pos = (218,372);
+pos = (222,372);
 ref = macron;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_slashacute.glyph b/src/Inter.glyphspackage/glyphs/O_slashacute.glyph
index 8710fafff..6a0021be3 100644
--- a/src/Inter.glyphspackage/glyphs/O_slashacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_slashacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Oslash;
 },
 {
-pos = (295,372);
+pos = (447,372);
 ref = acute;
 }
 );
@@ -127,7 +127,7 @@ shapes = (
 ref = Oslash;
 },
 {
-pos = (368,372);
+pos = (372,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/O_tilde.glyph b/src/Inter.glyphspackage/glyphs/O_tilde.glyph
index efe3cdccc..8992584df 100644
--- a/src/Inter.glyphspackage/glyphs/O_tilde.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_tilde.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (300,0);
+pos = (304,0);
 ref = casetilde.cn;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_tildeacute.glyph b/src/Inter.glyphspackage/glyphs/O_tildeacute.glyph
index 7d446f9b2..f6f68b61b 100644
--- a/src/Inter.glyphspackage/glyphs/O_tildeacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_tildeacute.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (1210,0);
+pos = (1214,0);
 ref = tildeacutecomb.uc;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/O_tildedieresis.glyph b/src/Inter.glyphspackage/glyphs/O_tildedieresis.glyph
index d37b0c74c..cb9711bfe 100644
--- a/src/Inter.glyphspackage/glyphs/O_tildedieresis.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_tildedieresis.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (1576,398);
+pos = (1580,398);
 ref = tildedieresiscomb.cn;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/P_acute.glyph b/src/Inter.glyphspackage/glyphs/P_acute.glyph
index f041c99d4..a3ee92323 100644
--- a/src/Inter.glyphspackage/glyphs/P_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/P_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = P;
 },
 {
-pos = (162,372);
+pos = (314,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/R_acute.glyph b/src/Inter.glyphspackage/glyphs/R_acute.glyph
index f408f1076..15757b5a3 100644
--- a/src/Inter.glyphspackage/glyphs/R_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/R_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (160,372);
+pos = (312,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/S_acute.glyph b/src/Inter.glyphspackage/glyphs/S_acute.glyph
index f82402727..6a18dea63 100644
--- a/src/Inter.glyphspackage/glyphs/S_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/S_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (166,372);
+pos = (318,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/T_horn.glyph b/src/Inter.glyphspackage/glyphs/T_horn.glyph
index 23b5fcee5..6a4c2b950 100644
--- a/src/Inter.glyphspackage/glyphs/T_horn.glyph
+++ b/src/Inter.glyphspackage/glyphs/T_horn.glyph
@@ -1,6 +1,7 @@
 {
 glyphname = Thorn;
 kernLeft = B;
+kernRight = o;
 layers = (
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
diff --git a/src/Inter.glyphspackage/glyphs/U_acute.glyph b/src/Inter.glyphspackage/glyphs/U_acute.glyph
index 7610d6bf6..cf0646868 100644
--- a/src/Inter.glyphspackage/glyphs/U_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/U_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (274,372);
+pos = (426,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/U_grave.glyph b/src/Inter.glyphspackage/glyphs/U_grave.glyph
index f8694534f..0e9a3a131 100644
--- a/src/Inter.glyphspackage/glyphs/U_grave.glyph
+++ b/src/Inter.glyphspackage/glyphs/U_grave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (140,372);
+pos = (204,372);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (122,372);
+pos = (122,414);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/U_hookabove.glyph b/src/Inter.glyphspackage/glyphs/U_hookabove.glyph
index b848180f1..5d4f4ea2e 100644
--- a/src/Inter.glyphspackage/glyphs/U_hookabove.glyph
+++ b/src/Inter.glyphspackage/glyphs/U_hookabove.glyph
@@ -11,7 +11,7 @@ ref = U;
 },
 {
 pos = (1354,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1518;
@@ -24,7 +24,7 @@ ref = U;
 },
 {
 pos = (1476,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1478;
@@ -37,7 +37,7 @@ ref = U;
 },
 {
 pos = (1418,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1519;
@@ -50,7 +50,7 @@ ref = U;
 },
 {
 pos = (1537,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1477;
@@ -63,7 +63,7 @@ ref = U;
 },
 {
 pos = (1266,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1536;
@@ -76,7 +76,7 @@ ref = U;
 },
 {
 pos = (1334,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1535;
@@ -89,7 +89,7 @@ ref = U;
 },
 {
 pos = (1354,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1454;
@@ -102,7 +102,7 @@ ref = U;
 },
 {
 pos = (1423,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1455;
@@ -114,8 +114,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1476,366);
-ref = hook;
+pos = (1476,414);
+ref = hookabovecmb;
 }
 );
 width = 1446;
@@ -128,7 +128,7 @@ ref = U;
 },
 {
 pos = (1543,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1446;
@@ -141,7 +141,7 @@ ref = U;
 },
 {
 pos = (1266,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1408;
@@ -154,7 +154,7 @@ ref = U;
 },
 {
 pos = (1334,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1407;
diff --git a/src/Inter.glyphspackage/glyphs/U_horn.glyph b/src/Inter.glyphspackage/glyphs/U_horn.glyph
index 562e3a34e..2dcef953e 100644
--- a/src/Inter.glyphspackage/glyphs/U_horn.glyph
+++ b/src/Inter.glyphspackage/glyphs/U_horn.glyph
@@ -19,7 +19,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1000,0);
+pos = (1030,0);
 ref = _part.rtophorn;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1000,0);
+pos = (998,0);
 ref = _part.rtophorn;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/U_hornacute.glyph b/src/Inter.glyphspackage/glyphs/U_hornacute.glyph
index 6dddd01cc..b390f7130 100644
--- a/src/Inter.glyphspackage/glyphs/U_hornacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/U_hornacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (274,372);
+pos = (426,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (228,372);
+pos = (348,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (334,372);
+pos = (487,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (291,372);
+pos = (410,372);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (262,372);
+pos = (488,372);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (324,372);
+pos = (547,372);
 ref = acute;
 }
 );
@@ -88,7 +88,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (274,414);
+pos = (377,414);
 ref = acute;
 }
 );
@@ -101,7 +101,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (339,372);
+pos = (444,414);
 ref = acute;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (228,414);
+pos = (312,414);
 ref = acute;
 }
 );
@@ -127,7 +127,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (297,372);
+pos = (381,414);
 ref = acute;
 }
 );
@@ -140,7 +140,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (262,372);
+pos = (424,372);
 ref = acute;
 }
 );
@@ -153,7 +153,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (324,372);
+pos = (483,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/U_horngrave.glyph b/src/Inter.glyphspackage/glyphs/U_horngrave.glyph
index 0b4167df9..8635a6553 100644
--- a/src/Inter.glyphspackage/glyphs/U_horngrave.glyph
+++ b/src/Inter.glyphspackage/glyphs/U_horngrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (140,372);
+pos = (204,372);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (122,372);
+pos = (134,372);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (202,372);
+pos = (267,372);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (185,372);
+pos = (196,372);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (162,372);
+pos = (274,372);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (226,372);
+pos = (341,372);
 ref = grave;
 }
 );
@@ -88,7 +88,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (140,372);
+pos = (168,414);
 ref = grave;
 }
 );
@@ -101,7 +101,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (207,372);
+pos = (235,414);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (122,372);
+pos = (50,414);
 ref = grave;
 }
 );
@@ -127,7 +127,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (191,372);
+pos = (119,414);
 ref = grave;
 }
 );
@@ -140,7 +140,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (162,372);
+pos = (210,372);
 ref = grave;
 }
 );
@@ -153,7 +153,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (226,372);
+pos = (277,372);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/U_hornhookabove.glyph b/src/Inter.glyphspackage/glyphs/U_hornhookabove.glyph
index a4c6052f6..773956be4 100644
--- a/src/Inter.glyphspackage/glyphs/U_hornhookabove.glyph
+++ b/src/Inter.glyphspackage/glyphs/U_hornhookabove.glyph
@@ -11,7 +11,7 @@ ref = Uhorn;
 },
 {
 pos = (1354,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1518;
@@ -24,7 +24,7 @@ ref = Uhorn;
 },
 {
 pos = (1476,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1478;
@@ -37,7 +37,7 @@ ref = Uhorn;
 },
 {
 pos = (1418,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1519;
@@ -50,7 +50,7 @@ ref = Uhorn;
 },
 {
 pos = (1537,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1477;
@@ -63,7 +63,7 @@ ref = Uhorn;
 },
 {
 pos = (1266,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1536;
@@ -76,7 +76,7 @@ ref = Uhorn;
 },
 {
 pos = (1334,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1535;
@@ -89,7 +89,7 @@ ref = Uhorn;
 },
 {
 pos = (1354,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1454;
@@ -102,7 +102,7 @@ ref = Uhorn;
 },
 {
 pos = (1423,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1455;
@@ -114,8 +114,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1476,366);
-ref = hook;
+pos = (1476,414);
+ref = hookabovecmb;
 }
 );
 width = 1446;
@@ -128,7 +128,7 @@ ref = Uhorn;
 },
 {
 pos = (1543,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1446;
@@ -141,7 +141,7 @@ ref = Uhorn;
 },
 {
 pos = (1266,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1408;
@@ -154,7 +154,7 @@ ref = Uhorn;
 },
 {
 pos = (1334,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1407;
diff --git a/src/Inter.glyphspackage/glyphs/U_kcyrillic.glyph b/src/Inter.glyphspackage/glyphs/U_kcyrillic.glyph
index c2920af49..297e2218b 100644
--- a/src/Inter.glyphspackage/glyphs/U_kcyrillic.glyph
+++ b/src/Inter.glyphspackage/glyphs/U_kcyrillic.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (1598,0);
+pos = (1596,0);
 ref = ucyrillic;
 }
 );
-width = 2806;
+width = 2804;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/W_acute.glyph b/src/Inter.glyphspackage/glyphs/W_acute.glyph
index 09b2fbe2b..12784a29c 100644
--- a/src/Inter.glyphspackage/glyphs/W_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/W_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (486,372);
+pos = (638,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/W_grave.glyph b/src/Inter.glyphspackage/glyphs/W_grave.glyph
index 40f2a74f4..b412ba6ad 100644
--- a/src/Inter.glyphspackage/glyphs/W_grave.glyph
+++ b/src/Inter.glyphspackage/glyphs/W_grave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (352,372);
+pos = (416,372);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (500,372);
+pos = (500,414);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/Y_acute.glyph b/src/Inter.glyphspackage/glyphs/Y_acute.glyph
index 8c5c05d19..1eeb0f669 100644
--- a/src/Inter.glyphspackage/glyphs/Y_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/Y_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (194,372);
+pos = (346,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/Y_grave.glyph b/src/Inter.glyphspackage/glyphs/Y_grave.glyph
index 2da831c25..afff482f2 100644
--- a/src/Inter.glyphspackage/glyphs/Y_grave.glyph
+++ b/src/Inter.glyphspackage/glyphs/Y_grave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (60,372);
+pos = (124,372);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (166,372);
+pos = (166,414);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/Y_hookabove.glyph b/src/Inter.glyphspackage/glyphs/Y_hookabove.glyph
index 557cdbc71..74c328b75 100644
--- a/src/Inter.glyphspackage/glyphs/Y_hookabove.glyph
+++ b/src/Inter.glyphspackage/glyphs/Y_hookabove.glyph
@@ -11,7 +11,7 @@ ref = Y;
 },
 {
 pos = (1274,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1362;
@@ -24,7 +24,7 @@ ref = Y;
 },
 {
 pos = (1520,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1566;
@@ -37,7 +37,7 @@ ref = Y;
 },
 {
 pos = (1340,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1362;
@@ -50,7 +50,7 @@ ref = Y;
 },
 {
 pos = (1582,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1566;
@@ -63,7 +63,7 @@ ref = Y;
 },
 {
 pos = (1126,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1256;
@@ -76,7 +76,7 @@ ref = Y;
 },
 {
 pos = (1194,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1256;
@@ -89,7 +89,7 @@ ref = Y;
 },
 {
 pos = (1274,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1298;
@@ -102,7 +102,7 @@ ref = Y;
 },
 {
 pos = (1340,398);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1298;
@@ -114,8 +114,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1520,366);
-ref = hook;
+pos = (1520,414);
+ref = hookabovecmb;
 }
 );
 width = 1534;
@@ -128,7 +128,7 @@ ref = Y;
 },
 {
 pos = (1582,366);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1534;
@@ -141,7 +141,7 @@ ref = Y;
 },
 {
 pos = (1126,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1128;
@@ -154,7 +154,7 @@ ref = Y;
 },
 {
 pos = (1194,416);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1128;
diff --git a/src/Inter.glyphspackage/glyphs/Z_acute.glyph b/src/Inter.glyphspackage/glyphs/Z_acute.glyph
index 8e376bdda..f47f00cb5 100644
--- a/src/Inter.glyphspackage/glyphs/Z_acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/Z_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (154,372);
+pos = (306,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/_part.otophorn.glyph b/src/Inter.glyphspackage/glyphs/_part.otophorn.glyph
new file mode 100644
index 000000000..1af67af9b
--- /dev/null
+++ b/src/Inter.glyphspackage/glyphs/_part.otophorn.glyph
@@ -0,0 +1,411 @@
+{
+export = 0;
+glyphname = _part.otophorn;
+layers = (
+{
+anchors = (
+{
+name = _tophorn;
+pos = (128,1510);
+}
+);
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+closed = 1;
+nodes = (
+(261,1467,o),
+(376,1473,o),
+(459,1523,cs),
+(530,1566,o),
+(577,1641,o),
+(590,1772,c),
+(544,1772,l),
+(533,1662,o),
+(494,1598,o),
+(433,1561,cs),
+(360,1516,o),
+(256,1510,o),
+(128,1510,c),
+(128,1467,l)
+);
+}
+);
+width = 718;
+},
+{
+anchors = (
+{
+name = _tophorn;
+pos = (128,1510);
+}
+);
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(267,1464,o),
+(388,1473,o),
+(472,1531,cs),
+(536,1576,o),
+(579,1650,o),
+(590,1772,c),
+(544,1772,l),
+(533,1669,o),
+(499,1606,o),
+(444,1568,cs),
+(371,1517,o),
+(262,1510,o),
+(128,1510,c),
+(128,1464,l)
+);
+}
+);
+width = 718;
+},
+{
+anchors = (
+{
+name = _tophorn;
+pos = (129,1510);
+}
+);
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+closed = 1;
+nodes = (
+(365,1402,o),
+(479,1423,o),
+(556,1465,cs),
+(658,1522,o),
+(697,1617,o),
+(704,1772,c),
+(544,1772,l),
+(536,1694,o),
+(527,1623,o),
+(456,1574,cs),
+(398,1534,o),
+(300,1510,o),
+(128,1510,c),
+(128,1393,l)
+);
+}
+);
+width = 832;
+},
+{
+anchors = (
+{
+name = _tophorn;
+pos = (128,1514);
+}
+);
+layerId = m007;
+shapes = (
+{
+closed = 1;
+nodes = (
+(365,1399,o),
+(474,1423,o),
+(551,1465,cs),
+(653,1522,o),
+(705,1621,o),
+(712,1776,c),
+(544,1776,l),
+(536,1698,o),
+(527,1627,o),
+(456,1578,cs),
+(398,1538,o),
+(300,1514,o),
+(128,1514,c),
+(128,1389,l)
+);
+}
+);
+width = 840;
+},
+{
+anchors = (
+{
+name = _tophorn;
+pos = (128,1510);
+}
+);
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+closed = 1;
+nodes = (
+(369,1323,o),
+(524,1375,o),
+(613,1426,cs),
+(731,1493,o),
+(808,1630,o),
+(808,1772,c),
+(507,1772,l),
+(504,1698,o),
+(452,1602,o),
+(390,1558,cs),
+(343,1525,o),
+(280,1513,o),
+(128,1510,c),
+(128,1312,l)
+);
+}
+);
+width = 936;
+},
+{
+anchors = (
+{
+name = _tophorn;
+pos = (128,1514);
+}
+);
+layerId = m009;
+shapes = (
+{
+closed = 1;
+nodes = (
+(369,1327,o),
+(524,1379,o),
+(613,1430,cs),
+(731,1497,o),
+(808,1634,o),
+(808,1776,c),
+(507,1776,l),
+(504,1702,o),
+(452,1606,o),
+(390,1562,cs),
+(343,1529,o),
+(280,1517,o),
+(128,1514,c),
+(128,1316,l)
+);
+}
+);
+width = 936;
+},
+{
+anchors = (
+{
+name = _tophorn;
+pos = (285,1510);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+shapes = (
+{
+closed = 1;
+nodes = (
+(411,1467,o),
+(527,1473,o),
+(619,1523,cs),
+(697,1566,o),
+(756,1641,o),
+(791,1772,c),
+(745,1772,l),
+(716,1662,o),
+(666,1598,o),
+(599,1561,cs),
+(518,1516,o),
+(413,1510,o),
+(285,1510,c),
+(278,1467,l)
+);
+}
+);
+width = 718;
+},
+{
+anchors = (
+{
+name = _tophorn;
+pos = (285,1510);
+}
+);
+layerId = m012;
+shapes = (
+{
+closed = 1;
+nodes = (
+(417,1464,o),
+(539,1473,o),
+(633,1531,cs),
+(704,1576,o),
+(760,1650,o),
+(791,1772,c),
+(745,1772,l),
+(717,1669,o),
+(672,1606,o),
+(611,1568,cs),
+(530,1517,o),
+(419,1510,o),
+(285,1510,c),
+(278,1464,l)
+);
+}
+);
+width = 718;
+},
+{
+anchors = (
+{
+name = _tophorn;
+pos = (285,1510);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+shapes = (
+{
+closed = 1;
+nodes = (
+(505,1402,o),
+(622,1423,o),
+(706,1465,cs),
+(817,1522,o),
+(872,1617,o),
+(905,1772,c),
+(745,1772,l),
+(724,1694,o),
+(703,1623,o),
+(624,1574,cs),
+(559,1534,o),
+(457,1510,o),
+(285,1510,c),
+(266,1393,l)
+);
+}
+);
+width = 832;
+},
+{
+anchors = (
+{
+name = _tophorn;
+pos = (291,1514);
+}
+);
+layerId = m008;
+shapes = (
+{
+closed = 1;
+nodes = (
+(509,1399,o),
+(625,1424,o),
+(709,1466,cs),
+(821,1523,o),
+(878,1621,o),
+(911,1776,c),
+(751,1776,l),
+(730,1698,o),
+(709,1627,o),
+(630,1578,cs),
+(565,1538,o),
+(463,1514,o),
+(291,1514,c),
+(271,1389,l)
+);
+}
+);
+width = 832;
+},
+{
+anchors = (
+{
+name = _tophorn;
+pos = (285,1510);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+shapes = (
+{
+closed = 1;
+nodes = (
+(527,1342,o),
+(635,1373,o),
+(719,1426,cs),
+(837,1501,o),
+(911,1619,o),
+(937,1772,c),
+(636,1772,l),
+(615,1672,o),
+(580,1609,o),
+(522,1569,cs),
+(468,1531,o),
+(392,1512,o),
+(285,1510,c),
+(253,1312,l)
+);
+}
+);
+width = 864;
+},
+{
+anchors = (
+{
+name = _tophorn;
+pos = (291,1514);
+}
+);
+layerId = m010;
+shapes = (
+{
+closed = 1;
+nodes = (
+(532,1346,o),
+(641,1377,o),
+(724,1430,cs),
+(843,1505,o),
+(917,1623,o),
+(943,1776,c),
+(642,1776,l),
+(621,1676,o),
+(586,1613,o),
+(528,1573,cs),
+(474,1535,o),
+(398,1516,o),
+(291,1514,c),
+(258,1316,l)
+);
+}
+);
+width = 864;
+},
+{
+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;
+}
+);
+}
diff --git a/src/Inter.glyphspackage/glyphs/_part.rtophorn.glyph b/src/Inter.glyphspackage/glyphs/_part.rtophorn.glyph
index e9fe26a9e..b8c9202ce 100644
--- a/src/Inter.glyphspackage/glyphs/_part.rtophorn.glyph
+++ b/src/Inter.glyphspackage/glyphs/_part.rtophorn.glyph
@@ -70,7 +70,7 @@ width = 664;
 anchors = (
 {
 name = _rtophorn;
-pos = (158,1490);
+pos = (128,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -78,31 +78,31 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(232,1344,ls),
-(331,1348,o),
-(416,1377,o),
-(481,1429,cs),
-(571,1501,o),
-(623,1618,o),
-(622,1776,c),
-(454,1776,l),
-(454,1679,o),
-(430,1607,o),
-(381,1560,cs),
-(332,1513,o),
-(259,1490,o),
-(158,1490,c),
-(158,1341,l)
+(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 = 780;
+width = 720;
 },
 {
 anchors = (
 {
 name = _rtophorn;
-pos = (126,1490);
+pos = (128,1490);
 }
 );
 layerId = m007;
@@ -110,25 +110,25 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(200,1344,ls),
-(299,1348,o),
-(384,1377,o),
-(449,1429,cs),
-(539,1501,o),
-(591,1618,o),
-(590,1776,c),
-(422,1776,l),
-(422,1679,o),
-(398,1607,o),
-(349,1560,cs),
-(300,1513,o),
-(227,1490,o),
-(126,1490,c),
-(126,1341,l)
+(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 = 716;
+width = 720;
 },
 {
 anchors = (
@@ -218,7 +218,7 @@ nodes = (
 (405,1642,o),
 (388,1599,cs),
 (355,1512,o),
-(270,1507,o),
+(270,1499,o),
 (102,1490,c),
 (102,1284,l)
 );
@@ -233,6 +233,29 @@ name = _rtophorn;
 pos = (86,1490);
 }
 );
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(289,1327,o),
+(444,1379,o),
+(533,1430,cs),
+(651,1497,o),
+(728,1634,o),
+(728,1776,c),
+(427,1776,l),
+(424,1702,o),
+(372,1606,o),
+(310,1562,cs),
+(263,1529,o),
+(200,1517,o),
+(48,1514,c),
+(48,1316,l)
+);
+}
+);
+};
 layerId = m009;
 shapes = (
 {
@@ -243,14 +266,14 @@ nodes = (
 (421,1314,o),
 (492,1349,cs),
 (635,1420,o),
-(691,1546,o),
-(691,1776,c),
-(395,1776,l),
-(395,1700,o),
+(696,1546,o),
+(704,1776,c),
+(403,1776,l),
+(399,1700,o),
 (389,1642,o),
 (372,1599,cs),
 (339,1512,o),
-(254,1507,o),
+(254,1499,o),
 (86,1490,c),
 (86,1284,l)
 );
@@ -334,11 +357,11 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(184,1451,ls),
-(265,1464,o),
-(323,1506,o),
-(358,1556,cs),
-(393,1605,o),
+(184,1454,ls),
+(265,1467,o),
+(325,1511,o),
+(359,1562,cs),
+(392,1611,o),
 (404,1690,o),
 (404,1776,c),
 (358,1776,l),
@@ -348,7 +371,7 @@ nodes = (
 (312,1547,o),
 (234,1496,o),
 (134,1490,c),
-(134,1443,l)
+(134,1446,l)
 );
 }
 );
@@ -385,6 +408,40 @@ nodes = (
 }
 );
 width = 536;
+},
+{
+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;
 }
 );
 }
diff --git a/src/Inter.glyphspackage/glyphs/aacute.1.glyph b/src/Inter.glyphspackage/glyphs/aacute.1.glyph
index ee1ce87e9..98e2bd511 100644
--- a/src/Inter.glyphspackage/glyphs/aacute.1.glyph
+++ b/src/Inter.glyphspackage/glyphs/aacute.1.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = a.1;
 },
 {
-pos = (76,0);
+pos = (302,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/aacute.glyph b/src/Inter.glyphspackage/glyphs/aacute.glyph
index ff944444b..bd817ba75 100644
--- a/src/Inter.glyphspackage/glyphs/aacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/aacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (110,0);
+pos = (262,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/acute.glyph b/src/Inter.glyphspackage/glyphs/acute.glyph
index 37660ed66..af7ccb017 100644
--- a/src/Inter.glyphspackage/glyphs/acute.glyph
+++ b/src/Inter.glyphspackage/glyphs/acute.glyph
@@ -6,11 +6,11 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (486,1304);
+pos = (334,1304);
 },
 {
 name = top;
-pos = (510,1676);
+pos = (358,1676);
 }
 );
 background = {
@@ -18,19 +18,19 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(560,1270,l),
-(824,1578,l),
-(632,1578,l),
-(408,1270,l)
+(408,1270,l),
+(672,1578,l),
+(480,1578,l),
+(256,1270,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(246,1270,l),
-(462,1578,l),
-(272,1578,l),
-(110,1270,l)
+(94,1270,l),
+(310,1578,l),
+(120,1578,l),
+(-42,1270,l)
 );
 }
 );
@@ -40,24 +40,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(558,1268,l),
-(786,1606,l),
-(584,1606,l),
-(408,1268,l)
+(406,1268,l),
+(634,1606,l),
+(432,1606,l),
+(256,1268,l)
 );
 }
 );
-width = 1018;
+width = 890;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (510,1304);
+pos = (390,1304);
 },
 {
 name = top;
-pos = (510,1676);
+pos = (390,1676);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -65,24 +65,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(640,1256,l),
-(858,1582,l),
-(514,1582,l),
-(376,1256,l)
+(520,1256,l),
+(738,1582,l),
+(394,1582,l),
+(256,1256,l)
 );
 }
 );
-width = 1018;
+width = 994;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (610,1304);
+pos = (457,1304);
 },
 {
 name = top;
-pos = (694,1676);
+pos = (541,1676);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -90,24 +90,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(676,1268,l),
-(958,1606,l),
-(758,1606,l),
-(526,1268,l)
+(523,1268,l),
+(805,1606,l),
+(605,1606,l),
+(373,1268,l)
 );
 }
 );
-width = 1018;
+width = 888;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (632,1304);
+pos = (513,1304);
 },
 {
 name = top;
-pos = (694,1676);
+pos = (575,1676);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -115,24 +115,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(754,1256,l),
-(1028,1582,l),
-(686,1582,l),
-(490,1256,l)
+(635,1256,l),
+(909,1582,l),
+(567,1582,l),
+(371,1256,l)
 );
 }
 );
-width = 1018;
+width = 996;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (506,1304);
+pos = (280,1304);
 },
 {
 name = top;
-pos = (510,1676);
+pos = (284,1676);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -140,24 +140,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(528,1280,l),
-(744,1594,l),
-(686,1594,l),
-(482,1280,l)
+(302,1280,l),
+(518,1594,l),
+(460,1594,l),
+(256,1280,l)
 );
 }
 );
-width = 1018;
+width = 774;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (630,1304);
+pos = (407,1304);
 },
 {
 name = top;
-pos = (694,1676);
+pos = (471,1676);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -165,14 +165,14 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(648,1280,l),
-(914,1594,l),
-(854,1594,l),
-(598,1280,l)
+(425,1280,l),
+(691,1594,l),
+(631,1594,l),
+(375,1280,l)
 );
 }
 );
-width = 1018;
+width = 776;
 },
 {
 anchors = (
@@ -205,30 +205,21 @@ width = 1018;
 anchors = (
 {
 name = _top;
-pos = (454,1262);
+pos = (351,1262);
 },
 {
 name = top;
-pos = (453,1676);
+pos = (351,1676);
 }
 );
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(796,1490,l),
-(554,1490,l),
-(376,1191,l),
-(538,1191,l)
-);
-}
-);
-};
 guides = (
 {
 angle = 90;
-pos = (193,1132);
+pos = (90,1132);
+},
+{
+angle = 90;
+pos = (351,1177);
 }
 );
 layerId = m007;
@@ -236,24 +227,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(509,1202,l),
-(758,1490,l),
-(524,1490,l),
-(359,1202,l)
+(406,1200,l),
+(655,1490,l),
+(421,1490,l),
+(256,1200,l)
 );
 }
 );
-width = 954;
+width = 911;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (578,1304);
+pos = (473,1262);
 },
 {
 name = top;
-pos = (662,1676);
+pos = (541,1676);
 }
 );
 layerId = m008;
@@ -261,30 +252,30 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(644,1268,l),
-(926,1606,l),
-(726,1606,l),
-(494,1268,l)
+(517,1200,l),
+(814,1490,l),
+(580,1490,l),
+(367,1200,l)
 );
 }
 );
-width = 954;
+width = 911;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (494,1262);
+pos = (410,1262);
 },
 {
 name = top;
-pos = (494,1676);
+pos = (410,1676);
 }
 );
 guides = (
 {
 angle = 90;
-pos = (414,1107);
+pos = (410,1107);
 }
 );
 layerId = m009;
@@ -292,24 +283,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(604,1164,l),
-(910,1490,l),
-(542,1490,l),
-(340,1164,l)
+(520,1164,l),
+(826,1490,l),
+(458,1490,l),
+(256,1164,l)
 );
 }
 );
-width = 986;
+width = 1082;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (616,1304);
+pos = (532,1262);
 },
 {
 name = top;
-pos = (678,1676);
+pos = (600,1676);
 }
 );
 layerId = m010;
@@ -317,24 +308,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(738,1256,l),
-(1012,1582,l),
-(670,1582,l),
-(474,1256,l)
+(625,1164,l),
+(985,1490,l),
+(617,1490,l),
+(361,1164,l)
 );
 }
 );
-width = 986;
+width = 1082;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (442,1304);
+pos = (280,1304);
 },
 {
 name = top;
-pos = (446,1676);
+pos = (284,1676);
 }
 );
 layerId = m011;
@@ -342,14 +333,14 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(464,1280,l),
-(680,1594,l),
-(622,1594,l),
-(418,1280,l)
+(302,1280,l),
+(518,1594,l),
+(460,1594,l),
+(256,1280,l)
 );
 }
 );
-width = 890;
+width = 774;
 },
 {
 anchors = (
@@ -382,11 +373,11 @@ width = 1018;
 anchors = (
 {
 name = _top;
-pos = (566,1304);
+pos = (407,1304);
 },
 {
 name = top;
-pos = (630,1676);
+pos = (471,1676);
 }
 );
 layerId = m012;
@@ -394,14 +385,14 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(584,1280,l),
-(850,1594,l),
-(790,1594,l),
-(534,1280,l)
+(425,1280,l),
+(691,1594,l),
+(631,1594,l),
+(375,1280,l)
 );
 }
 );
-width = 890;
+width = 776;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/aeacute.glyph b/src/Inter.glyphspackage/glyphs/aeacute.glyph
index 8e5c84461..d30c85262 100644
--- a/src/Inter.glyphspackage/glyphs/aeacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/aeacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (458,0);
+pos = (610,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/afii10032.glyph b/src/Inter.glyphspackage/glyphs/afii10032.glyph
index 787712ee6..e2f5ecf66 100644
--- a/src/Inter.glyphspackage/glyphs/afii10032.glyph
+++ b/src/Inter.glyphspackage/glyphs/afii10032.glyph
@@ -91,7 +91,7 @@ shapes = (
 ref = O;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/afii10052.glyph b/src/Inter.glyphspackage/glyphs/afii10052.glyph
index 021bb43ed..e5656e0fb 100644
--- a/src/Inter.glyphspackage/glyphs/afii10052.glyph
+++ b/src/Inter.glyphspackage/glyphs/afii10052.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Gamma;
 },
 {
-pos = (146,372);
+pos = (298,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/afii10061.glyph b/src/Inter.glyphspackage/glyphs/afii10061.glyph
index e2e57bdbe..fa85eb090 100644
--- a/src/Inter.glyphspackage/glyphs/afii10061.glyph
+++ b/src/Inter.glyphspackage/glyphs/afii10061.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (188,372);
+pos = (340,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/agrave.1.glyph b/src/Inter.glyphspackage/glyphs/agrave.1.glyph
index 77abd3ae4..7388ae63b 100644
--- a/src/Inter.glyphspackage/glyphs/agrave.1.glyph
+++ b/src/Inter.glyphspackage/glyphs/agrave.1.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = a.1;
 },
 {
-pos = (-24,0);
+pos = (88,0);
 ref = grave;
 }
 );
@@ -115,7 +115,7 @@ shapes = (
 ref = a.1;
 },
 {
-pos = (58,0);
+pos = (58,42);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/agrave.glyph b/src/Inter.glyphspackage/glyphs/agrave.glyph
index 2bde1857f..57a429547 100644
--- a/src/Inter.glyphspackage/glyphs/agrave.glyph
+++ b/src/Inter.glyphspackage/glyphs/agrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (-24,0);
+pos = (40,0);
 ref = grave;
 }
 );
@@ -112,7 +112,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (-24,-42);
+pos = (-24,0);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/ahookabove.1.glyph b/src/Inter.glyphspackage/glyphs/ahookabove.1.glyph
index d07f7e779..e62632c72 100644
--- a/src/Inter.glyphspackage/glyphs/ahookabove.1.glyph
+++ b/src/Inter.glyphspackage/glyphs/ahookabove.1.glyph
@@ -12,7 +12,7 @@ ref = a.1;
 },
 {
 pos = (1080,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1224;
@@ -25,7 +25,7 @@ ref = a.1;
 },
 {
 pos = (1084,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1224;
@@ -38,7 +38,7 @@ ref = a.1;
 },
 {
 pos = (1220,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1272;
@@ -51,7 +51,7 @@ ref = a.1;
 },
 {
 pos = (1222,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1274;
@@ -64,7 +64,7 @@ ref = a.1;
 },
 {
 pos = (1412,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1320;
@@ -77,7 +77,7 @@ ref = a.1;
 },
 {
 pos = (1412,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1320;
@@ -90,7 +90,7 @@ ref = a.1;
 },
 {
 pos = (1220,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1208;
@@ -103,7 +103,7 @@ ref = a.1;
 },
 {
 pos = (1222,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1210;
@@ -115,8 +115,8 @@ shapes = (
 ref = a.1;
 },
 {
-pos = (1412,-6);
-ref = hook;
+pos = (1412,42);
+ref = hookabovecmb;
 }
 );
 width = 1288;
@@ -129,7 +129,7 @@ ref = a.1;
 },
 {
 pos = (1412,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1288;
@@ -142,7 +142,7 @@ ref = a.1;
 },
 {
 pos = (1080,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1096;
@@ -155,7 +155,7 @@ ref = a.1;
 },
 {
 pos = (1084,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1096;
diff --git a/src/Inter.glyphspackage/glyphs/ahookabove.glyph b/src/Inter.glyphspackage/glyphs/ahookabove.glyph
index 8f427d8f1..16bfca271 100644
--- a/src/Inter.glyphspackage/glyphs/ahookabove.glyph
+++ b/src/Inter.glyphspackage/glyphs/ahookabove.glyph
@@ -11,7 +11,7 @@ ref = a;
 },
 {
 pos = (1190,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1156;
@@ -24,7 +24,7 @@ ref = a;
 },
 {
 pos = (1354,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1222;
@@ -37,7 +37,7 @@ ref = a;
 },
 {
 pos = (1192,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1154;
@@ -50,7 +50,7 @@ ref = a;
 },
 {
 pos = (1352,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1222;
@@ -63,7 +63,7 @@ ref = a;
 },
 {
 pos = (1050,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1102;
@@ -76,7 +76,7 @@ ref = a;
 },
 {
 pos = (1054,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1103;
@@ -89,7 +89,7 @@ ref = a;
 },
 {
 pos = (1166,-16);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1048;
@@ -102,7 +102,7 @@ ref = a;
 },
 {
 pos = (1192,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1091;
@@ -114,8 +114,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (1330,-48);
-ref = hook;
+pos = (1330,0);
+ref = hookabovecmb;
 }
 );
 width = 1178;
@@ -128,7 +128,7 @@ ref = a;
 },
 {
 pos = (1352,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1190;
@@ -141,7 +141,7 @@ ref = a;
 },
 {
 pos = (1050,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 974;
@@ -154,7 +154,7 @@ ref = a;
 },
 {
 pos = (1054,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 975;
diff --git a/src/Inter.glyphspackage/glyphs/bullseye.glyph b/src/Inter.glyphspackage/glyphs/bullseye.glyph
index 19f646c2e..38a3fa994 100644
--- a/src/Inter.glyphspackage/glyphs/bullseye.glyph
+++ b/src/Inter.glyphspackage/glyphs/bullseye.glyph
@@ -143,7 +143,7 @@ pos = (1505,0);
 ref = period;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/cacute.glyph b/src/Inter.glyphspackage/glyphs/cacute.glyph
index c8e981e52..8510ac779 100644
--- a/src/Inter.glyphspackage/glyphs/cacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/cacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (120,0);
+pos = (272,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/ccedillaacute.glyph b/src/Inter.glyphspackage/glyphs/ccedillaacute.glyph
index ea06f6004..0f7cc7f9b 100644
--- a/src/Inter.glyphspackage/glyphs/ccedillaacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/ccedillaacute.glyph
@@ -14,7 +14,7 @@ pos = (326,0);
 ref = cedilla;
 },
 {
-pos = (120,0);
+pos = (272,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/e.glyph b/src/Inter.glyphspackage/glyphs/e.glyph
index 4defae9cb..b7284a118 100644
--- a/src/Inter.glyphspackage/glyphs/e.glyph
+++ b/src/Inter.glyphspackage/glyphs/e.glyph
@@ -617,9 +617,9 @@ nodes = (
 (434,431,cs),
 (434,647,ls),
 (434,739,o),
-(497,798,o),
-(594,798,cs),
-(690,798,o),
+(499,798,o),
+(596,798,cs),
+(692,798,o),
 (753,739,o),
 (756,647,c),
 (164,647,l),
diff --git a/src/Inter.glyphspackage/glyphs/eacute.glyph b/src/Inter.glyphspackage/glyphs/eacute.glyph
index cfc6e6396..751d71541 100644
--- a/src/Inter.glyphspackage/glyphs/eacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/eacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (114,0);
+pos = (266,0);
 ref = acute;
 }
 );
@@ -27,7 +27,7 @@ pos = (112,0);
 ref = acute;
 }
 );
-width = 1246;
+width = 1242;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter.glyphspackage/glyphs/ecircumflexdotbelow.glyph b/src/Inter.glyphspackage/glyphs/ecircumflexdotbelow.glyph
index 7f4c55137..8ffffd261 100644
--- a/src/Inter.glyphspackage/glyphs/ecircumflexdotbelow.glyph
+++ b/src/Inter.glyphspackage/glyphs/ecircumflexdotbelow.glyph
@@ -35,7 +35,7 @@ pos = (1158,0);
 ref = dotbelow;
 }
 );
-width = 1246;
+width = 1242;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter.glyphspackage/glyphs/edotbelow.glyph b/src/Inter.glyphspackage/glyphs/edotbelow.glyph
index 0b4e70431..fc3e34ab4 100644
--- a/src/Inter.glyphspackage/glyphs/edotbelow.glyph
+++ b/src/Inter.glyphspackage/glyphs/edotbelow.glyph
@@ -27,7 +27,7 @@ pos = (1158,0);
 ref = dotbelow;
 }
 );
-width = 1246;
+width = 1242;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter.glyphspackage/glyphs/egrave.glyph b/src/Inter.glyphspackage/glyphs/egrave.glyph
index 0358e4bcd..4041317cf 100644
--- a/src/Inter.glyphspackage/glyphs/egrave.glyph
+++ b/src/Inter.glyphspackage/glyphs/egrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-20,0);
+pos = (44,0);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-17,-42);
+pos = (-17,0);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/ehookabove.glyph b/src/Inter.glyphspackage/glyphs/ehookabove.glyph
index 79c4b805f..d63dc6425 100644
--- a/src/Inter.glyphspackage/glyphs/ehookabove.glyph
+++ b/src/Inter.glyphspackage/glyphs/ehookabove.glyph
@@ -11,7 +11,7 @@ ref = e;
 },
 {
 pos = (1194,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1188;
@@ -24,10 +24,10 @@ ref = e;
 },
 {
 pos = (1360,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
-width = 1246;
+width = 1242;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -37,7 +37,7 @@ ref = e;
 },
 {
 pos = (1196,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1197;
@@ -50,7 +50,7 @@ ref = e;
 },
 {
 pos = (1358,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1247;
@@ -63,7 +63,7 @@ ref = e;
 },
 {
 pos = (1088,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1172;
@@ -76,7 +76,7 @@ ref = e;
 },
 {
 pos = (1092,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1179;
@@ -89,7 +89,7 @@ ref = e;
 },
 {
 pos = (1180,-16);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1106;
@@ -102,7 +102,7 @@ ref = e;
 },
 {
 pos = (1196,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1133;
@@ -114,8 +114,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (1337,-48);
-ref = hook;
+pos = (1337,0);
+ref = hookabovecmb;
 }
 );
 width = 1162;
@@ -128,7 +128,7 @@ ref = e;
 },
 {
 pos = (1358,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1215;
@@ -141,10 +141,10 @@ ref = e;
 },
 {
 pos = (1088,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
-width = 1052;
+width = 1048;
 },
 {
 layerId = m012;
@@ -154,7 +154,7 @@ ref = e;
 },
 {
 pos = (1092,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1051;
diff --git a/src/Inter.glyphspackage/glyphs/gacute.glyph b/src/Inter.glyphspackage/glyphs/gacute.glyph
index 7e675146e..afdd72a0d 100644
--- a/src/Inter.glyphspackage/glyphs/gacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/gacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (140,0);
+pos = (292,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/gjecyrillic.glyph b/src/Inter.glyphspackage/glyphs/gjecyrillic.glyph
index 8b3b65438..2aa452e82 100644
--- a/src/Inter.glyphspackage/glyphs/gjecyrillic.glyph
+++ b/src/Inter.glyphspackage/glyphs/gjecyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = gecyrillic;
 },
 {
-pos = (12,0);
+pos = (164,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/grave.glyph b/src/Inter.glyphspackage/glyphs/grave.glyph
index 576125ceb..3313e8ff1 100644
--- a/src/Inter.glyphspackage/glyphs/grave.glyph
+++ b/src/Inter.glyphspackage/glyphs/grave.glyph
@@ -6,11 +6,11 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (620,1304);
+pos = (556,1304);
 },
 {
 name = top;
-pos = (596,1676);
+pos = (532,1676);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -18,24 +18,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(698,1268,l),
-(520,1606,l),
-(320,1606,l),
-(546,1268,l)
+(634,1268,l),
+(456,1606,l),
+(256,1606,l),
+(482,1268,l)
 );
 }
 );
-width = 1018;
+width = 890;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (616,1304);
+pos = (604,1304);
 },
 {
 name = top;
-pos = (616,1676);
+pos = (604,1676);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -43,24 +43,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(750,1256,l),
-(610,1582,l),
-(268,1582,l),
-(486,1256,l)
+(738,1256,l),
+(598,1582,l),
+(256,1582,l),
+(474,1256,l)
 );
 }
 );
-width = 1018;
+width = 994;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (742,1304);
+pos = (677,1304);
 },
 {
 name = top;
-pos = (782,1676);
+pos = (717,1676);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -68,24 +68,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(814,1268,l),
-(696,1606,l),
-(494,1606,l),
-(664,1268,l)
+(749,1268,l),
+(631,1606,l),
+(429,1606,l),
+(599,1268,l)
 );
 }
 );
-width = 1018;
+width = 888;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (738,1304);
+pos = (727,1304);
 },
 {
 name = top;
-pos = (802,1676);
+pos = (791,1676);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -93,24 +93,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(866,1256,l),
-(780,1582,l),
-(436,1582,l),
-(602,1256,l)
+(855,1256,l),
+(769,1582,l),
+(425,1582,l),
+(591,1256,l)
 );
 }
 );
-width = 1018;
+width = 996;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (606,1304);
+pos = (494,1304);
 },
 {
 name = top;
-pos = (602,1676);
+pos = (490,1676);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -118,24 +118,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(630,1280,l),
-(426,1594,l),
-(368,1594,l),
-(584,1280,l)
+(518,1280,l),
+(314,1594,l),
+(256,1594,l),
+(472,1280,l)
 );
 }
 );
-width = 1018;
+width = 774;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (728,1304);
+pos = (613,1304);
 },
 {
 name = top;
-pos = (788,1676);
+pos = (673,1676);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -143,24 +143,30 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(748,1280,l),
-(596,1594,l),
-(542,1594,l),
-(704,1280,l)
+(633,1280,l),
+(481,1594,l),
+(427,1594,l),
+(589,1280,l)
 );
 }
 );
-width = 1018;
+width = 770;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (588,1304);
+pos = (560,1262);
 },
 {
 name = top;
-pos = (564,1676);
+pos = (560,1676);
+}
+);
+guides = (
+{
+angle = 90;
+pos = (560,1177);
 }
 );
 layerId = m007;
@@ -168,20 +174,20 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(666,1268,l),
-(488,1606,l),
-(288,1606,l),
-(514,1268,l)
+(490,1490,l),
+(256,1490,l),
+(505,1200,l),
+(655,1200,l)
 );
 }
 );
-width = 954;
+width = 911;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (710,1304);
+pos = (682,1262);
 },
 {
 name = top;
@@ -193,24 +199,30 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(782,1268,l),
-(664,1606,l),
-(462,1606,l),
-(632,1268,l)
+(649,1490,l),
+(415,1490,l),
+(616,1200,l),
+(766,1200,l)
 );
 }
 );
-width = 954;
+width = 911;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (600,1304);
+pos = (672,1262);
 },
 {
 name = top;
-pos = (600,1676);
+pos = (672,1676);
+}
+);
+guides = (
+{
+angle = 90;
+pos = (672,1107);
 }
 );
 layerId = m009;
@@ -218,24 +230,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(734,1256,l),
-(594,1582,l),
-(252,1582,l),
-(470,1256,l)
+(624,1490,l),
+(256,1490,l),
+(562,1164,l),
+(826,1164,l)
 );
 }
 );
-width = 986;
+width = 1082;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (722,1304);
+pos = (794,1262);
 },
 {
 name = top;
-pos = (786,1676);
+pos = (862,1676);
 }
 );
 layerId = m010;
@@ -243,24 +255,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(850,1256,l),
-(764,1582,l),
-(420,1582,l),
-(586,1256,l)
+(783,1490,l),
+(415,1490,l),
+(667,1164,l),
+(931,1164,l)
 );
 }
 );
-width = 986;
+width = 1082;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (542,1304);
+pos = (494,1304);
 },
 {
 name = top;
-pos = (538,1676);
+pos = (490,1676);
 }
 );
 layerId = m011;
@@ -268,24 +280,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(566,1280,l),
-(362,1594,l),
-(304,1594,l),
-(520,1280,l)
+(518,1280,l),
+(314,1594,l),
+(256,1594,l),
+(472,1280,l)
 );
 }
 );
-width = 890;
+width = 774;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (664,1304);
+pos = (613,1304);
 },
 {
 name = top;
-pos = (724,1676);
+pos = (673,1676);
 }
 );
 layerId = m012;
@@ -293,17 +305,18 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(684,1280,l),
-(532,1594,l),
-(478,1594,l),
-(640,1280,l)
+(633,1280,l),
+(481,1594,l),
+(427,1594,l),
+(589,1280,l)
 );
 }
 );
-width = 890;
+width = 770;
 }
 );
-metricWidth = acute;
+metricLeft = "=|acute";
+metricRight = "=|acute";
 note = "mirrored version of acute";
 tags = (
 "TODO-opsz"
diff --git a/src/Inter.glyphspackage/glyphs/hook.glyph b/src/Inter.glyphspackage/glyphs/hookabovecmb.glyph
index 37d29836d..7c3504775 100644
--- a/src/Inter.glyphspackage/glyphs/hook.glyph
+++ b/src/Inter.glyphspackage/glyphs/hookabovecmb.glyph
@@ -1,6 +1,6 @@
 {
 color = (250,227,227,1);
-glyphname = hook;
+glyphname = hookabovecmb;
 layers = (
 {
 anchors = (
@@ -270,7 +270,12 @@ width = 0;
 anchors = (
 {
 name = _top;
-pos = (-754,1310);
+pos = (-754,1262);
+}
+);
+guides = (
+{
+pos = (0,1164);
 }
 );
 layerId = m009;
@@ -278,22 +283,22 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(-616,1346,l),
-(-535,1359,o),
-(-457,1402,o),
-(-458,1484,cs),
-(-457,1612,o),
-(-617,1684,o),
-(-914,1684,c),
-(-924,1524,l),
-(-844,1524,o),
-(-785,1516,o),
-(-786,1464,cs),
-(-785,1431,o),
-(-826,1405,o),
-(-930,1402,c),
-(-904,1288,l),
-(-616,1288,l)
+(-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)
 );
 }
 );
@@ -402,5 +407,4 @@ width = 0;
 tags = (
 "TODO-opsz"
 );
-unicode = 777;
 }
diff --git a/src/Inter.glyphspackage/glyphs/iacute.glyph b/src/Inter.glyphspackage/glyphs/iacute.glyph
index 187c683e5..bbb8330bb 100644
--- a/src/Inter.glyphspackage/glyphs/iacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/iacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-242,0);
+pos = (-90,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/igrave.glyph b/src/Inter.glyphspackage/glyphs/igrave.glyph
index c7be39c3f..0d1b9556d 100644
--- a/src/Inter.glyphspackage/glyphs/igrave.glyph
+++ b/src/Inter.glyphspackage/glyphs/igrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-376,0);
+pos = (-312,0);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-314,-42);
+pos = (-314,0);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/ihookabove.glyph b/src/Inter.glyphspackage/glyphs/ihookabove.glyph
index 594794d63..c75c30080 100644
--- a/src/Inter.glyphspackage/glyphs/ihookabove.glyph
+++ b/src/Inter.glyphspackage/glyphs/ihookabove.glyph
@@ -11,7 +11,7 @@ ref = idotless;
 },
 {
 pos = (838,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 486;
@@ -24,7 +24,7 @@ ref = idotless;
 },
 {
 pos = (1040,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 606;
@@ -37,7 +37,7 @@ ref = idotless;
 },
 {
 pos = (844,28);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 486;
@@ -50,7 +50,7 @@ ref = idotless;
 },
 {
 pos = (1038,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 605;
@@ -63,7 +63,7 @@ ref = idotless;
 },
 {
 pos = (718,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 442;
@@ -76,7 +76,7 @@ ref = idotless;
 },
 {
 pos = (724,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 442;
@@ -89,7 +89,7 @@ ref = idotless;
 },
 {
 pos = (837,-16);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 422;
@@ -102,7 +102,7 @@ ref = idotless;
 },
 {
 pos = (844,28);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 423;
@@ -114,8 +114,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (1040,-48);
-ref = hook;
+pos = (1040,0);
+ref = hookabovecmb;
 }
 );
 width = 572;
@@ -128,7 +128,7 @@ ref = idotless;
 },
 {
 pos = (1038,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 573;
@@ -141,7 +141,7 @@ ref = idotless;
 },
 {
 pos = (718,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 314;
@@ -154,7 +154,7 @@ ref = idotless;
 },
 {
 pos = (724,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 314;
diff --git a/src/Inter.glyphspackage/glyphs/kacute.glyph b/src/Inter.glyphspackage/glyphs/kacute.glyph
index 3e9e6c436..28b5b7ebd 100644
--- a/src/Inter.glyphspackage/glyphs/kacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/kacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-242,372);
+pos = (-90,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/kjecyrillic.glyph b/src/Inter.glyphspackage/glyphs/kjecyrillic.glyph
index f1612629b..942b35cfc 100644
--- a/src/Inter.glyphspackage/glyphs/kjecyrillic.glyph
+++ b/src/Inter.glyphspackage/glyphs/kjecyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = kacyrillic;
 },
 {
-pos = (64,0);
+pos = (216,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/lacute.glyph b/src/Inter.glyphspackage/glyphs/lacute.glyph
index 95a8ff32a..0d17b51fe 100644
--- a/src/Inter.glyphspackage/glyphs/lacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/lacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-244,372);
+pos = (-92,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/lacute.ss02.glyph b/src/Inter.glyphspackage/glyphs/lacute.ss02.glyph
index fe8894451..3c16baeb1 100644
--- a/src/Inter.glyphspackage/glyphs/lacute.ss02.glyph
+++ b/src/Inter.glyphspackage/glyphs/lacute.ss02.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = l.ss02;
 },
 {
-pos = (-244,372);
+pos = (-92,372);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/macute.glyph b/src/Inter.glyphspackage/glyphs/macute.glyph
index 035e2d5a6..ca83a41d8 100644
--- a/src/Inter.glyphspackage/glyphs/macute.glyph
+++ b/src/Inter.glyphspackage/glyphs/macute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = m;
 },
 {
-pos = (404,0);
+pos = (556,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/nacute.glyph b/src/Inter.glyphspackage/glyphs/nacute.glyph
index a4ff13b17..692b23f71 100644
--- a/src/Inter.glyphspackage/glyphs/nacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/nacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (114,0);
+pos = (266,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/oacute.glyph b/src/Inter.glyphspackage/glyphs/oacute.glyph
index 7e573407d..584a405f5 100644
--- a/src/Inter.glyphspackage/glyphs/oacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/oacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (124,0);
+pos = (276,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/ograve.glyph b/src/Inter.glyphspackage/glyphs/ograve.glyph
index 2354e8f13..0dff9f0c4 100644
--- a/src/Inter.glyphspackage/glyphs/ograve.glyph
+++ b/src/Inter.glyphspackage/glyphs/ograve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-10,0);
+pos = (54,0);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-2,-42);
+pos = (-2,0);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/ohookabove.glyph b/src/Inter.glyphspackage/glyphs/ohookabove.glyph
index 085e99731..3a8aa8cf5 100644
--- a/src/Inter.glyphspackage/glyphs/ohookabove.glyph
+++ b/src/Inter.glyphspackage/glyphs/ohookabove.glyph
@@ -11,7 +11,7 @@ ref = o;
 },
 {
 pos = (1204,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1222;
@@ -24,7 +24,7 @@ ref = o;
 },
 {
 pos = (1378,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1280;
@@ -37,7 +37,7 @@ ref = o;
 },
 {
 pos = (1208,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1222;
@@ -50,7 +50,7 @@ ref = o;
 },
 {
 pos = (1376,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1280;
@@ -63,7 +63,7 @@ ref = o;
 },
 {
 pos = (1092,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1186;
@@ -76,7 +76,7 @@ ref = o;
 },
 {
 pos = (1096,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1186;
@@ -89,7 +89,7 @@ ref = o;
 },
 {
 pos = (1192,-16);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1132;
@@ -102,7 +102,7 @@ ref = o;
 },
 {
 pos = (1208,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1158;
@@ -114,8 +114,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (1352,-48);
-ref = hook;
+pos = (1352,0);
+ref = hookabovecmb;
 }
 );
 width = 1196;
@@ -128,7 +128,7 @@ ref = o;
 },
 {
 pos = (1376,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1248;
@@ -141,7 +141,7 @@ ref = o;
 },
 {
 pos = (1092,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1058;
@@ -154,7 +154,7 @@ ref = o;
 },
 {
 pos = (1096,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1058;
diff --git a/src/Inter.glyphspackage/glyphs/ohorn.glyph b/src/Inter.glyphspackage/glyphs/ohorn.glyph
index 222f7e33d..fe36c505f 100644
--- a/src/Inter.glyphspackage/glyphs/ohorn.glyph
+++ b/src/Inter.glyphspackage/glyphs/ohorn.glyph
@@ -1,7 +1,7 @@
 {
 glyphname = ohorn;
 kernLeft = o;
-kernRight = ohorn;
+kernRight = o;
 layers = (
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
diff --git a/src/Inter.glyphspackage/glyphs/ohornacute.glyph b/src/Inter.glyphspackage/glyphs/ohornacute.glyph
index b4363fe39..c8fc7e9ab 100644
--- a/src/Inter.glyphspackage/glyphs/ohornacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/ohornacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (124,0);
+pos = (276,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (130,0);
+pos = (250,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (124,0);
+pos = (277,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (130,0);
+pos = (249,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (88,0);
+pos = (314,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (86,0);
+pos = (309,0);
 ref = acute;
 }
 );
@@ -88,7 +88,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (112,0);
+pos = (215,0);
 ref = acute;
 }
 );
@@ -101,7 +101,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (124,0);
+pos = (229,42);
 ref = acute;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (104,0);
+pos = (188,0);
 ref = acute;
 }
 );
@@ -127,7 +127,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (130,0);
+pos = (214,42);
 ref = acute;
 }
 );
@@ -140,7 +140,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (88,0);
+pos = (250,0);
 ref = acute;
 }
 );
@@ -153,7 +153,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (86,0);
+pos = (245,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/ohorngrave.glyph b/src/Inter.glyphspackage/glyphs/ohorngrave.glyph
index 856fc4b08..5ec51355f 100644
--- a/src/Inter.glyphspackage/glyphs/ohorngrave.glyph
+++ b/src/Inter.glyphspackage/glyphs/ohorngrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (-10,0);
+pos = (54,0);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (24,0);
+pos = (36,0);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (-8,0);
+pos = (57,0);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (24,0);
+pos = (35,0);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (-12,0);
+pos = (100,0);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (-12,0);
+pos = (103,0);
 ref = grave;
 }
 );
@@ -88,7 +88,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (-22,-42);
+pos = (6,0);
 ref = grave;
 }
 );
@@ -101,7 +101,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (-8,0);
+pos = (20,42);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (-2,-42);
+pos = (-74,0);
 ref = grave;
 }
 );
@@ -127,7 +127,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (24,0);
+pos = (-48,42);
 ref = grave;
 }
 );
@@ -140,7 +140,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (-12,0);
+pos = (36,0);
 ref = grave;
 }
 );
@@ -153,7 +153,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (-12,0);
+pos = (39,0);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/ohornhookabove.glyph b/src/Inter.glyphspackage/glyphs/ohornhookabove.glyph
index 347d7ca3c..d41b93cda 100644
--- a/src/Inter.glyphspackage/glyphs/ohornhookabove.glyph
+++ b/src/Inter.glyphspackage/glyphs/ohornhookabove.glyph
@@ -11,7 +11,7 @@ ref = ohorn;
 },
 {
 pos = (1204,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1224;
@@ -24,7 +24,7 @@ ref = ohorn;
 },
 {
 pos = (1378,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1342;
@@ -37,7 +37,7 @@ ref = ohorn;
 },
 {
 pos = (1208,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1228;
@@ -50,7 +50,7 @@ ref = ohorn;
 },
 {
 pos = (1376,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1342;
@@ -63,7 +63,7 @@ ref = ohorn;
 },
 {
 pos = (1092,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1154;
@@ -76,7 +76,7 @@ ref = ohorn;
 },
 {
 pos = (1096,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1154;
@@ -89,7 +89,7 @@ ref = ohorn;
 },
 {
 pos = (1192,-16);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1160;
@@ -102,7 +102,7 @@ ref = ohorn;
 },
 {
 pos = (1208,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1164;
@@ -114,8 +114,8 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1352,-48);
-ref = hook;
+pos = (1352,0);
+ref = hookabovecmb;
 }
 );
 width = 1310;
@@ -128,7 +128,7 @@ ref = ohorn;
 },
 {
 pos = (1376,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1310;
@@ -141,7 +141,7 @@ ref = ohorn;
 },
 {
 pos = (1092,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1026;
@@ -154,7 +154,7 @@ ref = ohorn;
 },
 {
 pos = (1096,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1026;
diff --git a/src/Inter.glyphspackage/glyphs/oslashacute.glyph b/src/Inter.glyphspackage/glyphs/oslashacute.glyph
index 5cd49f54a..82bbbaf01 100644
--- a/src/Inter.glyphspackage/glyphs/oslashacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/oslashacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = oslash;
 },
 {
-pos = (124,0);
+pos = (276,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/pacute.glyph b/src/Inter.glyphspackage/glyphs/pacute.glyph
index a264beb84..29c7f958b 100644
--- a/src/Inter.glyphspackage/glyphs/pacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/pacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = p;
 },
 {
-pos = (172,0);
+pos = (324,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/racute.1.glyph b/src/Inter.glyphspackage/glyphs/racute.1.glyph
index 1638e9a2c..7317c1455 100644
--- a/src/Inter.glyphspackage/glyphs/racute.1.glyph
+++ b/src/Inter.glyphspackage/glyphs/racute.1.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = r.1;
 },
 {
-pos = (-64,0);
+pos = (88,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/racute.glyph b/src/Inter.glyphspackage/glyphs/racute.glyph
index 4dbfc164a..85469d0d1 100644
--- a/src/Inter.glyphspackage/glyphs/racute.glyph
+++ b/src/Inter.glyphspackage/glyphs/racute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (-64,0);
+pos = (88,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/sacute.glyph b/src/Inter.glyphspackage/glyphs/sacute.glyph
index ffc23e9a1..43f98e8e2 100644
--- a/src/Inter.glyphspackage/glyphs/sacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/sacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (66,0);
+pos = (218,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uacute.glyph b/src/Inter.glyphspackage/glyphs/uacute.glyph
index cffd5f586..153219281 100644
--- a/src/Inter.glyphspackage/glyphs/uacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/uacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (110,0);
+pos = (262,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/ugrave.glyph b/src/Inter.glyphspackage/glyphs/ugrave.glyph
index a869cc7cd..158631c00 100644
--- a/src/Inter.glyphspackage/glyphs/ugrave.glyph
+++ b/src/Inter.glyphspackage/glyphs/ugrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (-24,0);
+pos = (40,0);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (50,0);
+pos = (50,42);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uhookabove.glyph b/src/Inter.glyphspackage/glyphs/uhookabove.glyph
index 30909c056..37cf4ddb5 100644
--- a/src/Inter.glyphspackage/glyphs/uhookabove.glyph
+++ b/src/Inter.glyphspackage/glyphs/uhookabove.glyph
@@ -11,7 +11,7 @@ ref = u;
 },
 {
 pos = (1190,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1190;
@@ -24,7 +24,7 @@ ref = u;
 },
 {
 pos = (1404,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1330;
@@ -37,7 +37,7 @@ ref = u;
 },
 {
 pos = (1194,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1192;
@@ -50,7 +50,7 @@ ref = u;
 },
 {
 pos = (1402,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1329;
@@ -63,7 +63,7 @@ ref = u;
 },
 {
 pos = (1080,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1164;
@@ -76,7 +76,7 @@ ref = u;
 },
 {
 pos = (1084,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1162;
@@ -89,7 +89,7 @@ ref = u;
 },
 {
 pos = (1194,-16);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1136;
@@ -102,7 +102,7 @@ ref = u;
 },
 {
 pos = (1193,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1128;
@@ -114,8 +114,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (1404,-6);
-ref = hook;
+pos = (1404,42);
+ref = hookabovecmb;
 }
 );
 width = 1298;
@@ -128,7 +128,7 @@ ref = u;
 },
 {
 pos = (1401,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1296;
@@ -141,7 +141,7 @@ ref = u;
 },
 {
 pos = (1080,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1036;
@@ -154,7 +154,7 @@ ref = u;
 },
 {
 pos = (1084,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1034;
diff --git a/src/Inter.glyphspackage/glyphs/uhornacute.glyph b/src/Inter.glyphspackage/glyphs/uhornacute.glyph
index c74593f70..939fddffd 100644
--- a/src/Inter.glyphspackage/glyphs/uhornacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/uhornacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (110,0);
+pos = (262,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (168,0);
+pos = (288,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (110,0);
+pos = (263,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (164,0);
+pos = (283,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (68,0);
+pos = (294,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (68,0);
+pos = (291,0);
 ref = acute;
 }
 );
@@ -88,7 +88,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (114,0);
+pos = (217,0);
 ref = acute;
 }
 );
@@ -101,7 +101,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (109,0);
+pos = (214,42);
 ref = acute;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (168,42);
+pos = (252,42);
 ref = acute;
 }
 );
@@ -127,7 +127,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (163,0);
+pos = (247,42);
 ref = acute;
 }
 );
@@ -140,7 +140,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (68,0);
+pos = (230,0);
 ref = acute;
 }
 );
@@ -153,7 +153,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (68,0);
+pos = (227,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uhorngrave.glyph b/src/Inter.glyphspackage/glyphs/uhorngrave.glyph
index 321178783..4ec283d0c 100644
--- a/src/Inter.glyphspackage/glyphs/uhorngrave.glyph
+++ b/src/Inter.glyphspackage/glyphs/uhorngrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (-24,0);
+pos = (40,0);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (62,0);
+pos = (74,0);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (-22,0);
+pos = (43,0);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (58,0);
+pos = (69,0);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (-32,0);
+pos = (80,0);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (-30,0);
+pos = (85,0);
 ref = grave;
 }
 );
@@ -88,7 +88,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (-20,-42);
+pos = (8,0);
 ref = grave;
 }
 );
@@ -101,7 +101,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (-23,0);
+pos = (5,42);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (62,0);
+pos = (-10,42);
 ref = grave;
 }
 );
@@ -127,7 +127,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (57,0);
+pos = (-15,42);
 ref = grave;
 }
 );
@@ -140,7 +140,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (-32,0);
+pos = (16,0);
 ref = grave;
 }
 );
@@ -153,7 +153,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (-30,0);
+pos = (21,0);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uhornhookabove.glyph b/src/Inter.glyphspackage/glyphs/uhornhookabove.glyph
index 2dc2fc56e..41321704e 100644
--- a/src/Inter.glyphspackage/glyphs/uhornhookabove.glyph
+++ b/src/Inter.glyphspackage/glyphs/uhornhookabove.glyph
@@ -11,7 +11,7 @@ ref = uhorn;
 },
 {
 pos = (1190,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1274;
@@ -24,7 +24,7 @@ ref = uhorn;
 },
 {
 pos = (1416,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1570;
@@ -37,7 +37,7 @@ ref = uhorn;
 },
 {
 pos = (1194,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1274;
@@ -50,7 +50,7 @@ ref = uhorn;
 },
 {
 pos = (1410,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1568;
@@ -63,7 +63,7 @@ ref = uhorn;
 },
 {
 pos = (1072,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1096;
@@ -76,7 +76,7 @@ ref = uhorn;
 },
 {
 pos = (1078,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1096;
@@ -89,7 +89,7 @@ ref = uhorn;
 },
 {
 pos = (1194,-16);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1210;
@@ -102,7 +102,7 @@ ref = uhorn;
 },
 {
 pos = (1193,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1210;
@@ -114,8 +114,8 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1416,-6);
-ref = hook;
+pos = (1416,42);
+ref = hookabovecmb;
 }
 );
 width = 1538;
@@ -128,7 +128,7 @@ ref = uhorn;
 },
 {
 pos = (1409,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1536;
@@ -141,7 +141,7 @@ ref = uhorn;
 },
 {
 pos = (1072,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 968;
@@ -154,7 +154,7 @@ ref = uhorn;
 },
 {
 pos = (1078,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 968;
diff --git a/src/Inter.glyphspackage/glyphs/uni01F_8.glyph b/src/Inter.glyphspackage/glyphs/uni01F_8.glyph
index 3c1381701..4093ac33a 100644
--- a/src/Inter.glyphspackage/glyphs/uni01F_8.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni01F_8.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (150,372);
+pos = (214,372);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (154,372);
+pos = (154,414);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni01F_9.glyph b/src/Inter.glyphspackage/glyphs/uni01F_9.glyph
index 3f2082529..fd37fbbfa 100644
--- a/src/Inter.glyphspackage/glyphs/uni01F_9.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni01F_9.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (-20,0);
+pos = (44,0);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (48,-42);
+pos = (48,0);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni022A_.glyph b/src/Inter.glyphspackage/glyphs/uni022A_.glyph
index 40bcd0841..d5209b7dd 100644
--- a/src/Inter.glyphspackage/glyphs/uni022A_.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni022A_.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (1532,0);
+pos = (1536,0);
 ref = dieresismacroncomb.cn;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/uni022C_.glyph b/src/Inter.glyphspackage/glyphs/uni022C_.glyph
index 36ea68c7a..7b1a51433 100644
--- a/src/Inter.glyphspackage/glyphs/uni022C_.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni022C_.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (1582,428);
+pos = (1586,428);
 ref = tildemacroncomb.cn;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/uni022E_.glyph b/src/Inter.glyphspackage/glyphs/uni022E_.glyph
index 6ff9258e0..54951fc70 100644
--- a/src/Inter.glyphspackage/glyphs/uni022E_.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni022E_.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (542,372);
+pos = (546,372);
 ref = dotaccent;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/uni0230.glyph b/src/Inter.glyphspackage/glyphs/uni0230.glyph
index 1f37d2ff6..166c06bbe 100644
--- a/src/Inter.glyphspackage/glyphs/uni0230.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni0230.glyph
@@ -127,11 +127,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (1550,0);
+pos = (1554,0);
 ref = dotmacroncomb.cn;
 }
 );
-width = 1598;
+width = 1596;
 },
 {
 layerId = m011;
diff --git a/src/Inter.glyphspackage/glyphs/uni0400.glyph b/src/Inter.glyphspackage/glyphs/uni0400.glyph
index a5d86b07c..7e5544cc3 100644
--- a/src/Inter.glyphspackage/glyphs/uni0400.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni0400.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (8,372);
+pos = (72,372);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (30,372);
+pos = (30,414);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni040D_.glyph b/src/Inter.glyphspackage/glyphs/uni040D_.glyph
index 175aee2e9..364178a06 100644
--- a/src/Inter.glyphspackage/glyphs/uni040D_.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni040D_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = afii10026;
 },
 {
-pos = (154,372);
+pos = (218,372);
 ref = grave;
 }
 );
@@ -122,7 +122,7 @@ shapes = (
 ref = afii10026;
 },
 {
-pos = (154,372);
+pos = (154,414);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni0450.glyph b/src/Inter.glyphspackage/glyphs/uni0450.glyph
index 390233205..50c59a542 100644
--- a/src/Inter.glyphspackage/glyphs/uni0450.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni0450.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-20,0);
+pos = (44,0);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-17,-42);
+pos = (-17,0);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni045D_.glyph b/src/Inter.glyphspackage/glyphs/uni045D_.glyph
index a6dd339ea..6cdadd28b 100644
--- a/src/Inter.glyphspackage/glyphs/uni045D_.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni045D_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (-10,0);
+pos = (54,0);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (18,0);
+pos = (18,42);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni1F_48.glyph b/src/Inter.glyphspackage/glyphs/uni1F_48.glyph
index e6caed866..0127820d1 100644
--- a/src/Inter.glyphspackage/glyphs/uni1F_48.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni1F_48.glyph
@@ -149,7 +149,7 @@ pos = (140,0);
 ref = O;
 },
 {
-pos = (-100,-6);
+pos = (-95,-6);
 ref = koronisaccentleft.cn;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni1F_49.glyph b/src/Inter.glyphspackage/glyphs/uni1F_49.glyph
index 423c2548b..bed694190 100644
--- a/src/Inter.glyphspackage/glyphs/uni1F_49.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni1F_49.glyph
@@ -149,7 +149,7 @@ pos = (212,0);
 ref = O;
 },
 {
-pos = (-132,0);
+pos = (-127,0);
 ref = uni1FFE.tonos;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni1F_4A_.glyph b/src/Inter.glyphspackage/glyphs/uni1F_4A_.glyph
index 04276ffa4..610a9e556 100644
--- a/src/Inter.glyphspackage/glyphs/uni1F_4A_.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni1F_4A_.glyph
@@ -149,7 +149,7 @@ pos = (482,0);
 ref = O;
 },
 {
-pos = (-198,0);
+pos = (-193,0);
 ref = uni1FCD.tonos;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni1F_4B_.glyph b/src/Inter.glyphspackage/glyphs/uni1F_4B_.glyph
index 711e1ffd6..51c8447c3 100644
--- a/src/Inter.glyphspackage/glyphs/uni1F_4B_.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni1F_4B_.glyph
@@ -149,7 +149,7 @@ pos = (428,0);
 ref = O;
 },
 {
-pos = (-110,0);
+pos = (-105,0);
 ref = uni1FDD.tonos;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/uni1F_F_8.glyph b/src/Inter.glyphspackage/glyphs/uni1F_F_8.glyph
index 9fa811903..0492687b0 100644
--- a/src/Inter.glyphspackage/glyphs/uni1F_F_8.glyph
+++ b/src/Inter.glyphspackage/glyphs/uni1F_F_8.glyph
@@ -149,7 +149,7 @@ pos = (180,0);
 ref = O;
 },
 {
-pos = (-180,0);
+pos = (-175,0);
 ref = uni1FEF.tonos;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/wacute.glyph b/src/Inter.glyphspackage/glyphs/wacute.glyph
index 25a399edc..c34ea9823 100644
--- a/src/Inter.glyphspackage/glyphs/wacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/wacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (346,0);
+pos = (498,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/wgrave.glyph b/src/Inter.glyphspackage/glyphs/wgrave.glyph
index 1509df669..749a01b4f 100644
--- a/src/Inter.glyphspackage/glyphs/wgrave.glyph
+++ b/src/Inter.glyphspackage/glyphs/wgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (212,0);
+pos = (276,0);
 ref = grave;
 }
 );
@@ -114,7 +114,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (272,-42);
+pos = (272,0);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/yacute.glyph b/src/Inter.glyphspackage/glyphs/yacute.glyph
index fa3a9e1b2..984154ec2 100644
--- a/src/Inter.glyphspackage/glyphs/yacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/yacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (84,0);
+pos = (236,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/ygrave.glyph b/src/Inter.glyphspackage/glyphs/ygrave.glyph
index 000707013..b0e441784 100644
--- a/src/Inter.glyphspackage/glyphs/ygrave.glyph
+++ b/src/Inter.glyphspackage/glyphs/ygrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-50,0);
+pos = (14,0);
 ref = grave;
 }
 );
@@ -113,7 +113,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-8,0);
+pos = (-8,42);
 ref = grave;
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/yhookabove.glyph b/src/Inter.glyphspackage/glyphs/yhookabove.glyph
index c688336f7..5c875afa2 100644
--- a/src/Inter.glyphspackage/glyphs/yhookabove.glyph
+++ b/src/Inter.glyphspackage/glyphs/yhookabove.glyph
@@ -11,7 +11,7 @@ ref = y;
 },
 {
 pos = (1164,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1140;
@@ -24,7 +24,7 @@ ref = y;
 },
 {
 pos = (1354,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1240;
@@ -37,7 +37,7 @@ ref = y;
 },
 {
 pos = (1168,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1140;
@@ -50,7 +50,7 @@ ref = y;
 },
 {
 pos = (1354,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1240;
@@ -63,7 +63,7 @@ ref = y;
 },
 {
 pos = (1034,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1070;
@@ -76,7 +76,7 @@ ref = y;
 },
 {
 pos = (1038,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1070;
@@ -89,7 +89,7 @@ ref = y;
 },
 {
 pos = (1158,-16);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1064;
@@ -102,7 +102,7 @@ ref = y;
 },
 {
 pos = (1168,26);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1076;
@@ -114,8 +114,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (1346,-6);
-ref = hook;
+pos = (1346,42);
+ref = hookabovecmb;
 }
 );
 width = 1192;
@@ -128,7 +128,7 @@ ref = y;
 },
 {
 pos = (1354,-6);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 1208;
@@ -141,7 +141,7 @@ ref = y;
 },
 {
 pos = (1034,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 942;
@@ -154,7 +154,7 @@ ref = y;
 },
 {
 pos = (1038,44);
-ref = hook;
+ref = hookabovecmb;
 }
 );
 width = 942;
diff --git a/src/Inter.glyphspackage/glyphs/zacute.glyph b/src/Inter.glyphspackage/glyphs/zacute.glyph
index a1e8b7a23..c6ad2e707 100644
--- a/src/Inter.glyphspackage/glyphs/zacute.glyph
+++ b/src/Inter.glyphspackage/glyphs/zacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (66,0);
+pos = (218,0);
 ref = acute;
 }
 );
diff --git a/src/Inter.glyphspackage/order.plist b/src/Inter.glyphspackage/order.plist
index a185937ff..735cfd5a9 100644
--- a/src/Inter.glyphspackage/order.plist
+++ b/src/Inter.glyphspackage/order.plist
@@ -1665,7 +1665,7 @@ macroncomb,
 dieresisnosp,
 brevenosp,
 breveinvnosp,
-hook,
+hookabovecmb,
 circumflexnosp,
 caroncmb,
 tildecomb,
@@ -2549,6 +2549,7 @@ cyrillictail.cn,
 cyrillictic.cn,
 koronisaccentleft.cn,
 debug1,
+_part.otophorn,
 _part.rtophorn,
 _part.top_r_hook
 )
\ No newline at end of file
diff --git a/src/features/ccmp.fea b/src/features/ccmp.fea
index efe9495df..9d4caf13c 100644
--- a/src/features/ccmp.fea
+++ b/src/features/ccmp.fea
@@ -7,7 +7,7 @@
   tildeacutecomb macrongravecomb.cn macronacutecomb.cn
   macrondieresiscomb.cn acutedotcomb.cn carondotcomb.cn
   tildemacroncomb.cn tildedieresiscomb.cn circumflexnosp overscorenosp
-  brevenosp dotnosp dieresisnosp hook ringnosp acutedblnosp caroncmb
+  brevenosp dotnosp dieresisnosp hookabovecmb ringnosp acutedblnosp caroncmb
   linevertnosp linevertdblnosp dblgravecmb candrabindunosp breveinvnosp
   commaturnsupnosp commaabovecmb commasuprevnosp commaaboverightcmb
   anglesupnosp hornnosp xsupnosp tildevertsupnosp overscoredblnosp
@@ -233,8 +233,8 @@ lookup ccmp03 {
   sub jdotless caroncmb by jcaron;
   sub A dotbelow by Adotbelow;
   sub a dotbelow by adotbelow;
-  sub A hook by Ahookabove;
-  sub a hook by ahookabove;
+  sub A hookabovecmb by Ahookabove;
+  sub a hookabovecmb by ahookabove;
   #sub A circumflexacutecomb.cn by uni1EA4;
   sub A circumflexnosp acutecomb by Acircumflexacute;
   sub a circumflexacutecomb.cn by acircumflexacute;
@@ -242,7 +242,7 @@ lookup ccmp03 {
   sub A circumflexnosp gravecomb by Acircumflexgrave;
   sub a circumflexgravecomb.cn by acircumflexgrave;
   #sub A circumflexhookcomb.cn by uni1EA8;
-  sub A circumflexnosp hook by Acircumflexhookabove;
+  sub A circumflexnosp hookabovecmb by Acircumflexhookabove;
   sub a circumflexhookcomb.cn by acircumflexhookabove;
   #sub A circumflextildecomb.cn by uni1EAA;
   sub A circumflexnosp tildecomb by Acircumflextilde;
@@ -254,14 +254,14 @@ lookup ccmp03 {
   sub A brevenosp gravecomb by Abrevegrave;
   sub a brevegravecomb.cn by abrevegrave;
   #sub A brevehookcomb.cn by uni1EB2;
-  sub A brevenosp hook by Abrevehookabove;
+  sub A brevenosp hookabovecmb by Abrevehookabove;
   sub a brevehookcomb.cn by abrevehookabove;
   sub A brevetildecomb.cn by Abrevetilde;
   sub a brevetildecomb.cn by abrevetilde;
   sub E dotbelow by Edotbelow;
   sub e dotbelow by edotbelow;
-  sub E hook by Ehookabove;
-  sub e hook by ehookabove;
+  sub E hookabovecmb by Ehookabove;
+  sub e hookabovecmb by ehookabove;
   sub E tildecomb by Etilde;
   sub e tildecomb by etilde;
   #sub E circumflexacutecomb.cn by uni1EBE;
@@ -271,19 +271,19 @@ lookup ccmp03 {
   sub E circumflexnosp gravecomb by Ecircumflexgrave;
   sub e circumflexgravecomb.cn by ecircumflexgrave;
   #sub E circumflexhookcomb.cn by uni1EC2;
-  sub E circumflexnosp hook by Ecircumflexhookabove;
+  sub E circumflexnosp hookabovecmb by Ecircumflexhookabove;
   sub e circumflexhookcomb.cn by ecircumflexhookabove;
   #sub E circumflextildecomb.cn by uni1EC4;
   sub E circumflexnosp tildecomb by Ecircumflextilde;
   sub e circumflextildecomb.cn by ecircumflextilde;
-  sub I hook by Ihookabove;
-  sub idotless hook by ihookabove;
+  sub I hookabovecmb by Ihookabove;
+  sub idotless hookabovecmb by ihookabove;
   sub I dotbelow by Idotbelow;
   sub i dotbelow by idotbelow;
   sub O dotbelow by Odotbelow;
   sub o dotbelow by odotbelow;
-  sub O hook by Ohookabove;
-  sub o hook by ohookabove;
+  sub O hookabovecmb by Ohookabove;
+  sub o hookabovecmb by ohookabove;
   #sub O circumflexacutecomb.cn by uni1ED0;
   sub O circumflexnosp acutecomb by Ocircumflexacute;
   sub o circumflexacutecomb.cn by ocircumflexacute;
@@ -291,7 +291,7 @@ lookup ccmp03 {
   sub O circumflexnosp gravecomb by Ocircumflexgrave;
   sub o circumflexgravecomb.cn by ocircumflexgrave;
   #sub O circumflexhookcomb.cn by uni1ED4;
-  sub O circumflexnosp hook by Ocircumflexhookabove;
+  sub O circumflexnosp hookabovecmb by Ocircumflexhookabove;
   sub o circumflexhookcomb.cn by ocircumflexhookabove;
   #sub O circumflextildecomb.cn by uni1ED6;
   sub O circumflexnosp tildecomb by Ocircumflextilde;
@@ -300,30 +300,30 @@ lookup ccmp03 {
   sub ohorn acutecomb by ohornacute;
   sub Ohorn gravecomb by Ohorngrave;
   sub ohorn gravecomb by ohorngrave;
-  sub Ohorn hook by Ohornhookabove;
-  sub ohorn hook by ohornhookabove;
+  sub Ohorn hookabovecmb by Ohornhookabove;
+  sub ohorn hookabovecmb by ohornhookabove;
   sub Ohorn tildecomb by Ohorntilde;
   sub ohorn tildecomb by ohorntilde;
   sub Ohorn dotbelow by Ohorndotbelow;
   sub ohorn dotbelow by ohorndotbelow;
   sub U dotbelow by Udotbelow;
   sub u dotbelow by udotbelow;
-  sub U hook by Uhookabove;
-  sub u hook by uhookabove;
+  sub U hookabovecmb by Uhookabove;
+  sub u hookabovecmb by uhookabove;
   sub Uhorn acutecomb by Uhornacute;
   sub uhorn acutecomb by uhornacute;
   sub Uhorn gravecomb by Uhorngrave;
   sub uhorn gravecomb by uhorngrave;
-  sub Uhorn hook by Uhornhookabove;
-  sub uhorn hook by uhornhookabove;
+  sub Uhorn hookabovecmb by Uhornhookabove;
+  sub uhorn hookabovecmb by uhornhookabove;
   sub Uhorn tildecomb by Uhorntilde;
   sub uhorn tildecomb by uhorntilde;
   sub Uhorn dotbelow by Uhorndotbelow;
   sub uhorn dotbelow by uhorndotbelow;
   sub Y dotbelow by Ydotbelow;
   sub y dotbelow by ydotbelow;
-  sub Y hook by Yhookabove;
-  sub y hook by yhookabove;
+  sub Y hookabovecmb by Yhookabove;
+  sub y hookabovecmb by yhookabove;
   sub Y tildecomb by Ytilde;
   sub y tildecomb by ytilde;
   sub A caroncmb by Acaron;