Misc polish for v3.0

author: Rasmus Andersson <rasmus@notion.se> 2018-10-03 20:17:18 +0300
committer: Rasmus Andersson <rasmus@notion.se> 2018-10-11 09:38:27 +0300
commit: 750564b7b1e2e3538c610e2f5f016ba9139134c1 (patch)
tree: 71b36be237cb29ad15772e27f90b9cb3ca65313e /src/Inter-UI-Black.ufo
parent: 4855042425152435f1b3373176073830f17e24fb (diff)
download: inter-750564b7b1e2e3538c610e2f5f016ba9139134c1.tar.xz
165 files changed, 1680 insertions, 1635 deletions
diff --git a/src/Inter-UI-Black.ufo/features.fea b/src/Inter-UI-Black.ufo/features.fea
index 5996c6f0b..f6db5159b 100644
--- a/src/Inter-UI-Black.ufo/features.fea
+++ b/src/Inter-UI-Black.ufo/features.fea
@@ -1449,7 +1449,7 @@ sub rlinebelow by rlinebelow.1;
 table GDEF {
   # automatic
   GlyphClassDef
-    [A Agrave Aacute Acircumflex Aring Amacron Abreve Aogonek Acaron Adieresismacron Adotmacron Adblgrave Ainvertedbreve uni0226 Aringbelow Adotbelow Ahookabove Acircumflexacute Acircumflexgrave Acircumflexhookabove Acircumflextilde Acircumflexdotbelow Abreveacute Abrevegrave Abrevehookabove Abrevetilde Abrevedotbelow Alpha uni1F0A uni1FB8 uni1FB9 afii10017 Abrevecyrillic uni1F8A uni1FBC AE AEmacron Aiecyrillic B Bdotbelow Blinebelow afii10019 Beta C Ccedilla Ccircumflex Cdotaccent Ccaron Ccedillaacute Oopen uni03F9 D Dcaron Ddotaccent Ddotbelow Dlinebelow Dcedilla Dcircumflexbelow E Egrave Ecircumflex Edieresis Emacron Ebreve Edotaccent Eogonek Ecaron Edblgrave Einvertedbreve uni0228 Emacrongrave Emacronacute Ecircumflexbelow Etildebelow Ecedillabreve Edotbelow Ehookabove Etilde Ecircumflexacute Ecircumflexgrave Ecircumflexhookabove Ecircumflextilde Ecircumflexdotbelow uni0400 afii10023 Iebrevecyrillic F Fdotaccent G Gcircumflex Gbreve Gdotaccent Gcommaaccent Gcaron Gmacron H Hcircumflex uni021E Hdotaccent Hdotbelow Hdieresis Hbrevebelow uni04C9 uni1FCC I Igrave Icircumflex Itilde Imacron Ibreve Iogonek Idotaccent Icaron Idblgrave Iinvertedbreve Ihookabove Idotbelow uni1FD8 uni1FD9 afii10055 afii10056 J K Kcommaaccent Kcaron Kacute L Lacute Lcommaaccent Ldotbelow Ldotbelowmacron Llinebelow Lcircumflexbelow M Macute Mdotaccent Mdotbelow uni04CD Mu uni03FA afii10030 N Ntilde Ncommaaccent Ncaron uni01F8 Ndotaccent Ndotbelow Nlinebelow Ncircumflexbelow Eng afii10026 uni040D afii10027 Imacroncyrillic Idieresiscyrillic uni048A Nu O Ograve Ocircumflex Omacron Obreve Ohungarumlaut Ocaron Oogonek Oogonekmacron Odblgrave Oinvertedbreve uni022A uni022C uni0230 Otildeacute Otildedieresis Omacrongrave Omacronacute Odotbelow Ohookabove Ocircumflexgrave Ocircumflexhookabove Ocircumflextilde Ocircumflexdotbelow Ohornacute Ohorngrave Ohornhookabove Ohorntilde Ohorndotbelow Omicron afii10032 P Pdotaccent R Racute Rcommaaccent Rcaron Rdblgrave Rinvertedbreve Rdotaccent Rdotbelow Rdotbelowmacron Rlinebelow S Sacute Scircumflex Scedilla Scaron Scommaaccent Sdotaccent Sdotbelow Sacutedotaccent Scarondotaccent Sdotbelowdotaccent afii10054 T Tcommaaccent Tcaron uni021A Tdotaccent Tdotbelow Tlinebelow Tcircumflexbelow Tau U Uhorn Ugrave Ucircumflex Udieresis Utilde Umacron Ubreve Uring Uhungarumlaut Uogonek Ucaron Udieresismacron Udieresisgrave Udblgrave Uinvertedbreve Udieresisbelow Ucircumflexbelow Utildeacute Umacrondieresis Udotbelow Uhookabove Uhornacute Uhorngrave Uhornhookabove Uhorntilde Uhorndotbelow V Vtilde Vdotbelow W Wcircumflex Wgrave Wdieresis Wdotaccent Wdotbelow X Xdotaccent Xdieresis Chi Y Yacute Ycircumflex Ydieresis uni0232 Ydotaccent Ygrave Ydotbelow Yhookabove Ytilde uni024E Upsilon Upsilon2 Upsilonhooksymbol Upsilondieresishooksymbolgreek uni1FE8 uni1FE9 Z Zacute Zdotaccent Zcaron Zcircumflex Zdotbelow Zlinebelow Zeta a agrave aacute acircumflex amacron abreve aogonek acaron adieresismacron adotmacron aringacute adblgrave ainvertedbreve adotbelow ahookabove acircumflexacute acircumflexgrave acircumflexhookabove acircumflextilde acircumflexdotbelow abreveacute abrevegrave abrevehookabove abrevetilde abrevedotbelow afii10065 abrevecyrillic ae aemacron aeacute b bhook blinebelow c ccurl ccedilla cacute ccircumflex cdotaccent ccaron ccedillaacute sigmalunatesymbolgreek d drthook dhook ddotaccent ddotbelow dlinebelow dcedilla dcircumflexbelow dz dzcurl dyogh e egrave eacute ecircumflex emacron ebreve edotaccent eogonek ecaron edblgrave einvertedbreve uni0229 emacrongrave emacronacute ecircumflexbelow ecedillabreve edotbelow ehookabove etilde ecircumflexacute ecircumflexgrave ecircumflexhookabove ecircumflextilde ecircumflexdotbelow iecyrillic uni0450 iebrevecyrillic f g gcircumflex gbreve gdotaccent gcommaaccent gcaron gacute gmacron h hturn hturnlthook hturnhook2 hcircumflex uni021F hdotaccent hdotbelow hbrevebelow hlinebelow shhacyrillic idotless uni1E2D.ccmp igrave iacute icircumflex imacron ibreve uni012F.ccmp iogonek icaron idblgrave iinvertedbreve ihookabove idotbelow uni1ECB.ccmp jdotless j jcrosstail.ccmp jcircumflex jcaron yotgreek jecyrillic k kcommaaccent kdotbelow klinebelow l l.ss02 lslash lbar lrthook lbelt lcommaaccent ldotbelow ldotbelowmacron llinebelow uni04CF m mhook mturn macute mdotaccent mdotbelow n nlfthook nlegrightlong nacute ncommaaccent ncaron uni01F9 ndotaccent ndotbelow nlinebelow ncircumflexbelow o 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 ohornhookabove ohorntilde ohorndotbelow oslashacute omicron uni1F40 uni1F41 uni1F42 uni1F45 uni1F78 ocyrillic p pacute pdotaccent ercyrillic qhook r rfishhookrev rfishhook r.1 s srthook scedilla t tcommaaccent uni021B tdotbelow tlinebelow tcircumflexbelow tdieresis u ubar ugrave uacute ucircumflex umacron ubreve uring uhungarumlaut uogonek ucaron udieresismacron udieresisacute udieresiscaron udieresisgrave udblgrave uinvertedbreve udieresisbelow ucircumflexbelow utildeacute umacrondieresis udotbelow uhookabove uhornacute uhorngrave uhornhookabove uhorntilde uhorndotbelow v vtilde vdotbelow w wturn wcircumflex wgrave wdotaccent wdotbelow wring x xdotaccent xdieresis khacyrillic y yacute ycircumflex uni0233 ydotaccent yring ygrave ydotbelow yhookabove ytilde ucyrillic ushortcyrillic umacroncyrillic uhungarumlautcyrillic z zacute zdotaccent zcaron zcircumflex zdotbelow zlinebelow zcurl Gamma Pi Omega afii10024 Zhedescendercyrillic afii10025 Kacyr afii10029 afii10037 afii10041 Shhacyrillic afii10045 afii10046 afii10047 afii10049 afii10053 Haabkhasiancyrillic Cheabkhasiancyrillic Schwacyrillic afii10148 alpha uni1F00 uni1F01 uni1F03 uni1F05 uni1F07 uni1F70 uni1F80 uni1F81 uni1F83 uni1F85 uni1F87 uni1FB0 uni1FB1 uni1FB2 uni1FB3 uni1FB4 uni1FB6 uni1FB7 gamma epsilon uni1F10 uni1F11 uni1F13 uni1F15 uni1F72 eta uni1F20 uni1F21 uni1F23 uni1F25 uni1F27 uni1F74 uni1F90 uni1F91 uni1F93 uni1F95 uni1F97 uni1FC2 uni1FC3 uni1FC4 uni1FC6 uni1FC7 iota iotadieresistonos iotadieresis uni1F30 uni1F31 uni1F33 uni1F35 uni1F37 uni1F76 uni1FD0 uni1FD1 uni1FD2 uni1FD6 uni1FD7 lambda rho uni1FE4 uni1FE5 upsilon upsilondieresistonos upsilondieresis uni1F50 uni1F51 uni1F53 uni1F55 uni1F57 uni1F7A uni1FE0 uni1FE1 uni1FE2 uni1FE6 uni1FE7 psi omega uni1F60 uni1F61 uni1F63 uni1F65 uni1F67 uni1F7C uni1FA0 uni1FA1 uni1FA3 uni1FA5 uni1FA7 uni1FF2 uni1FF3 uni1FF4 uni1FF6 uni1FF7 gamma1 vecyrillic gecyrillic decyrillic zhecyrillic zhedescendercyrillic zecyrillic iicyrillic uni048B kacyrillic kadescendercyrillic elcyrillic uni04C6 uni052F emcyrillic uni04CE encyrillic endescendercyrillic uni04CA pecyrillic tecyrillic efcyrillic hadescendercyrillic tsecyrillic checyrillic chedescendercyrillic shacyrillic shchacyrillic softsigncyrillic yericyrillic uni048D yatcyrillic ereversedcyrillic iucyrillic iacyrillic ecyrillic haabkhasiancyrillic cheabkhasiancyrillic izhitsacyrillic franc two two.sups fraction acute hungarumlaut grave dieresis circumflex tilde macron breve ring caron brevenosp commabelowcmb overscoredblnosp acutedotcomb.lc tildedieresiscomb.lc carondotcomb.lc oopen Gsmallcaphook anglesupnosp breveinvsubnosp commaturnsupnosp uni02AB uni02AC OEsmallcap tackupsubnosp seagullsubnosp longs Ysmallcap gravesubnosp glottalstoprevinv erev cstretch Rsmallcap glottalstopinv schwahook tesh philatin glottalstop linevertnosp linevertsubnosp tackdownsubnosp uni2071.ccmp babygamma overscorenosp diaeresistonosnosp rturnascend bridgesubnosp dotmacroncomb.lc Lsmallcap squaresubnosp Schwa finalmem Gsmallcap Esh dieresismacroncomb.lc Rsmallcapinv ts pisymbolgreek dieresisgravecomb.lc commasuprevnosp archdblsubnosp plus.dnomnosp tildemacroncomb.lc iota1 macrondieresiscomb.lc omegacyrillic Omegacyrillic ksicyrillic tildeacutecomb.lc dieresiscaroncomb.lc ascriptturn ezh ezhcurl omegaroundcyrillic otcyrillic upsilonlatin omegaclosed xsupnosp eshshortrev vscript acuterightnosp tildevertsupnosp linevertdblnosp ascript Epsilon1 iotasubnosp kgreenlandic graveleftnosp tackleftsubnosp glottalstopbar minus.dnomnosp lambdabar underscoredblnosp tackrightsubnosp koppacyrillic Koppacyrillic eshcurl acutesubnosp finalkaf Ismallcap lyogh Ldot Aogonek.NAV Eogonek.NAV Oogonek.NAV afii10020 afii10052 afii10035 afii10036 afii10039 Ghestrokecyrillic Tedescendercyrillic Ustraightcyrillic Ustraightstrokecyrillic palochkacyrillic Chekhakassiancyrillic uni04F6 uni04FE Schwadieresiscyrillic Zhebrevecyrillic Zhedieresiscyrillic Zedieresiscyrillic afii10062 Umacroncyrillic Udieresiscyrillic Uhungarumlautcyrillic Chedieresiscyrillic Yerudieresiscyrillic uni04EC Izhitsadblgravecyrillic uni0299 uni029C oogonek.NAV kappa uni1F71 uni1F73 uni1F75 uni1F77 uni1F79 uni1F7B uni1F7D uni1FD3 uni1FE3 psicyrillic ghestrokecyrillic tedescendercyrillic schwacyrillic schwadieresiscyrillic obarredcyrillic obarreddieresiscyrillic chedieresiscyrillic uni04ED gjecyrillic iishortcyrillic uni045D imacroncyrillic idieresiscyrillic izhitsadblgravecyrillic kjecyrillic yerudieresiscyrillic zedieresiscyrillic zhebrevecyrillic zhedieresiscyrillic Nsmallcap esh uni02B2.ccmp bridgeinvsubnosp], # Base
+    [A Agrave Aacute Acircumflex Aring Amacron Abreve Aogonek Acaron Adieresismacron Adotmacron Adblgrave Ainvertedbreve uni0226 Aringbelow Adotbelow Ahookabove Acircumflexacute Acircumflexgrave Acircumflexhookabove Acircumflextilde Acircumflexdotbelow Abreveacute Abrevegrave Abrevehookabove Abrevetilde Abrevedotbelow Alpha uni1F0A uni1FB8 uni1FB9 afii10017 Abrevecyrillic uni1F8A uni1FBC AE AEmacron Aiecyrillic B Bdotbelow Blinebelow afii10019 Beta C Ccedilla Ccircumflex Cdotaccent Ccaron Ccedillaacute Oopen uni03F9 D Dcaron Ddotaccent Ddotbelow Dlinebelow Dcedilla Dcircumflexbelow E Egrave Ecircumflex Edieresis Emacron Ebreve Edotaccent Eogonek Ecaron Edblgrave Einvertedbreve uni0228 Emacrongrave Emacronacute Ecircumflexbelow Etildebelow Ecedillabreve Edotbelow Ehookabove Etilde Ecircumflexacute Ecircumflexgrave Ecircumflexhookabove Ecircumflextilde Ecircumflexdotbelow uni0400 afii10023 Iebrevecyrillic F Fdotaccent G Gcircumflex Gbreve Gdotaccent Gcommaaccent Gcaron Gmacron H Hcircumflex uni021E Hdotaccent Hdotbelow Hdieresis Hbrevebelow uni04C9 uni1FCC I Igrave Icircumflex Itilde Imacron Ibreve Iogonek Idotaccent Icaron Idblgrave Iinvertedbreve Ihookabove Idotbelow uni1FD8 uni1FD9 afii10055 afii10056 J K Kcommaaccent Kcaron Kacute L Lacute Lcommaaccent Ldotbelow Ldotbelowmacron Llinebelow Lcircumflexbelow M Macute Mdotaccent Mdotbelow uni04CD Mu uni03FA afii10030 N Ntilde Ncommaaccent Ncaron uni01F8 Ndotaccent Ndotbelow Nlinebelow Ncircumflexbelow afii10026 uni040D afii10027 Imacroncyrillic Idieresiscyrillic uni048A Nu O Ograve Ocircumflex Omacron Obreve Ohungarumlaut Ocaron Oogonek Oogonekmacron Odblgrave Oinvertedbreve uni022A uni022C uni0230 Otildeacute Otildedieresis Omacrongrave Omacronacute Odotbelow Ohookabove Ocircumflexgrave Ocircumflexhookabove Ocircumflextilde Ocircumflexdotbelow Ohornacute Ohorngrave Ohornhookabove Ohorntilde Ohorndotbelow Omicron afii10032 P Pdotaccent R Racute Rcommaaccent Rcaron Rdblgrave Rinvertedbreve Rdotaccent Rdotbelow Rdotbelowmacron Rlinebelow S Sacute Scircumflex Scedilla Scaron Scommaaccent Sdotaccent Sdotbelow Sacutedotaccent Scarondotaccent Sdotbelowdotaccent afii10054 T Tcommaaccent Tcaron uni021A Tdotaccent Tdotbelow Tlinebelow Tcircumflexbelow Tau U Uhorn Ugrave Ucircumflex Udieresis Utilde Umacron Ubreve Uring Uhungarumlaut Uogonek Ucaron Udieresismacron Udieresisgrave Udblgrave Uinvertedbreve Udieresisbelow Ucircumflexbelow Utildeacute Umacrondieresis Udotbelow Uhookabove Uhornacute Uhorngrave Uhornhookabove Uhorntilde Uhorndotbelow V Vtilde Vdotbelow W Wcircumflex Wgrave Wdieresis Wdotaccent Wdotbelow X Xdotaccent Xdieresis Chi Y Yacute Ycircumflex Ydieresis uni0232 Ydotaccent Ygrave Ydotbelow Yhookabove Ytilde uni024E Upsilon Upsilon2 Upsilonhooksymbol Upsilondieresishooksymbolgreek uni1FE8 uni1FE9 Z Zacute Zdotaccent Zcaron Zcircumflex Zdotbelow Zlinebelow Zeta a agrave aacute acircumflex amacron abreve aogonek acaron adieresismacron adotmacron aringacute adblgrave ainvertedbreve adotbelow ahookabove acircumflexacute acircumflexgrave acircumflexhookabove acircumflextilde acircumflexdotbelow abreveacute abrevegrave abrevehookabove abrevetilde abrevedotbelow afii10065 abrevecyrillic ae aemacron aeacute b bhook blinebelow c ccurl ccedilla cacute ccircumflex cdotaccent ccaron ccedillaacute sigmalunatesymbolgreek d drthook dhook ddotaccent ddotbelow dlinebelow dcedilla dcircumflexbelow dz dzcurl dyogh e egrave eacute ecircumflex emacron ebreve edotaccent eogonek ecaron edblgrave einvertedbreve uni0229 emacrongrave emacronacute ecircumflexbelow ecedillabreve edotbelow ehookabove etilde ecircumflexacute ecircumflexgrave ecircumflexhookabove ecircumflextilde ecircumflexdotbelow iecyrillic uni0450 iebrevecyrillic f g gcircumflex gbreve gdotaccent gcommaaccent gcaron gacute gmacron h hturn hturnlthook hturnhook2 hcircumflex uni021F hdotaccent hdotbelow hbrevebelow hlinebelow shhacyrillic idotless uni1E2D.ccmp igrave iacute icircumflex imacron ibreve uni012F.ccmp iogonek icaron idblgrave iinvertedbreve ihookabove idotbelow uni1ECB.ccmp jdotless j jcrosstail.ccmp jcircumflex jcaron yotgreek jecyrillic k kcommaaccent kdotbelow klinebelow l l.ss02 lslash lbar lrthook lbelt lcommaaccent ldotbelow ldotbelowmacron llinebelow uni04CF m mhook mturn macute mdotaccent mdotbelow n nlfthook nlegrightlong nacute ncommaaccent ncaron uni01F9 ndotaccent ndotbelow nlinebelow ncircumflexbelow o 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 ohornhookabove ohorntilde ohorndotbelow oslashacute omicron uni1F40 uni1F41 uni1F42 uni1F45 uni1F78 ocyrillic p pacute pdotaccent ercyrillic r rfishhookrev rfishhook r.1 s srthook scedilla t tcommaaccent uni021B tdotbelow tlinebelow tcircumflexbelow tdieresis u ubar ugrave uacute ucircumflex umacron ubreve uring uhungarumlaut uogonek ucaron udieresismacron udieresisacute udieresiscaron udieresisgrave udblgrave uinvertedbreve udieresisbelow ucircumflexbelow utildeacute umacrondieresis udotbelow uhookabove uhornacute uhorngrave uhornhookabove uhorntilde uhorndotbelow v vtilde vdotbelow w wturn wcircumflex wgrave wdotaccent wdotbelow wring x xdotaccent xdieresis khacyrillic y yacute ycircumflex uni0233 ydotaccent yring ygrave ydotbelow yhookabove ytilde ucyrillic ushortcyrillic umacroncyrillic uhungarumlautcyrillic z zacute zdotaccent zcaron zcircumflex zdotbelow zlinebelow zcurl Gamma Pi Omega afii10024 Zhedescendercyrillic afii10025 Kacyr afii10029 afii10037 afii10041 Shhacyrillic afii10045 afii10046 afii10047 afii10049 afii10053 Haabkhasiancyrillic Cheabkhasiancyrillic Schwacyrillic afii10148 alpha uni1F00 uni1F01 uni1F03 uni1F05 uni1F07 uni1F70 uni1F80 uni1F81 uni1F83 uni1F85 uni1F87 uni1FB0 uni1FB1 uni1FB2 uni1FB3 uni1FB4 uni1FB6 uni1FB7 gamma epsilon uni1F10 uni1F11 uni1F13 uni1F15 uni1F72 eta uni1F20 uni1F21 uni1F23 uni1F25 uni1F27 uni1F74 uni1F90 uni1F91 uni1F93 uni1F95 uni1F97 uni1FC2 uni1FC3 uni1FC4 uni1FC6 uni1FC7 iota iotadieresistonos iotadieresis uni1F30 uni1F31 uni1F33 uni1F35 uni1F37 uni1F76 uni1FD0 uni1FD1 uni1FD2 uni1FD6 uni1FD7 lambda rho uni1FE4 uni1FE5 upsilon upsilondieresistonos upsilondieresis uni1F50 uni1F51 uni1F53 uni1F55 uni1F57 uni1F7A uni1FE0 uni1FE1 uni1FE2 uni1FE6 uni1FE7 psi omega uni1F60 uni1F61 uni1F63 uni1F65 uni1F67 uni1F7C uni1FA0 uni1FA1 uni1FA3 uni1FA5 uni1FA7 uni1FF2 uni1FF3 uni1FF4 uni1FF6 uni1FF7 gamma1 vecyrillic gecyrillic decyrillic zhecyrillic zhedescendercyrillic zecyrillic iicyrillic uni048B kacyrillic kadescendercyrillic elcyrillic uni04C6 uni052F emcyrillic uni04CE encyrillic endescendercyrillic uni04CA pecyrillic tecyrillic efcyrillic hadescendercyrillic tsecyrillic checyrillic chedescendercyrillic shacyrillic shchacyrillic softsigncyrillic yericyrillic uni048D yatcyrillic ereversedcyrillic iucyrillic iacyrillic ecyrillic haabkhasiancyrillic cheabkhasiancyrillic izhitsacyrillic franc two two.sups fraction acute hungarumlaut grave dieresis circumflex tilde macron breve ring caron brevenosp commabelowcmb overscoredblnosp acutedotcomb.lc tildedieresiscomb.lc carondotcomb.lc oopen Gsmallcaphook anglesupnosp breveinvsubnosp commaturnsupnosp uni02AB uni02AC OEsmallcap tackupsubnosp seagullsubnosp longs Ysmallcap gravesubnosp glottalstoprevinv erev cstretch Rsmallcap glottalstopinv schwahook tesh philatin glottalstop linevertnosp linevertsubnosp tackdownsubnosp uni2071.ccmp babygamma overscorenosp diaeresistonosnosp rturnascend bridgesubnosp dotmacroncomb.lc Lsmallcap squaresubnosp Schwa finalmem Gsmallcap Esh dieresismacroncomb.lc Rsmallcapinv ts pisymbolgreek dieresisgravecomb.lc commasuprevnosp archdblsubnosp plus.dnomnosp tildemacroncomb.lc iota1 macrondieresiscomb.lc omegacyrillic Omegacyrillic ksicyrillic tildeacutecomb.lc dieresiscaroncomb.lc ascriptturn ezh ezhcurl omegaroundcyrillic otcyrillic upsilonlatin omegaclosed xsupnosp eshshortrev vscript acuterightnosp tildevertsupnosp linevertdblnosp ascript Epsilon1 iotasubnosp kgreenlandic graveleftnosp tackleftsubnosp glottalstopbar minus.dnomnosp lambdabar underscoredblnosp tackrightsubnosp koppacyrillic Koppacyrillic eshcurl acutesubnosp finalkaf Ismallcap lyogh Ldot Aogonek.NAV Eogonek.NAV Oogonek.NAV afii10020 afii10052 afii10035 afii10036 afii10039 Ghestrokecyrillic Tedescendercyrillic Ustraightcyrillic Ustraightstrokecyrillic palochkacyrillic Chekhakassiancyrillic uni04F6 uni04FE Schwadieresiscyrillic Zhebrevecyrillic Zhedieresiscyrillic Zedieresiscyrillic afii10062 Umacroncyrillic Udieresiscyrillic Uhungarumlautcyrillic Chedieresiscyrillic Yerudieresiscyrillic uni04EC Izhitsadblgravecyrillic uni0299 uni029C oogonek.NAV kappa uni1F71 uni1F73 uni1F75 uni1F77 uni1F79 uni1F7B uni1F7D uni1FD3 uni1FE3 psicyrillic ghestrokecyrillic tedescendercyrillic schwacyrillic schwadieresiscyrillic obarredcyrillic obarreddieresiscyrillic chedieresiscyrillic uni04ED gjecyrillic iishortcyrillic uni045D imacroncyrillic idieresiscyrillic izhitsadblgravecyrillic kjecyrillic yerudieresiscyrillic zedieresiscyrillic zhebrevecyrillic zhedieresiscyrillic Nsmallcap esh uni02B2.ccmp bridgeinvsubnosp], # Base
     , # Liga
     [commaaccent acutecomb gravecomb dblgravecmb macroncomb caroncmb tildecomb uni0346 uni1DD8 uni1DD9 uni1DD2 uni1DD3 uni1DD0 uni1DD1 uni1DD4 uni1DD5 uni1DDB uni1DDC uni1DDF uni1DDD uni1DDE uni2DFF uni036A uni036B uni036C uni036D uni036E uni036F tildedoublecmb breveinverteddoublecmb uni0362 uni0363 uni0364 uni0365 uni0366 uni0367 uni0368 uni0369 uni0359 uni0358 uni0355 uni0354 uni0357 uni0356 uni0351 uni0350 uni0353 uni0352 uni035E uni035F uni035C uni035B uniA69F uni1DD6 uni1DD7 uni034B uni034C uni034A uni034F uni034D uni034E uni0348 uni0349 perispomenigreekcmb koroniscmb uni0347 uni1DC6 uni1DC4 macrongravecomb.lc macronacutecomb.lc uni1DCF uni1DCE uni1DCD uni1DCC uni1DCB uni1DCA uni1DC9 uni1DC8 uni1DC7 uni1DC5 uni1DC3 uni1DC2 uni1DC1 uni1DC0 uni1DE9 uni035D uni035A uni1DE2 uni20DC uni20DB uni20E8 uni1DDA titlocyrilliccmb dasiapneumatacyrilliccmb palatalizationcyrilliccmb uni0487 psilipneumatacyrilliccmb uni20F0 uni1DF0 uni1DF1 uni1DF2 uni1DF3 uni1DF4 uni1DF5 caronbelowcmb uni1DFC uni1DFD uni1DFE uni1DFF uniFE29 uniFE22 uniFE23 uniFE24 uniFE25 uniFE26 uniFE2A uniFE2B uniFE2C uniFE2D commaabovecmb commaaboverightcmb uni1DE7 uni1DE8 uni1DEA uni1DEB uni1DEC uni1DED uni1DEE uni1DEF macronacutecomb.cn macrongravecomb.cn uni1DE0 uni1DE1 uni1DE3 uni1DE4 uni1DE5 uni1DE6], # Mark
     ;
diff --git a/src/Inter-UI-Black.ufo/fontinfo.plist b/src/Inter-UI-Black.ufo/fontinfo.plist
index d5de4bbc6..38eea741d 100644
--- a/src/Inter-UI-Black.ufo/fontinfo.plist
+++ b/src/Inter-UI-Black.ufo/fontinfo.plist
@@ -97,9 +97,9 @@
     <key>openTypeNameSampleText</key>
     <string></string>
     <key>openTypeNameUniqueID</key>
-    <string>Inter UI Black:2018:2fbbc7ef9</string>
+    <string>Inter UI Black:2018:61b0aaa4a</string>
     <key>openTypeNameVersion</key>
-    <string>3.0;2fbbc7ef9</string>
+    <string>3.0;61b0aaa4a</string>
     <key>openTypeOS2CodePageRanges</key>
     <array>
       <integer>0</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_.glif b/src/Inter-UI-Black.ufo/glyphs/A_.glif
index 88fc9f377..8dd776543 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_.glif
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="A" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="0041"/>
-  <guideline x="1084.0" y="1364.0" angle="0.0"/>
-  <guideline x="1068.0" y="964.0" angle="90.0"/>
+  <guideline x="1036.0" y="1364.0" angle="0.0"/>
+  <guideline x="1020.0" y="964.0" angle="90.0"/>
   <outline>
     <contour>
-      <point x="672.0" y="0.0" type="line"/>
-      <point x="1156.0" y="1364.0" type="line"/>
-      <point x="1172.0" y="1364.0" type="line"/>
-      <point x="1656.0" y="0.0" type="line"/>
-      <point x="2256.0" y="0.0" type="line"/>
-      <point x="1464.0" y="2048.0" type="line"/>
-      <point x="868.0" y="2048.0" type="line"/>
-      <point x="72.0" y="0.0" type="line"/>
+      <point x="664.0" y="0.0" type="line"/>
+      <point x="1112.0" y="1484.0" type="line"/>
+      <point x="1128.0" y="1484.0" type="line"/>
+      <point x="1576.0" y="0.0" type="line"/>
+      <point x="2176.0" y="0.0" type="line"/>
+      <point x="1500.0" y="2048.0" type="line"/>
+      <point x="740.0" y="2048.0" type="line"/>
+      <point x="64.0" y="0.0" type="line"/>
     </contour>
     <contour>
-      <point x="560.0" y="752.0" type="line"/>
-      <point x="560.0" y="320.0" type="line"/>
-      <point x="1768.0" y="320.0" type="line"/>
-      <point x="1768.0" y="752.0" type="line"/>
+      <point x="552.0" y="808.0" type="line"/>
+      <point x="552.0" y="392.0" type="line"/>
+      <point x="1680.0" y="392.0" type="line"/>
+      <point x="1680.0" y="808.0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_E_.glif b/src/Inter-UI-Black.ufo/glyphs/A_E_.glif
index bf695bbdc..f3a361559 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_E_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_E_.glif
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="AE" format="2">
-  <advance width="2848.0"/>
+  <advance width="2976.0"/>
   <unicode hex="00C6"/>
+  <guideline x="1388.0" y="2140.0" angle="90.0"/>
   <outline>
     <contour>
-      <point x="72.0" y="0.0" type="line"/>
-      <point x="684.0" y="0.0" type="line"/>
-      <point x="828.0" y="316.0" type="line"/>
-      <point x="1392.0" y="316.0" type="line"/>
-      <point x="1404.0" y="0.0" type="line"/>
-      <point x="2704.0" y="0.0" type="line"/>
-      <point x="2704.0" y="420.0" type="line"/>
-      <point x="1908.0" y="420.0" type="line"/>
-      <point x="1892.0" y="808.0" type="line"/>
-      <point x="2500.0" y="808.0" type="line"/>
-      <point x="2500.0" y="1224.0" type="line"/>
-      <point x="1876.0" y="1224.0" type="line"/>
-      <point x="1860.0" y="1628.0" type="line"/>
-      <point x="2616.0" y="1628.0" type="line"/>
-      <point x="2616.0" y="2048.0" type="line"/>
-      <point x="1100.0" y="2048.0" type="line"/>
+      <point x="64.0" y="0.0" type="line"/>
+      <point x="676.0" y="0.0" type="line"/>
+      <point x="1216.0" y="1484.0" type="line"/>
+      <point x="1356.0" y="1484.0" type="line"/>
+      <point x="1356.0" y="0.0" type="line"/>
+      <point x="2828.0" y="0.0" type="line"/>
+      <point x="2828.0" y="448.0" type="line"/>
+      <point x="1912.0" y="448.0" type="line"/>
+      <point x="1912.0" y="800.0" type="line"/>
+      <point x="2676.0" y="800.0" type="line"/>
+      <point x="2676.0" y="1248.0" type="line"/>
+      <point x="1912.0" y="1248.0" type="line"/>
+      <point x="1912.0" y="1600.0" type="line"/>
+      <point x="2832.0" y="1600.0" type="line"/>
+      <point x="2832.0" y="2048.0" type="line"/>
+      <point x="864.0" y="2048.0" type="line"/>
     </contour>
     <contour>
-      <point x="1024.0" y="752.0" type="line"/>
-      <point x="1340.0" y="1456.0" type="line"/>
-      <point x="1372.0" y="752.0" type="line"/>
+      <point x="556.0" y="392.0" type="line"/>
+      <point x="1684.0" y="392.0" type="line"/>
+      <point x="1684.0" y="808.0" type="line"/>
+      <point x="556.0" y="808.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -40,10 +42,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>15.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -60,10 +62,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>14.0</real>
+            <real>2048.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -82,10 +84,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>15.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -97,10 +99,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>14.0</real>
+            <real>2048.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_E_acute.glif b/src/Inter-UI-Black.ufo/glyphs/A_E_acute.glif
index a074a4a86..45fad306a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_E_acute.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_E_acute.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="AEacute" format="2">
-  <advance width="2848.0"/>
+  <advance width="2976.0"/>
   <unicode hex="01FC"/>
   <outline>
     <component base="AE"/>
-    <component base="acute" xOffset="908.0" yOffset="440.0"/>
+    <component base="acute" xOffset="1412.0" yOffset="440.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_E_macron.glif b/src/Inter-UI-Black.ufo/glyphs/A_E_macron.glif
index f0c6ac9f6..ad16020b0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_E_macron.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_E_macron.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="AEmacron" format="2">
-  <advance width="2848.0"/>
+  <advance width="2976.0"/>
   <unicode hex="01E2"/>
   <outline>
     <component base="AE"/>
-    <component base="macron" xOffset="448.0" yOffset="388.0"/>
+    <component base="macron" xOffset="952.0" yOffset="388.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_acute.glif b/src/Inter-UI-Black.ufo/glyphs/A_acute.glif
index 03c2948e4..4e3ed591d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_acute.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_acute.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Aacute" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="00C1"/>
   <outline>
     <component base="A"/>
-    <component base="acute" xOffset="716.0" yOffset="440.0"/>
+    <component base="acute" xOffset="672.0" yOffset="440.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_breve.glif b/src/Inter-UI-Black.ufo/glyphs/A_breve.glif
index 8b13f5afc..d3c9db967 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_breve.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_breve.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Abreve" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="0102"/>
   <outline>
     <component base="A"/>
-    <component base="breve" xOffset="452.0" yOffset="404.0"/>
+    <component base="breve" xOffset="408.0" yOffset="404.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_breveacute.glif b/src/Inter-UI-Black.ufo/glyphs/A_breveacute.glif
index 08d0f22ae..f13333d91 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_breveacute.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_breveacute.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Abreveacute" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1EAE"/>
   <outline>
     <component base="A"/>
-    <component base="breveacutecomb.cn" xOffset="448.0" yOffset="420.0"/>
+    <component base="breveacutecomb.cn" xOffset="404.0" yOffset="420.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_brevecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/A_brevecyrillic.glif
index 3ce9788d1..a5bf08897 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_brevecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_brevecyrillic.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Abrevecyrillic" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="04D0"/>
   <outline>
     <component base="A"/>
-    <component base="breve" xOffset="452.0" yOffset="404.0"/>
+    <component base="breve" xOffset="408.0" yOffset="404.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_brevedotbelow.glif b/src/Inter-UI-Black.ufo/glyphs/A_brevedotbelow.glif
index aef917f38..2f9241085 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_brevedotbelow.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_brevedotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Abrevedotbelow" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1EB6"/>
   <outline>
     <component base="A"/>
-    <component base="breve" xOffset="452.0" yOffset="404.0"/>
-    <component base="dotbelow" xOffset="2116.0" yOffset="-164.0"/>
+    <component base="breve" xOffset="408.0" yOffset="404.0"/>
+    <component base="dotbelow" xOffset="2072.0" yOffset="-164.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_brevegrave.glif b/src/Inter-UI-Black.ufo/glyphs/A_brevegrave.glif
index 9ad991c3d..f71ce0588 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_brevegrave.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_brevegrave.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Abrevegrave" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1EB0"/>
   <outline>
     <component base="A"/>
-    <component base="brevegravecomb.cn" xOffset="448.0" yOffset="420.0"/>
+    <component base="brevegravecomb.cn" xOffset="404.0" yOffset="420.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_brevehookabove.glif b/src/Inter-UI-Black.ufo/glyphs/A_brevehookabove.glif
index a02ca3638..ac6f1abd9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_brevehookabove.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_brevehookabove.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Abrevehookabove" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1EB2"/>
   <outline>
     <component base="A"/>
-    <component base="brevehookcomb.cn" xOffset="448.0" yOffset="376.0"/>
+    <component base="brevehookcomb.cn" xOffset="404.0" yOffset="376.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_brevetilde.glif b/src/Inter-UI-Black.ufo/glyphs/A_brevetilde.glif
index 8aa9efe46..514d19c5b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_brevetilde.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_brevetilde.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Abrevetilde" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1EB4"/>
   <outline>
     <component base="A"/>
-    <component base="brevetildecomb.cn" xOffset="444.0" yOffset="376.0"/>
+    <component base="brevetildecomb.cn" xOffset="400.0" yOffset="376.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_caron.glif b/src/Inter-UI-Black.ufo/glyphs/A_caron.glif
index bdd2d2704..3977528d7 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_caron.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_caron.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Acaron" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="01CD"/>
   <outline>
     <component base="A"/>
-    <component base="caron" xOffset="272.0" yOffset="472.0"/>
+    <component base="caron" xOffset="228.0" yOffset="472.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_circumflex.glif b/src/Inter-UI-Black.ufo/glyphs/A_circumflex.glif
index e4cbec350..7e60fc40c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_circumflex.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_circumflex.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Acircumflex" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="00C2"/>
   <outline>
     <component base="A"/>
-    <component base="circumflex" xOffset="280.0" yOffset="320.0"/>
+    <component base="circumflex" xOffset="236.0" yOffset="320.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_circumflexacute.glif b/src/Inter-UI-Black.ufo/glyphs/A_circumflexacute.glif
index 78bfc40f8..04e40b35e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_circumflexacute.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_circumflexacute.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Acircumflexacute" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1EA4"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexacutecomb.cn" xOffset="580.0" yOffset="336.0"/>
+    <component base="circumflexacutecomb.cn" xOffset="536.0" yOffset="336.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_circumflexdotbelow.glif b/src/Inter-UI-Black.ufo/glyphs/A_circumflexdotbelow.glif
index 4300cbbf6..99d706a13 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_circumflexdotbelow.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_circumflexdotbelow.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Acircumflexdotbelow" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1EAC"/>
   <outline>
     <component base="A"/>
-    <component base="circumflex" xOffset="280.0" yOffset="320.0"/>
-    <component base="dotbelow" xOffset="2116.0" yOffset="-164.0"/>
+    <component base="circumflex" xOffset="236.0" yOffset="320.0"/>
+    <component base="dotbelow" xOffset="2072.0" yOffset="-164.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_circumflexgrave.glif b/src/Inter-UI-Black.ufo/glyphs/A_circumflexgrave.glif
index 8bb01ceae..f5ba810da 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_circumflexgrave.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_circumflexgrave.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Acircumflexgrave" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1EA6"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexgravecomb.cn" xOffset="68.0" yOffset="316.0"/>
+    <component base="circumflexgravecomb.cn" xOffset="24.0" yOffset="316.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_circumflexhookabove.glif b/src/Inter-UI-Black.ufo/glyphs/A_circumflexhookabove.glif
index a93c40dcf..224b88655 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_circumflexhookabove.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_circumflexhookabove.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Acircumflexhookabove" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1EA8"/>
   <outline>
     <component base="A"/>
-    <component base="circumflexhookcomb.cn" xOffset="464.0" yOffset="336.0"/>
+    <component base="circumflexhookcomb.cn" xOffset="420.0" yOffset="336.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_circumflextilde.glif b/src/Inter-UI-Black.ufo/glyphs/A_circumflextilde.glif
index c70e4bef3..4a14c9bad 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_circumflextilde.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_circumflextilde.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Acircumflextilde" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1EAA"/>
   <outline>
     <component base="A"/>
-    <component base="circumflextildecomb.cn" xOffset="300.0" yOffset="348.0"/>
+    <component base="circumflextildecomb.cn" xOffset="256.0" yOffset="348.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_dblgrave.glif b/src/Inter-UI-Black.ufo/glyphs/A_dblgrave.glif
index a05282469..7406ec25d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_dblgrave.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_dblgrave.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Adblgrave" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="0200"/>
   <outline>
     <component base="A"/>
-    <component base="dblgravecmb" xOffset="2012.0" yOffset="408.0"/>
+    <component base="dblgravecmb" xOffset="1968.0" yOffset="408.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_dieresis.glif b/src/Inter-UI-Black.ufo/glyphs/A_dieresis.glif
index b7744fd7c..aa12e150a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_dieresis.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_dieresis.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Adieresis" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="00C4"/>
   <guideline x="1084.0" y="1232.0" angle="90.0"/>
   <outline>
     <component base="A"/>
-    <component base="casedieresis.cn" xOffset="504.0" yOffset="68.0"/>
+    <component base="casedieresis.cn" xOffset="460.0" yOffset="68.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_dieresiscyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/A_dieresiscyrillic.glif
index 817e400b2..da43df60b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_dieresiscyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_dieresiscyrillic.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Adieresiscyrillic" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="04D2"/>
   <outline>
     <component base="Adieresis"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_dieresismacron.glif b/src/Inter-UI-Black.ufo/glyphs/A_dieresismacron.glif
index 3e41af2f5..8e00d8d88 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_dieresismacron.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_dieresismacron.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Adieresismacron" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="01DE"/>
   <outline>
     <component base="A"/>
-    <component base="dieresismacroncomb.cn" xOffset="2120.0" yOffset="444.0"/>
+    <component base="dieresismacroncomb.cn" xOffset="2076.0" yOffset="444.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_dotbelow.glif b/src/Inter-UI-Black.ufo/glyphs/A_dotbelow.glif
index b95374422..c674d9211 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_dotbelow.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Adotbelow" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1EA0"/>
   <outline>
     <component base="A"/>
-    <component base="dotbelow" xOffset="2116.0" yOffset="-164.0"/>
+    <component base="dotbelow" xOffset="2072.0" yOffset="-164.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_dotmacron.glif b/src/Inter-UI-Black.ufo/glyphs/A_dotmacron.glif
index 728c223a4..7f86129a8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_dotmacron.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_dotmacron.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Adotmacron" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="01E0"/>
   <outline>
     <component base="A"/>
-    <component base="dotmacroncomb.cn" xOffset="2120.0" yOffset="460.0"/>
+    <component base="dotmacroncomb.cn" xOffset="2076.0" yOffset="460.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_grave.glif b/src/Inter-UI-Black.ufo/glyphs/A_grave.glif
index c4e7f6586..8ca220dcb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_grave.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_grave.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Agrave" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="00C0"/>
   <outline>
     <component base="A"/>
-    <component base="grave" xOffset="364.0" yOffset="440.0"/>
+    <component base="grave" xOffset="320.0" yOffset="440.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_hookabove.glif b/src/Inter-UI-Black.ufo/glyphs/A_hookabove.glif
index d7fae8209..82bcf02a9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_hookabove.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_hookabove.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Ahookabove" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1EA2"/>
   <outline>
     <component base="A"/>
-    <component base="hook" xOffset="2180.0" yOffset="380.0"/>
+    <component base="hook" xOffset="2136.0" yOffset="380.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_iecyrillic.glif b/src/Inter-UI-Black.ufo/glyphs/A_iecyrillic.glif
index 6443c4a31..9e8ca63da 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_iecyrillic.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_iecyrillic.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Aiecyrillic" format="2">
-  <advance width="2848.0"/>
+  <advance width="2976.0"/>
   <unicode hex="04D4"/>
   <outline>
     <component base="AE"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_invertedbreve.glif b/src/Inter-UI-Black.ufo/glyphs/A_invertedbreve.glif
index e0f731343..8785b72b5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_invertedbreve.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_invertedbreve.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Ainvertedbreve" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="0202"/>
   <outline>
     <component base="A"/>
-    <component base="breveinvnosp" xOffset="2124.0" yOffset="604.0"/>
+    <component base="breveinvnosp" xOffset="2080.0" yOffset="604.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_lpha.glif b/src/Inter-UI-Black.ufo/glyphs/A_lpha.glif
index 51fd87a33..378a0a0f4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_lpha.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_lpha.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Alpha" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="0391"/>
   <outline>
     <component base="A"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_lphatonos.glif b/src/Inter-UI-Black.ufo/glyphs/A_lphatonos.glif
index e34dc193f..4370b61b7 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_lphatonos.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_lphatonos.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Alphatonos" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="0386"/>
   <outline>
     <component base="A"/>
-    <component base="tonos" xOffset="-148.0"/>
+    <component base="tonos" xOffset="-272.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_macron.glif b/src/Inter-UI-Black.ufo/glyphs/A_macron.glif
index b00d98ea6..7579d7f06 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_macron.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_macron.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Amacron" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="0100"/>
   <outline>
     <component base="A"/>
-    <component base="macron" xOffset="256.0" yOffset="388.0"/>
+    <component base="macron" xOffset="212.0" yOffset="388.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_ogonek.glif b/src/Inter-UI-Black.ufo/glyphs/A_ogonek.glif
index d61de6638..f87bd8c63 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_ogonek.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_ogonek.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Aogonek" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="0104"/>
   <outline>
     <component base="A"/>
-    <component base="ogonek" xOffset="1512.0"/>
+    <component base="ogonek" xOffset="1468.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_ring.glif b/src/Inter-UI-Black.ufo/glyphs/A_ring.glif
index 97c06488a..d37b4bedf 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_ring.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_ring.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Aring" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="00C5"/>
   <outline>
     <component base="A"/>
-    <component base="ring" xOffset="560.0" yOffset="656.0"/>
+    <component base="ring" xOffset="516.0" yOffset="656.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_ringacute.glif b/src/Inter-UI-Black.ufo/glyphs/A_ringacute.glif
index 33beb4439..ebde5d6fb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_ringacute.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_ringacute.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Aringacute" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="01FA"/>
   <outline>
     <component base="A"/>
-    <component base="ringacute.cn" xOffset="680.0" yOffset="468.0"/>
+    <component base="ringacute.cn" xOffset="636.0" yOffset="468.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_ringbelow.glif b/src/Inter-UI-Black.ufo/glyphs/A_ringbelow.glif
index d2a95c229..ed77eb824 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_ringbelow.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_ringbelow.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Aringbelow" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1E00"/>
   <outline>
     <component base="A"/>
-    <component base="uni02F3" xOffset="528.0"/>
+    <component base="uni02F3" xOffset="484.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/A_tilde.glif b/src/Inter-UI-Black.ufo/glyphs/A_tilde.glif
index 0afd1c86e..6e4b9d88d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/A_tilde.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/A_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Atilde" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="00C3"/>
   <outline>
     <component base="A"/>
-    <component base="casetilde.cn" xOffset="452.0" yOffset="20.0"/>
+    <component base="casetilde.cn" xOffset="408.0" yOffset="20.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/B_.glif b/src/Inter-UI-Black.ufo/glyphs/B_.glif
index d440ff82f..b72ff063b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/B_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/B_.glif
@@ -2,47 +2,47 @@
 <glyph name="B" format="2">
   <advance width="1880.0"/>
   <unicode hex="0042"/>
-  <guideline x="776.0" y="716.0" angle="90.0"/>
+  <guideline x="760.0" y="716.0" angle="90.0"/>
   <outline>
     <contour>
       <point x="132.0" y="0.0" type="line"/>
-      <point x="1044.0" y="0.0" type="line" smooth="yes"/>
-      <point x="1516.0" y="0.0"/>
-      <point x="1792.0" y="220.0"/>
-      <point x="1792.0" y="560.0" type="curve" smooth="yes"/>
-      <point x="1792.0" y="805.0"/>
-      <point x="1648.0" y="996.0"/>
-      <point x="1376.0" y="1036.0" type="curve"/>
-      <point x="1376.0" y="1060.0" type="line"/>
-      <point x="1680.0" y="1116.0"/>
-      <point x="1760.0" y="1294.0"/>
-      <point x="1760.0" y="1480.0" type="curve" smooth="yes"/>
-      <point x="1760.0" y="1820.0"/>
-      <point x="1496.0" y="2048.0"/>
-      <point x="956.0" y="2048.0" type="curve" smooth="yes"/>
+      <point x="1096.0" y="0.0" type="line" smooth="yes"/>
+      <point x="1541.0" y="0.0"/>
+      <point x="1816.0" y="243.0"/>
+      <point x="1816.0" y="580.0" type="curve" smooth="yes"/>
+      <point x="1816.0" y="869.0"/>
+      <point x="1603.0" y="1058.0"/>
+      <point x="1340.0" y="1068.0" type="curve"/>
+      <point x="1340.0" y="1088.0" type="line"/>
+      <point x="1577.0" y="1135.0"/>
+      <point x="1736.0" y="1310.0"/>
+      <point x="1736.0" y="1536.0" type="curve" smooth="yes"/>
+      <point x="1736.0" y="1848.0"/>
+      <point x="1488.0" y="2048.0"/>
+      <point x="1020.0" y="2048.0" type="curve" smooth="yes"/>
       <point x="132.0" y="2048.0" type="line"/>
     </contour>
     <contour>
-      <point x="688.0" y="448.0" type="line"/>
-      <point x="688.0" y="852.0" type="line"/>
-      <point x="1016.0" y="852.0" type="line" smooth="yes"/>
-      <point x="1192.0" y="852.0"/>
-      <point x="1244.0" y="760.0"/>
-      <point x="1244.0" y="652.0" type="curve" smooth="yes"/>
-      <point x="1244.0" y="500.0"/>
-      <point x="1148.0" y="448.0"/>
-      <point x="996.0" y="448.0" type="curve" smooth="yes"/>
+      <point x="688.0" y="444.0" type="line"/>
+      <point x="688.0" y="876.0" type="line"/>
+      <point x="956.0" y="876.0" type="line" smooth="yes"/>
+      <point x="1125.0" y="876.0"/>
+      <point x="1228.0" y="796.0"/>
+      <point x="1228.0" y="652.0" type="curve" smooth="yes"/>
+      <point x="1228.0" y="515.0"/>
+      <point x="1135.0" y="444.0"/>
+      <point x="948.0" y="444.0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="688.0" y="1216.0" type="line"/>
-      <point x="688.0" y="1600.0" type="line"/>
-      <point x="940.0" y="1600.0" type="line" smooth="yes"/>
-      <point x="1164.0" y="1600.0"/>
-      <point x="1208.0" y="1492.0"/>
-      <point x="1208.0" y="1392.0" type="curve" smooth="yes"/>
-      <point x="1208.0" y="1260.0"/>
-      <point x="1136.0" y="1216.0"/>
-      <point x="904.0" y="1216.0" type="curve" smooth="yes"/>
+      <point x="688.0" y="1220.0" type="line"/>
+      <point x="688.0" y="1612.0" type="line"/>
+      <point x="924.0" y="1612.0" type="line" smooth="yes"/>
+      <point x="1062.0" y="1612.0"/>
+      <point x="1164.0" y="1542.0"/>
+      <point x="1164.0" y="1416.0" type="curve" smooth="yes"/>
+      <point x="1164.0" y="1290.0"/>
+      <point x="1062.0" y="1220.0"/>
+      <point x="916.0" y="1220.0" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/B_dotbelow.glif b/src/Inter-UI-Black.ufo/glyphs/B_dotbelow.glif
index bb795c54b..f6b7b99d5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/B_dotbelow.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/B_dotbelow.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E04"/>
   <outline>
     <component base="B"/>
-    <component base="dotbelow" xOffset="1904.0" yOffset="-164.0"/>
+    <component base="dotbelow" xOffset="1864.0" yOffset="-164.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/B_hook.glif b/src/Inter-UI-Black.ufo/glyphs/B_hook.glif
index e15a4f857..c19af3a58 100644
--- a/src/Inter-UI-Black.ufo/glyphs/B_hook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/B_hook.glif
@@ -1,26 +1,30 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Bhook" format="2">
-  <advance width="2304.0"/>
+  <advance width="2560.0"/>
   <unicode hex="0181"/>
   <outline>
     <contour>
-      <point x="1092.0" y="1604.0" type="line"/>
-      <point x="1092.0" y="2048.0" type="line"/>
-      <point x="728.0" y="2048.0" type="line" smooth="yes"/>
-      <point x="298.0" y="2048.0"/>
-      <point x="22.0" y="1828.0"/>
-      <point x="24.0" y="1440.0" type="curve" smooth="yes"/>
-      <point x="24.0" y="1196.0" type="line"/>
-      <point x="512.0" y="1196.0" type="line"/>
-      <point x="512.0" y="1344.0" type="line" smooth="yes"/>
-      <point x="510.0" y="1464.0"/>
-      <point x="558.0" y="1604.0"/>
-      <point x="728.0" y="1604.0" type="curve" smooth="yes"/>
+      <point x="1144.0" y="1604.0" type="line"/>
+      <point x="1144.0" y="2048.0" type="line"/>
+      <point x="780.0" y="2048.0" type="line" smooth="yes"/>
+      <point x="350.0" y="2048.0"/>
+      <point x="74.0" y="1828.0"/>
+      <point x="76.0" y="1440.0" type="curve" smooth="yes"/>
+      <point x="76.0" y="1196.0" type="line"/>
+      <point x="564.0" y="1196.0" type="line"/>
+      <point x="564.0" y="1344.0" type="line" smooth="yes"/>
+      <point x="562.0" y="1464.0"/>
+      <point x="610.0" y="1604.0"/>
+      <point x="780.0" y="1604.0" type="curve" smooth="yes"/>
     </contour>
-    <component base="B" xOffset="628.0"/>
+    <component base="B" xOffset="680.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>T</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>B</string>
       <key>com.schriftgestaltung.Glyphs.nodeUserData.0.11</key>
       <dict>
         <key>name</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/B_linebelow.glif b/src/Inter-UI-Black.ufo/glyphs/B_linebelow.glif
index 4462a136c..eba50933c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/B_linebelow.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/B_linebelow.glif
@@ -4,6 +4,6 @@
   <unicode hex="1E06"/>
   <outline>
     <component base="B"/>
-    <component base="macronsubnosp" xOffset="1800.0"/>
+    <component base="macronsubnosp" xOffset="1760.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/D_elta.glif b/src/Inter-UI-Black.ufo/glyphs/D_elta.glif
index 006ee07cc..f6ab09994 100644
--- a/src/Inter-UI-Black.ufo/glyphs/D_elta.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/D_elta.glif
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Delta" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="0394"/>
   <unicode hex="2206"/>
   <guideline x="-96.0" y="1240.0" angle="90.0"/>
   <guideline x="-96.0" y="764.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="72.0" y="0.0" type="line"/>
-      <point x="2256.0" y="0.0" type="line"/>
-      <point x="1464.0" y="2048.0" type="line"/>
-      <point x="868.0" y="2048.0" type="line"/>
+      <point x="64.0" y="0.0" type="line"/>
+      <point x="2176.0" y="0.0" type="line"/>
+      <point x="1500.0" y="2048.0" type="line"/>
+      <point x="740.0" y="2048.0" type="line"/>
     </contour>
     <contour>
-      <point x="832.0" y="448.0" type="line"/>
-      <point x="1156.0" y="1364.0" type="line"/>
-      <point x="1172.0" y="1364.0" type="line"/>
-      <point x="1496.0" y="448.0" type="line"/>
+      <point x="800.0" y="448.0" type="line"/>
+      <point x="1112.0" y="1484.0" type="line"/>
+      <point x="1128.0" y="1484.0" type="line"/>
+      <point x="1440.0" y="448.0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/E_ng.glif b/src/Inter-UI-Black.ufo/glyphs/E_ng.glif
index 48ee78df0..c42596e3e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/E_ng.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/E_ng.glif
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Eng" format="2">
-  <advance width="1968.0"/>
+  <advance width="2036.0"/>
   <unicode hex="014A"/>
   <outline>
     <contour>
-      <point x="1360.0" y="160.0" type="line"/>
-      <point x="1360.0" y="8.0" type="line" smooth="yes"/>
-      <point x="1361.0" y="-146.0"/>
+      <point x="1360.0" y="0.0" type="line"/>
+      <point x="1360.0" y="-40.0" type="line" smooth="yes"/>
+      <point x="1360.0" y="-174.0"/>
       <point x="1193.0" y="-180.0"/>
       <point x="1068.0" y="-180.0" type="curve" smooth="yes"/>
       <point x="1029.0" y="-180.0"/>
@@ -16,15 +16,19 @@
       <point x="1013.0" y="-628.0"/>
       <point x="1101.0" y="-628.0"/>
       <point x="1172.0" y="-628.0" type="curve" smooth="yes"/>
-      <point x="1569.0" y="-628.0"/>
-      <point x="1905.0" y="-432.0"/>
-      <point x="1904.0" y="20.0" type="curve" smooth="yes"/>
-      <point x="1904.0" y="160.0" type="line"/>
+      <point x="1469.0" y="-628.0"/>
+      <point x="1904.0" y="-540.0"/>
+      <point x="1904.0" y="-28.0" type="curve" smooth="yes"/>
+      <point x="1904.0" y="0.0" type="line"/>
     </contour>
-    <component base="N" xOffset="12.0" yOffset="4.0"/>
+    <component base="N"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>N</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>N</string>
       <key>com.schriftgestaltung.Glyphs.nodeUserData.0.15</key>
       <dict>
         <key>name</key>
@@ -37,18 +41,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>10.0</real>
+            <real>-628.0</real>
+            <real>632.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>15.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -57,18 +56,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>7.0</real>
+            <real>936.0</real>
+            <real>980.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>13.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -77,18 +71,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>10.0</real>
+            <real>-628.0</real>
+            <real>632.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>15.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/E_ogonek.glif b/src/Inter-UI-Black.ufo/glyphs/E_ogonek.glif
index 198a0bb8d..408fc40d8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/E_ogonek.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/E_ogonek.glif
@@ -4,6 +4,6 @@
   <unicode hex="0118"/>
   <outline>
     <component base="E"/>
-    <component base="ogonek" xOffset="596.0"/>
+    <component base="ogonek" xOffset="896.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/F_.glif b/src/Inter-UI-Black.ufo/glyphs/F_.glif
index efa486090..99fb7e90b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/F_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/F_.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="F" format="2">
-  <advance width="1676.0"/>
+  <advance width="1688.0"/>
   <unicode hex="0046"/>
   <guideline x="12.0" y="1320.0" angle="0.0"/>
   <outline>
diff --git a/src/Inter-UI-Black.ufo/glyphs/F_dotaccent.glif b/src/Inter-UI-Black.ufo/glyphs/F_dotaccent.glif
index cb6a8b356..17e9febb1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/F_dotaccent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/F_dotaccent.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Fdotaccent" format="2">
-  <advance width="1676.0"/>
+  <advance width="1688.0"/>
   <unicode hex="1E1E"/>
   <outline>
     <component base="F"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/F_hook.glif b/src/Inter-UI-Black.ufo/glyphs/F_hook.glif
index e164ef9f6..a34147906 100644
--- a/src/Inter-UI-Black.ufo/glyphs/F_hook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/F_hook.glif
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Fhook" format="2">
-  <advance width="1644.0"/>
+  <advance width="1780.0"/>
   <unicode hex="0191"/>
   <outline>
     <contour>
-      <point x="100.0" y="244.0" type="line"/>
-      <point x="100.0" y="-48.0" type="line" smooth="yes"/>
-      <point x="102.0" y="-140.0"/>
-      <point x="-6.0" y="-160.0"/>
-      <point x="-108.0" y="-160.0" type="curve"/>
-      <point x="-130.0" y="-160.0"/>
-      <point x="-170.0" y="-164.0"/>
-      <point x="-200.0" y="-160.0" type="curve"/>
-      <point x="-200.0" y="-568.0" type="line"/>
-      <point x="-142.0" y="-576.0"/>
-      <point x="-14.0" y="-576.0"/>
-      <point x="40.0" y="-576.0" type="curve"/>
-      <point x="330.0" y="-576.0"/>
-      <point x="658.0" y="-532.0"/>
-      <point x="660.0" y="-48.0" type="curve" smooth="yes"/>
-      <point x="660.0" y="244.0" type="line"/>
+      <point x="236.0" y="0.0" type="line"/>
+      <point x="236.0" y="-48.0" type="line" smooth="yes"/>
+      <point x="236.0" y="-140.0"/>
+      <point x="130.0" y="-160.0"/>
+      <point x="28.0" y="-160.0" type="curve"/>
+      <point x="6.0" y="-160.0"/>
+      <point x="-34.0" y="-164.0"/>
+      <point x="-64.0" y="-160.0" type="curve"/>
+      <point x="-64.0" y="-568.0" type="line"/>
+      <point x="-6.0" y="-576.0"/>
+      <point x="122.0" y="-576.0"/>
+      <point x="176.0" y="-576.0" type="curve"/>
+      <point x="466.0" y="-576.0"/>
+      <point x="792.0" y="-532.0"/>
+      <point x="792.0" y="-48.0" type="curve" smooth="yes"/>
+      <point x="792.0" y="0.0" type="line"/>
     </contour>
-    <component base="F" xOffset="-20.0"/>
+    <component base="F" xOffset="104.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>F</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/F_turn.glif b/src/Inter-UI-Black.ufo/glyphs/F_turn.glif
index fa2921169..9bae8a18a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/F_turn.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/F_turn.glif
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Fturn" format="2">
-  <advance width="1676.0"/>
+  <advance width="1688.0"/>
   <unicode hex="2132"/>
   <outline>
-    <component base="F" xScale="-1.0" yScale="-1.0" xOffset="1676.0" yOffset="2048.0"/>
+    <component base="F" xScale="-1.0" yScale="-1.0" xOffset="1688.0" yOffset="2048.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/G_hook.glif b/src/Inter-UI-Black.ufo/glyphs/G_hook.glif
index d71cd1edc..1e9d6fd7e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/G_hook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/G_hook.glif
@@ -1,31 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Ghook" format="2">
-  <advance width="2324.0"/>
+  <advance width="2464.0"/>
   <unicode hex="0193"/>
-  <guideline x="1884.0" y="996.0" angle="90.0"/>
+  <guideline x="1872.0" y="996.0" angle="90.0"/>
   <outline>
     <contour>
-      <point x="1976.0" y="1372.0" type="line"/>
-      <point x="1976.0" y="1748.0" type="line" smooth="yes"/>
-      <point x="1976.0" y="1920.0"/>
-      <point x="2120.0" y="1944.0"/>
-      <point x="2268.0" y="1944.0" type="curve" smooth="yes"/>
-      <point x="2316.0" y="1944.0"/>
-      <point x="2364.0" y="1936.0"/>
-      <point x="2416.0" y="1932.0" type="curve"/>
-      <point x="2416.0" y="2364.0" type="line"/>
-      <point x="2324.0" y="2384.0"/>
-      <point x="2252.0" y="2396.0"/>
-      <point x="2172.0" y="2396.0" type="curve" smooth="yes"/>
-      <point x="1784.0" y="2396.0"/>
-      <point x="1400.0" y="2168.0"/>
-      <point x="1404.0" y="1748.0" type="curve" smooth="yes"/>
-      <point x="1408.0" y="1372.0" type="line"/>
+      <point x="2024.0" y="1372.0" type="line"/>
+      <point x="2024.0" y="1748.0" type="line" smooth="yes"/>
+      <point x="2024.0" y="1920.0"/>
+      <point x="2168.0" y="1944.0"/>
+      <point x="2316.0" y="1944.0" type="curve" smooth="yes"/>
+      <point x="2364.0" y="1944.0"/>
+      <point x="2412.0" y="1936.0"/>
+      <point x="2464.0" y="1932.0" type="curve"/>
+      <point x="2464.0" y="2364.0" type="line"/>
+      <point x="2372.0" y="2384.0"/>
+      <point x="2300.0" y="2396.0"/>
+      <point x="2220.0" y="2396.0" type="curve" smooth="yes"/>
+      <point x="1832.0" y="2396.0"/>
+      <point x="1448.0" y="2168.0"/>
+      <point x="1452.0" y="1748.0" type="curve" smooth="yes"/>
+      <point x="1456.0" y="1372.0" type="line"/>
     </contour>
-    <component base="G" xOffset="12.0"/>
+    <component base="G"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>G</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/L_ambda.glif b/src/Inter-UI-Black.ufo/glyphs/L_ambda.glif
index de31e22c3..b795bbb72 100644
--- a/src/Inter-UI-Black.ufo/glyphs/L_ambda.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/L_ambda.glif
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Lambda" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="039B"/>
   <outline>
     <contour>
-      <point x="672.0" y="0.0" type="line"/>
-      <point x="1156.0" y="1364.0" type="line"/>
-      <point x="1172.0" y="1364.0" type="line"/>
-      <point x="1656.0" y="0.0" type="line"/>
-      <point x="2256.0" y="0.0" type="line"/>
-      <point x="1464.0" y="2048.0" type="line"/>
-      <point x="868.0" y="2048.0" type="line"/>
-      <point x="72.0" y="0.0" type="line"/>
+      <point x="664.0" y="0.0" type="line"/>
+      <point x="1112.0" y="1484.0" type="line"/>
+      <point x="1128.0" y="1484.0" type="line"/>
+      <point x="1576.0" y="0.0" type="line"/>
+      <point x="2176.0" y="0.0" type="line"/>
+      <point x="1500.0" y="2048.0" type="line"/>
+      <point x="740.0" y="2048.0" type="line"/>
+      <point x="64.0" y="0.0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/N_hook.glif b/src/Inter-UI-Black.ufo/glyphs/N_hook.glif
index 26878cd76..058afcbe8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/N_hook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/N_hook.glif
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Nhook" format="2">
-  <advance width="1940.0"/>
+  <advance width="2140.0"/>
   <unicode hex="019D"/>
   <outline>
     <contour>
-      <point x="100.0" y="244.0" type="line"/>
-      <point x="100.0" y="-48.0" type="line" smooth="yes"/>
-      <point x="102.0" y="-140.0"/>
-      <point x="-6.0" y="-160.0"/>
-      <point x="-108.0" y="-160.0" type="curve"/>
-      <point x="-130.0" y="-160.0"/>
-      <point x="-170.0" y="-164.0"/>
-      <point x="-200.0" y="-160.0" type="curve"/>
-      <point x="-200.0" y="-568.0" type="line"/>
-      <point x="-142.0" y="-576.0"/>
-      <point x="-14.0" y="-576.0"/>
-      <point x="40.0" y="-576.0" type="curve"/>
-      <point x="330.0" y="-576.0"/>
-      <point x="658.0" y="-532.0"/>
-      <point x="660.0" y="-48.0" type="curve" smooth="yes"/>
-      <point x="660.0" y="244.0" type="line"/>
+      <point x="236.0" y="0.0" type="line"/>
+      <point x="236.0" y="-48.0" type="line" smooth="yes"/>
+      <point x="236.0" y="-140.0"/>
+      <point x="130.0" y="-160.0"/>
+      <point x="28.0" y="-160.0" type="curve"/>
+      <point x="6.0" y="-160.0"/>
+      <point x="-34.0" y="-164.0"/>
+      <point x="-64.0" y="-160.0" type="curve"/>
+      <point x="-64.0" y="-568.0" type="line"/>
+      <point x="-6.0" y="-576.0"/>
+      <point x="122.0" y="-576.0"/>
+      <point x="176.0" y="-576.0" type="curve"/>
+      <point x="466.0" y="-576.0"/>
+      <point x="792.0" y="-532.0"/>
+      <point x="792.0" y="-48.0" type="curve" smooth="yes"/>
+      <point x="792.0" y="0.0" type="line"/>
     </contour>
-    <component base="N" xOffset="-20.0"/>
+    <component base="N" xOffset="104.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>H</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/O_open.glif b/src/Inter-UI-Black.ufo/glyphs/O_open.glif
index b30ecbcd3..a179e7f78 100644
--- a/src/Inter-UI-Black.ufo/glyphs/O_open.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/O_open.glif
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Oopen" format="2">
-  <advance width="2240.0"/>
+  <advance width="2164.0"/>
   <unicode hex="0186"/>
   <outline>
     <contour>
-      <point x="1128.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="1692.0" y="-28.0"/>
-      <point x="2116.0" y="344.0"/>
-      <point x="2116.0" y="1024.0" type="curve"/>
-      <point x="2116.0" y="1708.0"/>
-      <point x="1680.0" y="2076.0"/>
-      <point x="1128.0" y="2076.0" type="curve" smooth="yes"/>
-      <point x="612.0" y="2076.0"/>
-      <point x="240.0" y="1788.0"/>
-      <point x="196.0" y="1280.0" type="curve"/>
-      <point x="760.0" y="1280.0" type="line"/>
-      <point x="776.0" y="1468.0"/>
-      <point x="896.0" y="1592.0"/>
-      <point x="1112.0" y="1592.0" type="curve" smooth="yes"/>
-      <point x="1392.0" y="1592.0"/>
-      <point x="1544.0" y="1380.0"/>
-      <point x="1544.0" y="1024.0" type="curve"/>
-      <point x="1544.0" y="648.0"/>
-      <point x="1388.0" y="456.0"/>
-      <point x="1116.0" y="456.0" type="curve" smooth="yes"/>
-      <point x="912.0" y="456.0"/>
-      <point x="788.0" y="564.0"/>
-      <point x="760.0" y="740.0" type="curve"/>
-      <point x="196.0" y="736.0" type="line"/>
-      <point x="224.0" y="388.0"/>
-      <point x="528.0" y="-28.0"/>
+      <point x="1052.0" y="-28.0" type="curve" smooth="yes"/>
+      <point x="1616.0" y="-28.0"/>
+      <point x="2040.0" y="344.0"/>
+      <point x="2040.0" y="1024.0" type="curve"/>
+      <point x="2040.0" y="1708.0"/>
+      <point x="1604.0" y="2076.0"/>
+      <point x="1052.0" y="2076.0" type="curve" smooth="yes"/>
+      <point x="536.0" y="2076.0"/>
+      <point x="164.0" y="1788.0"/>
+      <point x="120.0" y="1280.0" type="curve"/>
+      <point x="684.0" y="1280.0" type="line"/>
+      <point x="700.0" y="1468.0"/>
+      <point x="820.0" y="1592.0"/>
+      <point x="1036.0" y="1592.0" type="curve" smooth="yes"/>
+      <point x="1316.0" y="1592.0"/>
+      <point x="1468.0" y="1380.0"/>
+      <point x="1468.0" y="1024.0" type="curve"/>
+      <point x="1468.0" y="648.0"/>
+      <point x="1312.0" y="456.0"/>
+      <point x="1040.0" y="456.0" type="curve" smooth="yes"/>
+      <point x="836.0" y="456.0"/>
+      <point x="712.0" y="564.0"/>
+      <point x="684.0" y="740.0" type="curve"/>
+      <point x="120.0" y="736.0" type="line"/>
+      <point x="148.0" y="388.0"/>
+      <point x="452.0" y="-28.0"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/Q__rthook.glif b/src/Inter-UI-Black.ufo/glyphs/Q__rthook.glif
index 1bd619a84..cd75781ce 100644
--- a/src/Inter-UI-Black.ufo/glyphs/Q__rthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/Q__rthook.glif
@@ -1,71 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Q_rthook" format="2">
-  <advance width="2416.0"/>
+  <advance width="2428.0"/>
   <unicode hex="024A"/>
-  <guideline x="112.0" y="1024.0" angle="0.0"/>
+  <note>
+Composed by O and a vertical stem with tail
+</note>
+  <guideline x="80.0" y="1024.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="2128.0" y="2052.0" type="line"/>
-      <point x="1572.0" y="2052.0" type="line"/>
-      <point x="1572.0" y="1988.0" type="line"/>
-      <point x="1552.0" y="1988.0" type="line"/>
-      <point x="1446.0" y="2056.0"/>
-      <point x="1254.0" y="2076.0"/>
-      <point x="1088.0" y="2076.0" type="curve" smooth="yes"/>
-      <point x="470.0" y="2076.0"/>
-      <point x="110.0" y="1628.0"/>
-      <point x="112.0" y="1020.0" type="curve"/>
-      <point x="110.0" y="404.0"/>
-      <point x="446.0" y="-28.0"/>
-      <point x="1100.0" y="-28.0" type="curve"/>
-      <point x="1274.0" y="-28.0"/>
-      <point x="1442.0" y="-12.0"/>
-      <point x="1560.0" y="48.0" type="curve"/>
-      <point x="1576.0" y="48.0" type="line"/>
-      <point x="1576.0" y="12.0" type="line"/>
-      <point x="2128.0" y="12.0" type="line"/>
+      <point x="2096.0" y="2048.0" type="line"/>
+      <point x="1544.0" y="2048.0" type="line"/>
+      <point x="1544.0" y="1760.0" type="line"/>
+      <point x="1528.0" y="1760.0" type="line"/>
+      <point x="1429.0" y="1926.0"/>
+      <point x="1253.0" y="2076.0"/>
+      <point x="976.0" y="2076.0" type="curve" smooth="yes"/>
+      <point x="498.0" y="2076.0"/>
+      <point x="124.0" y="1608.0"/>
+      <point x="124.0" y="1024.0" type="curve" smooth="yes"/>
+      <point x="124.0" y="444.0"/>
+      <point x="486.0" y="-28.0"/>
+      <point x="976.0" y="-28.0" type="curve" smooth="yes"/>
+      <point x="1251.0" y="-28.0"/>
+      <point x="1430.0" y="120.0"/>
+      <point x="1528.0" y="288.0" type="curve"/>
+      <point x="1544.0" y="288.0" type="line"/>
+      <point x="1544.0" y="-48.0" type="line" smooth="yes"/>
+      <point x="1544.0" y="-500.0"/>
+      <point x="1816.0" y="-576.0"/>
+      <point x="2152.0" y="-576.0" type="curve" smooth="yes"/>
+      <point x="2280.0" y="-576.0"/>
+      <point x="2368.0" y="-564.0"/>
+      <point x="2428.0" y="-560.0" type="curve"/>
+      <point x="2428.0" y="-152.0" type="line"/>
+      <point x="2384.0" y="-156.0"/>
+      <point x="2344.0" y="-160.0"/>
+      <point x="2304.0" y="-160.0" type="curve" smooth="yes"/>
+      <point x="2204.0" y="-160.0"/>
+      <point x="2096.0" y="-140.0"/>
+      <point x="2096.0" y="-48.0" type="curve" smooth="yes"/>
     </contour>
     <contour>
-      <point x="644.0" y="1024.0" type="curve"/>
-      <point x="642.0" y="1324.0"/>
-      <point x="742.0" y="1596.0"/>
-      <point x="1100.0" y="1596.0" type="curve"/>
-      <point x="1498.0" y="1596.0"/>
-      <point x="1530.0" y="1280.0"/>
-      <point x="1540.0" y="1272.0" type="curve"/>
-      <point x="1558.0" y="1212.0"/>
-      <point x="1566.0" y="1136.0"/>
-      <point x="1568.0" y="1032.0" type="curve"/>
-      <point x="1566.0" y="924.0"/>
-      <point x="1538.0" y="796.0"/>
-      <point x="1528.0" y="716.0" type="curve"/>
-      <point x="1498.0" y="656.0"/>
-      <point x="1442.0" y="460.0"/>
-      <point x="1120.0" y="460.0" type="curve" smooth="yes"/>
-      <point x="738.0" y="460.0"/>
-      <point x="642.0" y="716.0"/>
-    </contour>
-    <contour>
-      <point x="2128.0" y="216.0" type="line"/>
-      <point x="1576.0" y="216.0" type="line"/>
-      <point x="1576.0" y="-48.0" type="line" smooth="yes"/>
-      <point x="1574.0" y="-500.0"/>
-      <point x="1846.0" y="-576.0"/>
-      <point x="2184.0" y="-576.0" type="curve" smooth="yes"/>
-      <point x="2310.0" y="-576.0"/>
-      <point x="2398.0" y="-564.0"/>
-      <point x="2460.0" y="-560.0" type="curve"/>
-      <point x="2460.0" y="-152.0" type="line"/>
-      <point x="2414.0" y="-156.0"/>
-      <point x="2374.0" y="-160.0"/>
-      <point x="2336.0" y="-160.0" type="curve" smooth="yes"/>
-      <point x="2234.0" y="-160.0"/>
-      <point x="2126.0" y="-140.0"/>
-      <point x="2128.0" y="-48.0" type="curve" smooth="yes"/>
+      <point x="1120.0" y="456.0" type="curve" smooth="yes"/>
+      <point x="844.0" y="456.0"/>
+      <point x="696.0" y="656.0"/>
+      <point x="696.0" y="1024.0" type="curve" smooth="yes"/>
+      <point x="696.0" y="1392.0"/>
+      <point x="844.0" y="1592.0"/>
+      <point x="1120.0" y="1592.0" type="curve" smooth="yes"/>
+      <point x="1396.0" y="1592.0"/>
+      <point x="1544.0" y="1392.0"/>
+      <point x="1544.0" y="1024.0" type="curve" smooth="yes"/>
+      <point x="1544.0" y="656.0"/>
+      <point x="1396.0" y="456.0"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>O</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -75,8 +68,8 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
-            <real>7.0</real>
+            <real>0.0</real>
+            <real>22.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -93,10 +86,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>11.0</real>
+            <real>-28.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -113,10 +106,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>5.0</real>
+            <real>2076.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -135,10 +128,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>2052.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -157,8 +150,8 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
-            <real>4.0</real>
+            <real>0.0</real>
+            <real>19.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -177,8 +170,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
-            <real>7.0</real>
+            <real>0.0</real>
+            <real>22.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -193,7 +186,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>11.0</real>
+            <real>16.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -208,7 +201,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>5.0</real>
+            <real>0.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -237,8 +230,80 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
-            <real>4.0</real>
+            <real>0.0</real>
+            <real>19.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>Anchor</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>origin</key>
+          <array>
+            <real>0.0</real>
+            <real>11.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <string>u</string>
+            <string>p</string>
+          </array>
+          <key>type</key>
+          <string>BottomGhost</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>origin</key>
+          <array>
+            <real>0.0</real>
+            <real>5.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <string>d</string>
+            <string>o</string>
+            <string>w</string>
+            <string>n</string>
+          </array>
+          <key>type</key>
+          <string>TopGhost</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>origin</key>
+          <array>
+            <real>0.0</real>
+            <real>11.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>type</key>
+          <string>Anchor</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>origin</key>
+          <array>
+            <real>0.0</real>
+            <real>5.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/V_.glif b/src/Inter-UI-Black.ufo/glyphs/V_.glif
index b878c2a54..88f161c20 100644
--- a/src/Inter-UI-Black.ufo/glyphs/V_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/V_.glif
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="V" format="2">
-  <advance width="2232.0"/>
+  <advance width="2240.0"/>
   <unicode hex="0056"/>
   <guideline x="1040.0" y="1048.0" angle="90.0"/>
   <outline>
     <contour>
-      <point x="680.0" y="2048.0" type="line"/>
+      <point x="692.0" y="2048.0" type="line"/>
       <point x="64.0" y="2048.0" type="line"/>
-      <point x="760.0" y="0.0" type="line"/>
-      <point x="1472.0" y="0.0" type="line"/>
-      <point x="2168.0" y="2048.0" type="line"/>
-      <point x="1552.0" y="2048.0" type="line"/>
-      <point x="1128.0" y="684.0" type="line"/>
-      <point x="1104.0" y="684.0" type="line"/>
+      <point x="740.0" y="0.0" type="line"/>
+      <point x="1500.0" y="0.0" type="line"/>
+      <point x="2176.0" y="2048.0" type="line"/>
+      <point x="1548.0" y="2048.0" type="line"/>
+      <point x="1128.0" y="604.0" type="line"/>
+      <point x="1112.0" y="604.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -24,10 +24,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>1.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -44,10 +44,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>2048.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -66,10 +66,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>1.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -81,10 +81,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>2048.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/V_dotbelow.glif b/src/Inter-UI-Black.ufo/glyphs/V_dotbelow.glif
index bc9eb61a1..2e05d7320 100644
--- a/src/Inter-UI-Black.ufo/glyphs/V_dotbelow.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/V_dotbelow.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Vdotbelow" format="2">
-  <advance width="2232.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1E7E"/>
   <outline>
     <component base="V"/>
-    <component base="dotbelow" xOffset="2068.0" yOffset="-164.0"/>
+    <component base="dotbelow" xOffset="2072.0" yOffset="-164.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/V_tilde.glif b/src/Inter-UI-Black.ufo/glyphs/V_tilde.glif
index 00f6625b3..6408eca8c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/V_tilde.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/V_tilde.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="Vtilde" format="2">
-  <advance width="2232.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1E7C"/>
   <outline>
     <component base="V"/>
-    <component base="tilde" xOffset="408.0" yOffset="404.0"/>
+    <component base="tilde" xOffset="412.0" yOffset="404.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/afii10017.glif b/src/Inter-UI-Black.ufo/glyphs/afii10017.glif
index 811bf638d..c97d9c7b7 100644
--- a/src/Inter-UI-Black.ufo/glyphs/afii10017.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/afii10017.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="afii10017" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="0410"/>
   <outline>
     <component base="A"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/austral.glif b/src/Inter-UI-Black.ufo/glyphs/austral.glif
index 44f25d2b1..c84d08025 100644
--- a/src/Inter-UI-Black.ufo/glyphs/austral.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/austral.glif
@@ -1,39 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="austral" format="2">
-  <advance width="2376.0"/>
+  <advance width="2240.0"/>
   <unicode hex="20B3"/>
+  <guideline x="1240.0" y="68.0" angle="90.0"/>
   <outline>
     <contour>
-      <point x="2220.0" y="1276.0" type="line"/>
-      <point x="156.0" y="1276.0" type="line"/>
-      <point x="156.0" y="864.0" type="line"/>
-      <point x="2220.0" y="864.0" type="line"/>
+      <point x="64.0" y="844.0" type="line"/>
+      <point x="2176.0" y="844.0" type="line"/>
+      <point x="2176.0" y="1044.0" type="line"/>
+      <point x="64.0" y="1044.0" type="line"/>
     </contour>
     <contour>
-      <point x="2220.0" y="740.0" type="line"/>
-      <point x="156.0" y="740.0" type="line"/>
-      <point x="156.0" y="324.0" type="line"/>
-      <point x="2220.0" y="324.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1836.0" y="752.0" type="line"/>
-      <point x="540.0" y="752.0" type="line"/>
-      <point x="540.0" y="320.0" type="line"/>
-      <point x="1836.0" y="320.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="696.0" y="0.0" type="line"/>
-      <point x="1176.0" y="1364.0" type="line"/>
-      <point x="1200.0" y="1364.0" type="line"/>
-      <point x="1680.0" y="0.0" type="line"/>
-      <point x="2280.0" y="0.0" type="line"/>
-      <point x="1488.0" y="2048.0" type="line"/>
-      <point x="892.0" y="2048.0" type="line"/>
-      <point x="96.0" y="0.0" type="line"/>
+      <point x="64.0" y="444.0" type="line"/>
+      <point x="2176.0" y="444.0" type="line"/>
+      <point x="2176.0" y="644.0" type="line"/>
+      <point x="64.0" y="644.0" type="line"/>
     </contour>
+    <component base="Lambda"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>A</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>A</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -41,10 +31,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>3.0</real>
-            <real>6.0</real>
+            <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -61,10 +51,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>3.0</real>
-            <real>5.0</real>
+            <real>2048.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -83,10 +73,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>3.0</real>
-            <real>6.0</real>
+            <real>0.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -98,10 +88,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>3.0</real>
-            <real>5.0</real>
+            <real>2048.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/blackS_unW_ithR_ays.glif b/src/Inter-UI-Black.ufo/glyphs/blackS_unW_ithR_ays.glif
index c21e994d5..fe5b9f86a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/blackS_unW_ithR_ays.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/blackS_unW_ithR_ays.glif
@@ -2,68 +2,69 @@
 <glyph name="blackSunWithRays" format="2">
   <advance width="2664.0"/>
   <unicode hex="2600"/>
+  <guideline x="1412.0" y="1056.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="1984.0" y="1180.0" type="line"/>
-      <point x="1984.0" y="932.0" type="line"/>
-      <point x="2592.0" y="932.0" type="line"/>
-      <point x="2592.0" y="1180.0" type="line"/>
+      <point x="1332.0" y="604.0" type="curve" smooth="yes"/>
+      <point x="1580.0" y="604.0"/>
+      <point x="1784.0" y="808.0"/>
+      <point x="1784.0" y="1056.0" type="curve" smooth="yes"/>
+      <point x="1784.0" y="1304.0"/>
+      <point x="1580.0" y="1508.0"/>
+      <point x="1332.0" y="1508.0" type="curve" smooth="yes"/>
+      <point x="1080.0" y="1508.0"/>
+      <point x="880.0" y="1304.0"/>
+      <point x="880.0" y="1056.0" type="curve" smooth="yes"/>
+      <point x="880.0" y="808.0"/>
+      <point x="1080.0" y="604.0"/>
+    </contour>
+    <contour>
+      <point x="528.0" y="76.0" type="line"/>
+      <point x="960.0" y="508.0" type="line"/>
+      <point x="784.0" y="684.0" type="line"/>
+      <point x="352.0" y="252.0" type="line"/>
     </contour>
     <contour>
-      <point x="72.0" y="1180.0" type="line"/>
       <point x="72.0" y="932.0" type="line"/>
       <point x="680.0" y="932.0" type="line"/>
       <point x="680.0" y="1180.0" type="line"/>
+      <point x="72.0" y="1180.0" type="line"/>
     </contour>
     <contour>
-      <point x="1456.0" y="404.0" type="line"/>
-      <point x="1208.0" y="404.0" type="line"/>
       <point x="1208.0" y="-204.0" type="line"/>
       <point x="1456.0" y="-204.0" type="line"/>
+      <point x="1456.0" y="404.0" type="line"/>
+      <point x="1208.0" y="404.0" type="line"/>
     </contour>
     <contour>
-      <point x="1456.0" y="2316.0" type="line"/>
-      <point x="1208.0" y="2316.0" type="line"/>
-      <point x="1208.0" y="1708.0" type="line"/>
-      <point x="1456.0" y="1708.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1332.0" y="604.0" type="curve" smooth="yes"/>
-      <point x="1080.0" y="604.0"/>
-      <point x="880.0" y="808.0"/>
-      <point x="880.0" y="1056.0" type="curve" smooth="yes"/>
-      <point x="880.0" y="1304.0"/>
-      <point x="1080.0" y="1508.0"/>
-      <point x="1332.0" y="1508.0" type="curve" smooth="yes"/>
-      <point x="1580.0" y="1508.0"/>
-      <point x="1784.0" y="1304.0"/>
-      <point x="1784.0" y="1056.0" type="curve" smooth="yes"/>
-      <point x="1784.0" y="808.0"/>
-      <point x="1580.0" y="604.0"/>
-    </contour>
-    <contour>
-      <point x="1880.0" y="684.0" type="line"/>
-      <point x="1704.0" y="508.0" type="line"/>
       <point x="2136.0" y="76.0" type="line"/>
       <point x="2312.0" y="252.0" type="line"/>
+      <point x="1880.0" y="684.0" type="line"/>
+      <point x="1704.0" y="508.0" type="line"/>
     </contour>
     <contour>
-      <point x="528.0" y="2036.0" type="line"/>
-      <point x="352.0" y="1860.0" type="line"/>
       <point x="784.0" y="1428.0" type="line"/>
       <point x="960.0" y="1604.0" type="line"/>
+      <point x="528.0" y="2036.0" type="line"/>
+      <point x="352.0" y="1860.0" type="line"/>
     </contour>
     <contour>
-      <point x="960.0" y="508.0" type="line"/>
-      <point x="784.0" y="684.0" type="line"/>
-      <point x="352.0" y="252.0" type="line"/>
-      <point x="528.0" y="76.0" type="line"/>
+      <point x="1984.0" y="932.0" type="line"/>
+      <point x="2592.0" y="932.0" type="line"/>
+      <point x="2592.0" y="1180.0" type="line"/>
+      <point x="1984.0" y="1180.0" type="line"/>
     </contour>
     <contour>
+      <point x="1208.0" y="1708.0" type="line"/>
+      <point x="1456.0" y="1708.0" type="line"/>
+      <point x="1456.0" y="2316.0" type="line"/>
+      <point x="1208.0" y="2316.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="1880.0" y="1428.0" type="line"/>
       <point x="2312.0" y="1860.0" type="line"/>
       <point x="2136.0" y="2036.0" type="line"/>
       <point x="1704.0" y="1604.0" type="line"/>
-      <point x="1880.0" y="1428.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -81,15 +82,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>0.0</real>
+            <real>2.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
-            <real>3.0</real>
+            <real>2.0</real>
+            <real>2.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -101,15 +102,15 @@
           <integer>0</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
-            <real>1.0</real>
+            <real>3.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>2.0</real>
-            <real>2.0</real>
+            <real>3.0</real>
+            <real>0.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -121,15 +122,15 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>0.0</real>
+            <real>2.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <real>1.0</real>
-            <real>3.0</real>
+            <real>2.0</real>
+            <real>2.0</real>
           </array>
           <key>type</key>
           <string>TTStem</string>
diff --git a/src/Inter-UI-Black.ufo/glyphs/cedi.glif b/src/Inter-UI-Black.ufo/glyphs/cedi.glif
index cc4df3bc1..aa0fdecf1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/cedi.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/cedi.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="cedi" format="2">
-  <advance width="2088.0"/>
+  <advance width="2096.0"/>
   <unicode hex="20B5"/>
   <outline>
     <contour>
@@ -40,6 +40,10 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>C</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>C</string>
       <key>public.markColor</key>
       <string>0.8,0.941,0.949,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/cent.glif b/src/Inter-UI-Black.ufo/glyphs/cent.glif
index b6c05ee7c..16d2a3060 100644
--- a/src/Inter-UI-Black.ufo/glyphs/cent.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/cent.glif
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="cent" format="2">
-  <advance width="1692.0"/>
+  <advance width="1656.0"/>
   <unicode hex="00A2"/>
-  <guideline x="1480.0" y="1372.0" angle="90.0"/>
+  <guideline x="1472.0" y="1372.0" angle="90.0"/>
   <outline>
     <contour>
-      <point x="780.0" y="-256.0" type="line"/>
-      <point x="908.0" y="-256.0" type="line"/>
-      <point x="908.0" y="1780.0" type="line"/>
-      <point x="780.0" y="1780.0" type="line"/>
+      <point x="768.0" y="-256.0" type="line"/>
+      <point x="896.0" y="-256.0" type="line"/>
+      <point x="896.0" y="1780.0" type="line"/>
+      <point x="768.0" y="1780.0" type="line"/>
     </contour>
-    <component base="c" xOffset="8.0"/>
+    <component base="c"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>c</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>c</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/circleblack.glif b/src/Inter-UI-Black.ufo/glyphs/circleblack.glif
index be2ea666e..9026b2d5a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/circleblack.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/circleblack.glif
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="circleblack" format="2">
-  <advance width="2640.0"/>
+  <advance width="2576.0"/>
   <unicode hex="25CF"/>
   <outline>
     <contour>
-      <point x="1320.0" y="-32.0" type="curve" smooth="yes"/>
-      <point x="1892.0" y="-32.0"/>
-      <point x="2372.0" y="440.0"/>
-      <point x="2372.0" y="1016.0" type="curve" smooth="yes"/>
-      <point x="2372.0" y="1596.0"/>
-      <point x="1892.0" y="2072.0"/>
-      <point x="1320.0" y="2072.0" type="curve" smooth="yes"/>
-      <point x="740.0" y="2072.0"/>
-      <point x="268.0" y="1596.0"/>
-      <point x="268.0" y="1016.0" type="curve" smooth="yes"/>
-      <point x="268.0" y="440.0"/>
-      <point x="740.0" y="-32.0"/>
+      <point x="1288.0" y="-32.0" type="curve" smooth="yes"/>
+      <point x="1889.0" y="-32.0"/>
+      <point x="2376.0" y="455.0"/>
+      <point x="2376.0" y="1056.0" type="curve" smooth="yes"/>
+      <point x="2376.0" y="1657.0"/>
+      <point x="1889.0" y="2144.0"/>
+      <point x="1288.0" y="2144.0" type="curve" smooth="yes"/>
+      <point x="687.0" y="2144.0"/>
+      <point x="200.0" y="1657.0"/>
+      <point x="200.0" y="1056.0" type="curve" smooth="yes"/>
+      <point x="200.0" y="455.0"/>
+      <point x="687.0" y="-32.0"/>
     </contour>
   </outline>
   <lib>
@@ -27,10 +27,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>11.0</real>
+            <real>-32.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -47,10 +47,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>5.0</real>
+            <real>2072.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -69,10 +69,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>11.0</real>
+            <real>-32.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -84,10 +84,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>5.0</real>
+            <real>2072.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/circlewhite.glif b/src/Inter-UI-Black.ufo/glyphs/circlewhite.glif
index 967142f11..971fa4f2b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/circlewhite.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/circlewhite.glif
@@ -1,27 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="circlewhite" format="2">
-  <advance width="2644.0"/>
+  <advance width="2576.0"/>
   <unicode hex="25CB"/>
   <guideline x="1060.0" y="1652.0" angle="0.0"/>
   <guideline x="676.0" y="1008.0" angle="90.0"/>
   <guideline x="1308.0" y="388.0" angle="0.0"/>
   <guideline x="1940.0" y="952.0" angle="90.0"/>
+  <guideline x="1412.0" y="1056.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="1324.0" y="388.0" type="curve" smooth="yes"/>
-      <point x="975.0" y="388.0"/>
-      <point x="691.0" y="672.0"/>
-      <point x="692.0" y="1020.0" type="curve" smooth="yes"/>
-      <point x="691.0" y="1368.0"/>
-      <point x="975.0" y="1652.0"/>
-      <point x="1324.0" y="1652.0" type="curve" smooth="yes"/>
-      <point x="1671.0" y="1652.0"/>
-      <point x="1955.0" y="1368.0"/>
-      <point x="1956.0" y="1020.0" type="curve" smooth="yes"/>
-      <point x="1955.0" y="672.0"/>
-      <point x="1671.0" y="388.0"/>
+      <point x="1288.0" y="-32.0" type="curve" smooth="yes"/>
+      <point x="1889.0" y="-32.0"/>
+      <point x="2376.0" y="455.0"/>
+      <point x="2376.0" y="1056.0" type="curve" smooth="yes"/>
+      <point x="2376.0" y="1657.0"/>
+      <point x="1889.0" y="2144.0"/>
+      <point x="1288.0" y="2144.0" type="curve" smooth="yes"/>
+      <point x="687.0" y="2144.0"/>
+      <point x="200.0" y="1657.0"/>
+      <point x="200.0" y="1056.0" type="curve" smooth="yes"/>
+      <point x="200.0" y="455.0"/>
+      <point x="687.0" y="-32.0"/>
+    </contour>
+    <contour>
+      <point x="1288.0" y="288.0" type="curve" smooth="yes"/>
+      <point x="864.0" y="288.0"/>
+      <point x="520.0" y="632.0"/>
+      <point x="520.0" y="1056.0" type="curve" smooth="yes"/>
+      <point x="520.0" y="1480.0"/>
+      <point x="864.0" y="1824.0"/>
+      <point x="1288.0" y="1824.0" type="curve" smooth="yes"/>
+      <point x="1712.0" y="1824.0"/>
+      <point x="2056.0" y="1480.0"/>
+      <point x="2056.0" y="1056.0" type="curve" smooth="yes"/>
+      <point x="2056.0" y="632.0"/>
+      <point x="1712.0" y="288.0"/>
     </contour>
-    <component base="circleblack" xOffset="28.0"/>
   </outline>
   <lib>
     <dict>
@@ -32,18 +46,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>11.0</real>
+            <real>388.0</real>
+            <real>1264.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>5.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -52,18 +61,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>2.0</real>
+            <real>692.0</real>
+            <real>1264.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>8.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -72,18 +76,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>11.0</real>
+            <real>388.0</real>
+            <real>1264.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>5.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/coloncurrency.glif b/src/Inter-UI-Black.ufo/glyphs/coloncurrency.glif
index c0359d0a5..b13378c0a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/coloncurrency.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/coloncurrency.glif
@@ -1,24 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="coloncurrency" format="2">
-  <advance width="2084.0"/>
+  <advance width="2164.0"/>
   <unicode hex="20A1"/>
   <outline>
     <contour>
-      <point x="1752.0" y="2304.0" type="line"/>
-      <point x="1616.0" y="2304.0" type="line"/>
-      <point x="828.0" y="-256.0" type="line"/>
-      <point x="960.0" y="-256.0" type="line"/>
+      <point x="1740.0" y="2304.0" type="line"/>
+      <point x="1604.0" y="2304.0" type="line"/>
+      <point x="816.0" y="-256.0" type="line"/>
+      <point x="948.0" y="-256.0" type="line"/>
     </contour>
     <contour>
-      <point x="1392.0" y="2304.0" type="line"/>
-      <point x="1256.0" y="2300.0" type="line"/>
-      <point x="468.0" y="-260.0" type="line"/>
-      <point x="600.0" y="-256.0" type="line"/>
+      <point x="1380.0" y="2304.0" type="line"/>
+      <point x="1244.0" y="2300.0" type="line"/>
+      <point x="456.0" y="-260.0" type="line"/>
+      <point x="588.0" y="-256.0" type="line"/>
     </contour>
-    <component base="C" xOffset="12.0"/>
+    <component base="C"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>C</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>C</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/cruzeiro.glif b/src/Inter-UI-Black.ufo/glyphs/cruzeiro.glif
index 89240ab9a..51ee24b76 100644
--- a/src/Inter-UI-Black.ufo/glyphs/cruzeiro.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/cruzeiro.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="cruzeiro" format="2">
-  <advance width="2104.0"/>
+  <advance width="2096.0"/>
   <unicode hex="20A2"/>
   <guideline x="1020.0" y="1632.0" angle="90.0"/>
   <outline>
@@ -56,6 +56,10 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>C</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>C</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/diamondblack.glif b/src/Inter-UI-Black.ufo/glyphs/diamondblack.glif
index 267a66fd2..b6f8bb659 100644
--- a/src/Inter-UI-Black.ufo/glyphs/diamondblack.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/diamondblack.glif
@@ -2,12 +2,13 @@
 <glyph name="diamondblack" format="2">
   <advance width="3008.0"/>
   <unicode hex="25C6"/>
+  <guideline x="1412.0" y="1056.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="2848.0" y="768.0" type="line"/>
-      <point x="1512.0" y="2112.0" type="line"/>
-      <point x="160.0" y="768.0" type="line"/>
-      <point x="1512.0" y="-576.0" type="line"/>
+      <point x="2848.0" y="1056.0" type="line"/>
+      <point x="1512.0" y="2400.0" type="line"/>
+      <point x="160.0" y="1056.0" type="line"/>
+      <point x="1512.0" y="-288.0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/diamondblack_x.glif b/src/Inter-UI-Black.ufo/glyphs/diamondblack_x.glif
index b6f8adea4..a52fb82f1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/diamondblack_x.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/diamondblack_x.glif
@@ -2,30 +2,31 @@
 <glyph name="diamondblack_x" format="2">
   <advance width="3008.0"/>
   <unicode hex="2756"/>
+  <guideline x="1412.0" y="1056.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="2096.0" y="1520.0" type="line"/>
-      <point x="1512.0" y="2112.0" type="line"/>
-      <point x="920.0" y="1520.0" type="line"/>
-      <point x="1512.0" y="936.0" type="line"/>
+      <point x="2096.0" y="1808.0" type="line"/>
+      <point x="1512.0" y="2400.0" type="line"/>
+      <point x="920.0" y="1808.0" type="line"/>
+      <point x="1512.0" y="1224.0" type="line"/>
     </contour>
     <contour>
-      <point x="2848.0" y="768.0" type="line"/>
-      <point x="2264.0" y="1352.0" type="line"/>
-      <point x="1680.0" y="768.0" type="line"/>
-      <point x="2264.0" y="176.0" type="line"/>
+      <point x="2848.0" y="1056.0" type="line"/>
+      <point x="2264.0" y="1640.0" type="line"/>
+      <point x="1680.0" y="1056.0" type="line"/>
+      <point x="2264.0" y="464.0" type="line"/>
     </contour>
     <contour>
-      <point x="1344.0" y="768.0" type="line"/>
-      <point x="752.0" y="1352.0" type="line"/>
-      <point x="160.0" y="768.0" type="line"/>
-      <point x="752.0" y="176.0" type="line"/>
+      <point x="1344.0" y="1056.0" type="line"/>
+      <point x="752.0" y="1640.0" type="line"/>
+      <point x="160.0" y="1056.0" type="line"/>
+      <point x="752.0" y="464.0" type="line"/>
     </contour>
     <contour>
-      <point x="2096.0" y="8.0" type="line"/>
-      <point x="1512.0" y="600.0" type="line"/>
-      <point x="920.0" y="8.0" type="line"/>
-      <point x="1512.0" y="-576.0" type="line"/>
+      <point x="2096.0" y="296.0" type="line"/>
+      <point x="1512.0" y="888.0" type="line"/>
+      <point x="920.0" y="296.0" type="line"/>
+      <point x="1512.0" y="-288.0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/diamondwhite.glif b/src/Inter-UI-Black.ufo/glyphs/diamondwhite.glif
index 611720924..fb28e3034 100644
--- a/src/Inter-UI-Black.ufo/glyphs/diamondwhite.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/diamondwhite.glif
@@ -4,18 +4,19 @@
   <unicode hex="25C7"/>
   <guideline x="536.0" y="768.0" angle="0.0"/>
   <guideline x="1496.0" y="2072.0" angle="90.0"/>
+  <guideline x="1412.0" y="1056.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="2848.0" y="768.0" type="line"/>
-      <point x="1512.0" y="2112.0" type="line"/>
-      <point x="160.0" y="768.0" type="line"/>
-      <point x="1512.0" y="-576.0" type="line"/>
+      <point x="2848.0" y="1056.0" type="line"/>
+      <point x="1512.0" y="2400.0" type="line"/>
+      <point x="160.0" y="1056.0" type="line"/>
+      <point x="1512.0" y="-288.0" type="line"/>
     </contour>
     <contour>
-      <point x="2248.0" y="768.0" type="line"/>
-      <point x="1512.0" y="28.0" type="line"/>
-      <point x="768.0" y="768.0" type="line"/>
-      <point x="1512.0" y="1508.0" type="line"/>
+      <point x="2248.0" y="1056.0" type="line"/>
+      <point x="1512.0" y="316.0" type="line"/>
+      <point x="768.0" y="1056.0" type="line"/>
+      <point x="1512.0" y="1796.0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/diamondwhite_x.glif b/src/Inter-UI-Black.ufo/glyphs/diamondwhite_x.glif
index 27a311997..35ce6c51e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/diamondwhite_x.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/diamondwhite_x.glif
@@ -8,54 +8,55 @@
   <guideline x="1496.0" y="452.0" angle="90.0"/>
   <guideline x="736.0" y="148.0" angle="90.0"/>
   <guideline x="2248.0" y="76.0" angle="90.0"/>
+  <guideline x="1412.0" y="1056.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="2096.0" y="1520.0" type="line"/>
-      <point x="1512.0" y="2112.0" type="line"/>
-      <point x="920.0" y="1520.0" type="line"/>
-      <point x="1512.0" y="936.0" type="line"/>
+      <point x="2096.0" y="1808.0" type="line"/>
+      <point x="1512.0" y="2400.0" type="line"/>
+      <point x="920.0" y="1808.0" type="line"/>
+      <point x="1512.0" y="1224.0" type="line"/>
     </contour>
     <contour>
-      <point x="1324.0" y="1520.0" type="line"/>
-      <point x="1512.0" y="1716.0" type="line"/>
-      <point x="1700.0" y="1520.0" type="line"/>
-      <point x="1512.0" y="1332.0" type="line"/>
+      <point x="1324.0" y="1808.0" type="line"/>
+      <point x="1512.0" y="2004.0" type="line"/>
+      <point x="1700.0" y="1808.0" type="line"/>
+      <point x="1512.0" y="1620.0" type="line"/>
     </contour>
     <contour>
-      <point x="2848.0" y="768.0" type="line"/>
-      <point x="2264.0" y="1352.0" type="line"/>
-      <point x="1680.0" y="768.0" type="line"/>
-      <point x="2264.0" y="176.0" type="line"/>
+      <point x="2848.0" y="1056.0" type="line"/>
+      <point x="2264.0" y="1640.0" type="line"/>
+      <point x="1680.0" y="1056.0" type="line"/>
+      <point x="2264.0" y="464.0" type="line"/>
     </contour>
     <contour>
-      <point x="1344.0" y="768.0" type="line"/>
-      <point x="752.0" y="1352.0" type="line"/>
-      <point x="160.0" y="768.0" type="line"/>
-      <point x="752.0" y="176.0" type="line"/>
+      <point x="1344.0" y="1056.0" type="line"/>
+      <point x="752.0" y="1640.0" type="line"/>
+      <point x="160.0" y="1056.0" type="line"/>
+      <point x="752.0" y="464.0" type="line"/>
     </contour>
     <contour>
-      <point x="2072.0" y="768.0" type="line"/>
-      <point x="2264.0" y="956.0" type="line"/>
-      <point x="2452.0" y="768.0" type="line"/>
-      <point x="2264.0" y="572.0" type="line"/>
+      <point x="2072.0" y="1056.0" type="line"/>
+      <point x="2264.0" y="1244.0" type="line"/>
+      <point x="2452.0" y="1056.0" type="line"/>
+      <point x="2264.0" y="860.0" type="line"/>
     </contour>
     <contour>
-      <point x="564.0" y="768.0" type="line"/>
-      <point x="752.0" y="956.0" type="line"/>
-      <point x="944.0" y="768.0" type="line"/>
-      <point x="752.0" y="572.0" type="line"/>
+      <point x="564.0" y="1056.0" type="line"/>
+      <point x="752.0" y="1244.0" type="line"/>
+      <point x="944.0" y="1056.0" type="line"/>
+      <point x="752.0" y="860.0" type="line"/>
     </contour>
     <contour>
-      <point x="2096.0" y="8.0" type="line"/>
-      <point x="1512.0" y="600.0" type="line"/>
-      <point x="920.0" y="8.0" type="line"/>
-      <point x="1512.0" y="-576.0" type="line"/>
+      <point x="2096.0" y="296.0" type="line"/>
+      <point x="1512.0" y="888.0" type="line"/>
+      <point x="920.0" y="296.0" type="line"/>
+      <point x="1512.0" y="-288.0" type="line"/>
     </contour>
     <contour>
-      <point x="1324.0" y="8.0" type="line"/>
-      <point x="1512.0" y="196.0" type="line"/>
-      <point x="1700.0" y="8.0" type="line"/>
-      <point x="1512.0" y="-180.0" type="line"/>
+      <point x="1324.0" y="296.0" type="line"/>
+      <point x="1512.0" y="484.0" type="line"/>
+      <point x="1700.0" y="296.0" type="line"/>
+      <point x="1512.0" y="108.0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/dollar.glif b/src/Inter-UI-Black.ufo/glyphs/dollar.glif
index bc865ea2e..147bef33a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/dollar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/dollar.glif
@@ -1,20 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="dollar" format="2">
-  <advance width="1944.0"/>
+  <advance width="1876.0"/>
   <unicode hex="0024"/>
-  <guideline x="8.0" y="2280.0" angle="0.0"/>
-  <guideline x="8.0" y="764.0" angle="0.0"/>
+  <guideline y="2280.0"/>
+  <guideline y="764.0"/>
   <outline>
     <contour>
-      <point x="888.0" y="-256.0" type="line"/>
-      <point x="1016.0" y="-256.0" type="line"/>
-      <point x="1016.0" y="2304.0" type="line"/>
-      <point x="888.0" y="2304.0" type="line"/>
+      <point x="880.0" y="-256.0" type="line"/>
+      <point x="1008.0" y="-256.0" type="line"/>
+      <point x="1008.0" y="2304.0" type="line"/>
+      <point x="880.0" y="2304.0" type="line"/>
     </contour>
-    <component base="S" xOffset="8.0"/>
+    <component base="S"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>S</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>S</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/eight.tf.glif b/src/Inter-UI-Black.ufo/glyphs/eight.tf.glif
index e66e4da54..321d14e08 100644
--- a/src/Inter-UI-Black.ufo/glyphs/eight.tf.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/eight.tf.glif
@@ -6,6 +6,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>zero.tf</string>
       <key>public.markColor</key>
       <string>0.906,0.965,0.741,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/eta.glif b/src/Inter-UI-Black.ufo/glyphs/eta.glif
index d5cfb02da..700de0689 100644
--- a/src/Inter-UI-Black.ufo/glyphs/eta.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/eta.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="eta" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="03B7"/>
   <outline>
     <contour>
-      <point x="692.0" y="780.0" type="line" smooth="yes"/>
-      <point x="693.0" y="940.0"/>
-      <point x="693.0" y="1136.0"/>
-      <point x="880.0" y="1136.0" type="curve" smooth="yes"/>
-      <point x="989.0" y="1136.0"/>
-      <point x="1077.0" y="1076.0"/>
-      <point x="1076.0" y="936.0" type="curve" smooth="yes"/>
-      <point x="1076.0" y="-576.0" type="line"/>
-      <point x="1628.0" y="-576.0" type="line"/>
-      <point x="1628.0" y="952.0" type="line" smooth="yes"/>
-      <point x="1629.0" y="1416.0"/>
-      <point x="1345.0" y="1556.0"/>
-      <point x="1080.0" y="1556.0" type="curve" smooth="yes"/>
-      <point x="905.0" y="1556.0"/>
-      <point x="753.0" y="1500.0"/>
-      <point x="660.0" y="1412.0" type="curve"/>
-      <point x="644.0" y="1412.0" type="line"/>
-      <point x="644.0" y="1536.0" type="line"/>
+      <point x="692.0" y="864.0" type="line" smooth="yes"/>
+      <point x="692.0" y="1016.0"/>
+      <point x="780.0" y="1108.0"/>
+      <point x="916.0" y="1108.0" type="curve" smooth="yes"/>
+      <point x="1056.0" y="1108.0"/>
+      <point x="1136.0" y="1016.0"/>
+      <point x="1136.0" y="864.0" type="curve" smooth="yes"/>
+      <point x="1136.0" y="-576.0" type="line"/>
+      <point x="1688.0" y="-576.0" type="line"/>
+      <point x="1688.0" y="980.0" type="line" smooth="yes"/>
+      <point x="1688.0" y="1316.0"/>
+      <point x="1480.0" y="1556.0"/>
+      <point x="1152.0" y="1556.0" type="curve" smooth="yes"/>
+      <point x="928.0" y="1556.0"/>
+      <point x="748.0" y="1440.0"/>
+      <point x="680.0" y="1244.0" type="curve"/>
+      <point x="664.0" y="1244.0" type="line"/>
+      <point x="664.0" y="1536.0" type="line"/>
       <point x="140.0" y="1536.0" type="line"/>
       <point x="140.0" y="0.0" type="line"/>
       <point x="692.0" y="0.0" type="line"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/etatonos.glif b/src/Inter-UI-Black.ufo/glyphs/etatonos.glif
index 2836a6c64..998028923 100644
--- a/src/Inter-UI-Black.ufo/glyphs/etatonos.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/etatonos.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="etatonos" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="03AE"/>
   <outline>
     <component base="eta"/>
-    <component base="tonostop" xOffset="356.0"/>
+    <component base="tonostop" xOffset="400.0" yOffset="4.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/five.tf.glif b/src/Inter-UI-Black.ufo/glyphs/five.tf.glif
index e23866b9f..bc77bf61c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/five.tf.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/five.tf.glif
@@ -6,6 +6,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>zero.tf</string>
       <key>public.markColor</key>
       <string>0.906,0.965,0.741,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/four.glif b/src/Inter-UI-Black.ufo/glyphs/four.glif
index 9fa88b337..2c251f03d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/four.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/four.glif
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="four" format="2">
-  <advance width="1952.0"/>
+  <advance width="1976.0"/>
   <unicode hex="0034"/>
   <guideline x="104.0" y="320.0" angle="0.0"/>
   <guideline x="104.0" y="752.0" angle="0.0"/>
   <outline>
     <contour>
       <point x="116.0" y="320.0" type="line"/>
-      <point x="1856.0" y="320.0" type="line"/>
-      <point x="1856.0" y="752.0" type="line"/>
+      <point x="1880.0" y="320.0" type="line"/>
+      <point x="1880.0" y="752.0" type="line"/>
       <point x="664.0" y="752.0" type="line"/>
       <point x="664.0" y="768.0" type="line"/>
       <point x="1108.0" y="1472.0" type="line"/>
@@ -18,10 +18,12 @@
       <point x="116.0" y="752.0" type="line"/>
     </contour>
     <contour>
-      <point x="1124.0" y="0.0" type="line"/>
-      <point x="1620.0" y="0.0" type="line"/>
-      <point x="1620.0" y="2048.0" type="line"/>
+      <point x="1112.0" y="0.0" type="line"/>
+      <point x="1644.0" y="0.0" type="line"/>
+      <point x="1644.0" y="2048.0" type="line"/>
       <point x="1124.0" y="2048.0" type="line"/>
+      <point x="1124.0" y="640.0" type="line"/>
+      <point x="1112.0" y="452.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -36,7 +38,7 @@
           <key>origin</key>
           <array>
             <real>1.0</real>
-            <real>3.0</real>
+            <real>5.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -78,7 +80,7 @@
           <key>origin</key>
           <array>
             <real>1.0</real>
-            <real>3.0</real>
+            <real>5.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -100,6 +102,46 @@
           <key>type</key>
           <string>Anchor</string>
         </dict>
+        <dict>
+          <key>horizontal</key>
+          <false/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>origin</key>
+          <array>
+            <real>1.0</real>
+            <real>5.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <real>1.0</real>
+            <real>0.0</real>
+          </array>
+          <key>type</key>
+          <string>Stem</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>0</integer>
+          <key>origin</key>
+          <array>
+            <real>0.0</real>
+            <real>0.0</real>
+          </array>
+          <key>stem</key>
+          <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <real>0.0</real>
+            <real>1.0</real>
+          </array>
+          <key>type</key>
+          <string>Stem</string>
+        </dict>
       </array>
       <key>public.markColor</key>
       <string>0.89,0.961,0.922,0.004</string>
diff --git a/src/Inter-UI-Black.ufo/glyphs/four.ss01.glif b/src/Inter-UI-Black.ufo/glyphs/four.ss01.glif
index beaca1202..8a77f5013 100644
--- a/src/Inter-UI-Black.ufo/glyphs/four.ss01.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/four.ss01.glif
@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="four.ss01" format="2">
-  <advance width="1952.0"/>
+  <advance width="1976.0"/>
   <guideline x="12.0" y="1240.0" angle="0.0"/>
   <guideline x="12.0" y="896.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="1856.0" y="752.0" type="line"/>
+      <point x="116.0" y="320.0" type="line"/>
+      <point x="1880.0" y="320.0" type="line"/>
+      <point x="1880.0" y="752.0" type="line"/>
       <point x="640.0" y="752.0" type="line"/>
       <point x="1364.0" y="2048.0" type="line"/>
       <point x="844.0" y="2048.0" type="line"/>
       <point x="116.0" y="752.0" type="line"/>
-      <point x="116.0" y="320.0" type="line"/>
-      <point x="1856.0" y="320.0" type="line"/>
     </contour>
     <contour>
-      <point x="1620.0" y="1280.0" type="line"/>
-      <point x="1124.0" y="1280.0" type="line"/>
-      <point x="1124.0" y="0.0" type="line"/>
-      <point x="1620.0" y="0.0" type="line"/>
+      <point x="1112.0" y="0.0" type="line"/>
+      <point x="1632.0" y="0.0" type="line"/>
+      <point x="1632.0" y="1280.0" type="line"/>
+      <point x="1132.0" y="1280.0" type="line"/>
+      <point x="1132.0" y="640.0" type="line"/>
+      <point x="1112.0" y="448.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -32,73 +34,71 @@
           <key>horizontal</key>
           <true/>
           <key>options</key>
-          <integer>0</integer>
+          <integer>4</integer>
           <key>origin</key>
           <array>
             <real>1.0</real>
-            <real>1.0</real>
+            <real>5.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <string>u</string>
-            <string>p</string>
-          </array>
           <key>type</key>
-          <string>BottomGhost</string>
+          <string>Anchor</string>
         </dict>
         <dict>
           <key>horizontal</key>
           <true/>
           <key>options</key>
-          <integer>0</integer>
+          <integer>4</integer>
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>2.0</real>
+            <real>4.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <string>d</string>
-            <string>o</string>
-            <string>w</string>
-            <string>n</string>
-          </array>
           <key>type</key>
-          <string>TopGhost</string>
+          <string>Anchor</string>
         </dict>
         <dict>
           <key>horizontal</key>
-          <true/>
+          <false/>
           <key>options</key>
-          <integer>4</integer>
+          <integer>0</integer>
           <key>origin</key>
           <array>
             <real>1.0</real>
-            <real>1.0</real>
+            <real>5.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <real>1.0</real>
+            <real>0.0</real>
+          </array>
           <key>type</key>
-          <string>Anchor</string>
+          <string>Stem</string>
         </dict>
         <dict>
           <key>horizontal</key>
           <true/>
           <key>options</key>
-          <integer>4</integer>
+          <integer>0</integer>
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>2.0</real>
+            <real>0.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <real>0.0</real>
+            <real>1.0</real>
+          </array>
           <key>type</key>
-          <string>Anchor</string>
+          <string>Stem</string>
         </dict>
       </array>
       <key>public.markColor</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/four.tf.glif b/src/Inter-UI-Black.ufo/glyphs/four.tf.glif
index 0c54edc8a..b44c60ab9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/four.tf.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/four.tf.glif
@@ -2,10 +2,12 @@
 <glyph name="four.tf" format="2">
   <advance width="1984.0"/>
   <outline>
-    <component base="four" xOffset="60.0"/>
+    <component base="four" xOffset="8.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>zero.tf</string>
       <key>public.markColor</key>
       <string>0.906,0.965,0.741,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/four.tf.ss01.glif b/src/Inter-UI-Black.ufo/glyphs/four.tf.ss01.glif
index 5366b6b3d..d52e6166c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/four.tf.ss01.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/four.tf.ss01.glif
@@ -4,10 +4,12 @@
   <guideline x="12.0" y="1240.0" angle="0.0"/>
   <guideline x="12.0" y="896.0" angle="0.0"/>
   <outline>
-    <component base="four.ss01" xOffset="12.0"/>
+    <component base="four.ss01" xOffset="8.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>zero.tf</string>
       <key>public.markColor</key>
       <string>0.98,0.36,0.67,1</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/franc.glif b/src/Inter-UI-Black.ufo/glyphs/franc.glif
index a35549d86..74039d3ef 100644
--- a/src/Inter-UI-Black.ufo/glyphs/franc.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/franc.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="franc" format="2">
-  <advance width="1676.0"/>
+  <advance width="1688.0"/>
   <unicode hex="20A3"/>
   <outline>
     <component base="F"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/naira.glif b/src/Inter-UI-Black.ufo/glyphs/naira.glif
index 8a56e26c6..f7e95cca9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/naira.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/naira.glif
@@ -1,34 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="naira" format="2">
-  <advance width="2516.0"/>
+  <advance width="2104.0"/>
   <unicode hex="20A6"/>
   <outline>
     <contour>
-      <point x="2420.0" y="1412.0" type="line"/>
-      <point x="96.0" y="1412.0" type="line"/>
-      <point x="96.0" y="1192.0" type="line"/>
-      <point x="2420.0" y="1192.0" type="line"/>
+      <point x="2072.0" y="1300.0" type="line"/>
+      <point x="32.0" y="1300.0" type="line"/>
+      <point x="32.0" y="1100.0" type="line"/>
+      <point x="2072.0" y="1100.0" type="line"/>
     </contour>
     <contour>
-      <point x="2420.0" y="940.0" type="line"/>
-      <point x="96.0" y="940.0" type="line"/>
-      <point x="96.0" y="720.0" type="line"/>
-      <point x="2420.0" y="720.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="2144.0" y="2048.0" type="line"/>
-      <point x="1588.0" y="2048.0" type="line"/>
-      <point x="1588.0" y="928.0" type="line"/>
-      <point x="1572.0" y="928.0" type="line"/>
-      <point x="924.0" y="2048.0" type="line"/>
-      <point x="372.0" y="2048.0" type="line"/>
-      <point x="372.0" y="0.0" type="line"/>
-      <point x="924.0" y="0.0" type="line"/>
-      <point x="924.0" y="1124.0" type="line"/>
-      <point x="940.0" y="1124.0" type="line"/>
-      <point x="1596.0" y="0.0" type="line"/>
-      <point x="2144.0" y="0.0" type="line"/>
+      <point x="2072.0" y="868.0" type="line"/>
+      <point x="32.0" y="868.0" type="line"/>
+      <point x="32.0" y="668.0" type="line"/>
+      <point x="2072.0" y="668.0" type="line"/>
     </contour>
+    <component base="N" xOffset="36.0"/>
   </outline>
   <lib>
     <dict>
@@ -39,10 +26,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>5.0</real>
+            <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -59,18 +46,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>720.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>0.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -79,18 +61,13 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>1.0</real>
+            <real>1192.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>0.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -99,10 +76,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>4.0</real>
+            <real>2048.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -121,10 +98,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>5.0</real>
+            <real>0.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -136,18 +113,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>1.0</real>
+            <real>720.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>0.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -156,18 +128,13 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>1.0</real>
+            <real>1192.0</real>
+            <real>220.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>0.0</real>
-          </array>
           <key>type</key>
           <string>TTStem</string>
         </dict>
@@ -176,10 +143,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>4.0</real>
+            <real>2048.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/nine.tf.glif b/src/Inter-UI-Black.ufo/glyphs/nine.tf.glif
index 31942a2de..2bfb3a34c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/nine.tf.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/nine.tf.glif
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>zero.tf</string>
       <key>public.markColor</key>
       <string>0.906,0.965,0.741,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/nine.tf.ss01.glif b/src/Inter-UI-Black.ufo/glyphs/nine.tf.ss01.glif
index 17c387018..52861a44d 100644
--- a/src/Inter-UI-Black.ufo/glyphs/nine.tf.ss01.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/nine.tf.ss01.glif
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>zero.tf</string>
       <key>public.markColor</key>
       <string>0.98,0.36,0.67,1</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/nlegrightlong.glif b/src/Inter-UI-Black.ufo/glyphs/nlegrightlong.glif
index b7c3381c4..a9b53f970 100644
--- a/src/Inter-UI-Black.ufo/glyphs/nlegrightlong.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/nlegrightlong.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="nlegrightlong" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="019E"/>
   <outline>
     <component base="eta"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/one.glif b/src/Inter-UI-Black.ufo/glyphs/one.glif
index db1eff982..6cadfb8d4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/one.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/one.glif
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="one" format="2">
-  <advance width="1348.0"/>
+  <advance width="1392.0"/>
   <unicode hex="0031"/>
   <guideline x="-32.0" y="1240.0" angle="0.0"/>
   <guideline x="-32.0" y="764.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="1052.0" y="2048.0" type="line"/>
+      <point x="1108.0" y="2048.0" type="line"/>
       <point x="552.0" y="2048.0" type="line"/>
       <point x="552.0" y="1854.0"/>
       <point x="357.0" y="1688.0"/>
@@ -17,7 +17,7 @@
       <point x="536.0" y="1404.0" type="curve"/>
       <point x="556.0" y="1404.0" type="line"/>
       <point x="556.0" y="0.0" type="line"/>
-      <point x="1052.0" y="0.0" type="line"/>
+      <point x="1108.0" y="0.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -26,55 +26,13 @@
       <array>
         <dict>
           <key>horizontal</key>
-          <true/>
-          <key>options</key>
-          <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
-            <real>9.0</real>
-          </array>
-          <key>stem</key>
-          <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <string>u</string>
-            <string>p</string>
-          </array>
-          <key>type</key>
-          <string>BottomGhost</string>
-        </dict>
-        <dict>
-          <key>horizontal</key>
-          <true/>
-          <key>options</key>
-          <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
-            <real>0.0</real>
-          </array>
-          <key>stem</key>
-          <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <string>d</string>
-            <string>o</string>
-            <string>w</string>
-            <string>n</string>
-          </array>
-          <key>type</key>
-          <string>TopGhost</string>
-        </dict>
-        <dict>
-          <key>horizontal</key>
           <false/>
           <key>options</key>
           <integer>0</integer>
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>4.0</real>
+            <real>9.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/one.ss01.glif b/src/Inter-UI-Black.ufo/glyphs/one.ss01.glif
index 03df3240d..dabdd02fb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/one.ss01.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/one.ss01.glif
@@ -1,75 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="one.ss01" format="2">
-  <advance width="1380.0"/>
-  <guideline x="60.0" y="1240.0" angle="0.0"/>
-  <guideline x="60.0" y="764.0" angle="0.0"/>
+  <advance width="1420.0"/>
+  <guideline x="56.0" y="1240.0" angle="0.0"/>
+  <guideline x="56.0" y="764.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="1084.0" y="2048.0" type="line"/>
-      <point x="632.0" y="2048.0" type="line"/>
-      <point x="128.0" y="1740.0" type="line"/>
-      <point x="128.0" y="1268.0" type="line"/>
-      <point x="576.0" y="1536.0" type="line"/>
-      <point x="588.0" y="1536.0" type="line"/>
-      <point x="588.0" y="0.0" type="line"/>
-      <point x="1084.0" y="0.0" type="line"/>
+      <point x="1136.0" y="2048.0" type="line"/>
+      <point x="628.0" y="2048.0" type="line"/>
+      <point x="124.0" y="1740.0" type="line"/>
+      <point x="124.0" y="1268.0" type="line"/>
+      <point x="572.0" y="1536.0" type="line"/>
+      <point x="584.0" y="1536.0" type="line"/>
+      <point x="584.0" y="0.0" type="line"/>
+      <point x="1136.0" y="0.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>one</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
           <key>horizontal</key>
-          <true/>
-          <key>options</key>
-          <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
-            <real>5.0</real>
-          </array>
-          <key>stem</key>
-          <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <string>u</string>
-            <string>p</string>
-          </array>
-          <key>type</key>
-          <string>BottomGhost</string>
-        </dict>
-        <dict>
-          <key>horizontal</key>
-          <true/>
-          <key>options</key>
-          <integer>0</integer>
-          <key>origin</key>
-          <array>
-            <real>0.0</real>
-            <real>0.0</real>
-          </array>
-          <key>stem</key>
-          <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <string>d</string>
-            <string>o</string>
-            <string>w</string>
-            <string>n</string>
-          </array>
-          <key>type</key>
-          <string>TopGhost</string>
-        </dict>
-        <dict>
-          <key>horizontal</key>
           <false/>
           <key>options</key>
           <integer>0</integer>
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>2.0</real>
+            <real>5.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/one.tf.glif b/src/Inter-UI-Black.ufo/glyphs/one.tf.glif
index 1b8d1863c..f11a40875 100644
--- a/src/Inter-UI-Black.ufo/glyphs/one.tf.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/one.tf.glif
@@ -2,16 +2,12 @@
 <glyph name="one.tf" format="2">
   <advance width="1984.0"/>
   <outline>
-    <contour>
-      <point x="288.0" y="0.0" type="line"/>
-      <point x="1700.0" y="0.0" type="line"/>
-      <point x="1700.0" y="448.0" type="line"/>
-      <point x="288.0" y="448.0" type="line"/>
-    </contour>
-    <component base="one" xOffset="208.0"/>
+    <component base="one" xOffset="276.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>zero.tf</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -19,10 +15,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>3.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -61,18 +57,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>3.0</real>
+            <real>288.0</real>
+            <real>1412.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>0.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -81,10 +72,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>3.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -96,10 +87,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>2.0</real>
+            <real>448.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/one.tf.ss01.glif b/src/Inter-UI-Black.ufo/glyphs/one.tf.ss01.glif
index 716f79ceb..08e83a588 100644
--- a/src/Inter-UI-Black.ufo/glyphs/one.tf.ss01.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/one.tf.ss01.glif
@@ -2,16 +2,12 @@
 <glyph name="one.tf.ss01" format="2">
   <advance width="1984.0"/>
   <outline>
-    <contour>
-      <point x="288.0" y="0.0" type="line"/>
-      <point x="1700.0" y="0.0" type="line"/>
-      <point x="1700.0" y="448.0" type="line"/>
-      <point x="288.0" y="448.0" type="line"/>
-    </contour>
-    <component base="one.ss01" xOffset="160.0"/>
+    <component base="one.ss01" xOffset="292.0"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>zero.tf</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -19,10 +15,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>3.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -61,18 +57,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>2.0</real>
+            <real>288.0</real>
+            <real>1412.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>0.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -81,10 +72,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
             <real>0.0</real>
-            <real>3.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -96,10 +87,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>2.0</real>
+            <real>448.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/placeofinterestsign.glif b/src/Inter-UI-Black.ufo/glyphs/placeofinterestsign.glif
index b2fe8d72b..5cb5ab2d9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/placeofinterestsign.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/placeofinterestsign.glif
@@ -2,114 +2,115 @@
 <glyph name="placeofinterestsign" format="2">
   <advance width="2592.0"/>
   <unicode hex="2318"/>
+  <guideline x="1404.0" y="1056.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="712.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="966.0" y="-28.0"/>
-      <point x="1174.0" y="180.0"/>
-      <point x="1176.0" y="440.0" type="curve" smooth="yes"/>
-      <point x="1176.0" y="616.0" type="line"/>
-      <point x="1416.0" y="616.0" type="line"/>
-      <point x="1416.0" y="440.0" type="line" smooth="yes"/>
-      <point x="1414.0" y="180.0"/>
-      <point x="1622.0" y="-28.0"/>
-      <point x="1884.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="2138.0" y="-28.0"/>
-      <point x="2346.0" y="180.0"/>
-      <point x="2348.0" y="440.0" type="curve" smooth="yes"/>
-      <point x="2346.0" y="696.0"/>
-      <point x="2138.0" y="904.0"/>
-      <point x="1884.0" y="904.0" type="curve" smooth="yes"/>
-      <point x="1704.0" y="904.0" type="line"/>
-      <point x="1704.0" y="1144.0" type="line"/>
-      <point x="1884.0" y="1144.0" type="line" smooth="yes"/>
-      <point x="2138.0" y="1144.0"/>
-      <point x="2346.0" y="1352.0"/>
-      <point x="2348.0" y="1612.0" type="curve" smooth="yes"/>
-      <point x="2346.0" y="1868.0"/>
-      <point x="2138.0" y="2076.0"/>
-      <point x="1884.0" y="2076.0" type="curve" smooth="yes"/>
-      <point x="1622.0" y="2076.0"/>
-      <point x="1414.0" y="1868.0"/>
-      <point x="1416.0" y="1612.0" type="curve" smooth="yes"/>
-      <point x="1416.0" y="1432.0" type="line"/>
-      <point x="1176.0" y="1432.0" type="line"/>
-      <point x="1176.0" y="1612.0" type="line" smooth="yes"/>
-      <point x="1174.0" y="1868.0"/>
-      <point x="966.0" y="2076.0"/>
-      <point x="712.0" y="2076.0" type="curve" smooth="yes"/>
-      <point x="450.0" y="2076.0"/>
-      <point x="242.0" y="1868.0"/>
-      <point x="244.0" y="1612.0" type="curve" smooth="yes"/>
-      <point x="242.0" y="1352.0"/>
-      <point x="450.0" y="1144.0"/>
-      <point x="712.0" y="1144.0" type="curve" smooth="yes"/>
-      <point x="888.0" y="1144.0" type="line"/>
-      <point x="888.0" y="904.0" type="line"/>
-      <point x="712.0" y="904.0" type="line" smooth="yes"/>
-      <point x="450.0" y="904.0"/>
-      <point x="242.0" y="696.0"/>
-      <point x="244.0" y="440.0" type="curve" smooth="yes"/>
-      <point x="242.0" y="180.0"/>
-      <point x="450.0" y="-28.0"/>
+      <point x="712.0" y="4.0" type="curve" smooth="yes"/>
+      <point x="966.0" y="4.0"/>
+      <point x="1176.0" y="212.0"/>
+      <point x="1176.0" y="472.0" type="curve" smooth="yes"/>
+      <point x="1176.0" y="648.0" type="line"/>
+      <point x="1416.0" y="648.0" type="line"/>
+      <point x="1416.0" y="472.0" type="line" smooth="yes"/>
+      <point x="1416.0" y="212.0"/>
+      <point x="1622.0" y="4.0"/>
+      <point x="1884.0" y="4.0" type="curve" smooth="yes"/>
+      <point x="2138.0" y="4.0"/>
+      <point x="2346.0" y="212.0"/>
+      <point x="2348.0" y="472.0" type="curve" smooth="yes"/>
+      <point x="2350.0" y="728.0"/>
+      <point x="2138.0" y="936.0"/>
+      <point x="1884.0" y="936.0" type="curve" smooth="yes"/>
+      <point x="1704.0" y="936.0" type="line"/>
+      <point x="1704.0" y="1176.0" type="line"/>
+      <point x="1884.0" y="1176.0" type="line" smooth="yes"/>
+      <point x="2138.0" y="1176.0"/>
+      <point x="2346.0" y="1384.0"/>
+      <point x="2348.0" y="1644.0" type="curve" smooth="yes"/>
+      <point x="2350.0" y="1900.0"/>
+      <point x="2138.0" y="2108.0"/>
+      <point x="1884.0" y="2108.0" type="curve" smooth="yes"/>
+      <point x="1622.0" y="2108.0"/>
+      <point x="1416.0" y="1900.0"/>
+      <point x="1416.0" y="1644.0" type="curve" smooth="yes"/>
+      <point x="1416.0" y="1464.0" type="line"/>
+      <point x="1176.0" y="1464.0" type="line"/>
+      <point x="1176.0" y="1644.0" type="line" smooth="yes"/>
+      <point x="1176.0" y="1900.0"/>
+      <point x="966.0" y="2108.0"/>
+      <point x="712.0" y="2108.0" type="curve" smooth="yes"/>
+      <point x="450.0" y="2108.0"/>
+      <point x="242.0" y="1900.0"/>
+      <point x="244.0" y="1644.0" type="curve" smooth="yes"/>
+      <point x="246.0" y="1384.0"/>
+      <point x="450.0" y="1176.0"/>
+      <point x="712.0" y="1176.0" type="curve" smooth="yes"/>
+      <point x="888.0" y="1176.0" type="line"/>
+      <point x="888.0" y="936.0" type="line"/>
+      <point x="712.0" y="936.0" type="line" smooth="yes"/>
+      <point x="450.0" y="936.0"/>
+      <point x="242.0" y="728.0"/>
+      <point x="244.0" y="472.0" type="curve" smooth="yes"/>
+      <point x="246.0" y="212.0"/>
+      <point x="450.0" y="4.0"/>
     </contour>
     <contour>
-      <point x="712.0" y="260.0" type="curve" smooth="yes"/>
-      <point x="610.0" y="260.0"/>
-      <point x="530.0" y="340.0"/>
-      <point x="532.0" y="440.0" type="curve" smooth="yes"/>
-      <point x="530.0" y="536.0"/>
-      <point x="610.0" y="616.0"/>
-      <point x="712.0" y="616.0" type="curve" smooth="yes"/>
-      <point x="888.0" y="616.0" type="line"/>
-      <point x="888.0" y="440.0" type="line"/>
-      <point x="886.0" y="340.0"/>
-      <point x="806.0" y="260.0"/>
+      <point x="712.0" y="292.0" type="curve" smooth="yes"/>
+      <point x="610.0" y="292.0"/>
+      <point x="530.0" y="372.0"/>
+      <point x="532.0" y="472.0" type="curve" smooth="yes"/>
+      <point x="534.0" y="568.0"/>
+      <point x="610.0" y="648.0"/>
+      <point x="712.0" y="648.0" type="curve" smooth="yes"/>
+      <point x="888.0" y="648.0" type="line"/>
+      <point x="888.0" y="472.0" type="line"/>
+      <point x="886.0" y="372.0"/>
+      <point x="806.0" y="292.0"/>
     </contour>
     <contour>
-      <point x="712.0" y="1432.0" type="line" smooth="yes"/>
-      <point x="610.0" y="1432.0"/>
-      <point x="530.0" y="1512.0"/>
-      <point x="532.0" y="1612.0" type="curve" smooth="yes"/>
-      <point x="530.0" y="1708.0"/>
-      <point x="610.0" y="1788.0"/>
-      <point x="712.0" y="1788.0" type="curve" smooth="yes"/>
-      <point x="806.0" y="1788.0"/>
-      <point x="886.0" y="1708.0"/>
-      <point x="888.0" y="1612.0" type="curve" smooth="yes"/>
-      <point x="888.0" y="1432.0" type="line"/>
+      <point x="712.0" y="1464.0" type="line" smooth="yes"/>
+      <point x="610.0" y="1464.0"/>
+      <point x="530.0" y="1544.0"/>
+      <point x="532.0" y="1644.0" type="curve" smooth="yes"/>
+      <point x="534.0" y="1740.0"/>
+      <point x="610.0" y="1820.0"/>
+      <point x="712.0" y="1820.0" type="curve" smooth="yes"/>
+      <point x="806.0" y="1820.0"/>
+      <point x="888.0" y="1740.0"/>
+      <point x="888.0" y="1644.0" type="curve" smooth="yes"/>
+      <point x="888.0" y="1464.0" type="line"/>
     </contour>
     <contour>
-      <point x="1176.0" y="904.0" type="line"/>
-      <point x="1176.0" y="1144.0" type="line"/>
-      <point x="1416.0" y="1144.0" type="line"/>
-      <point x="1416.0" y="904.0" type="line"/>
+      <point x="1176.0" y="936.0" type="line"/>
+      <point x="1176.0" y="1176.0" type="line"/>
+      <point x="1416.0" y="1176.0" type="line"/>
+      <point x="1416.0" y="936.0" type="line"/>
     </contour>
     <contour>
-      <point x="1884.0" y="260.0" type="curve" smooth="yes"/>
-      <point x="1782.0" y="260.0"/>
-      <point x="1702.0" y="340.0"/>
-      <point x="1704.0" y="440.0" type="curve" smooth="yes"/>
-      <point x="1704.0" y="616.0" type="line"/>
-      <point x="1884.0" y="616.0" type="line" smooth="yes"/>
-      <point x="1978.0" y="616.0"/>
-      <point x="2058.0" y="536.0"/>
-      <point x="2060.0" y="440.0" type="curve" smooth="yes"/>
-      <point x="2058.0" y="340.0"/>
-      <point x="1978.0" y="260.0"/>
+      <point x="1884.0" y="292.0" type="curve" smooth="yes"/>
+      <point x="1782.0" y="292.0"/>
+      <point x="1704.0" y="372.0"/>
+      <point x="1704.0" y="472.0" type="curve" smooth="yes"/>
+      <point x="1704.0" y="648.0" type="line"/>
+      <point x="1884.0" y="648.0" type="line" smooth="yes"/>
+      <point x="1978.0" y="648.0"/>
+      <point x="2058.0" y="568.0"/>
+      <point x="2060.0" y="472.0" type="curve" smooth="yes"/>
+      <point x="2062.0" y="372.0"/>
+      <point x="1978.0" y="292.0"/>
     </contour>
     <contour>
-      <point x="1704.0" y="1432.0" type="line"/>
-      <point x="1704.0" y="1612.0" type="line"/>
-      <point x="1702.0" y="1708.0"/>
-      <point x="1782.0" y="1788.0"/>
-      <point x="1884.0" y="1788.0" type="curve" smooth="yes"/>
-      <point x="1978.0" y="1788.0"/>
-      <point x="2058.0" y="1708.0"/>
-      <point x="2060.0" y="1612.0" type="curve" smooth="yes"/>
-      <point x="2058.0" y="1512.0"/>
-      <point x="1978.0" y="1432.0"/>
-      <point x="1884.0" y="1432.0" type="curve" smooth="yes"/>
+      <point x="1704.0" y="1464.0" type="line"/>
+      <point x="1704.0" y="1644.0" type="line"/>
+      <point x="1702.0" y="1740.0"/>
+      <point x="1782.0" y="1820.0"/>
+      <point x="1884.0" y="1820.0" type="curve" smooth="yes"/>
+      <point x="1978.0" y="1820.0"/>
+      <point x="2058.0" y="1740.0"/>
+      <point x="2060.0" y="1644.0" type="curve" smooth="yes"/>
+      <point x="2062.0" y="1544.0"/>
+      <point x="1978.0" y="1464.0"/>
+      <point x="1884.0" y="1464.0" type="curve" smooth="yes"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/qhook.glif b/src/Inter-UI-Black.ufo/glyphs/qhook.glif
index c7f75e841..f33130f92 100644
--- a/src/Inter-UI-Black.ufo/glyphs/qhook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/qhook.glif
@@ -1,70 +1,73 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="qhook" format="2">
-  <advance width="1864.0"/>
+  <advance width="2016.0"/>
   <unicode hex="02A0"/>
   <outline>
     <contour>
-      <point x="1592.0" y="1076.0" type="line"/>
-      <point x="1592.0" y="1364.0" type="line" smooth="yes"/>
-      <point x="1592.0" y="1456.0"/>
-      <point x="1696.0" y="1476.0"/>
-      <point x="1800.0" y="1476.0" type="curve" smooth="yes"/>
-      <point x="1852.0" y="1476.0"/>
-      <point x="1892.0" y="1472.0"/>
-      <point x="1924.0" y="1468.0" type="curve"/>
-      <point x="1924.0" y="1876.0" type="line"/>
-      <point x="1852.0" y="1884.0"/>
-      <point x="1752.0" y="1896.0"/>
-      <point x="1648.0" y="1896.0" type="curve" smooth="yes"/>
-      <point x="1368.0" y="1896.0"/>
-      <point x="1036.0" y="1848.0"/>
-      <point x="1036.0" y="1348.0" type="curve" smooth="yes"/>
-      <point x="1036.0" y="1076.0" type="line"/>
+      <point x="1684.0" y="1312.0" type="line"/>
+      <point x="1684.0" y="1364.0" type="line" smooth="yes"/>
+      <point x="1684.0" y="1456.0"/>
+      <point x="1788.0" y="1476.0"/>
+      <point x="1892.0" y="1476.0" type="curve" smooth="yes"/>
+      <point x="1944.0" y="1476.0"/>
+      <point x="1984.0" y="1472.0"/>
+      <point x="2016.0" y="1468.0" type="curve"/>
+      <point x="2016.0" y="1876.0" type="line"/>
+      <point x="1944.0" y="1884.0"/>
+      <point x="1844.0" y="1896.0"/>
+      <point x="1740.0" y="1896.0" type="curve" smooth="yes"/>
+      <point x="1460.0" y="1896.0"/>
+      <point x="1136.0" y="1848.0"/>
+      <point x="1136.0" y="1348.0" type="curve" smooth="yes"/>
+      <point x="1136.0" y="1312.0" type="line"/>
     </contour>
     <contour>
-      <point x="1592.0" y="1536.0" type="line"/>
-      <point x="1044.0" y="1536.0" type="line"/>
-      <point x="1044.0" y="1272.0" type="line"/>
-      <point x="1044.0" y="1216.0" type="line"/>
-      <point x="1224.0" y="756.0" type="line"/>
-      <point x="1040.0" y="228.0" type="line"/>
-      <point x="1040.0" y="-576.0" type="line"/>
-      <point x="1592.0" y="-576.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1260.0" y="1404.0" type="line"/>
-      <point x="1024.0" y="1404.0" type="line"/>
-      <point x="968.0" y="1536.0"/>
-      <point x="812.0" y="1556.0"/>
+      <point x="696.0" y="-20.0" type="curve" smooth="yes"/>
+      <point x="912.0" y="-20.0"/>
+      <point x="1060.0" y="96.0"/>
+      <point x="1124.0" y="252.0" type="curve"/>
+      <point x="1352.0" y="252.0" type="line"/>
+      <point x="1352.0" y="1268.0" type="line"/>
+      <point x="1124.0" y="1268.0" type="line"/>
+      <point x="1064.0" y="1424.0"/>
+      <point x="920.0" y="1556.0"/>
       <point x="692.0" y="1556.0" type="curve" smooth="yes"/>
-      <point x="396.0" y="1556.0"/>
+      <point x="388.0" y="1556.0"/>
       <point x="92.0" y="1324.0"/>
       <point x="92.0" y="768.0" type="curve" smooth="yes"/>
-      <point x="92.0" y="232.0"/>
-      <point x="376.0" y="-20.0"/>
-      <point x="696.0" y="-20.0" type="curve" smooth="yes"/>
-      <point x="820.0" y="-20.0"/>
-      <point x="968.0" y="-4.0"/>
-      <point x="1024.0" y="124.0" type="curve"/>
-      <point x="1260.0" y="124.0" type="line"/>
+      <point x="92.0" y="236.0"/>
+      <point x="368.0" y="-20.0"/>
     </contour>
     <contour>
-      <point x="608.0" y="768.0" type="curve" smooth="yes"/>
-      <point x="608.0" y="1012.0"/>
-      <point x="696.0" y="1132.0"/>
-      <point x="872.0" y="1132.0" type="curve" smooth="yes"/>
-      <point x="1068.0" y="1132.0"/>
-      <point x="1108.0" y="960.0"/>
-      <point x="1108.0" y="768.0" type="curve" smooth="yes"/>
-      <point x="1108.0" y="584.0"/>
-      <point x="1076.0" y="404.0"/>
-      <point x="872.0" y="404.0" type="curve" smooth="yes"/>
-      <point x="696.0" y="404.0"/>
-      <point x="608.0" y="524.0"/>
+      <point x="1684.0" y="-576.0" type="line"/>
+      <point x="1684.0" y="1312.0" type="line"/>
+      <point x="1136.0" y="1312.0" type="line"/>
+      <point x="1136.0" y="1184.0" type="line"/>
+      <point x="1256.0" y="768.0" type="line"/>
+      <point x="1132.0" y="344.0" type="line"/>
+      <point x="1132.0" y="-576.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="900.0" y="404.0" type="curve" smooth="yes"/>
+      <point x="748.0" y="404.0"/>
+      <point x="660.0" y="540.0"/>
+      <point x="660.0" y="768.0" type="curve" smooth="yes"/>
+      <point x="660.0" y="996.0"/>
+      <point x="748.0" y="1132.0"/>
+      <point x="900.0" y="1132.0" type="curve" smooth="yes"/>
+      <point x="1052.0" y="1132.0"/>
+      <point x="1144.0" y="996.0"/>
+      <point x="1144.0" y="768.0" type="curve" smooth="yes"/>
+      <point x="1144.0" y="544.0"/>
+      <point x="1052.0" y="404.0"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>q</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>f</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -72,10 +75,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>5.0</real>
+            <real>-576.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -92,10 +95,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>9.0</real>
+            <real>-20.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -112,10 +115,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>3.0</real>
+            <real>1556.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -134,10 +137,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>0.0</real>
+            <real>1536.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -158,8 +161,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>5.0</real>
+            <real>0.0</real>
+            <real>14.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -173,8 +176,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
-            <real>9.0</real>
+            <real>0.0</real>
+            <real>14.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -188,7 +191,7 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>2.0</real>
+            <real>0.0</real>
             <real>3.0</real>
           </array>
           <key>stem</key>
@@ -203,8 +206,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
             <real>0.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/qrthook.glif b/src/Inter-UI-Black.ufo/glyphs/qrthook.glif
index c9d6f85b9..1d2bf186a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/qrthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/qrthook.glif
@@ -1,64 +1,71 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="qrthook" format="2">
-  <advance width="1880.0"/>
+  <advance width="2016.0"/>
   <unicode hex="024B"/>
   <outline>
     <contour>
-      <point x="1592.0" y="64.0" type="line"/>
-      <point x="1040.0" y="64.0" type="line"/>
-      <point x="1040.0" y="-48.0" type="line" smooth="yes"/>
-      <point x="1040.0" y="-500.0"/>
-      <point x="1312.0" y="-576.0"/>
-      <point x="1648.0" y="-576.0" type="curve" smooth="yes"/>
-      <point x="1772.0" y="-576.0"/>
-      <point x="1868.0" y="-564.0"/>
-      <point x="1924.0" y="-560.0" type="curve"/>
-      <point x="1924.0" y="-152.0" type="line"/>
-      <point x="1880.0" y="-156.0"/>
-      <point x="1840.0" y="-160.0"/>
-      <point x="1800.0" y="-160.0" type="curve" smooth="yes"/>
-      <point x="1704.0" y="-160.0"/>
-      <point x="1592.0" y="-140.0"/>
-      <point x="1592.0" y="-48.0" type="curve" smooth="yes"/>
+      <point x="1740.0" y="-576.0" type="curve" smooth="yes"/>
+      <point x="1864.0" y="-576.0"/>
+      <point x="1960.0" y="-564.0"/>
+      <point x="2016.0" y="-560.0" type="curve"/>
+      <point x="2016.0" y="-152.0" type="line"/>
+      <point x="1972.0" y="-156.0"/>
+      <point x="1932.0" y="-160.0"/>
+      <point x="1892.0" y="-160.0" type="curve" smooth="yes"/>
+      <point x="1796.0" y="-160.0"/>
+      <point x="1684.0" y="-140.0"/>
+      <point x="1684.0" y="-48.0" type="curve" smooth="yes"/>
+      <point x="1684.0" y="64.0" type="line"/>
+      <point x="1132.0" y="64.0" type="line"/>
+      <point x="1132.0" y="-48.0" type="line" smooth="yes"/>
+      <point x="1132.0" y="-500.0"/>
+      <point x="1404.0" y="-576.0"/>
     </contour>
     <contour>
-      <point x="1592.0" y="1536.0" type="line"/>
-      <point x="1044.0" y="1536.0" type="line"/>
-      <point x="1044.0" y="1404.0" type="line"/>
-      <point x="1024.0" y="1404.0" type="line"/>
-      <point x="968.0" y="1536.0"/>
-      <point x="812.0" y="1556.0"/>
+      <point x="696.0" y="-20.0" type="curve" smooth="yes"/>
+      <point x="912.0" y="-20.0"/>
+      <point x="1060.0" y="96.0"/>
+      <point x="1124.0" y="252.0" type="curve"/>
+      <point x="1352.0" y="252.0" type="line"/>
+      <point x="1352.0" y="1268.0" type="line"/>
+      <point x="1124.0" y="1268.0" type="line"/>
+      <point x="1064.0" y="1424.0"/>
+      <point x="920.0" y="1556.0"/>
       <point x="692.0" y="1556.0" type="curve" smooth="yes"/>
-      <point x="396.0" y="1556.0"/>
+      <point x="388.0" y="1556.0"/>
       <point x="92.0" y="1324.0"/>
       <point x="92.0" y="768.0" type="curve" smooth="yes"/>
-      <point x="92.0" y="232.0"/>
-      <point x="376.0" y="-20.0"/>
-      <point x="696.0" y="-20.0" type="curve" smooth="yes"/>
-      <point x="820.0" y="-20.0"/>
-      <point x="968.0" y="-4.0"/>
-      <point x="1024.0" y="124.0" type="curve"/>
-      <point x="1040.0" y="124.0" type="line"/>
-      <point x="1040.0" y="24.0" type="line"/>
-      <point x="1592.0" y="24.0" type="line"/>
+      <point x="92.0" y="236.0"/>
+      <point x="368.0" y="-20.0"/>
     </contour>
     <contour>
-      <point x="608.0" y="768.0" type="curve" smooth="yes"/>
-      <point x="608.0" y="1012.0"/>
-      <point x="696.0" y="1132.0"/>
-      <point x="872.0" y="1132.0" type="curve" smooth="yes"/>
-      <point x="1068.0" y="1132.0"/>
-      <point x="1108.0" y="960.0"/>
-      <point x="1108.0" y="768.0" type="curve" smooth="yes"/>
-      <point x="1108.0" y="584.0"/>
-      <point x="1076.0" y="404.0"/>
-      <point x="872.0" y="404.0" type="curve" smooth="yes"/>
-      <point x="696.0" y="404.0"/>
-      <point x="608.0" y="524.0"/>
+      <point x="1684.0" y="64.0" type="line"/>
+      <point x="1684.0" y="1536.0" type="line"/>
+      <point x="1136.0" y="1536.0" type="line"/>
+      <point x="1136.0" y="1184.0" type="line"/>
+      <point x="1256.0" y="768.0" type="line"/>
+      <point x="1132.0" y="344.0" type="line"/>
+      <point x="1132.0" y="64.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="900.0" y="404.0" type="curve" smooth="yes"/>
+      <point x="748.0" y="404.0"/>
+      <point x="660.0" y="540.0"/>
+      <point x="660.0" y="768.0" type="curve" smooth="yes"/>
+      <point x="660.0" y="996.0"/>
+      <point x="748.0" y="1132.0"/>
+      <point x="900.0" y="1132.0" type="curve" smooth="yes"/>
+      <point x="1052.0" y="1132.0"/>
+      <point x="1144.0" y="996.0"/>
+      <point x="1144.0" y="768.0" type="curve" smooth="yes"/>
+      <point x="1144.0" y="544.0"/>
+      <point x="1052.0" y="404.0"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>q</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -66,10 +73,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>7.0</real>
+            <real>-560.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -86,10 +93,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>11.0</real>
+            <real>-20.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -106,10 +113,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>5.0</real>
+            <real>1556.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -128,10 +135,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>0.0</real>
+            <real>1536.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -150,10 +157,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>4.0</real>
+            <real>-576.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -173,7 +180,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>7.0</real>
+            <real>12.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -187,8 +194,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>11.0</real>
+            <real>0.0</real>
+            <real>12.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -202,8 +209,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
-            <real>5.0</real>
+            <real>0.0</real>
+            <real>11.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -217,8 +224,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
             <real>0.0</real>
+            <real>11.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -233,7 +240,7 @@
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>4.0</real>
+            <real>12.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/rdescend.glif b/src/Inter-UI-Black.ufo/glyphs/rdescend.glif
index 2cec39424..76e07a5d9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/rdescend.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/rdescend.glif
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="rdescend" format="2">
-  <advance width="1304.0"/>
+  <advance width="1292.0"/>
   <unicode hex="027C"/>
   <outline>
     <contour>
-      <point x="152.0" y="-576.0" type="line"/>
-      <point x="704.0" y="-576.0" type="line"/>
-      <point x="704.0" y="0.0" type="line"/>
-      <point x="152.0" y="0.0" type="line"/>
+      <point x="140.0" y="-576.0" type="line"/>
+      <point x="692.0" y="-576.0" type="line"/>
+      <point x="692.0" y="0.0" type="line"/>
+      <point x="140.0" y="0.0" type="line"/>
     </contour>
-    <component base="r" xOffset="12.0"/>
+    <component base="r"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>r</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>r</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/romanfive.glif b/src/Inter-UI-Black.ufo/glyphs/romanfive.glif
index da5474fd1..97cd36129 100644
--- a/src/Inter-UI-Black.ufo/glyphs/romanfive.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/romanfive.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="romanfive" format="2">
-  <advance width="2232.0"/>
+  <advance width="2240.0"/>
   <unicode hex="2164"/>
   <outline>
     <component base="V"/>
diff --git a/src/Inter-UI-Black.ufo/glyphs/rrthook.glif b/src/Inter-UI-Black.ufo/glyphs/rrthook.glif
index e8fef525e..1a0d9baf0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/rrthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/rrthook.glif
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="rrthook" format="2">
-  <advance width="1308.0"/>
+  <advance width="1292.0"/>
   <unicode hex="027D"/>
   <outline>
     <contour>
-      <point x="764.0" y="-576.0" type="curve" smooth="yes"/>
-      <point x="897.0" y="-576.0"/>
-      <point x="973.0" y="-564.0"/>
-      <point x="1036.0" y="-560.0" type="curve"/>
-      <point x="1036.0" y="-152.0" type="line"/>
-      <point x="993.0" y="-156.0"/>
-      <point x="953.0" y="-160.0"/>
-      <point x="912.0" y="-160.0" type="curve" smooth="yes"/>
-      <point x="817.0" y="-160.0"/>
-      <point x="704.0" y="-140.0"/>
-      <point x="704.0" y="-48.0" type="curve" smooth="yes"/>
-      <point x="704.0" y="0.0" type="line"/>
-      <point x="152.0" y="0.0" type="line"/>
-      <point x="152.0" y="-48.0" type="line" smooth="yes"/>
-      <point x="152.0" y="-500.0"/>
-      <point x="425.0" y="-576.0"/>
+      <point x="752.0" y="-576.0" type="curve" smooth="yes"/>
+      <point x="885.0" y="-576.0"/>
+      <point x="961.0" y="-564.0"/>
+      <point x="1024.0" y="-560.0" type="curve"/>
+      <point x="1024.0" y="-152.0" type="line"/>
+      <point x="981.0" y="-156.0"/>
+      <point x="941.0" y="-160.0"/>
+      <point x="900.0" y="-160.0" type="curve" smooth="yes"/>
+      <point x="805.0" y="-160.0"/>
+      <point x="692.0" y="-140.0"/>
+      <point x="692.0" y="-48.0" type="curve" smooth="yes"/>
+      <point x="692.0" y="0.0" type="line"/>
+      <point x="140.0" y="0.0" type="line"/>
+      <point x="140.0" y="-48.0" type="line" smooth="yes"/>
+      <point x="140.0" y="-500.0"/>
+      <point x="413.0" y="-576.0"/>
     </contour>
-    <component base="r" xOffset="12.0"/>
+    <component base="r"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/rupee.glif b/src/Inter-UI-Black.ufo/glyphs/rupee.glif
index cccb480c5..b6bb7ebb7 100644
--- a/src/Inter-UI-Black.ufo/glyphs/rupee.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/rupee.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="rupee" format="2">
-  <advance width="3496.0"/>
+  <advance width="3432.0"/>
   <unicode hex="20A8"/>
   <outline>
     <component base="R"/>
@@ -8,6 +8,10 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>R</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>s</string>
       <key>com.schriftgestaltung.componentsAlignment</key>
       <array>
         <integer>-1</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/seven.glif b/src/Inter-UI-Black.ufo/glyphs/seven.glif
index 463248dee..359e638bf 100644
--- a/src/Inter-UI-Black.ufo/glyphs/seven.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/seven.glif
@@ -4,14 +4,14 @@
   <unicode hex="0037"/>
   <outline>
     <contour>
-      <point x="232.0" y="0.0" type="line"/>
+      <point x="228.0" y="0.0" type="line"/>
       <point x="800.0" y="0.0" type="line"/>
       <point x="1608.0" y="1604.0" type="line"/>
       <point x="1608.0" y="2048.0" type="line"/>
       <point x="88.0" y="2048.0" type="line"/>
       <point x="88.0" y="1604.0" type="line"/>
-      <point x="1036.0" y="1604.0" type="line"/>
-      <point x="1036.0" y="1592.0" type="line"/>
+      <point x="1032.0" y="1604.0" type="line"/>
+      <point x="1032.0" y="1592.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -20,95 +20,73 @@
       <array>
         <dict>
           <key>horizontal</key>
-          <true/>
+          <false/>
           <key>options</key>
           <integer>0</integer>
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>7.0</real>
+            <real>6.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <string>u</string>
-            <string>p</string>
+            <real>0.0</real>
+            <real>1.0</real>
           </array>
           <key>type</key>
-          <string>BottomGhost</string>
+          <string>Stem</string>
         </dict>
         <dict>
           <key>horizontal</key>
           <true/>
           <key>options</key>
-          <integer>0</integer>
+          <integer>4</integer>
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>3.0</real>
+            <real>7.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <string>d</string>
-            <string>o</string>
-            <string>w</string>
-            <string>n</string>
-          </array>
           <key>type</key>
-          <string>TopGhost</string>
+          <string>Anchor</string>
         </dict>
         <dict>
           <key>horizontal</key>
-          <false/>
+          <true/>
           <key>options</key>
-          <integer>0</integer>
+          <integer>4</integer>
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>4.0</real>
+            <real>3.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>1.0</real>
-          </array>
           <key>type</key>
-          <string>Stem</string>
+          <string>Anchor</string>
         </dict>
         <dict>
           <key>horizontal</key>
           <true/>
           <key>options</key>
-          <integer>4</integer>
+          <integer>0</integer>
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>7.0</real>
+            <real>4.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>type</key>
-          <string>Anchor</string>
-        </dict>
-        <dict>
-          <key>horizontal</key>
-          <true/>
-          <key>options</key>
-          <integer>4</integer>
-          <key>origin</key>
+          <key>target</key>
           <array>
             <real>0.0</real>
             <real>3.0</real>
           </array>
-          <key>stem</key>
-          <integer>-2</integer>
           <key>type</key>
-          <string>Anchor</string>
+          <string>Stem</string>
         </dict>
       </array>
       <key>public.markColor</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/seven.tf.glif b/src/Inter-UI-Black.ufo/glyphs/seven.tf.glif
index 12c3a6ed7..909fb4061 100644
--- a/src/Inter-UI-Black.ufo/glyphs/seven.tf.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/seven.tf.glif
@@ -6,6 +6,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>zero.tf</string>
       <key>public.markColor</key>
       <string>0.922,0.965,0.784,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/six.tf.glif b/src/Inter-UI-Black.ufo/glyphs/six.tf.glif
index e0c7fb2f0..35e6508b9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/six.tf.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/six.tf.glif
@@ -6,6 +6,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>zero.tf</string>
       <key>public.markColor</key>
       <string>0.906,0.965,0.741,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/six.tf.ss01.glif b/src/Inter-UI-Black.ufo/glyphs/six.tf.ss01.glif
index 0b3cb3cc8..19ee64385 100644
--- a/src/Inter-UI-Black.ufo/glyphs/six.tf.ss01.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/six.tf.ss01.glif
@@ -6,6 +6,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>zero.tf</string>
       <key>public.markColor</key>
       <string>0.98,0.36,0.67,1</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/sunW_ithR_ays.glif b/src/Inter-UI-Black.ufo/glyphs/sunW_ithR_ays.glif
index 1fb0f9eea..4db66185a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/sunW_ithR_ays.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/sunW_ithR_ays.glif
@@ -6,80 +6,80 @@
   <guideline x="1420.0" y="1056.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="1984.0" y="1180.0" type="line"/>
-      <point x="1984.0" y="932.0" type="line"/>
-      <point x="2592.0" y="932.0" type="line"/>
-      <point x="2592.0" y="1180.0" type="line"/>
+      <point x="1332.0" y="604.0" type="curve" smooth="yes"/>
+      <point x="1579.0" y="604.0"/>
+      <point x="1782.0" y="807.0"/>
+      <point x="1784.0" y="1056.0" type="curve" smooth="yes"/>
+      <point x="1782.0" y="1305.0"/>
+      <point x="1579.0" y="1508.0"/>
+      <point x="1332.0" y="1508.0" type="curve" smooth="yes"/>
+      <point x="1081.0" y="1508.0"/>
+      <point x="878.0" y="1305.0"/>
+      <point x="880.0" y="1056.0" type="curve" smooth="yes"/>
+      <point x="878.0" y="807.0"/>
+      <point x="1081.0" y="604.0"/>
+    </contour>
+    <contour>
+      <point x="528.0" y="76.0" type="line"/>
+      <point x="960.0" y="508.0" type="line"/>
+      <point x="784.0" y="684.0" type="line"/>
+      <point x="352.0" y="252.0" type="line"/>
     </contour>
     <contour>
-      <point x="72.0" y="1180.0" type="line"/>
       <point x="72.0" y="932.0" type="line"/>
       <point x="680.0" y="932.0" type="line"/>
       <point x="680.0" y="1180.0" type="line"/>
+      <point x="72.0" y="1180.0" type="line"/>
     </contour>
     <contour>
-      <point x="1456.0" y="404.0" type="line"/>
-      <point x="1208.0" y="404.0" type="line"/>
       <point x="1208.0" y="-204.0" type="line"/>
       <point x="1456.0" y="-204.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1456.0" y="2316.0" type="line"/>
-      <point x="1208.0" y="2316.0" type="line"/>
-      <point x="1208.0" y="1708.0" type="line"/>
-      <point x="1456.0" y="1708.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1332.0" y="604.0" type="curve" smooth="yes"/>
-      <point x="1081.0" y="604.0"/>
-      <point x="878.0" y="807.0"/>
-      <point x="880.0" y="1056.0" type="curve" smooth="yes"/>
-      <point x="878.0" y="1305.0"/>
-      <point x="1081.0" y="1508.0"/>
-      <point x="1332.0" y="1508.0" type="curve" smooth="yes"/>
-      <point x="1579.0" y="1508.0"/>
-      <point x="1782.0" y="1305.0"/>
-      <point x="1784.0" y="1056.0" type="curve" smooth="yes"/>
-      <point x="1782.0" y="807.0"/>
-      <point x="1579.0" y="604.0"/>
+      <point x="1456.0" y="404.0" type="line"/>
+      <point x="1208.0" y="404.0" type="line"/>
     </contour>
     <contour>
       <point x="1332.0" y="872.0" type="curve" smooth="yes"/>
-      <point x="1432.0" y="872.0"/>
-      <point x="1514.0" y="954.0"/>
-      <point x="1516.0" y="1056.0" type="curve" smooth="yes"/>
-      <point x="1514.0" y="1158.0"/>
-      <point x="1432.0" y="1240.0"/>
-      <point x="1332.0" y="1240.0" type="curve" smooth="yes"/>
-      <point x="1228.0" y="1240.0"/>
-      <point x="1146.0" y="1158.0"/>
-      <point x="1148.0" y="1056.0" type="curve" smooth="yes"/>
-      <point x="1146.0" y="954.0"/>
       <point x="1228.0" y="872.0"/>
+      <point x="1146.0" y="954.0"/>
+      <point x="1148.0" y="1056.0" type="curve" smooth="yes"/>
+      <point x="1146.0" y="1158.0"/>
+      <point x="1228.0" y="1240.0"/>
+      <point x="1332.0" y="1240.0" type="curve" smooth="yes"/>
+      <point x="1432.0" y="1240.0"/>
+      <point x="1514.0" y="1158.0"/>
+      <point x="1516.0" y="1056.0" type="curve" smooth="yes"/>
+      <point x="1514.0" y="954.0"/>
+      <point x="1432.0" y="872.0"/>
     </contour>
     <contour>
-      <point x="1880.0" y="684.0" type="line"/>
-      <point x="1704.0" y="508.0" type="line"/>
       <point x="2136.0" y="76.0" type="line"/>
       <point x="2312.0" y="252.0" type="line"/>
+      <point x="1880.0" y="684.0" type="line"/>
+      <point x="1704.0" y="508.0" type="line"/>
     </contour>
     <contour>
-      <point x="528.0" y="2036.0" type="line"/>
-      <point x="352.0" y="1860.0" type="line"/>
       <point x="784.0" y="1428.0" type="line"/>
       <point x="960.0" y="1604.0" type="line"/>
+      <point x="528.0" y="2036.0" type="line"/>
+      <point x="352.0" y="1860.0" type="line"/>
     </contour>
     <contour>
-      <point x="960.0" y="508.0" type="line"/>
-      <point x="784.0" y="684.0" type="line"/>
-      <point x="352.0" y="252.0" type="line"/>
-      <point x="528.0" y="76.0" type="line"/>
+      <point x="1984.0" y="932.0" type="line"/>
+      <point x="2592.0" y="932.0" type="line"/>
+      <point x="2592.0" y="1180.0" type="line"/>
+      <point x="1984.0" y="1180.0" type="line"/>
     </contour>
     <contour>
+      <point x="1208.0" y="1708.0" type="line"/>
+      <point x="1456.0" y="1708.0" type="line"/>
+      <point x="1456.0" y="2316.0" type="line"/>
+      <point x="1208.0" y="2316.0" type="line"/>
+    </contour>
+    <contour>
+      <point x="1880.0" y="1428.0" type="line"/>
       <point x="2312.0" y="1860.0" type="line"/>
       <point x="2136.0" y="2036.0" type="line"/>
       <point x="1704.0" y="1604.0" type="line"/>
-      <point x="1880.0" y="1428.0" type="line"/>
     </contour>
   </outline>
   <lib>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tbar.glif b/src/Inter-UI-Black.ufo/glyphs/tbar.glif
index bf49cbb75..e8dd20adb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tbar.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tbar.glif
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tbar" format="2">
-  <advance width="1164.0"/>
+  <advance width="1140.0"/>
   <unicode hex="0167"/>
   <outline>
     <contour>
-      <point x="72.0" y="724.0" type="line"/>
+      <point x="44.0" y="724.0" type="line"/>
       <point x="1056.0" y="724.0" type="line"/>
       <point x="1056.0" y="940.0" type="line"/>
-      <point x="72.0" y="940.0" type="line"/>
+      <point x="44.0" y="940.0" type="line"/>
     </contour>
-    <component base="t" xOffset="8.0"/>
+    <component base="t"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>t</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>t</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tccurl.glif b/src/Inter-UI-Black.ufo/glyphs/tccurl.glif
index d410f72ca..0aa8f286e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tccurl.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tccurl.glif
@@ -1,62 +1,62 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tccurl" format="2">
-  <advance width="2396.0"/>
+  <advance width="2408.0"/>
   <unicode hex="02A8"/>
   <outline>
     <contour>
-      <point x="740.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="1250.0" y="-28.0"/>
-      <point x="1598.0" y="484.0"/>
-      <point x="1732.0" y="484.0" type="curve" smooth="yes"/>
-      <point x="1770.0" y="484.0"/>
-      <point x="1802.0" y="472.0"/>
-      <point x="1800.0" y="444.0" type="curve" smooth="yes"/>
-      <point x="1802.0" y="396.0"/>
-      <point x="1754.0" y="388.0"/>
-      <point x="1692.0" y="388.0" type="curve" smooth="yes"/>
-      <point x="1434.0" y="388.0"/>
-      <point x="1434.0" y="540.0"/>
-      <point x="1432.0" y="724.0" type="curve" smooth="yes"/>
-      <point x="1432.0" y="748.0" type="line" smooth="yes"/>
-      <point x="1434.0" y="952.0"/>
-      <point x="1430.0" y="1144.0"/>
-      <point x="1624.0" y="1144.0" type="curve" smooth="yes"/>
-      <point x="1758.0" y="1144.0"/>
-      <point x="1818.0" y="1060.0"/>
-      <point x="1812.0" y="936.0" type="curve"/>
-      <point x="2304.0" y="936.0" type="line"/>
-      <point x="2310.0" y="1344.0"/>
-      <point x="2030.0" y="1556.0"/>
-      <point x="1636.0" y="1556.0" type="curve" smooth="yes"/>
-      <point x="1126.0" y="1556.0"/>
-      <point x="906.0" y="1188.0"/>
-      <point x="904.0" y="748.0" type="curve" smooth="yes"/>
-      <point x="904.0" y="724.0" type="line" smooth="yes"/>
-      <point x="906.0" y="284.0"/>
-      <point x="1150.0" y="-28.0"/>
-      <point x="1640.0" y="-28.0" type="curve" smooth="yes"/>
-      <point x="2118.0" y="-28.0"/>
-      <point x="2306.0" y="256.0"/>
-      <point x="2304.0" y="476.0" type="curve" smooth="yes"/>
-      <point x="2306.0" y="680.0"/>
-      <point x="2150.0" y="872.0"/>
-      <point x="1868.0" y="872.0" type="curve" smooth="yes"/>
-      <point x="1422.0" y="872.0"/>
-      <point x="1046.0" y="392.0"/>
-      <point x="852.0" y="392.0" type="curve"/>
-      <point x="758.0" y="392.0"/>
-      <point x="754.0" y="432.0"/>
-      <point x="752.0" y="512.0" type="curve" smooth="yes"/>
-      <point x="752.0" y="1904.0" type="line"/>
-      <point x="228.0" y="1904.0" type="line"/>
-      <point x="228.0" y="512.0" type="line" smooth="yes"/>
-      <point x="230.0" y="124.0"/>
-      <point x="446.0" y="-28.0"/>
+      <point x="752.0" y="-28.0" type="curve" smooth="yes"/>
+      <point x="1262.0" y="-28.0"/>
+      <point x="1610.0" y="484.0"/>
+      <point x="1744.0" y="484.0" type="curve" smooth="yes"/>
+      <point x="1782.0" y="484.0"/>
+      <point x="1814.0" y="472.0"/>
+      <point x="1812.0" y="444.0" type="curve" smooth="yes"/>
+      <point x="1814.0" y="396.0"/>
+      <point x="1766.0" y="388.0"/>
+      <point x="1704.0" y="388.0" type="curve" smooth="yes"/>
+      <point x="1446.0" y="388.0"/>
+      <point x="1446.0" y="540.0"/>
+      <point x="1444.0" y="724.0" type="curve" smooth="yes"/>
+      <point x="1444.0" y="748.0" type="line" smooth="yes"/>
+      <point x="1446.0" y="952.0"/>
+      <point x="1442.0" y="1144.0"/>
+      <point x="1636.0" y="1144.0" type="curve" smooth="yes"/>
+      <point x="1770.0" y="1144.0"/>
+      <point x="1830.0" y="1060.0"/>
+      <point x="1824.0" y="936.0" type="curve"/>
+      <point x="2316.0" y="936.0" type="line"/>
+      <point x="2322.0" y="1344.0"/>
+      <point x="2042.0" y="1556.0"/>
+      <point x="1648.0" y="1556.0" type="curve" smooth="yes"/>
+      <point x="1138.0" y="1556.0"/>
+      <point x="918.0" y="1188.0"/>
+      <point x="916.0" y="748.0" type="curve" smooth="yes"/>
+      <point x="916.0" y="724.0" type="line" smooth="yes"/>
+      <point x="918.0" y="284.0"/>
+      <point x="1162.0" y="-28.0"/>
+      <point x="1652.0" y="-28.0" type="curve" smooth="yes"/>
+      <point x="2130.0" y="-28.0"/>
+      <point x="2318.0" y="256.0"/>
+      <point x="2316.0" y="476.0" type="curve" smooth="yes"/>
+      <point x="2318.0" y="680.0"/>
+      <point x="2162.0" y="872.0"/>
+      <point x="1880.0" y="872.0" type="curve" smooth="yes"/>
+      <point x="1434.0" y="872.0"/>
+      <point x="1058.0" y="392.0"/>
+      <point x="864.0" y="392.0" type="curve"/>
+      <point x="770.0" y="392.0"/>
+      <point x="766.0" y="432.0"/>
+      <point x="764.0" y="512.0" type="curve" smooth="yes"/>
+      <point x="764.0" y="1904.0" type="line"/>
+      <point x="240.0" y="1904.0" type="line"/>
+      <point x="240.0" y="512.0" type="line" smooth="yes"/>
+      <point x="242.0" y="124.0"/>
+      <point x="458.0" y="-28.0"/>
     </contour>
     <contour>
-      <point x="44.0" y="1176.0" type="line"/>
-      <point x="872.0" y="1176.0" type="line"/>
-      <point x="872.0" y="1536.0" type="line"/>
+      <point x="44.0" y="1136.0" type="line"/>
+      <point x="916.0" y="1136.0" type="line"/>
+      <point x="916.0" y="1536.0" type="line"/>
       <point x="44.0" y="1536.0" type="line"/>
     </contour>
   </outline>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tcurl.glif b/src/Inter-UI-Black.ufo/glyphs/tcurl.glif
index 74da677a2..7b56b59c3 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tcurl.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tcurl.glif
@@ -21,25 +21,25 @@
       <point x="44.0" y="328.0" type="line"/>
       <point x="292.0" y="32.0" type="line"/>
       <point x="572.0" y="232.0" type="line" smooth="yes"/>
-      <point x="802.0" y="396.0"/>
-      <point x="946.0" y="472.0"/>
+      <point x="781.0" y="381.0"/>
+      <point x="987.0" y="472.0"/>
       <point x="1116.0" y="472.0" type="curve" smooth="yes"/>
       <point x="1166.0" y="472.0"/>
-      <point x="1194.0" y="416.0"/>
+      <point x="1196.0" y="445.0"/>
       <point x="1196.0" y="400.0" type="curve" smooth="yes"/>
-      <point x="1194.0" y="356.0"/>
-      <point x="1158.0" y="316.0"/>
+      <point x="1196.0" y="348.0"/>
+      <point x="1170.0" y="316.0"/>
       <point x="1128.0" y="316.0" type="curve" smooth="yes"/>
-      <point x="1038.0" y="316.0"/>
-      <point x="1018.0" y="372.0"/>
+      <point x="1059.0" y="316.0"/>
+      <point x="1018.0" y="374.0"/>
       <point x="1020.0" y="468.0" type="curve"/>
       <point x="1020.0" y="1904.0" type="line"/>
     </contour>
     <contour>
-      <point x="1272.0" y="1536.0" type="line"/>
-      <point x="284.0" y="1536.0" type="line"/>
-      <point x="284.0" y="1176.0" type="line"/>
-      <point x="1272.0" y="1176.0" type="line"/>
+      <point x="1284.0" y="1536.0" type="line"/>
+      <point x="272.0" y="1536.0" type="line"/>
+      <point x="272.0" y="1136.0" type="line"/>
+      <point x="1284.0" y="1136.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -75,10 +75,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>0.0</real>
+            <real>1536.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -134,8 +134,8 @@
           <integer>4</integer>
           <key>origin</key>
           <array>
-            <real>1.0</real>
             <real>0.0</real>
+            <real>29.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/three.tf.glif b/src/Inter-UI-Black.ufo/glyphs/three.tf.glif
index 73ebe925f..27802f039 100644
--- a/src/Inter-UI-Black.ufo/glyphs/three.tf.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/three.tf.glif
@@ -6,6 +6,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>zero.tf</string>
       <key>public.markColor</key>
       <string>0.922,0.965,0.784,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tpalatalhook.glif b/src/Inter-UI-Black.ufo/glyphs/tpalatalhook.glif
index 2cb6d7499..4ee6f457c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tpalatalhook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tpalatalhook.glif
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tpalatalhook" format="2">
-  <advance width="1184.0"/>
+  <advance width="1152.0"/>
   <unicode hex="01AB"/>
   <outline>
     <contour>
diff --git a/src/Inter-UI-Black.ufo/glyphs/trthook.glif b/src/Inter-UI-Black.ufo/glyphs/trthook.glif
index 3664b331d..08d24ffb5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/trthook.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/trthook.glif
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="trthook" format="2">
-  <advance width="1184.0"/>
+  <advance width="1140.0"/>
   <unicode hex="0288"/>
   <outline>
     <contour>
       <point x="1056.0" y="1536.0" type="line"/>
-      <point x="68.0" y="1536.0" type="line"/>
-      <point x="68.0" y="1176.0" type="line"/>
-      <point x="1056.0" y="1176.0" type="line"/>
+      <point x="44.0" y="1536.0" type="line"/>
+      <point x="44.0" y="1136.0" type="line"/>
+      <point x="1056.0" y="1136.0" type="line"/>
     </contour>
     <contour>
-      <point x="252.0" y="1904.0" type="line"/>
-      <point x="252.0" y="-108.0" type="line"/>
-      <point x="250.0" y="-430.0"/>
-      <point x="449.0" y="-592.0"/>
-      <point x="828.0" y="-572.0" type="curve" smooth="yes"/>
-      <point x="955.0" y="-565.0"/>
-      <point x="1048.0" y="-539.0"/>
-      <point x="1096.0" y="-524.0" type="curve"/>
-      <point x="1016.0" y="-136.0" type="line"/>
-      <point x="997.0" y="-141.0"/>
-      <point x="943.0" y="-152.0"/>
-      <point x="908.0" y="-152.0" type="curve" smooth="yes"/>
-      <point x="838.0" y="-152.0"/>
-      <point x="802.0" y="-119.0"/>
-      <point x="804.0" y="-56.0" type="curve"/>
-      <point x="804.0" y="1904.0" type="line"/>
+      <point x="240.0" y="1904.0" type="line"/>
+      <point x="240.0" y="-108.0" type="line"/>
+      <point x="236.0" y="-430.0"/>
+      <point x="435.0" y="-593.0"/>
+      <point x="816.0" y="-572.0" type="curve" smooth="yes"/>
+      <point x="941.0" y="-565.0"/>
+      <point x="1034.0" y="-539.0"/>
+      <point x="1084.0" y="-524.0" type="curve"/>
+      <point x="1004.0" y="-136.0" type="line"/>
+      <point x="983.0" y="-141.0"/>
+      <point x="929.0" y="-152.0"/>
+      <point x="896.0" y="-152.0" type="curve" smooth="yes"/>
+      <point x="824.0" y="-152.0"/>
+      <point x="788.0" y="-119.0"/>
+      <point x="792.0" y="-56.0" type="curve"/>
+      <point x="792.0" y="1904.0" type="line"/>
     </contour>
   </outline>
   <lib>
@@ -41,10 +41,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>3.0</real>
+            <real>-572.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -61,10 +61,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>6.0</real>
+            <real>-524.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -81,10 +81,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>1536.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -103,18 +103,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>1.0</real>
+            <real>68.0</real>
+            <real>1028.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>1.0</real>
-            <real>6.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -123,10 +118,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>3.0</real>
+            <real>-572.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -138,10 +133,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>1.0</real>
-            <real>6.0</real>
+            <real>-524.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -153,10 +148,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>0.0</real>
+            <real>1536.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/tugrik.glif b/src/Inter-UI-Black.ufo/glyphs/tugrik.glif
index ced54ce33..1cc109797 100644
--- a/src/Inter-UI-Black.ufo/glyphs/tugrik.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/tugrik.glif
@@ -1,35 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="tugrik" format="2">
-  <advance width="1836.0"/>
+  <advance width="1932.0"/>
   <unicode hex="20AE"/>
   <outline>
     <contour>
-      <point x="1396.0" y="1380.0" type="line"/>
-      <point x="440.0" y="1192.0" type="line"/>
-      <point x="440.0" y="896.0" type="line"/>
-      <point x="1396.0" y="1076.0" type="line"/>
+      <point x="1456.0" y="1412.0" type="line"/>
+      <point x="480.0" y="1020.0" type="line"/>
+      <point x="480.0" y="816.0" type="line"/>
+      <point x="1456.0" y="1200.0" type="line"/>
     </contour>
     <contour>
-      <point x="1396.0" y="928.0" type="line"/>
-      <point x="440.0" y="748.0" type="line"/>
-      <point x="440.0" y="444.0" type="line"/>
-      <point x="1396.0" y="628.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1192.0" y="2048.0" type="line"/>
-      <point x="644.0" y="2048.0" type="line"/>
-      <point x="644.0" y="0.0" type="line"/>
-      <point x="1192.0" y="0.0" type="line"/>
-    </contour>
-    <contour>
-      <point x="1808.0" y="2048.0" type="line"/>
-      <point x="28.0" y="2048.0" type="line"/>
-      <point x="28.0" y="1600.0" type="line"/>
-      <point x="1808.0" y="1600.0" type="line"/>
+      <point x="1456.0" y="992.0" type="line"/>
+      <point x="480.0" y="600.0" type="line"/>
+      <point x="480.0" y="396.0" type="line"/>
+      <point x="1456.0" y="780.0" type="line"/>
     </contour>
+    <component base="T"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>T</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>T</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -37,10 +30,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>1.0</real>
+            <real>0.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -57,10 +50,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>3.0</real>
-            <real>0.0</real>
+            <real>2048.0</real>
+            <real>-20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -79,10 +72,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>2.0</real>
-            <real>1.0</real>
+            <real>444.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -94,10 +87,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>3.0</real>
-            <real>0.0</real>
+            <real>1380.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/two.glif b/src/Inter-UI-Black.ufo/glyphs/two.glif
index 96ab3e584..784008e1c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/two.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/two.glif
@@ -40,62 +40,70 @@
       <array>
         <dict>
           <key>horizontal</key>
-          <true/>
+          <false/>
           <key>options</key>
           <integer>0</integer>
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>25.0</real>
+            <real>13.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
-            <string>u</string>
-            <string>p</string>
+            <real>0.0</real>
+            <real>14.0</real>
           </array>
           <key>type</key>
-          <string>BottomGhost</string>
+          <string>Stem</string>
         </dict>
         <dict>
           <key>horizontal</key>
           <true/>
           <key>options</key>
-          <integer>0</integer>
+          <integer>4</integer>
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>10.0</real>
+            <real>25.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
+          <key>type</key>
+          <string>Anchor</string>
+        </dict>
+        <dict>
+          <key>horizontal</key>
+          <true/>
+          <key>options</key>
+          <integer>4</integer>
+          <key>origin</key>
           <array>
-            <string>d</string>
-            <string>o</string>
-            <string>w</string>
-            <string>n</string>
+            <real>0.0</real>
+            <real>10.0</real>
           </array>
+          <key>stem</key>
+          <integer>-2</integer>
           <key>type</key>
-          <string>TopGhost</string>
+          <string>Anchor</string>
         </dict>
         <dict>
           <key>horizontal</key>
-          <false/>
+          <true/>
           <key>options</key>
           <integer>0</integer>
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>13.0</real>
+            <real>17.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
           <key>target</key>
           <array>
             <real>0.0</real>
-            <real>0.0</real>
+            <real>10.0</real>
           </array>
           <key>type</key>
           <string>Stem</string>
@@ -104,31 +112,41 @@
           <key>horizontal</key>
           <true/>
           <key>options</key>
-          <integer>4</integer>
+          <integer>0</integer>
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>25.0</real>
+            <real>0.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <real>0.0</real>
+            <real>1.0</real>
+          </array>
           <key>type</key>
-          <string>Anchor</string>
+          <string>Stem</string>
         </dict>
         <dict>
           <key>horizontal</key>
-          <true/>
+          <false/>
           <key>options</key>
-          <integer>4</integer>
+          <integer>0</integer>
           <key>origin</key>
           <array>
             <real>0.0</real>
-            <real>10.0</real>
+            <real>20.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
+          <key>target</key>
+          <array>
+            <real>0.0</real>
+            <real>7.0</real>
+          </array>
           <key>type</key>
-          <string>Anchor</string>
+          <string>Stem</string>
         </dict>
       </array>
       <key>public.markColor</key>
diff --git a/src/Inter-UI-Black.ufo/glyphs/two.tf.glif b/src/Inter-UI-Black.ufo/glyphs/two.tf.glif
index e7fb772af..1d9db716f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/two.tf.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/two.tf.glif
@@ -6,6 +6,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>zero.tf</string>
       <key>public.markColor</key>
       <string>0.922,0.965,0.784,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0226.glif b/src/Inter-UI-Black.ufo/glyphs/uni0226.glif
index 66ffeefc0..fd0a4f118 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0226.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0226.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni0226" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="0226"/>
   <outline>
     <component base="A"/>
-    <component base="dotaccent" xOffset="704.0" yOffset="496.0"/>
+    <component base="dotaccent" xOffset="660.0" yOffset="496.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni023A_.glif b/src/Inter-UI-Black.ufo/glyphs/uni023A_.glif
index 59f256fcf..258e30400 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni023A_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni023A_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni023A" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="023A"/>
   <outline>
     <contour>
-      <point x="2140.0" y="2176.0" type="line"/>
-      <point x="1816.0" y="2176.0" type="line"/>
-      <point x="192.0" y="-280.0" type="line"/>
-      <point x="516.0" y="-280.0" type="line"/>
+      <point x="1816.0" y="2308.0" type="line"/>
+      <point x="1532.0" y="2308.0" type="line"/>
+      <point x="756.0" y="-260.0" type="line"/>
+      <point x="1040.0" y="-260.0" type="line"/>
     </contour>
     <component base="A"/>
   </outline>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni023B_.glif b/src/Inter-UI-Black.ufo/glyphs/uni023B_.glif
index 05780d12d..5929d06c0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni023B_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni023B_.glif
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni023B" format="2">
-  <advance width="2240.0"/>
+  <advance width="2164.0"/>
   <unicode hex="023B"/>
   <outline>
     <contour>
-      <point x="764.0" y="-136.0" type="line"/>
-      <point x="1644.0" y="2268.0" type="line"/>
-      <point x="1508.0" y="2268.0" type="line"/>
-      <point x="628.0" y="-136.0" type="line"/>
+      <point x="556.0" y="-260.0" type="line"/>
+      <point x="840.0" y="-260.0" type="line"/>
+      <point x="1616.0" y="2308.0" type="line"/>
+      <point x="1332.0" y="2308.0" type="line"/>
     </contour>
     <component base="C"/>
   </outline>
@@ -24,18 +24,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>2.0</real>
+            <real>628.0</real>
+            <real>1016.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>0.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni023E_.glif b/src/Inter-UI-Black.ufo/glyphs/uni023E_.glif
index bdfa41764..1d653ef73 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni023E_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni023E_.glif
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni023E" format="2">
-  <advance width="1828.0"/>
+  <advance width="1932.0"/>
   <unicode hex="023E"/>
   <outline>
     <contour>
-      <point x="488.0" y="-28.0" type="line"/>
-      <point x="1740.0" y="2216.0" type="line"/>
-      <point x="1496.0" y="2344.0" type="line"/>
-      <point x="244.0" y="100.0" type="line"/>
+      <point x="476.0" y="-260.0" type="line"/>
+      <point x="760.0" y="-260.0" type="line"/>
+      <point x="1536.0" y="2308.0" type="line"/>
+      <point x="1252.0" y="2308.0" type="line"/>
     </contour>
-    <component base="T" xOffset="8.0"/>
+    <component base="T"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>T</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>T</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -20,10 +24,10 @@
           <true/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>3.0</real>
+            <real>-28.0</real>
+            <real>21.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
@@ -40,18 +44,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>2.0</real>
+            <real>244.0</real>
+            <real>1496.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>0.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
@@ -60,10 +59,10 @@
           <true/>
           <key>options</key>
           <integer>4</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>3.0</real>
+            <real>-28.0</real>
+            <real>-2147483648.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0243.glif b/src/Inter-UI-Black.ufo/glyphs/uni0243.glif
index bde91e207..0620a3ca1 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0243.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0243.glif
@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni0243" format="2">
-  <advance width="1880.0"/>
+  <advance width="2072.0"/>
   <unicode hex="0243"/>
   <outline>
-    <component base="B"/>
-    <component base="crossbar" xOffset="-308.0" yOffset="-452.0"/>
+    <component base="B" xOffset="192.0"/>
+    <component base="crossbar" xOffset="-132.0" yOffset="-460.0"/>
   </outline>
+  <lib>
+    <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>t</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>B</string>
+      <key>com.schriftgestaltung.componentsAlignment</key>
+      <array>
+        <integer>-1</integer>
+        <integer>-1</integer>
+      </array>
+    </dict>
+  </lib>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni0246.glif b/src/Inter-UI-Black.ufo/glyphs/uni0246.glif
index 121e2a751..fda54a590 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni0246.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni0246.glif
@@ -1,18 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni0246" format="2">
-  <advance width="1672.0"/>
+  <advance width="1752.0"/>
   <unicode hex="0246"/>
   <outline>
     <contour>
-      <point x="676.0" y="-224.0" type="line"/>
-      <point x="1552.0" y="2180.0" type="line"/>
-      <point x="1296.0" y="2268.0" type="line"/>
-      <point x="420.0" y="-136.0" type="line"/>
+      <point x="1412.0" y="2308.0" type="line"/>
+      <point x="1184.0" y="2308.0" type="line"/>
+      <point x="444.0" y="-260.0" type="line"/>
+      <point x="672.0" y="-260.0" type="line"/>
     </contour>
-    <component base="E" xOffset="12.0"/>
+    <component base="E"/>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>E</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>E</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
@@ -20,18 +24,13 @@
           <false/>
           <key>options</key>
           <integer>0</integer>
-          <key>origin</key>
+          <key>place</key>
           <array>
-            <real>0.0</real>
-            <real>2.0</real>
+            <real>420.0</real>
+            <real>1132.0</real>
           </array>
           <key>stem</key>
           <integer>-2</integer>
-          <key>target</key>
-          <array>
-            <real>0.0</real>
-            <real>0.0</real>
-          </array>
           <key>type</key>
           <string>Stem</string>
         </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_08.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_08.glif
index c843530ba..d2d2ca1b8 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_08.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_08.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F08" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1F08"/>
   <outline>
     <component base="A"/>
-    <component base="koronisaccentleft.cn" xOffset="212.0" yOffset="-8.0"/>
+    <component base="koronisaccentleft.cn" xOffset="88.0" yOffset="-8.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_09.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_09.glif
index 01e42a7d7..2fd4e2f9c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_09.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_09.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F09" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1F09"/>
   <outline>
     <component base="A"/>
-    <component base="uni1FFE.tonos" xOffset="56.0"/>
+    <component base="uni1FFE.tonos" xOffset="-68.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_0A_.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_0A_.glif
index 3a83634a8..894be8958 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_0A_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_0A_.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F0A" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1F0A"/>
   <outline>
     <component base="A"/>
-    <component base="uni1FCD.tonos" xOffset="-412.0"/>
+    <component base="uni1FCD.tonos" xOffset="-536.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_0B_.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_0B_.glif
index 12f47af65..f8871fd6c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_0B_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_0B_.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F0B" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1F0B"/>
   <outline>
     <component base="A"/>
-    <component base="uni1FDD.tonos" xOffset="-224.0"/>
+    <component base="uni1FDD.tonos" xOffset="-348.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_0C_.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_0C_.glif
index 20a801c7c..65ad889d2 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_0C_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_0C_.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F0C" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1F0C"/>
   <outline>
     <component base="A"/>
-    <component base="uni1FCE.tonos" xOffset="-456.0"/>
+    <component base="uni1FCE.tonos" xOffset="-580.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_0D_.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_0D_.glif
index 2b317649a..03462a103 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_0D_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_0D_.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F0D" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1F0D"/>
   <outline>
     <component base="A"/>
-    <component base="uni1FDE.tonos" xOffset="-476.0"/>
+    <component base="uni1FDE.tonos" xOffset="-600.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_0E_.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_0E_.glif
index 29d33dd7c..658ef59f2 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_0E_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_0E_.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F0E" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1F0E"/>
   <outline>
     <component base="A"/>
-    <component base="uni1FCF.tonos" xOffset="-88.0" yOffset="48.0"/>
+    <component base="uni1FCF.tonos" xOffset="-212.0" yOffset="48.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_0F_.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_0F_.glif
index b3ca1f08d..7ed451ae6 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_0F_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_0F_.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F0F" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1F0F"/>
   <outline>
     <component base="A"/>
-    <component base="uni1FDF.tonos" xOffset="-144.0" yOffset="48.0"/>
+    <component base="uni1FDF.tonos" xOffset="-268.0" yOffset="48.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_20.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_20.glif
index 6e0c635bd..5e9b674ce 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_20.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_20.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F20" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F20"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FBD" xOffset="636.0" yOffset="140.0"/>
+    <component base="uni1FBD" xOffset="680.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_21.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_21.glif
index 7f6e32dfd..b900d6892 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_21.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_21.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F21" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F21"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FFE" xOffset="344.0" yOffset="148.0"/>
+    <component base="uni1FFE" xOffset="388.0" yOffset="152.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_22.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_22.glif
index 89a812b10..edecfbee7 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_22.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_22.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F22" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F22"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FCD" xOffset="128.0" yOffset="140.0"/>
+    <component base="uni1FCD" xOffset="172.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_23.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_23.glif
index 5006b3d53..866a3a4b4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_23.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_23.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F23" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F23"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FDD" xOffset="264.0" yOffset="144.0"/>
+    <component base="uni1FDD" xOffset="308.0" yOffset="148.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_24.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_24.glif
index 1b68cfcaa..f208f9250 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_24.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_24.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F24" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F24"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FCE" xOffset="228.0" yOffset="148.0"/>
+    <component base="uni1FCE" xOffset="272.0" yOffset="152.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_25.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_25.glif
index d71df4da2..6f6a7bb00 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_25.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_25.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F25" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F25"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FDE" xOffset="236.0" yOffset="144.0"/>
+    <component base="uni1FDE" xOffset="280.0" yOffset="148.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_26.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_26.glif
index 60580a8a8..95a8a8c6a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_26.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_26.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F26" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F26"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FCF" xOffset="368.0" yOffset="140.0"/>
+    <component base="uni1FCF" xOffset="412.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_27.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_27.glif
index 06606afca..88dc4966a 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_27.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_27.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F27" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F27"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FDF" xOffset="264.0" yOffset="140.0"/>
+    <component base="uni1FDF" xOffset="308.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_74.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_74.glif
index c6647c8f6..242171b1f 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_74.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_74.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F74" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F74"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FEF" xOffset="312.0" yOffset="140.0"/>
+    <component base="uni1FEF" xOffset="356.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_75.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_75.glif
index d3f90bc0b..0f4716728 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_75.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_75.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F75" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F75"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FFD" xOffset="600.0" yOffset="140.0"/>
+    <component base="uni1FFD" xOffset="644.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_88.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_88.glif
index b02b3a686..acff9523c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_88.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_88.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F88" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1F88"/>
   <outline>
     <component base="A"/>
-    <component base="uni1FBE" xOffset="796.0"/>
-    <component base="koronisaccentleft.cn" xOffset="212.0" yOffset="-8.0"/>
+    <component base="uni1FBE" xOffset="752.0"/>
+    <component base="koronisaccentleft.cn" xOffset="88.0" yOffset="-8.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_89.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_89.glif
index ecf2687be..49cd50441 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_89.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_89.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F89" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1F89"/>
   <outline>
     <component base="A"/>
-    <component base="uni1FBE" xOffset="796.0"/>
-    <component base="uni1FFE.tonos" xOffset="56.0"/>
+    <component base="uni1FBE" xOffset="752.0"/>
+    <component base="uni1FFE.tonos" xOffset="-68.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_8A_.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_8A_.glif
index 7d2360358..4671987f0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_8A_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_8A_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F8A" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1F8A"/>
   <outline>
     <component base="A"/>
-    <component base="uni1FBE" xOffset="796.0"/>
-    <component base="uni1FCD.tonos" xOffset="-412.0"/>
+    <component base="uni1FBE" xOffset="752.0"/>
+    <component base="uni1FCD.tonos" xOffset="-536.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_8B_.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_8B_.glif
index 4df7048e5..087983eba 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_8B_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_8B_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F8B" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1F8B"/>
   <outline>
     <component base="A"/>
-    <component base="uni1FBE" xOffset="796.0"/>
-    <component base="uni1FDD.tonos" xOffset="-224.0"/>
+    <component base="uni1FBE" xOffset="752.0"/>
+    <component base="uni1FDD.tonos" xOffset="-348.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_8C_.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_8C_.glif
index add20861f..641595fb7 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_8C_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_8C_.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F8C" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1F8C"/>
   <outline>
     <component base="uni1F0C"/>
-    <component base="uni1FBE" xOffset="796.0"/>
+    <component base="uni1FBE" xOffset="752.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_8D_.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_8D_.glif
index 33e2d50a4..f29281c1c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_8D_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_8D_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F8D" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1F8D"/>
   <outline>
     <component base="A"/>
-    <component base="uni1FBE" xOffset="796.0"/>
-    <component base="uni1FDE.tonos" xOffset="-476.0"/>
+    <component base="uni1FBE" xOffset="752.0"/>
+    <component base="uni1FDE.tonos" xOffset="-600.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_8E_.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_8E_.glif
index 11c53bddb..809f8ac5b 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_8E_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_8E_.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F8E" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1F8E"/>
   <outline>
     <component base="uni1F0E"/>
-    <component base="uni1FBE" xOffset="796.0"/>
+    <component base="uni1FBE" xOffset="752.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_8F_.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_8F_.glif
index d5a022ec1..8097cf442 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_8F_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_8F_.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F8F" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1F8F"/>
   <outline>
     <component base="A"/>
-    <component base="uni1FBE" xOffset="796.0"/>
-    <component base="uni1FDF.tonos" xOffset="-144.0" yOffset="48.0"/>
+    <component base="uni1FBE" xOffset="752.0"/>
+    <component base="uni1FDF.tonos" xOffset="-268.0" yOffset="48.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_90.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_90.glif
index a1ca5238f..f33ec33d9 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_90.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_90.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F90" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F90"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FBE" yOffset="16.0"/>
-    <component base="uni1FBD" xOffset="636.0" yOffset="140.0"/>
+    <component base="uni1FBE" xOffset="48.0"/>
+    <component base="uni1FBD" xOffset="680.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_91.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_91.glif
index e4e69c04a..e94cae6b6 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_91.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_91.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F91" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F91"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FBE" yOffset="16.0"/>
-    <component base="uni1FFE" xOffset="344.0" yOffset="148.0"/>
+    <component base="uni1FBE" xOffset="48.0"/>
+    <component base="uni1FFE" xOffset="388.0" yOffset="152.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_92.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_92.glif
index eae65a868..de6ab753e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_92.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_92.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F92" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F92"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FBE" yOffset="16.0"/>
-    <component base="uni1FCD" xOffset="128.0" yOffset="140.0"/>
+    <component base="uni1FBE" xOffset="48.0"/>
+    <component base="uni1FCD" xOffset="172.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_93.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_93.glif
index 65788ce7d..c1f8032c7 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_93.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_93.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F93" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F93"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FBE" yOffset="16.0"/>
-    <component base="uni1FDD" xOffset="264.0" yOffset="144.0"/>
+    <component base="uni1FBE" xOffset="48.0"/>
+    <component base="uni1FDD" xOffset="308.0" yOffset="148.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_94.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_94.glif
index e065ed350..b3203eed0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_94.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_94.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F94" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F94"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FBE" yOffset="16.0"/>
-    <component base="uni1FCE" xOffset="228.0" yOffset="148.0"/>
+    <component base="uni1FBE" xOffset="48.0"/>
+    <component base="uni1FCE" xOffset="272.0" yOffset="152.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_95.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_95.glif
index 575b1df67..84e6ed5d5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_95.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_95.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F95" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F95"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FBE" yOffset="16.0"/>
-    <component base="uni1FDE" xOffset="236.0" yOffset="144.0"/>
+    <component base="uni1FBE" xOffset="48.0"/>
+    <component base="uni1FDE" xOffset="280.0" yOffset="148.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_96.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_96.glif
index a88c0044b..1955f8232 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_96.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_96.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F96" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F96"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FBE" yOffset="16.0"/>
-    <component base="uni1FCF" xOffset="368.0" yOffset="140.0"/>
+    <component base="uni1FBE" xOffset="48.0"/>
+    <component base="uni1FCF" xOffset="412.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_97.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_97.glif
index ee57a1f67..899c01ca5 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_97.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_97.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1F97" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1F97"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FBE" yOffset="16.0"/>
-    <component base="uni1FDF" xOffset="264.0" yOffset="140.0"/>
+    <component base="uni1FBE" xOffset="48.0"/>
+    <component base="uni1FDF" xOffset="308.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_B_8.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_B_8.glif
index ecbd27a2f..102f28efc 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_B_8.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_B_8.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FB8" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1FB8"/>
   <outline>
     <component base="A"/>
-    <component base="breve" xOffset="452.0" yOffset="404.0"/>
+    <component base="breve" xOffset="408.0" yOffset="404.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_B_9.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_B_9.glif
index 289d9454a..3300d5b20 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_B_9.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_B_9.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FB9" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1FB9"/>
   <outline>
     <component base="A"/>
-    <component base="macron" xOffset="256.0" yOffset="388.0"/>
+    <component base="macron" xOffset="212.0" yOffset="388.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_B_A_.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_B_A_.glif
index 7d32799fa..d69dbd5dd 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_B_A_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_B_A_.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FBA" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1FBA"/>
   <outline>
     <component base="A"/>
-    <component base="uni1FEF.tonos" xOffset="36.0"/>
+    <component base="uni1FEF.tonos" xOffset="-88.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_B_B_.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_B_B_.glif
index c2eede316..d34621fcb 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_B_B_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_B_B_.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FBB" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1FBB"/>
   <outline>
     <component base="A"/>
-    <component base="uni1FFD.tonos" xOffset="36.0"/>
+    <component base="uni1FFD.tonos" xOffset="-88.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_B_C_.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_B_C_.glif
index 0b9f8dfdf..81381df79 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_B_C_.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_B_C_.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FBC" format="2">
-  <advance width="2328.0"/>
+  <advance width="2240.0"/>
   <unicode hex="1FBC"/>
   <outline>
     <component base="A"/>
-    <component base="uni1FBE" xOffset="796.0"/>
+    <component base="uni1FBE" xOffset="752.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_C_0.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_C_0.glif
index a6eef180c..96969584e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_C_0.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_C_0.glif
@@ -3,7 +3,7 @@
   <advance width="1420.0"/>
   <unicode hex="1FC0"/>
   <outline>
-    <component base="tilde" xOffset="20.0"/>
+    <component base="tilde"/>
   </outline>
   <lib>
     <dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_C_2.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_C_2.glif
index c4c6e2436..253a3485e 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_C_2.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_C_2.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FC2" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1FC2"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FBE" yOffset="16.0"/>
-    <component base="uni1FEF" xOffset="312.0" yOffset="140.0"/>
+    <component base="uni1FBE" xOffset="48.0"/>
+    <component base="uni1FEF" xOffset="356.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_C_3.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_C_3.glif
index 53ba55a35..153be46c3 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_C_3.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_C_3.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FC3" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1FC3"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FBE" yOffset="16.0"/>
+    <component base="uni1FBE" xOffset="48.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_C_4.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_C_4.glif
index 7440c4159..d9d9799e0 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_C_4.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_C_4.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FC4" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1FC4"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FBE" yOffset="16.0"/>
-    <component base="uni1FFD" xOffset="600.0" yOffset="140.0"/>
+    <component base="uni1FBE" xOffset="48.0"/>
+    <component base="uni1FFD" xOffset="644.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_C_6.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_C_6.glif
index 30a2b9c6d..e8f6d972c 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_C_6.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_C_6.glif
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FC6" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1FC6"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FC0" xOffset="124.0" yOffset="140.0"/>
+    <component base="uni1FC0" xOffset="168.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/uni1F_C_7.glif b/src/Inter-UI-Black.ufo/glyphs/uni1F_C_7.glif
index 50a75a55b..1ac1a46c4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/uni1F_C_7.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/uni1F_C_7.glif
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="uni1FC7" format="2">
-  <advance width="1768.0"/>
+  <advance width="1820.0"/>
   <unicode hex="1FC7"/>
   <outline>
     <component base="eta"/>
-    <component base="uni1FBE" yOffset="16.0"/>
-    <component base="uni1FC0" xOffset="124.0" yOffset="140.0"/>
+    <component base="uni1FBE" xOffset="48.0"/>
+    <component base="uni1FC0" xOffset="168.0" yOffset="144.0"/>
   </outline>
 </glyph>
diff --git a/src/Inter-UI-Black.ufo/glyphs/zero.tf.slash.glif b/src/Inter-UI-Black.ufo/glyphs/zero.tf.slash.glif
index 00ca4cc73..43cc1b8b4 100644
--- a/src/Inter-UI-Black.ufo/glyphs/zero.tf.slash.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/zero.tf.slash.glif
@@ -8,6 +8,8 @@
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.widthMetricsKey</key>
+      <string>zero.tf</string>
       <key>public.markColor</key>
       <string>0.922,0.965,0.784,0.004</string>
     </dict>
diff --git a/src/Inter-UI-Black.ufo/glyphs/zeta.glif b/src/Inter-UI-Black.ufo/glyphs/zeta.glif
index 225c3f070..1813a6937 100644
--- a/src/Inter-UI-Black.ufo/glyphs/zeta.glif
+++ b/src/Inter-UI-Black.ufo/glyphs/zeta.glif
@@ -1,51 +1,55 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <glyph name="zeta" format="2">
-  <advance width="1692.0"/>
+  <advance width="1612.0"/>
   <unicode hex="03B6"/>
-  <guideline x="16.0" y="1132.0" angle="0.0"/>
+  <guideline x="4.0" y="1132.0" angle="0.0"/>
   <outline>
     <contour>
-      <point x="1160.0" y="2004.0" type="line"/>
-      <point x="584.0" y="1336.0" type="line" smooth="yes"/>
-      <point x="376.0" y="1092.0"/>
-      <point x="208.0" y="932.0"/>
-      <point x="208.0" y="524.0" type="curve" smooth="yes"/>
-      <point x="208.0" y="268.0"/>
-      <point x="396.0" y="80.0"/>
-      <point x="752.0" y="0.0" type="curve" smooth="yes"/>
-      <point x="840.0" y="-20.0" type="line" smooth="yes"/>
-      <point x="940.0" y="-44.0"/>
-      <point x="964.0" y="-76.0"/>
-      <point x="960.0" y="-144.0" type="curve"/>
-      <point x="964.0" y="-180.0"/>
-      <point x="924.0" y="-276.0"/>
-      <point x="832.0" y="-360.0" type="curve"/>
-      <point x="1092.0" y="-544.0" type="line"/>
-      <point x="1284.0" y="-428.0"/>
-      <point x="1484.0" y="-196.0"/>
-      <point x="1484.0" y="-28.0" type="curve"/>
-      <point x="1488.0" y="196.0"/>
-      <point x="1304.0" y="300.0"/>
-      <point x="1036.0" y="372.0" type="curve" smooth="yes"/>
-      <point x="976.0" y="388.0" type="line" smooth="yes"/>
-      <point x="848.0" y="424.0"/>
-      <point x="720.0" y="452.0"/>
-      <point x="720.0" y="632.0" type="curve"/>
-      <point x="720.0" y="852.0"/>
-      <point x="832.0" y="972.0"/>
-      <point x="968.0" y="1124.0" type="curve" smooth="yes"/>
-      <point x="1512.0" y="1728.0" type="line"/>
-      <point x="1512.0" y="2004.0" type="line"/>
+      <point x="1148.0" y="2048.0" type="line"/>
+      <point x="572.0" y="1336.0" type="line" smooth="yes"/>
+      <point x="325.0" y="1030.0"/>
+      <point x="196.0" y="882.0"/>
+      <point x="196.0" y="524.0" type="curve" smooth="yes"/>
+      <point x="196.0" y="260.0"/>
+      <point x="383.0" y="81.0"/>
+      <point x="740.0" y="0.0" type="curve" smooth="yes"/>
+      <point x="828.0" y="-20.0" type="line" smooth="yes"/>
+      <point x="910.0" y="-39.0"/>
+      <point x="952.0" y="-82.0"/>
+      <point x="948.0" y="-144.0" type="curve" smooth="yes"/>
+      <point x="944.0" y="-203.0"/>
+      <point x="911.0" y="-277.0"/>
+      <point x="820.0" y="-360.0" type="curve"/>
+      <point x="1080.0" y="-544.0" type="line"/>
+      <point x="1338.0" y="-388.0"/>
+      <point x="1472.0" y="-211.0"/>
+      <point x="1472.0" y="-28.0" type="curve" smooth="yes"/>
+      <point x="1472.0" y="155.0"/>
+      <point x="1322.0" y="296.0"/>
+      <point x="1024.0" y="376.0" type="curve" smooth="yes"/>
+      <point x="964.0" y="392.0" type="line" smooth="yes"/>
+      <point x="795.0" y="437.0"/>
+      <point x="708.0" y="519.0"/>
+      <point x="708.0" y="632.0" type="curve" smooth="yes"/>
+      <point x="708.0" y="760.0"/>
+      <point x="793.0" y="929.0"/>
+      <point x="956.0" y="1124.0" type="curve" smooth="yes"/>
+      <point x="1500.0" y="1772.0" type="line"/>
+      <point x="1500.0" y="2048.0" type="line"/>
     </contour>
     <contour>
-      <point x="180.0" y="2004.0" type="line"/>
-      <point x="180.0" y="1592.0" type="line"/>
-      <point x="1256.0" y="1592.0" type="line"/>
-      <point x="1256.0" y="2004.0" type="line"/>
+      <point x="88.0" y="2048.0" type="line"/>
+      <point x="88.0" y="1604.0" type="line"/>
+      <point x="1244.0" y="1604.0" type="line"/>
+      <point x="1244.0" y="2048.0" type="line"/>
     </contour>
   </outline>
   <lib>
     <dict>
+      <key>com.schriftgestaltung.Glyphs.glyph.leftMetricsKey</key>
+      <string>seven</string>
+      <key>com.schriftgestaltung.Glyphs.glyph.rightMetricsKey</key>
+      <string>seven</string>
       <key>com.schriftgestaltung.hints</key>
       <array>
         <dict>
diff --git a/src/Inter-UI-Black.ufo/groups.plist b/src/Inter-UI-Black.ufo/groups.plist
index 333997442..4383893bb 100644
--- a/src/Inter-UI-Black.ufo/groups.plist
+++ b/src/Inter-UI-Black.ufo/groups.plist
@@ -727,6 +727,7 @@
       <string>rrthook</string>
       <string>uni024D</string>
       <string>rfishhook</string>
+      <string>rdescend</string>
       <string>racute</string>
       <string>rcommaaccent</string>
       <string>rcaron</string>
@@ -751,6 +752,7 @@
       <string>scircumflex</string>
       <string>scedilla</string>
       <string>scaron</string>
+      <string>rupee</string>
     </array>
     <key>public.kern1.six.1</key>
     <array>
@@ -766,6 +768,8 @@
       <string>ncurl</string>
       <string>t</string>
       <string>tpalatalhook</string>
+      <string>trthook</string>
+      <string>tbar</string>
       <string>tcaron</string>
     </array>
     <key>public.kern1.two</key>
@@ -987,6 +991,7 @@
       <string>l.ss02</string>
       <string>germandbls</string>
       <string>Thorn</string>
+      <string>rupee</string>
       <string>numero</string>
     </array>
     <key>public.kern2.C</key>
@@ -1057,6 +1062,10 @@
       <string>Jcircumflex</string>
       <string>uni0248</string>
     </array>
+    <key>public.kern2.O</key>
+    <array>
+      <string>Q_rthook</string>
+    </array>
     <key>public.kern2.Omicrongreek</key>
     <array>
       <string>Theta</string>
@@ -1537,6 +1546,10 @@
       <string>primetripl1</string>
       <string>quotedblright</string>
     </array>
+    <key>public.kern2.r</key>
+    <array>
+      <string>rdescend</string>
+    </array>
     <key>public.kern2.s</key>
     <array>
       <string>s</string>
@@ -1564,7 +1577,9 @@
     <array>
       <string>t</string>
       <string>tpalatalhook</string>
+      <string>trthook</string>
       <string>tccurl</string>
+      <string>tbar</string>
       <string>tcaron</string>
     </array>
     <key>public.kern2.two</key>
diff --git a/src/Inter-UI-Black.ufo/kerning.plist b/src/Inter-UI-Black.ufo/kerning.plist
index b8760eb07..467147299 100644
--- a/src/Inter-UI-Black.ufo/kerning.plist
+++ b/src/Inter-UI-Black.ufo/kerning.plist
@@ -2451,7 +2451,7 @@
       <key>periodcentered</key>
       <real>-112.0</real>
       <key>public.kern2.A</key>
-      <real>-296.0</real>
+      <real>-336.0</real>
       <key>public.kern2.AE</key>
       <real>-368.0</real>
       <key>public.kern2.C</key>
author	Rasmus Andersson <rasmus@notion.se>	2018-10-03 20:17:18 +0300
committer	Rasmus Andersson <rasmus@notion.se>	2018-10-11 09:38:27 +0300
commit	750564b7b1e2e3538c610e2f5f016ba9139134c1 (patch)
tree	71b36be237cb29ad15772e27f90b9cb3ca65313e /src/Inter-UI-Black.ufo
parent	4855042425152435f1b3373176073830f17e24fb (diff)
download	inter-750564b7b1e2e3538c610e2f5f016ba9139134c1.tar.xz