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

648 files changed, 10287 insertions, 9112 deletions

diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_E_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_E_acute.glyph
index a51795ffa..d758393a5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_E_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_E_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (972,372);
+pos = (1080,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (962,372);
+pos = (1048,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (976,372);
+pos = (1044,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (937,434);
+pos = (1124,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (904,434);
+pos = (1096,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (926,434);
+pos = (1080,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_E_macron.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_E_macron.glyph
index dd8493263..800ee6d7c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_E_macron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_E_macron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (724,372);
+pos = (836,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (687,372);
+pos = (936,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (674,372);
+pos = (856,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (720,434);
+pos = (872,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (665,434);
+pos = (930,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = AE;
 },
 {
-pos = (676,434);
+pos = (826,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_acute.glyph
index f31cd96ca..83367cc8e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (340,372);
+pos = (448,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (424,372);
+pos = (510,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (352,372);
+pos = (420,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (317,434);
+pos = (504,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (358,434);
+pos = (550,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (302,434);
+pos = (456,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_brevedotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_brevedotbelow.glyph
index 70c61711b..6ce836fd6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_brevedotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_brevedotbelow.glyph
@@ -14,7 +14,7 @@ pos = (308,372);
 ref = breve;
 },
 {
-pos = (1298,0);
+pos = (1292,0);
 ref = dotbelow;
 }
 );
@@ -31,7 +31,7 @@ pos = (334,372);
 ref = breve;
 },
 {
-pos = (1350,0);
+pos = (1481,0);
 ref = dotbelow;
 }
 );
@@ -48,7 +48,7 @@ pos = (280,372);
 ref = breve;
 },
 {
-pos = (1190,0);
+pos = (1217,0);
 ref = dotbelow;
 }
 );
@@ -65,7 +65,7 @@ pos = (268,434);
 ref = breve;
 },
 {
-pos = (1306,0);
+pos = (1237,0);
 ref = dotbelow;
 }
 );
@@ -82,7 +82,7 @@ pos = (288,434);
 ref = breve;
 },
 {
-pos = (1320,0);
+pos = (1415,0);
 ref = dotbelow;
 }
 );
@@ -99,7 +99,7 @@ pos = (234,434);
 ref = breve;
 },
 {
-pos = (1208,0);
+pos = (1121,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_brevetilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_brevetilde.glyph
index 8fd399fbd..e9dd9b48a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_brevetilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_brevetilde.glyph
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (288,434);
+pos = (282,434);
 ref = brevetildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_caron.glyph
index cc10e4f2c..af216ea33 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_caron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (226,372);
+pos = (276,372);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (168,372);
+pos = (302,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (234,434);
+pos = (268,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (140,434);
+pos = (336,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (218,434);
+pos = (234,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_circumflex.glyph
index 18dc60e33..55cc12616 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (228,372);
+pos = (276,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (174,372);
+pos = (302,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (236,434);
+pos = (268,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (140,434);
+pos = (336,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (218,434);
+pos = (234,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_circumflexacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_circumflexacute.glyph
index b00f3abf9..a4aaf36c1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_circumflexacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_circumflexacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (228,372);
+pos = (276,372);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (174,372);
+pos = (302,372);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (236,434);
+pos = (268,434);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (140,434);
+pos = (336,434);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (218,434);
+pos = (234,434);
 ref = circumflexacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_circumflexdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_circumflexdotbelow.glyph
index baa8c5c71..fea074899 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_circumflexdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_circumflexdotbelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = A;
 },
 {
-pos = (228,372);
+pos = (276,372);
 ref = circumflex;
 },
 {
-pos = (1298,0);
+pos = (1292,0);
 ref = dotbelow;
 }
 );
@@ -27,11 +27,11 @@ shapes = (
 ref = A;
 },
 {
-pos = (174,372);
+pos = (302,372);
 ref = circumflex;
 },
 {
-pos = (1350,0);
+pos = (1481,0);
 ref = dotbelow;
 }
 );
@@ -48,7 +48,7 @@ pos = (200,372);
 ref = circumflex;
 },
 {
-pos = (1190,0);
+pos = (1217,0);
 ref = dotbelow;
 }
 );
@@ -61,11 +61,11 @@ shapes = (
 ref = A;
 },
 {
-pos = (236,434);
+pos = (268,434);
 ref = circumflex;
 },
 {
-pos = (1306,0);
+pos = (1237,0);
 ref = dotbelow;
 }
 );
@@ -78,11 +78,11 @@ shapes = (
 ref = A;
 },
 {
-pos = (140,434);
+pos = (336,434);
 ref = circumflex;
 },
 {
-pos = (1320,0);
+pos = (1415,0);
 ref = dotbelow;
 }
 );
@@ -95,11 +95,11 @@ shapes = (
 ref = A;
 },
 {
-pos = (218,434);
+pos = (234,434);
 ref = circumflex;
 },
 {
-pos = (1208,0);
+pos = (1121,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_circumflexgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_circumflexgrave.glyph
index 32897db0b..05949d4cc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_circumflexgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_circumflexgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (226,372);
+pos = (276,372);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (162,372);
+pos = (302,372);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (132,250);
+pos = (200,372);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (234,434);
+pos = (268,434);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (136,434);
+pos = (336,434);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (150,250);
+pos = (234,434);
 ref = circumflexgravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_circumflexhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_circumflexhookabove.glyph
index deba8fc4e..0183e0496 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_circumflexhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_circumflexhookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (228,372);
+pos = (276,372);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (174,372);
+pos = (302,372);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (236,434);
+pos = (268,434);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (140,434);
+pos = (336,434);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (218,434);
+pos = (234,434);
 ref = circumflexhookcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_circumflextilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_circumflextilde.glyph
index d70fd4b84..8d40d1529 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_circumflextilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_circumflextilde.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (228,372);
+pos = (276,372);
 ref = circumflextildecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (174,372);
+pos = (302,372);
 ref = circumflextildecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (202,144);
+pos = (200,372);
 ref = circumflextildecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (236,434);
+pos = (268,434);
 ref = circumflextildecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (140,434);
+pos = (336,434);
 ref = circumflextildecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (220,144);
+pos = (231,434);
 ref = circumflextildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_dblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_dblgrave.glyph
index 8c6800256..620c463ee 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_dblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_dblgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1164,372);
+pos = (1268,372);
 ref = dblgravecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1424,372);
+pos = (1470,372);
 ref = dblgravecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1190,372);
+pos = (1208,372);
 ref = dblgravecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1172,434);
+pos = (1227,434);
 ref = dblgravecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1394,434);
+pos = (1408,434);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1208,434);
+pos = (1122,434);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_dieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_dieresis.glyph
index e094865bf..9457b6308 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_dieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_dieresis.glyph
@@ -62,12 +62,6 @@ ref = dieresis;
 width = 1338;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (1084,1232);
-}
-);
 layerId = m009;
 shapes = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_dieresismacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_dieresismacron.glyph
index 0fd40b166..d0a2cc717 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_dieresismacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_dieresismacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (91,0);
+pos = (92,0);
 ref = dieresismacroncomb.uc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (99,0);
+pos = (100,0);
 ref = dieresismacroncomb.uc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_dotbelow.glyph
index f7a159494..9131eabb8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1298,0);
+pos = (1292,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1350,0);
+pos = (1481,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1190,0);
+pos = (1217,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1306,0);
+pos = (1237,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1320,0);
+pos = (1415,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1208,0);
+pos = (1121,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_grave.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_grave.glyph
index f008ae58d..29653c2a8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_grave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_grave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (154,372);
+pos = (282,372);
 ref = grave;
 }
 );
@@ -28,7 +28,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (210,372);
+pos = (296,372);
 ref = grave;
 }
 );
@@ -41,7 +41,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (138,372);
+pos = (267,372);
 ref = grave;
 }
 );
@@ -54,7 +54,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (108,434);
+pos = (338,434);
 ref = grave;
 }
 );
@@ -67,7 +67,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (96,434);
+pos = (288,434);
 ref = grave;
 }
 );
@@ -80,7 +80,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (92,434);
+pos = (260,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_hookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_hookabove.glyph
index 1c1d20b1f..cbe2da2fd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_hookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_hookabove.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1279,372);
-ref = hookabovecmb;
+pos = (427,372);
+ref = hookabove;
 }
 );
 width = 1384;
@@ -23,8 +23,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1478,372);
-ref = hookabovecmb;
+pos = (500,372);
+ref = hookabove;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1154,372);
-ref = hookabovecmb;
+pos = (412,372);
+ref = hookabove;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1231,434);
-ref = hookabovecmb;
+pos = (403,434);
+ref = hookabove;
 }
 );
 width = 1338;
@@ -62,8 +62,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1422,434);
-ref = hookabovecmb;
+pos = (445,434);
+ref = hookabove;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1090,434);
-ref = hookabovecmb;
+pos = (368,434);
+ref = hookabove;
 }
 );
 width = 1170;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_invertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_invertedbreve.glyph
index 8a0ab372d..1ed4a0d65 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_invertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1289,372);
+pos = (1282,372);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1476,372);
+pos = (1480,372);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1418,434);
+pos = (1421,434);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (1115,434);
+pos = (1125,434);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_macron.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_macron.glyph
index d8566350d..50b8159e3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_macron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_macron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (92,372);
+pos = (204,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (149,372);
+pos = (398,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (50,372);
+pos = (232,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (100,434);
+pos = (252,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (119,434);
+pos = (384,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (52,434);
+pos = (202,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/A_ringacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/A_ringacute.glyph
index 73c9ac824..346c4eaa1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/A_ringacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/A_ringacute.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (390,304);
-ref = ringacute.cn;
+pos = (388,0);
+ref = ringacute.uc;
 }
 );
 width = 1384;
@@ -23,8 +23,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (464,244);
-ref = ringacute.cn;
+pos = (382,28);
+ref = ringacute.uc;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (352,338);
-ref = ringacute.cn;
+pos = (392,0);
+ref = ringacute.uc;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (398,304);
-ref = ringacute.cn;
+pos = (380,0);
+ref = ringacute.uc;
 }
 );
 width = 1338;
@@ -62,8 +62,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (434,244);
-ref = ringacute.cn;
+pos = (336,75);
+ref = ringacute.uc;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (370,338);
-ref = ringacute.cn;
+pos = (298,0);
+ref = ringacute.uc;
 }
 );
 width = 1170;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/B_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/B_dotbelow.glyph
index 1c5327d6a..e14c8fc89 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/B_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/B_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = B;
 },
 {
-pos = (1252,0);
+pos = (1246,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = B;
 },
 {
-pos = (1200,0);
+pos = (1331,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = B;
 },
 {
-pos = (1196,0);
+pos = (1223,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = B;
 },
 {
-pos = (1252,0);
+pos = (1183,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = B;
 },
 {
-pos = (1200,0);
+pos = (1295,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = B;
 },
 {
-pos = (1194,0);
+pos = (1107,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/B_linebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/B_linebelow.glyph
index d7614606e..3422ee2da 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/B_linebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/B_linebelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = B;
 },
 {
-pos = (1244,0);
-ref = macronsubnosp;
+pos = (158,0);
+ref = macronsub;
 }
 );
 width = 1332;
@@ -23,8 +23,8 @@ shapes = (
 ref = B;
 },
 {
-pos = (1330,0);
-ref = macronsubnosp;
+pos = (248,0);
+ref = macronsub;
 }
 );
 width = 1368;
@@ -36,8 +36,8 @@ shapes = (
 ref = B;
 },
 {
-pos = (1213,0);
-ref = macronsubnosp;
+pos = (238,0);
+ref = macronsub;
 }
 );
 width = 1312;
@@ -49,8 +49,8 @@ shapes = (
 ref = B;
 },
 {
-pos = (1174,0);
-ref = macronsubnosp;
+pos = (198,0);
+ref = macronsub;
 }
 );
 width = 1268;
@@ -62,8 +62,8 @@ shapes = (
 ref = B;
 },
 {
-pos = (1293,0);
-ref = macronsubnosp;
+pos = (264,0);
+ref = macronsub;
 }
 );
 width = 1328;
@@ -75,8 +75,8 @@ shapes = (
 ref = B;
 },
 {
-pos = (1101,0);
-ref = macronsubnosp;
+pos = (188,0);
+ref = macronsub;
 }
 );
 width = 1182;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/C_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/C_acute.glyph
index e1f18dc8b..d449601ee 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/C_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/C_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (428,372);
+pos = (536,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (418,372);
+pos = (504,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (486,372);
+pos = (554,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (407,434);
+pos = (594,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (348,434);
+pos = (540,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (418,434);
+pos = (572,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/C_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/C_caron.glyph
index b384c32e3..e5985fe8a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/C_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/C_caron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (314,372);
+pos = (364,372);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (162,372);
+pos = (296,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (324,434);
+pos = (358,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (130,434);
+pos = (326,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (334,434);
+pos = (350,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/C_cedillaacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/C_cedillaacute.glyph
index ce508b908..28a42072d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/C_cedillaacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/C_cedillaacute.glyph
@@ -14,7 +14,7 @@ pos = (500,-12);
 ref = cedilla;
 },
 {
-pos = (428,372);
+pos = (536,372);
 ref = acute;
 }
 );
@@ -31,7 +31,7 @@ pos = (344,6);
 ref = cedilla;
 },
 {
-pos = (418,372);
+pos = (504,372);
 ref = acute;
 }
 );
@@ -48,7 +48,7 @@ pos = (552,0);
 ref = cedilla;
 },
 {
-pos = (486,372);
+pos = (554,372);
 ref = acute;
 }
 );
@@ -65,7 +65,7 @@ pos = (510,0);
 ref = cedilla;
 },
 {
-pos = (407,434);
+pos = (594,434);
 ref = acute;
 }
 );
@@ -82,7 +82,7 @@ pos = (310,6);
 ref = cedilla;
 },
 {
-pos = (348,434);
+pos = (540,434);
 ref = acute;
 }
 );
@@ -99,7 +99,7 @@ pos = (552,0);
 ref = cedilla;
 },
 {
-pos = (418,434);
+pos = (572,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/C_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/C_circumflex.glyph
index d1b393192..73bbdb746 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/C_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/C_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (316,372);
+pos = (364,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (168,372);
+pos = (296,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (326,434);
+pos = (358,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (130,434);
+pos = (326,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = C;
 },
 {
-pos = (334,434);
+pos = (350,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/D_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/D_caron.glyph
index fdd1c0d63..add017827 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/D_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/D_caron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (150,372);
+pos = (200,372);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (-52,372);
+pos = (82,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (150,434);
+pos = (184,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (-42,434);
+pos = (154,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (200,434);
+pos = (216,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/D_circumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/D_circumflexbelow.glyph
index 4dbacf879..3c44e377a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/D_circumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/D_circumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1214,0);
+pos = (1218,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1164,0);
+pos = (1167,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1158,0);
+pos = (1156,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1318,0);
+pos = (1316,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1054,0);
+pos = (1050,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/D_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/D_dotbelow.glyph
index 9a4640b7f..b43b4e46f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/D_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/D_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1228,0);
+pos = (1222,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1210,0);
+pos = (1341,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1148,0);
+pos = (1175,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1228,0);
+pos = (1159,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1218,0);
+pos = (1313,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (1148,0);
+pos = (1061,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/D_linebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/D_linebelow.glyph
index 430547040..c5021b069 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/D_linebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/D_linebelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (1220,0);
-ref = macronsubnosp;
+pos = (134,0);
+ref = macronsub;
 }
 );
 width = 1472;
@@ -23,8 +23,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (1340,0);
-ref = macronsubnosp;
+pos = (258,0);
+ref = macronsub;
 }
 );
 width = 1500;
@@ -36,8 +36,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (1165,0);
-ref = macronsubnosp;
+pos = (190,0);
+ref = macronsub;
 }
 );
 width = 1462;
@@ -49,8 +49,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (1150,0);
-ref = macronsubnosp;
+pos = (174,0);
+ref = macronsub;
 }
 );
 width = 1412;
@@ -62,8 +62,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (1311,0);
-ref = macronsubnosp;
+pos = (282,0);
+ref = macronsub;
 }
 );
 width = 1456;
@@ -75,8 +75,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (1055,0);
-ref = macronsubnosp;
+pos = (142,0);
+ref = macronsub;
 }
 );
 width = 1334;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_acute.glyph
index 96e0197e6..b6db9ce29 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (276,372);
+pos = (384,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (248,372);
+pos = (334,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (354,372);
+pos = (422,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (245,434);
+pos = (432,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (220,434);
+pos = (412,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (286,434);
+pos = (440,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_caron.glyph
index 9da441a60..c84655624 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_caron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (162,372);
+pos = (212,372);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-8,372);
+pos = (126,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (162,434);
+pos = (196,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (2,434);
+pos = (198,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (202,434);
+pos = (218,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_circumflex.glyph
index e54116f58..83a0df81a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (164,372);
+pos = (212,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-2,372);
+pos = (126,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (164,434);
+pos = (196,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (2,434);
+pos = (198,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (202,434);
+pos = (218,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexacute.glyph
index 7f97d2109..ea0d44e4b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (164,372);
+pos = (212,372);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-2,372);
+pos = (126,372);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (164,434);
+pos = (196,434);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (2,434);
+pos = (198,434);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (202,434);
+pos = (218,434);
 ref = circumflexacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexbelow.glyph
index 0acec333c..a21d1ee08 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1206,0);
+pos = (1210,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1174,0);
+pos = (1177,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1150,0);
+pos = (1148,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1282,0);
+pos = (1280,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1064,0);
+pos = (1060,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexdotbelow.glyph
index bfe60b923..870b6146b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexdotbelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = E;
 },
 {
-pos = (164,372);
+pos = (212,372);
 ref = circumflex;
 },
 {
-pos = (1220,0);
+pos = (1214,0);
 ref = dotbelow;
 }
 );
@@ -27,11 +27,11 @@ shapes = (
 ref = E;
 },
 {
-pos = (-2,372);
+pos = (126,372);
 ref = circumflex;
 },
 {
-pos = (1174,0);
+pos = (1305,0);
 ref = dotbelow;
 }
 );
@@ -48,7 +48,7 @@ pos = (202,372);
 ref = circumflex;
 },
 {
-pos = (1158,0);
+pos = (1185,0);
 ref = dotbelow;
 }
 );
@@ -61,11 +61,11 @@ shapes = (
 ref = E;
 },
 {
-pos = (164,434);
+pos = (196,434);
 ref = circumflex;
 },
 {
-pos = (1220,0);
+pos = (1151,0);
 ref = dotbelow;
 }
 );
@@ -78,11 +78,11 @@ shapes = (
 ref = E;
 },
 {
-pos = (2,434);
+pos = (198,434);
 ref = circumflex;
 },
 {
-pos = (1182,0);
+pos = (1277,0);
 ref = dotbelow;
 }
 );
@@ -95,11 +95,11 @@ shapes = (
 ref = E;
 },
 {
-pos = (202,434);
+pos = (218,434);
 ref = circumflex;
 },
 {
-pos = (1158,0);
+pos = (1071,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexgrave.glyph
index 544b70e42..80522eebe 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (162,372);
+pos = (212,372);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-14,372);
+pos = (126,372);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (134,250);
+pos = (202,372);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (162,434);
+pos = (196,434);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-2,434);
+pos = (198,434);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (134,250);
+pos = (218,434);
 ref = circumflexgravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexhookabove.glyph
index 2ba938bf7..57b456191 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_circumflexhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_circumflexhookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (164,372);
+pos = (212,372);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-2,372);
+pos = (126,372);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (164,434);
+pos = (196,434);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (2,434);
+pos = (198,434);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (202,434);
+pos = (218,434);
 ref = circumflexhookcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_circumflextilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_circumflextilde.glyph
index 58815bf01..0287de2a6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_circumflextilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_circumflextilde.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (164,372);
+pos = (212,372);
 ref = circumflextildecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-2,372);
+pos = (126,372);
 ref = circumflextildecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (204,144);
+pos = (202,372);
 ref = circumflextildecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (164,434);
+pos = (196,434);
 ref = circumflextildecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (2,434);
+pos = (198,434);
 ref = circumflextildecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (204,144);
+pos = (215,434);
 ref = circumflextildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_dblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_dblgrave.glyph
index 96c01d01d..f6ca1f90f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_dblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_dblgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1100,372);
+pos = (1204,372);
 ref = dblgravecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1248,372);
+pos = (1294,372);
 ref = dblgravecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1192,372);
+pos = (1210,372);
 ref = dblgravecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1100,434);
+pos = (1155,434);
 ref = dblgravecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1256,434);
+pos = (1270,434);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1192,434);
+pos = (1106,434);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_dotbelow.glyph
index 89caa5f0b..0660eeaa2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1220,0);
+pos = (1214,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1174,0);
+pos = (1305,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1158,0);
+pos = (1185,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1220,0);
+pos = (1151,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1182,0);
+pos = (1277,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1158,0);
+pos = (1071,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_grave.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_grave.glyph
index 1cb7f9cd6..ff967543e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_grave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_grave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (90,372);
+pos = (218,372);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (34,372);
+pos = (120,372);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (140,372);
+pos = (269,372);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (36,434);
+pos = (266,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-42,434);
+pos = (150,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (76,434);
+pos = (244,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_hookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_hookabove.glyph
index 100edfbe5..2c37c0efe 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_hookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_hookabove.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (1215,372);
-ref = hookabovecmb;
+pos = (363,372);
+ref = hookabove;
 }
 );
 width = 1224;
@@ -23,8 +23,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (1302,372);
-ref = hookabovecmb;
+pos = (324,372);
+ref = hookabove;
 }
 );
 width = 1274;
@@ -36,8 +36,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (1156,372);
-ref = hookabovecmb;
+pos = (414,372);
+ref = hookabove;
 }
 );
 width = 1196;
@@ -49,8 +49,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (1159,434);
-ref = hookabovecmb;
+pos = (331,434);
+ref = hookabove;
 }
 );
 width = 1160;
@@ -62,8 +62,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (1284,434);
-ref = hookabovecmb;
+pos = (307,434);
+ref = hookabove;
 }
 );
 width = 1260;
@@ -75,8 +75,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (1074,434);
-ref = hookabovecmb;
+pos = (352,434);
+ref = hookabove;
 }
 );
 width = 1068;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_invertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_invertedbreve.glyph
index d23d597e3..b5e110111 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_invertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1225,372);
+pos = (1218,372);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1300,372);
+pos = (1304,372);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1280,434);
+pos = (1283,434);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1099,434);
+pos = (1109,434);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_macron.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_macron.glyph
index 098f1a729..d33a31622 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_macron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_macron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (28,372);
+pos = (140,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-27,372);
+pos = (222,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (52,372);
+pos = (234,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (28,434);
+pos = (180,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-19,434);
+pos = (246,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (36,434);
+pos = (186,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_macronacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_macronacute.glyph
index 5e36d22dd..962a67357 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_macronacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_macronacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (28,0);
+pos = (140,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-27,0);
+pos = (222,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (52,0);
+pos = (234,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (28,0);
+pos = (180,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-19,0);
+pos = (246,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (36,0);
+pos = (186,0);
 ref = macronacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_macrongrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_macrongrave.glyph
index ac5de1d21..11aa98aaf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_macrongrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_macrongrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (28,0);
+pos = (140,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-27,0);
+pos = (222,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (52,0);
+pos = (234,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (28,0);
+pos = (180,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-19,0);
+pos = (246,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (36,0);
+pos = (186,0);
 ref = macrongravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_tildebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_tildebelow.glyph
index 20d366363..c95c0364e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_tildebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_tildebelow.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (1181,0);
+pos = (1183,0);
 ref = tildesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_zhcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_zhcaron.glyph
index 13d0f6690..87b596075 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_zhcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_zhcaron.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = Ezh;
 },
 {
-pos = (232,372);
+pos = (282,372);
 ref = caron;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = Ezh;
 },
 {
-pos = (60,372);
+pos = (194,372);
 ref = caron;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = Ezh;
 },
 {
-pos = (232,434);
+pos = (266,434);
 ref = caron;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = Ezh;
 },
 {
-pos = (62,434);
+pos = (258,434);
 ref = caron;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = Ezh;
 },
 {
-pos = (276,434);
+pos = (292,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_acute.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_acute.1.glyph
index 7048bfc13..ad847a626 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_acute.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_acute.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (476,372);
+pos = (544,372);
 ref = acute;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (422,372);
+pos = (530,372);
 ref = acute;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (416,372);
+pos = (502,372);
 ref = acute;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (409,434);
+pos = (596,434);
 ref = acute;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (346,434);
+pos = (538,434);
 ref = acute;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (408,434);
+pos = (562,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_acute.glyph
index 8c7ef3627..80ec0ec68 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (422,372);
+pos = (530,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (416,372);
+pos = (502,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (476,372);
+pos = (544,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (407,434);
+pos = (594,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (346,434);
+pos = (538,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (408,434);
+pos = (562,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_caron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_caron.1.glyph
index 126fc88b1..e0d5db748 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_caron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_caron.1.glyph
@@ -24,7 +24,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (308,372);
+pos = (358,372);
 ref = caron;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (160,372);
+pos = (294,372);
 ref = caron;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (326,434);
+pos = (360,434);
 ref = caron;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (128,434);
+pos = (324,434);
 ref = caron;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (324,434);
+pos = (340,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_caron.glyph
index 790c01110..693f4083f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_caron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (308,372);
+pos = (358,372);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (160,372);
+pos = (294,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (324,434);
+pos = (358,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (128,434);
+pos = (324,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (324,434);
+pos = (340,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_circumflex.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_circumflex.1.glyph
index fae6bcbd5..5ed233c4a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_circumflex.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_circumflex.1.glyph
@@ -24,7 +24,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (310,372);
+pos = (358,372);
 ref = circumflex;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (166,372);
+pos = (294,372);
 ref = circumflex;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (328,434);
+pos = (360,434);
 ref = circumflex;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (128,434);
+pos = (324,434);
 ref = circumflex;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (324,434);
+pos = (340,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_circumflex.glyph
index 2f5268bd8..a803b7056 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (310,372);
+pos = (358,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (166,372);
+pos = (294,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (326,434);
+pos = (358,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (128,434);
+pos = (324,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (324,434);
+pos = (340,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_macron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_macron.1.glyph
index 17ad2dcd6..e0200b3dd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_macron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_macron.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (174,372);
+pos = (356,372);
 ref = macron;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (174,372);
+pos = (286,372);
 ref = macron;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (141,372);
+pos = (390,372);
 ref = macron;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (192,434);
+pos = (344,434);
 ref = macron;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (107,434);
+pos = (372,434);
 ref = macron;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (158,434);
+pos = (308,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_macron.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_macron.glyph
index 7c8aec956..c5bc6e3c1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_macron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_macron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (174,372);
+pos = (286,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (141,372);
+pos = (390,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (174,372);
+pos = (356,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (190,434);
+pos = (342,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (107,434);
+pos = (372,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = G;
 },
 {
-pos = (158,434);
+pos = (308,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/H_brevebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/H_brevebelow.glyph
index 3914b7d9b..605084d6c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/H_brevebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/H_brevebelow.glyph
@@ -17,7 +17,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (1344,0);
+pos = (1355,0);
 ref = brevesubnosp;
 }
 );
@@ -30,7 +30,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (1472,2);
+pos = (1438,0);
 ref = brevesubnosp;
 }
 );
@@ -43,7 +43,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (1272,-2);
+pos = (1329,0);
 ref = brevesubnosp;
 }
 );
@@ -63,7 +63,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (1345,0);
+pos = (1292,0);
 ref = brevesubnosp;
 }
 );
@@ -76,7 +76,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (1464,2);
+pos = (1395,0);
 ref = brevesubnosp;
 }
 );
@@ -89,7 +89,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (1272,-2);
+pos = (1225,0);
 ref = brevesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/H_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/H_circumflex.glyph
index eb4004e64..e9046ce64 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/H_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/H_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (292,372);
+pos = (340,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (128,372);
+pos = (256,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (293,434);
+pos = (325,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (116,434);
+pos = (312,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (322,434);
+pos = (338,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/H_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/H_dotbelow.glyph
index 3581445d8..451c26f54 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/H_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/H_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (1362,0);
+pos = (1356,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (1304,0);
+pos = (1435,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (1312,0);
+pos = (1339,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (1363,0);
+pos = (1294,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (1296,0);
+pos = (1391,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (1312,0);
+pos = (1225,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_acute.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_acute.1.glyph
index cb45d44ba..334fc4c01 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_acute.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_acute.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (101,372);
+pos = (209,372);
 ref = acute;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (129,372);
+pos = (215,372);
 ref = acute;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (80,372);
+pos = (148,372);
 ref = acute;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (70,434);
+pos = (257,434);
 ref = acute;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (91,434);
+pos = (283,434);
 ref = acute;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (8,434);
+pos = (162,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_acute.glyph
index df9cd4e01..00bbc5739 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-82,372);
+pos = (26,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-90,372);
+pos = (-4,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-24,372);
+pos = (44,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-113,434);
+pos = (74,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-122,434);
+pos = (70,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-92,434);
+pos = (62,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_caron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_caron.1.glyph
index 519b152a4..55d8bde23 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_caron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_caron.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-13,372);
+pos = (37,372);
 ref = caron;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-127,372);
+pos = (7,372);
 ref = caron;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-13,434);
+pos = (21,434);
 ref = caron;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-127,434);
+pos = (69,434);
 ref = caron;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-76,434);
+pos = (-60,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_caron.glyph
index 19e4466fd..8dd68823b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_caron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-196,372);
+pos = (-146,372);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-346,372);
+pos = (-212,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-196,434);
+pos = (-162,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-340,434);
+pos = (-144,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-176,434);
+pos = (-160,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.1.glyph
index 8c609a58d..bab20572b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-11,372);
+pos = (37,372);
 ref = circumflex;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-121,372);
+pos = (7,372);
 ref = circumflex;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-11,434);
+pos = (21,434);
 ref = circumflex;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-127,434);
+pos = (69,434);
 ref = circumflex;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-76,434);
+pos = (-60,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.glyph
index d413d6912..1fc739653 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-194,372);
+pos = (-146,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-340,372);
+pos = (-212,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-194,434);
+pos = (-162,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-340,434);
+pos = (-144,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-176,434);
+pos = (-160,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.1.glyph
index ce82ce9c6..7340344aa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (925,372);
+pos = (1029,372);
 ref = dblgravecmb;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1129,372);
+pos = (1175,372);
 ref = dblgravecmb;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (918,372);
+pos = (936,372);
 ref = dblgravecmb;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (925,434);
+pos = (980,434);
 ref = dblgravecmb;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1127,434);
+pos = (1141,434);
 ref = dblgravecmb;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (914,434);
+pos = (828,434);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.glyph
index 20aadc146..7b4b3b787 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (742,372);
+pos = (846,372);
 ref = dblgravecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (910,372);
+pos = (956,372);
 ref = dblgravecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (814,372);
+pos = (832,372);
 ref = dblgravecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (742,434);
+pos = (797,434);
 ref = dblgravecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (914,434);
+pos = (928,434);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (814,434);
+pos = (728,434);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.double.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.double.glyph
index 787aadc8e..75c82a96b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.double.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.double.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I.double;
 },
 {
-pos = (-34,186);
+pos = (-34,372);
 ref = dieresis.three;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I.double;
 },
 {
-pos = (-97,186);
+pos = (-97,372);
 ref = dieresis.three;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I.double;
 },
 {
-pos = (85,186);
+pos = (85,372);
 ref = dieresis.three;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I.double;
 },
 {
-pos = (-98,228);
+pos = (-98,434);
 ref = dieresis.three;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I.double;
 },
 {
-pos = (-120,228);
+pos = (-120,434);
 ref = dieresis.three;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I.double;
 },
 {
-pos = (-43,228);
+pos = (-43,434);
 ref = dieresis.three;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.1.glyph
index e17e17636..5afd1d27a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.1.glyph
@@ -11,7 +11,7 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (-148,0);
+pos = (-147,0);
 ref = dieresisacutecomb.uc;
 }
 );
@@ -56,7 +56,7 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (-148,0);
+pos = (-147,0);
 ref = dieresisacutecomb.uc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.glyph
index 665e1737d..d44b2c98f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.glyph
@@ -11,7 +11,7 @@ ref = I;
 },
 {
 alignment = 1;
-pos = (-331,0);
+pos = (-330,0);
 ref = dieresisacutecomb.uc;
 }
 );
@@ -109,7 +109,7 @@ ref = I;
 },
 {
 alignment = 1;
-pos = (-331,0);
+pos = (-330,0);
 ref = dieresisacutecomb.uc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dotbelow.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dotbelow.1.glyph
index 4e2914aec..f3355d66f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dotbelow.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dotbelow.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1059,0);
+pos = (1053,0);
 ref = dotbelow;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1051,0);
+pos = (1182,0);
 ref = dotbelow;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (918,0);
+pos = (945,0);
 ref = dotbelow;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1059,0);
+pos = (990,0);
 ref = dotbelow;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1053,0);
+pos = (1148,0);
 ref = dotbelow;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (914,0);
+pos = (827,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dotbelow.glyph
index ea0617409..93a649ed1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (876,0);
+pos = (870,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (832,0);
+pos = (963,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (814,0);
+pos = (841,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (876,0);
+pos = (807,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (840,0);
+pos = (935,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (814,0);
+pos = (727,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_grave.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_grave.1.glyph
index d991b2116..6155eeb31 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_grave.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_grave.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-85,372);
+pos = (43,372);
 ref = grave;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-85,372);
+pos = (1,372);
 ref = grave;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-134,372);
+pos = (-5,372);
 ref = grave;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-139,434);
+pos = (91,434);
 ref = grave;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-171,434);
+pos = (21,434);
 ref = grave;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-202,434);
+pos = (-34,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_grave.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_grave.glyph
index 81c0175b8..a2e7d7d1b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_grave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_grave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-268,372);
+pos = (-140,372);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-304,372);
+pos = (-218,372);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-238,372);
+pos = (-109,372);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-322,434);
+pos = (-92,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-384,434);
+pos = (-192,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-302,434);
+pos = (-134,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.1.glyph
index a0916d692..38e2b2a8d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.1.glyph
@@ -11,8 +11,8 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (1040,372);
-ref = hookabovecmb;
+pos = (188,372);
+ref = hookabove;
 }
 );
 width = 906;
@@ -26,8 +26,8 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (1183,372);
-ref = hookabovecmb;
+pos = (205,372);
+ref = hookabove;
 }
 );
 width = 1034;
@@ -41,8 +41,8 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (882,372);
-ref = hookabovecmb;
+pos = (140,372);
+ref = hookabove;
 }
 );
 width = 720;
@@ -56,8 +56,8 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (984,434);
-ref = hookabovecmb;
+pos = (156,434);
+ref = hookabove;
 }
 );
 width = 842;
@@ -71,8 +71,8 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (1155,434);
-ref = hookabovecmb;
+pos = (178,434);
+ref = hookabove;
 }
 );
 width = 1002;
@@ -86,8 +86,8 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (796,434);
-ref = hookabovecmb;
+pos = (74,434);
+ref = hookabove;
 }
 );
 width = 584;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.glyph
index 18e3ba757..c450f5e6f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (857,372);
-ref = hookabovecmb;
+pos = (5,372);
+ref = hookabove;
 }
 );
 width = 540;
@@ -23,8 +23,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (964,372);
-ref = hookabovecmb;
+pos = (-14,372);
+ref = hookabove;
 }
 );
 width = 596;
@@ -36,8 +36,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (778,372);
-ref = hookabovecmb;
+pos = (36,372);
+ref = hookabove;
 }
 );
 width = 512;
@@ -49,8 +49,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (801,434);
-ref = hookabovecmb;
+pos = (-27,434);
+ref = hookabove;
 }
 );
 width = 476;
@@ -62,8 +62,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (942,434);
-ref = hookabovecmb;
+pos = (-35,434);
+ref = hookabove;
 }
 );
 width = 576;
@@ -75,8 +75,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (696,434);
-ref = hookabovecmb;
+pos = (-26,434);
+ref = hookabove;
 }
 );
 width = 384;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.1.glyph
index 9e859751c..64b09ba9d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1050,372);
+pos = (1043,372);
 ref = breveinvnosp;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1181,372);
+pos = (1185,372);
 ref = breveinvnosp;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (1151,434);
+pos = (1154,434);
 ref = breveinvnosp;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (821,434);
+pos = (831,434);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.glyph
index ed2f86888..eccfe70c7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (867,372);
+pos = (860,372);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (962,372);
+pos = (966,372);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (938,434);
+pos = (941,434);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (721,434);
+pos = (731,434);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_macron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_macron.1.glyph
index 201eff0fd..53bd5257c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_macron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_macron.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-147,372);
+pos = (-35,372);
 ref = macron;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-146,372);
+pos = (103,372);
 ref = macron;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-222,372);
+pos = (-40,372);
 ref = macron;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-147,434);
+pos = (5,434);
 ref = macron;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-148,434);
+pos = (117,434);
 ref = macron;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-242,434);
+pos = (-92,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_macron.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_macron.glyph
index 1d98d5c48..2b7f715f7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_macron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_macron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-330,372);
+pos = (-218,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-365,372);
+pos = (-116,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-326,372);
+pos = (-144,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-330,434);
+pos = (-178,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-361,434);
+pos = (-96,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-342,434);
+pos = (-192,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_macroncyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_macroncyrillic.glyph
index 4feeb0f36..cd196535e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_macroncyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_macroncyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (172,372);
+pos = (284,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (75,372);
+pos = (324,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (208,372);
+pos = (390,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (168,434);
+pos = (320,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (107,434);
+pos = (372,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (192,434);
+pos = (342,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.1.glyph
index 04225f08c..e8043accd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.1.glyph
@@ -38,7 +38,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (941,0);
+pos = (943,0);
 ref = tildesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.glyph
index d031c7dc2..fa2cb9893 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (837,0);
+pos = (839,0);
 ref = tildesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_zhitsadblgravecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_zhitsadblgravecyrillic.glyph
index dd4133eaa..ee6be5373 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_zhitsadblgravecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_zhitsadblgravecyrillic.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = afii10148;
 },
 {
-pos = (1188,372);
+pos = (1292,372);
 ref = dblgravecmb;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = afii10148;
 },
 {
-pos = (1434,372);
+pos = (1480,372);
 ref = dblgravecmb;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = afii10148;
 },
 {
-pos = (1222,372);
+pos = (1240,372);
 ref = dblgravecmb;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = afii10148;
 },
 {
-pos = (1188,434);
+pos = (1243,434);
 ref = dblgravecmb;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = afii10148;
 },
 {
-pos = (1404,434);
+pos = (1418,434);
 ref = dblgravecmb;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = afii10148;
 },
 {
-pos = (1240,434);
+pos = (1154,434);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/J_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/J_circumflex.glyph
index d318c1587..92589adef 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/J_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/J_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (376,372);
+pos = (424,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (268,372);
+pos = (396,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (376,434);
+pos = (408,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (254,434);
+pos = (450,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = J;
 },
 {
-pos = (376,434);
+pos = (392,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/K_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/K_acute.glyph
index a7294f9a5..74f39d270 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/K_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/K_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (322,372);
+pos = (430,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (334,372);
+pos = (420,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (358,372);
+pos = (426,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (291,434);
+pos = (478,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (310,434);
+pos = (502,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (288,434);
+pos = (442,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/K_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/K_caron.glyph
index fc84cd591..1135321a9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/K_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/K_caron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (208,372);
+pos = (258,372);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (78,372);
+pos = (212,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (208,434);
+pos = (242,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (92,434);
+pos = (288,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (204,434);
+pos = (220,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/K_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/K_dotbelow.glyph
index 2d52a24c8..6abb4cc90 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/K_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/K_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (1276,0);
+pos = (1270,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (1258,2);
+pos = (1389,2);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (1192,0);
+pos = (1219,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (1276,0);
+pos = (1207,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (1270,2);
+pos = (1365,2);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (1190,0);
+pos = (1103,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/K_linebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/K_linebelow.glyph
index 156dd70c0..169d75fba 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/K_linebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/K_linebelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = K;
 },
 {
-pos = (1268,0);
-ref = macronsubnosp;
+pos = (182,0);
+ref = macronsub;
 }
 );
 width = 1336;
@@ -23,8 +23,8 @@ shapes = (
 ref = K;
 },
 {
-pos = (1388,2);
-ref = macronsubnosp;
+pos = (306,2);
+ref = macronsub;
 }
 );
 width = 1464;
@@ -36,8 +36,8 @@ shapes = (
 ref = K;
 },
 {
-pos = (1209,0);
-ref = macronsubnosp;
+pos = (234,0);
+ref = macronsub;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = K;
 },
 {
-pos = (1198,0);
-ref = macronsubnosp;
+pos = (222,0);
+ref = macronsub;
 }
 );
 width = 1272;
@@ -62,8 +62,8 @@ shapes = (
 ref = K;
 },
 {
-pos = (1363,2);
-ref = macronsubnosp;
+pos = (334,2);
+ref = macronsub;
 }
 );
 width = 1442;
@@ -75,8 +75,8 @@ shapes = (
 ref = K;
 },
 {
-pos = (1097,0);
-ref = macronsubnosp;
+pos = (184,0);
+ref = macronsub;
 }
 );
 width = 1146;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/L_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/L_acute.glyph
index bc73e81c4..7b5c8ab53 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/L_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/L_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-82,372);
+pos = (26,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-96,372);
+pos = (-10,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-24,372);
+pos = (44,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-113,434);
+pos = (74,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-132,434);
+pos = (60,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (-92,434);
+pos = (62,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/L_circumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/L_circumflexbelow.glyph
index 316b6948a..14a7874b7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/L_circumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/L_circumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1208,0);
+pos = (1212,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1202,0);
+pos = (1205,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1152,0);
+pos = (1150,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1236,0);
+pos = (1234,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1092,0);
+pos = (1088,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/L_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/L_dotbelow.glyph
index 9be19bea9..5db429b6a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/L_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/L_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1222,0);
+pos = (1216,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1136,0);
+pos = (1267,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1186,0);
+pos = (1213,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1222,0);
+pos = (1153,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1136,0);
+pos = (1231,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (1186,0);
+pos = (1099,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/L_dotbelowmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/L_dotbelowmacron.glyph
index c318ef9c5..e8c88d08a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/L_dotbelowmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/L_dotbelowmacron.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = L;
 },
 {
-pos = (1222,0);
+pos = (1216,0);
 ref = dotbelow;
 },
 {
-pos = (-330,372);
+pos = (-218,372);
 ref = macron;
 }
 );
@@ -27,11 +27,11 @@ shapes = (
 ref = L;
 },
 {
-pos = (1136,0);
+pos = (1267,0);
 ref = dotbelow;
 },
 {
-pos = (-371,372);
+pos = (-122,372);
 ref = macron;
 }
 );
@@ -44,11 +44,11 @@ shapes = (
 ref = L;
 },
 {
-pos = (1186,0);
+pos = (1213,0);
 ref = dotbelow;
 },
 {
-pos = (-326,372);
+pos = (-144,372);
 ref = macron;
 }
 );
@@ -61,11 +61,11 @@ shapes = (
 ref = L;
 },
 {
-pos = (1222,0);
+pos = (1153,0);
 ref = dotbelow;
 },
 {
-pos = (-330,434);
+pos = (-178,434);
 ref = macron;
 }
 );
@@ -78,11 +78,11 @@ shapes = (
 ref = L;
 },
 {
-pos = (1136,0);
+pos = (1231,0);
 ref = dotbelow;
 },
 {
-pos = (-371,434);
+pos = (-106,434);
 ref = macron;
 }
 );
@@ -95,11 +95,11 @@ shapes = (
 ref = L;
 },
 {
-pos = (1186,0);
+pos = (1099,0);
 ref = dotbelow;
 },
 {
-pos = (-342,434);
+pos = (-192,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/L_linebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/L_linebelow.glyph
index a565ad383..d399cc051 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/L_linebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/L_linebelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = L;
 },
 {
-pos = (1214,0);
-ref = macronsubnosp;
+pos = (128,0);
+ref = macronsub;
 }
 );
 width = 1152;
@@ -23,8 +23,8 @@ shapes = (
 ref = L;
 },
 {
-pos = (1266,0);
-ref = macronsubnosp;
+pos = (184,0);
+ref = macronsub;
 }
 );
 width = 1170;
@@ -36,8 +36,8 @@ shapes = (
 ref = L;
 },
 {
-pos = (1203,0);
-ref = macronsubnosp;
+pos = (228,0);
+ref = macronsub;
 }
 );
 width = 1152;
@@ -49,8 +49,8 @@ shapes = (
 ref = L;
 },
 {
-pos = (1144,0);
-ref = macronsubnosp;
+pos = (168,0);
+ref = macronsub;
 }
 );
 width = 1088;
@@ -62,8 +62,8 @@ shapes = (
 ref = L;
 },
 {
-pos = (1229,0);
-ref = macronsubnosp;
+pos = (200,0);
+ref = macronsub;
 }
 );
 width = 1138;
@@ -75,8 +75,8 @@ shapes = (
 ref = L;
 },
 {
-pos = (1093,0);
-ref = macronsubnosp;
+pos = (180,0);
+ref = macronsub;
 }
 );
 width = 1024;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/M_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/M_acute.glyph
index 21648150b..0c56f64c7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/M_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/M_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (558,372);
+pos = (666,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (564,372);
+pos = (650,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (604,372);
+pos = (672,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (523,434);
+pos = (710,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (528,434);
+pos = (720,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (536,434);
+pos = (690,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/M_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/M_dotbelow.glyph
index f4998c29a..6a41f2244 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/M_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/M_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (1516,0);
+pos = (1510,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (1490,0);
+pos = (1621,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (1442,0);
+pos = (1469,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (1512,0);
+pos = (1443,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (1490,0);
+pos = (1585,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = M;
 },
 {
-pos = (1442,0);
+pos = (1355,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/N_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/N_acute.glyph
index 1043f0846..97461c908 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/N_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/N_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (418,372);
+pos = (526,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (352,372);
+pos = (438,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (510,372);
+pos = (578,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (391,434);
+pos = (578,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (348,434);
+pos = (540,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (442,434);
+pos = (596,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/N_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/N_caron.glyph
index 1a7e7f618..070988c7d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/N_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/N_caron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (304,372);
+pos = (354,372);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (96,372);
+pos = (230,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (308,434);
+pos = (342,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (130,434);
+pos = (326,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (358,434);
+pos = (374,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/N_circumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/N_circumflexbelow.glyph
index c68251aa8..e5c75b055 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/N_circumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/N_circumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1362,0);
+pos = (1366,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1364,0);
+pos = (1367,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1310,0);
+pos = (1308,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1410,0);
+pos = (1408,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1254,0);
+pos = (1250,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/N_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/N_dotbelow.glyph
index 7fdf3a58d..f7994a435 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/N_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/N_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1376,0);
+pos = (1370,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1278,0);
+pos = (1409,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1348,0);
+pos = (1375,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1380,0);
+pos = (1311,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1310,0);
+pos = (1405,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (1348,0);
+pos = (1261,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/N_linebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/N_linebelow.glyph
index 90c25337c..61f1c45df 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/N_linebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/N_linebelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (1368,0);
-ref = macronsubnosp;
+pos = (282,0);
+ref = macronsub;
 }
 );
 width = 1544;
@@ -23,8 +23,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (1408,0);
-ref = macronsubnosp;
+pos = (326,0);
+ref = macronsub;
 }
 );
 width = 1480;
@@ -36,8 +36,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (1365,0);
-ref = macronsubnosp;
+pos = (390,0);
+ref = macronsub;
 }
 );
 width = 1580;
@@ -49,8 +49,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (1302,0);
-ref = macronsubnosp;
+pos = (326,0);
+ref = macronsub;
 }
 );
 width = 1472;
@@ -62,8 +62,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (1403,0);
-ref = macronsubnosp;
+pos = (374,0);
+ref = macronsub;
 }
 );
 width = 1512;
@@ -75,8 +75,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (1255,0);
-ref = macronsubnosp;
+pos = (342,0);
+ref = macronsub;
 }
 );
 width = 1452;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_acute.glyph
index ef4754b7a..823daad28 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (429,372);
+pos = (537,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (424,372);
+pos = (510,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (486,372);
+pos = (554,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (416,434);
+pos = (603,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (354,434);
+pos = (546,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (418,434);
+pos = (572,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_caron.glyph
index 2ea89bfa0..082541ee3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_caron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (315,372);
+pos = (365,372);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (168,372);
+pos = (302,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (333,434);
+pos = (367,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (136,434);
+pos = (332,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (334,434);
+pos = (350,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_circumflex.glyph
index 79d1fc943..a46518357 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (317,372);
+pos = (365,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (174,372);
+pos = (302,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (335,434);
+pos = (367,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (136,434);
+pos = (332,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (334,434);
+pos = (350,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_circumflexacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_circumflexacute.glyph
index f1d278096..7be755782 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_circumflexacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_circumflexacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (317,372);
+pos = (365,372);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (174,372);
+pos = (302,372);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (335,434);
+pos = (367,434);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (136,434);
+pos = (332,434);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (334,434);
+pos = (350,434);
 ref = circumflexacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_circumflexdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_circumflexdotbelow.glyph
index 917c0a56b..2b9913120 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_circumflexdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_circumflexdotbelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (317,372);
+pos = (365,372);
 ref = circumflex;
 },
 {
-pos = (1387,0);
+pos = (1381,0);
 ref = dotbelow;
 }
 );
@@ -27,11 +27,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (174,372);
+pos = (302,372);
 ref = circumflex;
 },
 {
-pos = (1350,0);
+pos = (1481,0);
 ref = dotbelow;
 }
 );
@@ -48,7 +48,7 @@ pos = (334,372);
 ref = circumflex;
 },
 {
-pos = (1324,0);
+pos = (1351,0);
 ref = dotbelow;
 }
 );
@@ -61,11 +61,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (335,434);
+pos = (367,434);
 ref = circumflex;
 },
 {
-pos = (1405,0);
+pos = (1336,0);
 ref = dotbelow;
 }
 );
@@ -78,11 +78,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (136,434);
+pos = (332,434);
 ref = circumflex;
 },
 {
-pos = (1316,0);
+pos = (1411,0);
 ref = dotbelow;
 }
 );
@@ -95,11 +95,11 @@ shapes = (
 ref = O;
 },
 {
-pos = (334,434);
+pos = (350,434);
 ref = circumflex;
 },
 {
-pos = (1324,0);
+pos = (1237,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_circumflexgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_circumflexgrave.glyph
index fe8e9554d..02416c744 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_circumflexgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_circumflexgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (315,372);
+pos = (365,372);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (162,372);
+pos = (302,372);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (266,250);
+pos = (334,372);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (333,434);
+pos = (367,434);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (132,434);
+pos = (332,434);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (266,250);
+pos = (350,434);
 ref = circumflexgravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_circumflexhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_circumflexhookabove.glyph
index 70464b306..5985a1c13 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_circumflexhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_circumflexhookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (317,372);
+pos = (365,372);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (174,372);
+pos = (302,372);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (335,434);
+pos = (367,434);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (136,434);
+pos = (332,434);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (334,434);
+pos = (350,434);
 ref = circumflexhookcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_circumflextilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_circumflextilde.glyph
index ec06c7d1f..b90dff29d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_circumflextilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_circumflextilde.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (317,372);
+pos = (365,372);
 ref = circumflextildecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (174,372);
+pos = (302,372);
 ref = circumflextildecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (336,144);
+pos = (334,372);
 ref = circumflextildecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (335,434);
+pos = (367,434);
 ref = circumflextildecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (136,434);
+pos = (332,434);
 ref = circumflextildecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (336,144);
+pos = (347,434);
 ref = circumflextildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_dblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_dblgrave.glyph
index 8f59b5377..c800ce43e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_dblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_dblgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1253,372);
+pos = (1357,372);
 ref = dblgravecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1424,372);
+pos = (1470,372);
 ref = dblgravecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1324,372);
+pos = (1342,372);
 ref = dblgravecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1271,434);
+pos = (1326,434);
 ref = dblgravecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1390,434);
+pos = (1404,434);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1324,434);
+pos = (1238,434);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_dotbelow.glyph
index 6f4ba0e79..3351109dd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1387,0);
+pos = (1381,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1350,0);
+pos = (1481,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1324,0);
+pos = (1351,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1405,0);
+pos = (1336,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1316,0);
+pos = (1411,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1324,0);
+pos = (1237,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_grave.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_grave.glyph
index fcc755cfd..2d6abf573 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_grave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_grave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (243,372);
+pos = (371,372);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (210,372);
+pos = (296,372);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (272,372);
+pos = (401,372);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (207,434);
+pos = (437,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (92,434);
+pos = (284,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (208,434);
+pos = (376,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_hookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_hookabove.glyph
index 36ec86bdd..881791965 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_hookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_hookabove.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1368,372);
-ref = hookabovecmb;
+pos = (516,372);
+ref = hookabove;
 }
 );
 width = 1560;
@@ -23,8 +23,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1478,372);
-ref = hookabovecmb;
+pos = (500,372);
+ref = hookabove;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1288,372);
-ref = hookabovecmb;
+pos = (546,372);
+ref = hookabove;
 }
 );
 width = 1530;
@@ -49,8 +49,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1330,434);
-ref = hookabovecmb;
+pos = (502,434);
+ref = hookabove;
 }
 );
 width = 1534;
@@ -62,8 +62,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1418,434);
-ref = hookabovecmb;
+pos = (441,434);
+ref = hookabove;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1206,434);
-ref = hookabovecmb;
+pos = (484,434);
+ref = hookabove;
 }
 );
 width = 1402;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_hornacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_hornacute.glyph
index 08e8e715d..97c0db32b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_hornacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_hornacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (429,372);
+pos = (537,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (424,372);
+pos = (510,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (486,372);
+pos = (554,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (416,434);
+pos = (603,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (354,434);
+pos = (546,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (418,434);
+pos = (572,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_horndotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_horndotbelow.glyph
index 96064ad5a..9a44439dd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_horndotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_horndotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1387,0);
+pos = (1381,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1350,0);
+pos = (1481,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1324,0);
+pos = (1351,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1405,0);
+pos = (1336,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1316,0);
+pos = (1411,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1324,0);
+pos = (1237,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_horngrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_horngrave.glyph
index 3c3a91105..357ead4f4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_horngrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_horngrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (243,372);
+pos = (371,372);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (210,372);
+pos = (296,372);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (272,372);
+pos = (401,372);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (207,434);
+pos = (437,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (92,434);
+pos = (284,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (208,434);
+pos = (376,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_hornhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_hornhookabove.glyph
index e979f01be..af748873e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_hornhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_hornhookabove.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1368,372);
-ref = hookabovecmb;
+pos = (516,372);
+ref = hookabove;
 }
 );
 width = 1560;
@@ -23,8 +23,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1478,372);
-ref = hookabovecmb;
+pos = (500,372);
+ref = hookabove;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1288,372);
-ref = hookabovecmb;
+pos = (546,372);
+ref = hookabove;
 }
 );
 width = 1530;
@@ -49,8 +49,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1330,434);
-ref = hookabovecmb;
+pos = (502,434);
+ref = hookabove;
 }
 );
 width = 1534;
@@ -62,8 +62,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1418,434);
-ref = hookabovecmb;
+pos = (441,434);
+ref = hookabove;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (1206,434);
-ref = hookabovecmb;
+pos = (484,434);
+ref = hookabove;
 }
 );
 width = 1402;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_hungarumlaut.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_hungarumlaut.glyph
index d8fa22ac4..79ae899af 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_hungarumlaut.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_hungarumlaut.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (429,198);
+pos = (531,372);
 ref = hungarumlaut;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (424,198);
+pos = (498,372);
 ref = hungarumlaut;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (438,198);
+pos = (574,372);
 ref = hungarumlaut;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (447,198);
+pos = (549,434);
 ref = hungarumlaut;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (390,198);
+pos = (464,434);
 ref = hungarumlaut;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (438,198);
+pos = (547,434);
 ref = hungarumlaut;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_invertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_invertedbreve.glyph
index 28caa2735..19a688c6c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_invertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1378,372);
+pos = (1371,372);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1476,372);
+pos = (1480,372);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1414,434);
+pos = (1417,434);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1231,434);
+pos = (1241,434);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_macron.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_macron.glyph
index d738eba7c..ad2062508 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_macron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_macron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (181,372);
+pos = (293,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (149,372);
+pos = (398,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (184,372);
+pos = (366,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (199,434);
+pos = (351,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (115,434);
+pos = (380,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (168,434);
+pos = (318,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_macronacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_macronacute.glyph
index ec4620165..35ea43667 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_macronacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_macronacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (181,0);
+pos = (293,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (149,0);
+pos = (398,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (184,0);
+pos = (366,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (199,0);
+pos = (351,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (115,0);
+pos = (380,0);
 ref = macronacutecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (168,0);
+pos = (318,0);
 ref = macronacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_macrongrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_macrongrave.glyph
index bc18f2708..34e28fc41 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_macrongrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_macrongrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (181,0);
+pos = (293,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (149,0);
+pos = (398,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (184,0);
+pos = (366,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (199,0);
+pos = (351,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (115,0);
+pos = (380,0);
 ref = macrongravecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (168,0);
+pos = (318,0);
 ref = macrongravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_ogonekmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_ogonekmacron.glyph
index 08f1ae875..b53e8e162 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_ogonekmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_ogonekmacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Oogonek;
 },
 {
-pos = (181,372);
+pos = (293,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Oogonek;
 },
 {
-pos = (149,372);
+pos = (398,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Oogonek;
 },
 {
-pos = (184,372);
+pos = (366,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Oogonek;
 },
 {
-pos = (199,434);
+pos = (351,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Oogonek;
 },
 {
-pos = (115,434);
+pos = (380,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Oogonek;
 },
 {
-pos = (168,434);
+pos = (318,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_slashacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_slashacute.glyph
index e1420d7ac..dc24fc9ba 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_slashacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_slashacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Oslash;
 },
 {
-pos = (429,372);
+pos = (537,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Oslash;
 },
 {
-pos = (424,372);
+pos = (510,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Oslash;
 },
 {
-pos = (486,372);
+pos = (554,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Oslash;
 },
 {
-pos = (416,434);
+pos = (603,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Oslash;
 },
 {
-pos = (354,434);
+pos = (546,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Oslash;
 },
 {
-pos = (418,434);
+pos = (572,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_tildeacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_tildeacute.glyph
index 890e3cc63..c2f9b78df 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_tildeacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_tildeacute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (287,434);
+pos = (286,434);
 ref = tildeacutecomb.uc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/P_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/P_acute.glyph
index 6b461fd25..db28846a7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/P_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/P_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = P;
 },
 {
-pos = (296,372);
+pos = (404,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = P;
 },
 {
-pos = (268,372);
+pos = (354,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = P;
 },
 {
-pos = (358,372);
+pos = (426,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = P;
 },
 {
-pos = (265,434);
+pos = (452,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = P;
 },
 {
-pos = (240,434);
+pos = (432,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = P;
 },
 {
-pos = (290,434);
+pos = (444,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/R_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/R_acute.glyph
index 001a4322c..06d5faf24 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/R_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/R_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (294,372);
+pos = (402,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (284,372);
+pos = (370,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (346,372);
+pos = (414,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (263,434);
+pos = (450,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (256,434);
+pos = (448,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (278,434);
+pos = (432,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/R_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/R_caron.glyph
index b4347a17b..06259e9d8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/R_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/R_caron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (180,372);
+pos = (230,372);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (28,372);
+pos = (162,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (180,434);
+pos = (214,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (38,434);
+pos = (234,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (194,434);
+pos = (210,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/R_dblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/R_dblgrave.glyph
index b51d19321..b8b7a75f3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/R_dblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/R_dblgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1118,372);
+pos = (1222,372);
 ref = dblgravecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1284,372);
+pos = (1330,372);
 ref = dblgravecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1184,372);
+pos = (1202,372);
 ref = dblgravecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1118,434);
+pos = (1173,434);
 ref = dblgravecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1292,434);
+pos = (1306,434);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1184,434);
+pos = (1098,434);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/R_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/R_dotbelow.glyph
index eefd7b868..826fd6653 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/R_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/R_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1278,0);
+pos = (1272,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1234,0);
+pos = (1365,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1204,0);
+pos = (1231,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1278,0);
+pos = (1209,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1242,0);
+pos = (1337,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1204,0);
+pos = (1117,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/R_dotbelowmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/R_dotbelowmacron.glyph
index 13797be38..3b2e99199 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/R_dotbelowmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/R_dotbelowmacron.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = R;
 },
 {
-pos = (1278,0);
+pos = (1272,0);
 ref = dotbelow;
 },
 {
-pos = (46,372);
+pos = (158,372);
 ref = macron;
 }
 );
@@ -27,11 +27,11 @@ shapes = (
 ref = R;
 },
 {
-pos = (1234,0);
+pos = (1365,0);
 ref = dotbelow;
 },
 {
-pos = (9,372);
+pos = (258,372);
 ref = macron;
 }
 );
@@ -44,11 +44,11 @@ shapes = (
 ref = R;
 },
 {
-pos = (1204,0);
+pos = (1231,0);
 ref = dotbelow;
 },
 {
-pos = (44,372);
+pos = (226,372);
 ref = macron;
 }
 );
@@ -61,11 +61,11 @@ shapes = (
 ref = R;
 },
 {
-pos = (1278,0);
+pos = (1209,0);
 ref = dotbelow;
 },
 {
-pos = (46,434);
+pos = (198,434);
 ref = macron;
 }
 );
@@ -78,11 +78,11 @@ shapes = (
 ref = R;
 },
 {
-pos = (1242,0);
+pos = (1337,0);
 ref = dotbelow;
 },
 {
-pos = (17,434);
+pos = (282,434);
 ref = macron;
 }
 );
@@ -95,11 +95,11 @@ shapes = (
 ref = R;
 },
 {
-pos = (1204,0);
+pos = (1117,0);
 ref = dotbelow;
 },
 {
-pos = (28,434);
+pos = (178,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/R_invertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/R_invertedbreve.glyph
index 73f815ac8..efe0ad661 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/R_invertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/R_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1243,372);
+pos = (1236,372);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1336,372);
+pos = (1340,372);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1316,434);
+pos = (1319,434);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (1091,434);
+pos = (1101,434);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/R_linebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/R_linebelow.glyph
index 360553f1d..312cba8e2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/R_linebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/R_linebelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (1270,0);
-ref = macronsubnosp;
+pos = (184,0);
+ref = macronsub;
 }
 );
 width = 1310;
@@ -23,8 +23,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (1364,0);
-ref = macronsubnosp;
+pos = (282,0);
+ref = macronsub;
 }
 );
 width = 1368;
@@ -36,8 +36,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (1221,0);
-ref = macronsubnosp;
+pos = (246,0);
+ref = macronsub;
 }
 );
 width = 1260;
@@ -49,8 +49,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (1200,0);
-ref = macronsubnosp;
+pos = (224,0);
+ref = macronsub;
 }
 );
 width = 1246;
@@ -62,8 +62,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (1335,0);
-ref = macronsubnosp;
+pos = (306,0);
+ref = macronsub;
 }
 );
 width = 1344;
@@ -75,8 +75,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (1111,0);
-ref = macronsubnosp;
+pos = (198,0);
+ref = macronsub;
 }
 );
 width = 1132;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/S_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/S_acute.glyph
index e820b468b..ca3c48a8c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/S_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/S_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (300,372);
+pos = (408,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (294,372);
+pos = (380,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (348,372);
+pos = (416,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (273,434);
+pos = (460,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (291,434);
+pos = (483,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (280,434);
+pos = (434,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/S_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/S_caron.glyph
index 1518fed6b..c307d84d8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/S_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/S_caron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (186,372);
+pos = (236,372);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (38,372);
+pos = (172,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (190,434);
+pos = (224,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (73,434);
+pos = (269,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (196,434);
+pos = (212,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/S_carondotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/S_carondotaccent.glyph
index f20053045..ba97d9a49 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/S_carondotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/S_carondotaccent.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (1242,228);
-ref = carondotcomb.cn;
+pos = (238,0);
+ref = carondot.uc;
 }
 );
 width = 1306;
@@ -23,8 +23,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (1390,282);
-ref = carondotcomb.cn;
+pos = (110,0);
+ref = carondot.uc;
 }
 );
 width = 1364;
@@ -36,8 +36,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (1148,192);
-ref = carondotcomb.cn;
+pos = (265,0);
+ref = carondot.uc;
 }
 );
 width = 1254;
@@ -49,8 +49,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (1246,228);
-ref = carondotcomb.cn;
+pos = (210,0);
+ref = carondot.uc;
 }
 );
 width = 1258;
@@ -62,8 +62,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (1423,282);
-ref = carondotcomb.cn;
+pos = (215,0);
+ref = carondot.uc;
 }
 );
 width = 1403;
@@ -75,8 +75,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (1148,192);
-ref = carondotcomb.cn;
+pos = (199,0);
+ref = carondot.uc;
 }
 );
 width = 1126;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/S_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/S_circumflex.glyph
index f2580fb2b..c671f0e32 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/S_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/S_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (188,372);
+pos = (236,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (44,372);
+pos = (172,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (192,434);
+pos = (224,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (73,434);
+pos = (269,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (196,434);
+pos = (212,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/S_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/S_dotbelow.glyph
index 029dfe075..359920355 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/S_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/S_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1260,-26);
+pos = (1254,-26);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1226,0);
+pos = (1357,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1186,-24);
+pos = (1213,-24);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1271,-24);
+pos = (1202,-24);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1256,0);
+pos = (1351,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1186,-24);
+pos = (1099,-24);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/S_dotbelowdotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/S_dotbelowdotaccent.glyph
index 150959a8c..eae19be73 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/S_dotbelowdotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/S_dotbelowdotaccent.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1260,-26);
+pos = (1254,-26);
 ref = dotbelow;
 },
 {
@@ -27,7 +27,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1226,0);
+pos = (1357,0);
 ref = dotbelow;
 },
 {
@@ -44,7 +44,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1186,-24);
+pos = (1213,-24);
 ref = dotbelow;
 },
 {
@@ -61,7 +61,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1271,-24);
+pos = (1202,-24);
 ref = dotbelow;
 },
 {
@@ -78,7 +78,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1256,0);
+pos = (1351,0);
 ref = dotbelow;
 },
 {
@@ -95,7 +95,7 @@ shapes = (
 ref = S;
 },
 {
-pos = (1186,-24);
+pos = (1099,-24);
 ref = dotbelow;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/T_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/T_caron.glyph
index 2c4c7a2ae..8a40d4056 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/T_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/T_caron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (192,372);
+pos = (242,372);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (57,372);
+pos = (191,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (192,434);
+pos = (226,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (69,434);
+pos = (265,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (194,434);
+pos = (210,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/T_circumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/T_circumflexbelow.glyph
index 36ae1d6da..e248c815f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/T_circumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/T_circumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1250,0);
+pos = (1254,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1204,0);
+pos = (1207,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1194,0);
+pos = (1192,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1347,0);
+pos = (1345,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1090,0);
+pos = (1086,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/T_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/T_dotbelow.glyph
index 2545f0e60..c7fdb8d6d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/T_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/T_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1264,0);
+pos = (1258,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1239,0);
+pos = (1370,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1188,0);
+pos = (1215,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1264,0);
+pos = (1195,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1247,0);
+pos = (1342,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (1184,0);
+pos = (1097,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/T_linebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/T_linebelow.glyph
index f42c2de5a..2427d4781 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/T_linebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/T_linebelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (1256,0);
-ref = macronsubnosp;
+pos = (170,0);
+ref = macronsub;
 }
 );
 width = 1314;
@@ -23,8 +23,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (1369,0);
-ref = macronsubnosp;
+pos = (287,0);
+ref = macronsub;
 }
 );
 width = 1406;
@@ -36,8 +36,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (1205,0);
-ref = macronsubnosp;
+pos = (230,0);
+ref = macronsub;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (1186,0);
-ref = macronsubnosp;
+pos = (210,0);
+ref = macronsub;
 }
 );
 width = 1250;
@@ -62,8 +62,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (1340,0);
-ref = macronsubnosp;
+pos = (311,0);
+ref = macronsub;
 }
 );
 width = 1392;
@@ -75,8 +75,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (1091,0);
-ref = macronsubnosp;
+pos = (178,0);
+ref = macronsub;
 }
 );
 width = 1126;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_acute.glyph
index 822722fdf..5cf0424a2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (408,372);
+pos = (516,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (348,372);
+pos = (434,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (488,372);
+pos = (556,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (369,434);
+pos = (556,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (312,434);
+pos = (504,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (392,434);
+pos = (546,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_caron.glyph
index b647f0a0c..d6966cf5f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_caron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (294,372);
+pos = (344,372);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (92,372);
+pos = (226,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (286,434);
+pos = (320,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (94,434);
+pos = (290,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (308,434);
+pos = (324,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_circumflex.glyph
index b9c81259c..0044e41f3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (296,372);
+pos = (344,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (98,372);
+pos = (226,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (288,434);
+pos = (320,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (94,434);
+pos = (290,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (308,434);
+pos = (324,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_circumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_circumflexbelow.glyph
index e14d65077..c298d2221 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_circumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_circumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1352,0);
+pos = (1356,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1342,0);
+pos = (1345,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1288,0);
+pos = (1286,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1374,0);
+pos = (1372,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1204,0);
+pos = (1200,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_dblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_dblgrave.glyph
index 7de40f631..aa6c711e3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_dblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_dblgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1232,372);
+pos = (1336,372);
 ref = dblgravecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1348,372);
+pos = (1394,372);
 ref = dblgravecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1326,372);
+pos = (1344,372);
 ref = dblgravecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1224,434);
+pos = (1279,434);
 ref = dblgravecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1348,434);
+pos = (1362,434);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1298,434);
+pos = (1212,434);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_dieresisacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_dieresisacute.glyph
index 238ada42b..20237e8cd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_dieresisacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_dieresisacute.glyph
@@ -11,7 +11,7 @@ ref = U;
 },
 {
 alignment = 1;
-pos = (159,0);
+pos = (160,0);
 ref = dieresisacutecomb.uc;
 }
 );
@@ -53,7 +53,7 @@ ref = U;
 },
 {
 alignment = 1;
-pos = (151,0);
+pos = (152,0);
 ref = dieresisacutecomb.uc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_dieresisbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_dieresisbelow.glyph
index dee8fc0ea..1364c1da6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_dieresisbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_dieresisbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1448,0);
+pos = (1360,0);
 ref = dotdblsubnosp;
 }
 );
@@ -30,7 +30,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1506,0);
+pos = (1403,0);
 ref = dotdblsubnosp;
 }
 );
@@ -43,7 +43,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1376,0);
+pos = (1348,0);
 ref = dotdblsubnosp;
 }
 );
@@ -56,7 +56,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1440,0);
+pos = (1287,0);
 ref = dotdblsubnosp;
 }
 );
@@ -76,7 +76,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1506,0);
+pos = (1373,0);
 ref = dotdblsubnosp;
 }
 );
@@ -89,7 +89,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1284,0);
+pos = (1210,0);
 ref = dotdblsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_dieresiscaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_dieresiscaron.glyph
index 12f4f3cec..ee8c98cfc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_dieresiscaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_dieresiscaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (159,0);
+pos = (160,0);
 ref = dieresiscaroncomb.uc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (151,0);
+pos = (152,0);
 ref = dieresiscaroncomb.uc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_dieresisgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_dieresisgrave.glyph
index ed23ab4f9..8ab1e34e8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_dieresisgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_dieresisgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (159,0);
+pos = (160,0);
 ref = dieresisgravecomb.uc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_dieresismacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_dieresismacron.glyph
index 89d6ebe69..36eef8f62 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_dieresismacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_dieresismacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (159,0);
+pos = (160,0);
 ref = dieresismacroncomb.uc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (151,0);
+pos = (152,0);
 ref = dieresismacroncomb.uc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_dotbelow.glyph
index 7397d9088..0bd2f0d75 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1366,0);
+pos = (1360,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1274,0);
+pos = (1405,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1326,0);
+pos = (1353,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1358,0);
+pos = (1289,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1274,0);
+pos = (1369,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1298,0);
+pos = (1211,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_grave.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_grave.glyph
index 66a61e372..f647e5431 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_grave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_grave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (222,372);
+pos = (350,372);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (134,372);
+pos = (220,372);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (274,372);
+pos = (403,372);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (160,434);
+pos = (390,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (50,434);
+pos = (242,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (182,434);
+pos = (350,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_hookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_hookabove.glyph
index 597651336..5cbf20c9c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_hookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_hookabove.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1347,372);
-ref = hookabovecmb;
+pos = (495,372);
+ref = hookabove;
 }
 );
 width = 1518;
@@ -23,8 +23,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1402,372);
-ref = hookabovecmb;
+pos = (424,372);
+ref = hookabove;
 }
 );
 width = 1478;
@@ -36,8 +36,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1290,372);
-ref = hookabovecmb;
+pos = (548,372);
+ref = hookabove;
 }
 );
 width = 1536;
@@ -49,8 +49,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1283,434);
-ref = hookabovecmb;
+pos = (455,434);
+ref = hookabove;
 }
 );
 width = 1440;
@@ -62,8 +62,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1376,434);
-ref = hookabovecmb;
+pos = (399,434);
+ref = hookabove;
 }
 );
 width = 1444;
@@ -75,8 +75,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1180,434);
-ref = hookabovecmb;
+pos = (458,434);
+ref = hookabove;
 }
 );
 width = 1352;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_hornacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_hornacute.glyph
index f899d7f1f..97c49e25c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_hornacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_hornacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (408,372);
+pos = (516,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (348,372);
+pos = (434,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (488,372);
+pos = (556,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (369,434);
+pos = (556,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (312,434);
+pos = (504,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (392,434);
+pos = (546,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_horndotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_horndotbelow.glyph
index cc4e8b367..e7fa6876e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_horndotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_horndotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1366,0);
+pos = (1360,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1274,0);
+pos = (1405,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1326,0);
+pos = (1353,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1358,0);
+pos = (1289,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1274,0);
+pos = (1369,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1298,0);
+pos = (1211,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_horngrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_horngrave.glyph
index 90a6f97d3..9c76cdcf1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_horngrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_horngrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (222,372);
+pos = (350,372);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (134,372);
+pos = (220,372);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (274,372);
+pos = (403,372);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (160,434);
+pos = (390,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (50,434);
+pos = (242,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (182,434);
+pos = (350,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_hornhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_hornhookabove.glyph
index 31456b28d..436d17ea9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_hornhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_hornhookabove.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1347,372);
-ref = hookabovecmb;
+pos = (495,372);
+ref = hookabove;
 }
 );
 width = 1518;
@@ -23,8 +23,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1402,372);
-ref = hookabovecmb;
+pos = (424,372);
+ref = hookabove;
 }
 );
 width = 1478;
@@ -36,8 +36,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1290,372);
-ref = hookabovecmb;
+pos = (548,372);
+ref = hookabove;
 }
 );
 width = 1536;
@@ -49,8 +49,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1283,434);
-ref = hookabovecmb;
+pos = (455,434);
+ref = hookabove;
 }
 );
 width = 1440;
@@ -62,8 +62,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1376,434);
-ref = hookabovecmb;
+pos = (399,434);
+ref = hookabove;
 }
 );
 width = 1444;
@@ -75,8 +75,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (1180,434);
-ref = hookabovecmb;
+pos = (458,434);
+ref = hookabove;
 }
 );
 width = 1352;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_hungarumlaut.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_hungarumlaut.glyph
index 88c9a9e05..80b7421b1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_hungarumlaut.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_hungarumlaut.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (408,198);
+pos = (510,372);
 ref = hungarumlaut;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (348,198);
+pos = (422,372);
 ref = hungarumlaut;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (440,198);
+pos = (576,372);
 ref = hungarumlaut;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (400,198);
+pos = (502,434);
 ref = hungarumlaut;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (348,198);
+pos = (422,434);
 ref = hungarumlaut;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (412,198);
+pos = (521,434);
 ref = hungarumlaut;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_hungarumlautcyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_hungarumlautcyrillic.glyph
index 6bce978aa..6f5463dac 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_hungarumlautcyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_hungarumlautcyrillic.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (282,198);
+pos = (384,372);
 ref = hungarumlaut;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (340,198);
+pos = (414,372);
 ref = hungarumlaut;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (262,198);
+pos = (398,372);
 ref = hungarumlaut;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (282,198);
+pos = (384,434);
 ref = hungarumlaut;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (310,198);
+pos = (384,434);
 ref = hungarumlaut;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (280,198);
+pos = (389,434);
 ref = hungarumlaut;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_invertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_invertedbreve.glyph
index 8bbf5dcbd..4424aa6b3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_invertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_invertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1357,372);
+pos = (1350,372);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1400,372);
+pos = (1404,372);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1372,434);
+pos = (1375,434);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1205,434);
+pos = (1215,434);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_macron.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_macron.glyph
index 2c1e5c36f..5596de8ce 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_macron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_macron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (160,372);
+pos = (272,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (73,372);
+pos = (322,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (186,372);
+pos = (368,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (152,434);
+pos = (304,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (73,434);
+pos = (338,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (142,434);
+pos = (292,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_macroncyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_macroncyrillic.glyph
index f75413a0a..3e33c20c0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_macroncyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_macroncyrillic.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (34,372);
+pos = (146,372);
 ref = macron;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (65,372);
+pos = (314,372);
 ref = macron;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (8,372);
+pos = (190,372);
 ref = macron;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (34,434);
+pos = (186,434);
 ref = macron;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (35,434);
+pos = (300,434);
 ref = macron;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (10,434);
+pos = (160,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_macrondieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_macrondieresis.glyph
index fb99c4223..130f89962 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_macrondieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_macrondieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (160,0);
+pos = (272,0);
 ref = macrondieresiscomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (73,0);
+pos = (322,0);
 ref = macrondieresiscomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (186,0);
+pos = (368,0);
 ref = macrondieresiscomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (152,0);
+pos = (304,0);
 ref = macrondieresiscomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (73,0);
+pos = (338,0);
 ref = macrondieresiscomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (142,0);
+pos = (292,0);
 ref = macrondieresiscomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_tildeacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_tildeacute.glyph
index 5a5b8a8a8..3e0619948 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_tildeacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_tildeacute.glyph
@@ -232,7 +232,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (240,434);
+pos = (239,434);
 ref = tildeacutecomb.uc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_tildebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_tildebelow.glyph
index 5854b197e..8e80b0896 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_tildebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_tildebelow.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1349,0);
+pos = (1351,0);
 ref = tildesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/V_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/V_dotbelow.glyph
index 8ebc17db9..5f3c78c7c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/V_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/V_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = V;
 },
 {
-pos = (1298,0);
+pos = (1292,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = V;
 },
 {
-pos = (1350,0);
+pos = (1481,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = V;
 },
 {
-pos = (1190,0);
+pos = (1217,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = V;
 },
 {
-pos = (1307,0);
+pos = (1238,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = V;
 },
 {
-pos = (1320,0);
+pos = (1415,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = V;
 },
 {
-pos = (1208,0);
+pos = (1121,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/W_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/W_acute.glyph
index c5378aecb..f21efa76a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/W_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/W_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (654,372);
+pos = (762,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (765,372);
+pos = (851,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (675,372);
+pos = (743,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (607,434);
+pos = (794,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (676,434);
+pos = (868,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (602,434);
+pos = (756,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/W_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/W_circumflex.glyph
index e23e92059..273d658b6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/W_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/W_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (542,372);
+pos = (590,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (515,372);
+pos = (643,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (526,434);
+pos = (558,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (458,434);
+pos = (654,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (518,434);
+pos = (534,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/W_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/W_dotbelow.glyph
index b6a585c5b..33e3f8edc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/W_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/W_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (1612,12);
+pos = (1606,12);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (1691,0);
+pos = (1822,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (1513,12);
+pos = (1540,12);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (1596,12);
+pos = (1527,12);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (1638,0);
+pos = (1733,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (1508,12);
+pos = (1421,12);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/W_grave.glyph b/src/Inter-Roman.glyphspackage/glyphs/W_grave.glyph
index c9ec57890..04cea5488 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/W_grave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/W_grave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (468,372);
+pos = (596,372);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (551,372);
+pos = (637,372);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (461,372);
+pos = (590,372);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (398,434);
+pos = (628,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (414,434);
+pos = (606,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = W;
 },
 {
-pos = (392,434);
+pos = (560,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_acute.glyph
index 715b6cc84..0ffb09e78 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (328,372);
+pos = (436,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (404,372);
+pos = (490,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (344,372);
+pos = (412,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (297,434);
+pos = (484,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (338,434);
+pos = (530,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (294,434);
+pos = (448,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_circumflex.glyph
index a94ce29a2..68c87ad88 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (216,372);
+pos = (264,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (154,372);
+pos = (282,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (216,434);
+pos = (248,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (120,434);
+pos = (316,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (210,434);
+pos = (226,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_dotbelow.glyph
index 9c2784d24..947b4f2a6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1286,0);
+pos = (1280,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1330,0);
+pos = (1461,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1180,0);
+pos = (1207,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1286,0);
+pos = (1217,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1300,0);
+pos = (1395,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1198,0);
+pos = (1111,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_grave.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_grave.glyph
index c4afa4e6a..90e75985e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_grave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_grave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (142,372);
+pos = (270,372);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (190,372);
+pos = (276,372);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (130,372);
+pos = (259,372);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (88,434);
+pos = (318,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (76,434);
+pos = (268,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (84,434);
+pos = (252,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Y_hookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/Y_hookabove.glyph
index 25f1a6fc4..4d29e703c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Y_hookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Y_hookabove.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1267,372);
-ref = hookabovecmb;
+pos = (415,372);
+ref = hookabove;
 }
 );
 width = 1362;
@@ -23,8 +23,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1458,372);
-ref = hookabovecmb;
+pos = (480,372);
+ref = hookabove;
 }
 );
 width = 1588;
@@ -36,8 +36,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1146,372);
-ref = hookabovecmb;
+pos = (404,372);
+ref = hookabove;
 }
 );
 width = 1248;
@@ -49,8 +49,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1211,434);
-ref = hookabovecmb;
+pos = (383,434);
+ref = hookabove;
 }
 );
 width = 1298;
@@ -62,8 +62,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1402,434);
-ref = hookabovecmb;
+pos = (425,434);
+ref = hookabove;
 }
 );
 width = 1496;
@@ -75,8 +75,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (1082,434);
-ref = hookabovecmb;
+pos = (360,434);
+ref = hookabove;
 }
 );
 width = 1156;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Z_acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/Z_acute.glyph
index 2596395f4..4c764d44d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Z_acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Z_acute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (288,372);
+pos = (396,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (326,372);
+pos = (412,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (340,372);
+pos = (408,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (257,434);
+pos = (444,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (290,434);
+pos = (482,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (272,434);
+pos = (426,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Z_caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/Z_caron.glyph
index aa62310dd..a87e774c0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Z_caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Z_caron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (174,372);
+pos = (224,372);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (70,372);
+pos = (204,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (174,434);
+pos = (208,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (72,434);
+pos = (268,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (188,434);
+pos = (204,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Z_circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/Z_circumflex.glyph
index ecf3083c7..1cd5dd414 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Z_circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Z_circumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (176,372);
+pos = (224,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (76,372);
+pos = (204,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (176,434);
+pos = (208,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (72,434);
+pos = (268,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (188,434);
+pos = (204,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Z_dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/Z_dotbelow.glyph
index 0bf9af4f2..5282d0d7e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Z_dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Z_dotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1240,0);
+pos = (1234,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1248,0);
+pos = (1379,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1178,0);
+pos = (1205,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1240,0);
+pos = (1171,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1248,0);
+pos = (1343,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1178,0);
+pos = (1091,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Z_linebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/Z_linebelow.glyph
index ef57918d0..edb7bace2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Z_linebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Z_linebelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1232,0);
-ref = macronsubnosp;
+pos = (146,0);
+ref = macronsub;
 }
 );
 width = 1280;
@@ -23,8 +23,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1378,0);
-ref = macronsubnosp;
+pos = (296,0);
+ref = macronsub;
 }
 );
 width = 1422;
@@ -36,8 +36,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1195,0);
-ref = macronsubnosp;
+pos = (220,0);
+ref = macronsub;
 }
 );
 width = 1240;
@@ -49,8 +49,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1162,0);
-ref = macronsubnosp;
+pos = (186,0);
+ref = macronsub;
 }
 );
 width = 1216;
@@ -62,8 +62,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1341,0);
-ref = macronsubnosp;
+pos = (312,0);
+ref = macronsub;
 }
 );
 width = 1390;
@@ -75,8 +75,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (1085,0);
-ref = macronsubnosp;
+pos = (172,0);
+ref = macronsub;
 }
 );
 width = 1112;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/a.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/a.1.glyph
index 5a1098773..84b9b32a9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/a.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/a.1.glyph
@@ -77,7 +77,7 @@ width = 1190;
 anchors = (
 {
 name = bottom;
-pos = (616,0);
+pos = (610,0);
 },
 {
 name = bottomr;
@@ -89,7 +89,7 @@ pos = (1088,0);
 },
 {
 name = top;
-pos = (626,1118);
+pos = (610,1118);
 },
 {
 name = topr;
@@ -215,7 +215,7 @@ width = 1322;
 anchors = (
 {
 name = bottom;
-pos = (560,0);
+pos = (558,0);
 },
 {
 name = bottomr;
@@ -227,7 +227,7 @@ pos = (1034,0);
 },
 {
 name = top;
-pos = (568,1056);
+pos = (558,1056);
 },
 {
 name = topr;
@@ -284,7 +284,7 @@ width = 1162;
 anchors = (
 {
 name = bottom;
-pos = (640,0);
+pos = (623,0);
 },
 {
 name = bottomr;
@@ -296,7 +296,7 @@ pos = (1188,0);
 },
 {
 name = top;
-pos = (654,1056);
+pos = (622,1056);
 },
 {
 name = topr;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/a.glyph b/src/Inter-Roman.glyphspackage/glyphs/a.glyph
index 171fc7e05..4b263cad3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/a.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/a.glyph
@@ -8,7 +8,7 @@ layers = (
 anchors = (
 {
 name = bottom;
-pos = (588,0);
+pos = (567,0);
 },
 {
 name = ogonek;
@@ -16,7 +16,13 @@ pos = (998,0);
 },
 {
 name = top;
-pos = (596,1118);
+pos = (567,1118);
+}
+);
+guides = (
+{
+angle = 90;
+pos = (567,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -283,7 +289,7 @@ width = 1094;
 anchors = (
 {
 name = bottom;
-pos = (526,0);
+pos = (524,0);
 },
 {
 name = ogonek;
@@ -291,7 +297,7 @@ pos = (934,0);
 },
 {
 name = top;
-pos = (532,1056);
+pos = (524,1056);
 }
 );
 layerId = m007;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aacute.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/aacute.1.glyph
index 28347f6a6..2a0048a8b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aacute.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aacute.1.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (302,0);
+pos = (370,0);
 ref = acute;
 }
 );
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (274,0);
+pos = (366,0);
 ref = acute;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (280,0);
+pos = (366,0);
 ref = acute;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (217,0);
+pos = (394,0);
 ref = acute;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (244,0);
+pos = (404,0);
 ref = acute;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (246,0);
+pos = (400,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/aacute.glyph
index 27bcab818..255b7481b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (244,0);
+pos = (323,0);
 ref = acute;
 }
 );
@@ -23,11 +23,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (226,0);
+pos = (312,0);
 ref = acute;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (272,0);
+pos = (340,0);
 ref = acute;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -49,7 +49,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (181,0);
+pos = (360,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (166,0);
+pos = (358,0);
 ref = acute;
 }
 );
@@ -75,11 +75,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (212,0);
+pos = (366,0);
 ref = acute;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 225;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abreve.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/abreve.1.glyph
index 5a04f9082..79501ecb3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abreve.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abreve.1.glyph
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (242,0);
+pos = (226,0);
 ref = breve;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (168,0);
+pos = (158,0);
 ref = breve;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (174,0);
+pos = (142,0);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/abreve.glyph
index fafc15221..9d895416a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (212,0);
+pos = (183,0);
 ref = breve;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (132,0);
+pos = (124,0);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abreveacute.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/abreveacute.1.glyph
index 604328ca2..6876cc410 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abreveacute.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abreveacute.1.glyph
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (242,0);
+pos = (226,0);
 ref = breveacutecomb.cn;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (168,0);
+pos = (158,0);
 ref = breveacutecomb.cn;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (174,0);
+pos = (142,0);
 ref = breveacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abreveacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/abreveacute.glyph
index a24edab67..817203e1b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abreveacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abreveacute.glyph
@@ -11,7 +11,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (212,0);
+pos = (183,0);
 ref = breveacutecomb.cn;
 }
 );
@@ -53,7 +53,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (132,0);
+pos = (124,0);
 ref = breveacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevecyrillic.glyph
index ef24e0fee..d5fd955a8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevecyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (212,0);
+pos = (183,0);
 ref = breve;
 }
 );
@@ -27,7 +27,7 @@ pos = (136,0);
 ref = breve;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -40,7 +40,7 @@ pos = (200,0);
 ref = breve;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -49,7 +49,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (132,0);
+pos = (124,0);
 ref = breve;
 }
 );
@@ -66,7 +66,7 @@ pos = (96,0);
 ref = breve;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -79,7 +79,7 @@ pos = (144,0);
 ref = breve;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 1233;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevedotbelow.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevedotbelow.1.glyph
index a2da88ef9..5edde2554 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevedotbelow.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevedotbelow.1.glyph
@@ -16,7 +16,7 @@ pos = (230,0);
 ref = breve;
 },
 {
-pos = (1158,0);
+pos = (1185,0);
 ref = dotbelow;
 }
 );
@@ -30,11 +30,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (242,0);
+pos = (226,0);
 ref = breve;
 },
 {
-pos = (1222,0);
+pos = (1210,0);
 ref = dotbelow;
 }
 );
@@ -52,7 +52,7 @@ pos = (190,0);
 ref = breve;
 },
 {
-pos = (1192,0);
+pos = (1323,0);
 ref = dotbelow;
 }
 );
@@ -66,11 +66,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (168,0);
+pos = (158,0);
 ref = breve;
 },
 {
-pos = (1198,0);
+pos = (1127,0);
 ref = dotbelow;
 }
 );
@@ -84,11 +84,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (174,0);
+pos = (142,0);
 ref = breve;
 },
 {
-pos = (1192,0);
+pos = (1270,0);
 ref = dotbelow;
 }
 );
@@ -106,7 +106,7 @@ pos = (178,0);
 ref = breve;
 },
 {
-pos = (1152,0);
+pos = (1065,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevedotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevedotbelow.glyph
index 498bd51e2..c76f3c1a7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevedotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevedotbelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (212,0);
+pos = (183,0);
 ref = breve;
 },
 {
-pos = (1194,0);
+pos = (1167,0);
 ref = dotbelow;
 }
 );
@@ -31,11 +31,11 @@ pos = (136,0);
 ref = breve;
 },
 {
-pos = (1138,0);
+pos = (1269,0);
 ref = dotbelow;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -48,11 +48,11 @@ pos = (200,0);
 ref = breve;
 },
 {
-pos = (1114,0);
+pos = (1141,0);
 ref = dotbelow;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -61,11 +61,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (132,0);
+pos = (124,0);
 ref = breve;
 },
 {
-pos = (1164,0);
+pos = (1093,0);
 ref = dotbelow;
 }
 );
@@ -82,11 +82,11 @@ pos = (96,0);
 ref = breve;
 },
 {
-pos = (1126,0);
+pos = (1221,0);
 ref = dotbelow;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -99,11 +99,11 @@ pos = (144,0);
 ref = breve;
 },
 {
-pos = (1122,0);
+pos = (1035,0);
 ref = dotbelow;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 7863;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevegrave.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevegrave.1.glyph
index c1d8d507b..5b6b78ca6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevegrave.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevegrave.1.glyph
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (242,0);
+pos = (226,0);
 ref = brevegravecomb.cn;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (168,0);
+pos = (158,0);
 ref = brevegravecomb.cn;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (174,0);
+pos = (142,0);
 ref = brevegravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevegrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevegrave.glyph
index a650dc5c7..ab917238e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevegrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevegrave.glyph
@@ -11,7 +11,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (212,0);
+pos = (183,0);
 ref = brevegravecomb.cn;
 }
 );
@@ -53,7 +53,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (132,0);
+pos = (124,0);
 ref = brevegravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevehookabove.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevehookabove.1.glyph
index f80d0f607..45d11d45c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevehookabove.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevehookabove.1.glyph
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (242,0);
+pos = (226,0);
 ref = brevehookcomb.cn;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (168,0);
+pos = (158,0);
 ref = brevehookcomb.cn;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (174,0);
+pos = (142,0);
 ref = brevehookcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevehookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevehookabove.glyph
index 1756d3c50..23b547797 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevehookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevehookabove.glyph
@@ -11,7 +11,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (212,0);
+pos = (183,0);
 ref = brevehookcomb.cn;
 }
 );
@@ -53,7 +53,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (132,0);
+pos = (124,0);
 ref = brevehookcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevetilde.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevetilde.1.glyph
index 7488ce367..932b56949 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevetilde.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevetilde.1.glyph
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (242,0);
+pos = (226,0);
 ref = brevetildecomb.cn;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (168,0);
+pos = (158,0);
 ref = brevetildecomb.cn;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (174,0);
+pos = (136,0);
 ref = brevetildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/abrevetilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/abrevetilde.glyph
index 40ce64ffe..05926090d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/abrevetilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/abrevetilde.glyph
@@ -11,7 +11,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (212,0);
+pos = (183,0);
 ref = brevetildecomb.cn;
 }
 );
@@ -53,7 +53,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (132,0);
+pos = (124,0);
 ref = brevetildecomb.cn;
 }
 );
@@ -67,7 +67,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (96,0);
+pos = (90,0);
 ref = brevetildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acaron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/acaron.1.glyph
index 43a5b7aaa..a1b844a9a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acaron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acaron.1.glyph
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (160,0);
+pos = (194,0);
 ref = caron;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (24,0);
+pos = (158,0);
 ref = caron;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (134,0);
+pos = (158,0);
 ref = caron;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (26,0);
+pos = (190,0);
 ref = caron;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (162,0);
+pos = (178,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/acaron.glyph
index f7eb4e869..3d88ef145 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (130,0);
+pos = (151,0);
 ref = caron;
 }
 );
@@ -23,11 +23,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (-30,0);
+pos = (104,0);
 ref = caron;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -40,7 +40,7 @@ pos = (120,0);
 ref = caron;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -49,7 +49,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (98,0);
+pos = (124,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (-52,0);
+pos = (144,0);
 ref = caron;
 }
 );
@@ -75,11 +75,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (128,0);
+pos = (144,0);
 ref = caron;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 462;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflex.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflex.1.glyph
index aa2815a50..0e9640240 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflex.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflex.1.glyph
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (162,0);
+pos = (194,0);
 ref = circumflex;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (30,0);
+pos = (158,0);
 ref = circumflex;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (136,0);
+pos = (158,0);
 ref = circumflex;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (26,0);
+pos = (190,0);
 ref = circumflex;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (162,0);
+pos = (178,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflex.glyph
index 45e8d0892..b20eef293 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (132,0);
+pos = (151,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (-24,0);
+pos = (104,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (100,0);
+pos = (124,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (-52,0);
+pos = (144,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (128,0);
+pos = (144,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflexacute.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflexacute.1.glyph
index e57643926..1a7c13bff 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflexacute.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflexacute.1.glyph
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (162,0);
+pos = (194,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -43,7 +43,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (30,0);
+pos = (158,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (136,0);
+pos = (158,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (26,0);
+pos = (190,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -88,7 +88,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (162,0);
+pos = (178,0);
 ref = circumflexacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflexacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflexacute.glyph
index a2171936c..b5db981ef 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflexacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflexacute.glyph
@@ -11,7 +11,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (132,0);
+pos = (151,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -25,7 +25,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (-24,0);
+pos = (104,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -53,7 +53,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (100,0);
+pos = (124,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -67,7 +67,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (-52,0);
+pos = (144,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -81,7 +81,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (128,0);
+pos = (144,0);
 ref = circumflexacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflexdotbelow.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflexdotbelow.1.glyph
index b8bcd95a7..908ed5654 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflexdotbelow.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflexdotbelow.1.glyph
@@ -16,7 +16,7 @@ pos = (150,0);
 ref = circumflex;
 },
 {
-pos = (1158,0);
+pos = (1185,0);
 ref = dotbelow;
 }
 );
@@ -30,11 +30,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (162,0);
+pos = (194,0);
 ref = circumflex;
 },
 {
-pos = (1222,0);
+pos = (1210,0);
 ref = dotbelow;
 }
 );
@@ -48,11 +48,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (30,0);
+pos = (158,0);
 ref = circumflex;
 },
 {
-pos = (1192,0);
+pos = (1323,0);
 ref = dotbelow;
 }
 );
@@ -66,11 +66,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (136,0);
+pos = (158,0);
 ref = circumflex;
 },
 {
-pos = (1198,0);
+pos = (1127,0);
 ref = dotbelow;
 }
 );
@@ -84,11 +84,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (26,0);
+pos = (190,0);
 ref = circumflex;
 },
 {
-pos = (1192,0);
+pos = (1270,0);
 ref = dotbelow;
 }
 );
@@ -102,11 +102,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (162,0);
+pos = (178,0);
 ref = circumflex;
 },
 {
-pos = (1152,0);
+pos = (1065,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflexdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflexdotbelow.glyph
index f574e2806..5792190fb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflexdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflexdotbelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (132,0);
+pos = (151,0);
 ref = circumflex;
 },
 {
-pos = (1194,0);
+pos = (1167,0);
 ref = dotbelow;
 }
 );
@@ -27,15 +27,15 @@ shapes = (
 ref = a;
 },
 {
-pos = (-24,0);
+pos = (104,0);
 ref = circumflex;
 },
 {
-pos = (1138,0);
+pos = (1269,0);
 ref = dotbelow;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -48,11 +48,11 @@ pos = (120,0);
 ref = circumflex;
 },
 {
-pos = (1114,0);
+pos = (1141,0);
 ref = dotbelow;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -61,11 +61,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (100,0);
+pos = (124,0);
 ref = circumflex;
 },
 {
-pos = (1164,0);
+pos = (1093,0);
 ref = dotbelow;
 }
 );
@@ -78,15 +78,15 @@ shapes = (
 ref = a;
 },
 {
-pos = (-52,0);
+pos = (144,0);
 ref = circumflex;
 },
 {
-pos = (1126,0);
+pos = (1221,0);
 ref = dotbelow;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -95,15 +95,15 @@ shapes = (
 ref = a;
 },
 {
-pos = (128,0);
+pos = (144,0);
 ref = circumflex;
 },
 {
-pos = (1122,0);
+pos = (1035,0);
 ref = dotbelow;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 7853;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflexgrave.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflexgrave.1.glyph
index ce4174a86..b8346f4db 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflexgrave.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflexgrave.1.glyph
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (160,0);
+pos = (194,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -43,7 +43,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (-128,-238);
+pos = (158,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (134,0);
+pos = (158,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (22,0);
+pos = (190,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -88,7 +88,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (94,-184);
+pos = (178,0);
 ref = circumflexgravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflexgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflexgrave.glyph
index 40faa1eef..8a592c97f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflexgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflexgrave.glyph
@@ -11,7 +11,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (130,0);
+pos = (151,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -25,7 +25,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (-36,0);
+pos = (104,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -53,7 +53,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (98,0);
+pos = (124,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -67,7 +67,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (-56,0);
+pos = (144,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -81,7 +81,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (132,0);
+pos = (144,0);
 ref = circumflexgravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflexhookabove.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflexhookabove.1.glyph
index 5fd293230..b792c2bf6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflexhookabove.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflexhookabove.1.glyph
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (162,0);
+pos = (194,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -43,7 +43,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (30,0);
+pos = (158,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (136,0);
+pos = (158,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (26,0);
+pos = (190,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -88,7 +88,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (162,0);
+pos = (178,0);
 ref = circumflexhookcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflexhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflexhookabove.glyph
index 36a158159..3aa73e952 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflexhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflexhookabove.glyph
@@ -11,7 +11,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (132,0);
+pos = (151,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -25,7 +25,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (-24,0);
+pos = (104,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -53,7 +53,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (100,0);
+pos = (124,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -67,7 +67,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (-52,0);
+pos = (144,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -81,7 +81,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (128,0);
+pos = (144,0);
 ref = circumflexhookcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflextilde.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflextilde.1.glyph
index cdc5148db..592e06caf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflextilde.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflextilde.1.glyph
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (162,0);
+pos = (194,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -43,7 +43,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (42,-214);
+pos = (158,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (136,0);
+pos = (158,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (26,0);
+pos = (190,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -88,7 +88,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (164,-290);
+pos = (175,0);
 ref = circumflextildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acircumflextilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/acircumflextilde.glyph
index 9df95c21d..b7b4ca0f9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acircumflextilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acircumflextilde.glyph
@@ -11,7 +11,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (132,0);
+pos = (151,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -25,7 +25,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (-24,0);
+pos = (104,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -53,7 +53,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (100,0);
+pos = (124,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -67,7 +67,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (-52,0);
+pos = (144,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -81,7 +81,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (128,0);
+pos = (141,0);
 ref = circumflextildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acute.glyph b/src/Inter-Roman.glyphspackage/glyphs/acute.glyph
index a5b0363e0..7fa978d15 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acute.glyph
@@ -6,89 +6,111 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (352,1118);
+pos = (244,1118);
 },
 {
 name = top;
-pos = (352,1532);
+pos = (244,1557);
 }
 );
-background = {
+guides = (
+{
+pos = (0,1283);
+},
+{
+pos = (0,1557);
+}
+);
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 closed = 1;
 nodes = (
-(408,1270,l),
-(672,1578,l),
-(480,1578,l),
-(256,1270,l)
+(302,1283,l),
+(494,1557,l),
+(300,1557,l),
+(160,1283,l)
+);
+}
 );
+width = 654;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (304,1118);
+},
+{
+name = top;
+pos = (304,1582);
+}
+);
+background = {
+shapes = (
+{
 closed = 1;
 nodes = (
-(94,1270,l),
-(310,1578,l),
-(120,1578,l),
-(-42,1270,l)
+(375,1283,l),
+(567,1557,l),
+(373,1557,l),
+(233,1283,l)
 );
 }
 );
 };
 guides = (
 {
-angle = 90;
-pos = (352,1621);
+pos = (0,1256);
+},
+{
+pos = (0,1582);
 }
 );
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 closed = 1;
 nodes = (
-(410,1258,l),
-(602,1532,l),
-(408,1532,l),
-(268,1258,l)
+(434,1256,l),
+(652,1582,l),
+(308,1582,l),
+(170,1256,l)
 );
 }
 );
-width = 890;
+width = 822;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (390,1118);
+pos = (212,1118);
 },
 {
 name = top;
-pos = (390,1582);
+pos = (216,1557);
 }
 );
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+background = {
 shapes = (
 {
 closed = 1;
 nodes = (
-(520,1256,l),
-(738,1582,l),
-(394,1582,l),
-(256,1256,l)
+(278,1283,l),
+(470,1557,l),
+(276,1557,l),
+(136,1283,l)
 );
 }
 );
-width = 994;
-},
-{
-anchors = (
+};
+guides = (
 {
-name = _top;
-pos = (280,1118);
+pos = (0,1283);
 },
 {
-name = top;
-pos = (284,1594);
+pos = (0,1557);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -96,14 +118,14 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(302,1280,l),
-(518,1594,l),
-(460,1594,l),
-(256,1280,l)
+(226,1283,l),
+(393,1557,l),
+(333,1557,l),
+(180,1283,l)
 );
 }
 );
-width = 774;
+width = 573;
 },
 {
 anchors = (
@@ -136,17 +158,19 @@ width = 1018;
 anchors = (
 {
 name = _top;
-pos = (351,1056);
+pos = (164,1056);
 },
 {
 name = top;
-pos = (351,1490);
+pos = (164,1515);
 }
 );
 guides = (
 {
-angle = 90;
-pos = (351,1177);
+pos = (0,1241);
+},
+{
+pos = (0,1515);
 }
 );
 layerId = m007;
@@ -154,30 +178,45 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(409,1216,l),
-(601,1490,l),
-(407,1490,l),
-(267,1216,l)
+(222,1241,l),
+(414,1515,l),
+(220,1515,l),
+(80,1241,l)
 );
 }
 );
-width = 911;
+width = 494;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (410,1056);
+pos = (218,1056);
 },
 {
 name = top;
-pos = (410,1490);
+pos = (218,1507);
+}
+);
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(313,1241,l),
+(505,1515,l),
+(311,1515,l),
+(171,1241,l)
+);
 }
 );
+};
 guides = (
 {
-angle = 90;
-pos = (410,1107);
+pos = (0,1181);
+},
+{
+pos = (0,1507);
 }
 );
 layerId = m009;
@@ -185,24 +224,32 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(520,1164,l),
-(826,1490,l),
-(458,1490,l),
-(256,1164,l)
+(328,1181,l),
+(634,1507,l),
+(266,1507,l),
+(64,1181,l)
 );
 }
 );
-width = 1082;
+width = 698;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (284,1056);
+pos = (130,1056);
 },
 {
 name = top;
-pos = (284,1490);
+pos = (130,1515);
+}
+);
+guides = (
+{
+pos = (0,1241);
+},
+{
+pos = (0,1515);
 }
 );
 layerId = m011;
@@ -210,14 +257,14 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(305,1216,l),
-(506,1490,l),
-(448,1490,l),
-(254,1216,l)
+(151,1241,l),
+(352,1515,l),
+(294,1515,l),
+(100,1241,l)
 );
 }
 );
-width = 774;
+width = 452;
 },
 {
 anchors = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acutecomb.glyph b/src/Inter-Roman.glyphspackage/glyphs/acutecomb.glyph
index 7d423f7d1..7d0d48bfa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acutecomb.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acutecomb.glyph
@@ -7,7 +7,7 @@ layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-768,0);
+pos = (-811,0);
 ref = acute;
 }
 );
@@ -18,7 +18,7 @@ layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-928,0);
+pos = (-973,0);
 ref = acute;
 }
 );
@@ -29,7 +29,7 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-672,0);
+pos = (-775,0);
 ref = acute;
 }
 );
@@ -40,7 +40,7 @@ layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-768,0);
+pos = (-703,0);
 ref = acute;
 }
 );
@@ -51,7 +51,7 @@ layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-928,0);
+pos = (-854,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-672,0);
+pos = (-648,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acutedblnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/acutedblnosp.glyph
index c51d7cc98..5b53a75cc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acutedblnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acutedblnosp.glyph
@@ -3,16 +3,6 @@ color = (250,227,227,1);
 glyphname = acutedblnosp;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (-894,1304);
-},
-{
-name = top;
-pos = (-894,1676);
-}
-);
 background = {
 shapes = (
 {
@@ -38,172 +28,70 @@ nodes = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (-1184,0);
-ref = acute;
-},
-{
-alignment = -1;
-pos = (-1481,0);
-ref = acute;
+pos = (-1154,0);
+ref = dblgravecmb;
+scale = (-1,1);
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-831,1304);
-},
-{
-name = top;
-pos = (-831,1676);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(-1010,1256,l),
-(-868,1582,l),
-(-1192,1582,l),
-(-1266,1256,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-616,1256,l),
-(-398,1582,l),
-(-740,1582,l),
-(-880,1256,l)
-);
-}
-);
-};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (-1109,0);
-ref = acute;
-},
-{
-alignment = -1;
-pos = (-1538,0);
-ref = acute;
+pos = (-1306,0);
+ref = dblgravecmb;
+scale = (-1,1);
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-375,1304);
-},
-{
-name = top;
-pos = (-371,1676);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (-681,0);
-ref = acute;
-},
-{
-alignment = -1;
-pos = (-837,0);
-ref = acute;
+pos = (-1162,0);
+ref = dblgravecmb;
+scale = (-1,1);
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-897,1262);
-},
-{
-name = top;
-pos = (-897,1676);
-}
-);
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (-1184,0);
-ref = acute;
-},
-{
-alignment = -1;
-pos = (-1481,0);
-ref = acute;
+pos = (-1106,0);
+ref = dblgravecmb;
+scale = (-1,1);
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-831,1304);
-},
-{
-name = top;
-pos = (-831,1676);
-}
-);
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (-1133,0);
-ref = acute;
-},
-{
-alignment = -1;
-pos = (-1610,0);
-ref = acute;
+pos = (-1274,0);
+ref = dblgravecmb;
+scale = (-1,1);
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-375,1304);
-},
-{
-name = top;
-pos = (-371,1676);
-}
-);
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (-681,0);
-ref = acute;
-},
-{
-alignment = -1;
-pos = (-837,0);
-ref = acute;
+pos = (-1084,0);
+ref = dblgravecmb;
+scale = (-1,1);
 }
 );
 width = 0;
 }
 );
-note = "match dblgravecmb";
+note = "Match /dblgravecmb.\012See /hungarumlaut for non-combining variant";
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acuterightnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/acuterightnosp.glyph
index 2c29a3d98..cb59e52bb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acuterightnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acuterightnosp.glyph
@@ -6,9 +6,8 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (-344,0);
-ref = acute;
+alignment = 1;
+ref = acutecomb;
 }
 );
 width = 0;
@@ -17,20 +16,18 @@ width = 0;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (-424,0);
-ref = acute;
+alignment = 1;
+ref = acutecomb;
 }
 );
-width = 0;
+width = 14;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (-294,0);
-ref = acute;
+alignment = 1;
+ref = acutecomb;
 }
 );
 width = 0;
@@ -39,9 +36,8 @@ width = 0;
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (-344,0);
-ref = acute;
+alignment = 1;
+ref = acutecomb;
 }
 );
 width = 0;
@@ -50,9 +46,8 @@ width = 0;
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (-424,0);
-ref = acute;
+alignment = 1;
+ref = acutecomb;
 }
 );
 width = 0;
@@ -61,9 +56,8 @@ width = 0;
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (-294,0);
-ref = acute;
+alignment = 1;
+ref = acutecomb;
 }
 );
 width = 0;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/acyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/acyrillic.glyph
index 1c3eda1ff..716c04d03 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/acyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/acyrillic.glyph
@@ -19,7 +19,7 @@ shapes = (
 ref = a;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -28,7 +28,7 @@ shapes = (
 ref = a;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -46,7 +46,7 @@ shapes = (
 ref = a;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -55,7 +55,7 @@ shapes = (
 ref = a;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 1072;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adblgrave.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/adblgrave.1.glyph
index 2d4957804..876f0b05a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adblgrave.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adblgrave.1.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1140,0);
+pos = (1158,0);
 ref = dblgravecmb;
 }
 );
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1098,0);
+pos = (1186,0);
 ref = dblgravecmb;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1280,0);
+pos = (1326,0);
 ref = dblgravecmb;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1072,0);
+pos = (1117,0);
 ref = dblgravecmb;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1280,0);
+pos = (1262,0);
 ref = dblgravecmb;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1152,0);
+pos = (1066,0);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/adblgrave.glyph
index 85fc5f317..235bae01e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adblgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1068,0);
+pos = (1143,0);
 ref = dblgravecmb;
 }
 );
@@ -23,11 +23,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1226,0);
+pos = (1272,0);
 ref = dblgravecmb;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1110,0);
+pos = (1128,0);
 ref = dblgravecmb;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -49,7 +49,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1036,0);
+pos = (1083,0);
 ref = dblgravecmb;
 }
 );
@@ -62,11 +62,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1202,0);
+pos = (1216,0);
 ref = dblgravecmb;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1118,0);
+pos = (1032,0);
 ref = dblgravecmb;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 513;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adieresis.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/adieresis.1.glyph
index c22bc0c56..b36d37cc5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adieresis.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adieresis.1.glyph
@@ -25,7 +25,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (25,0);
+pos = (9,0);
 ref = dieresis;
 }
 );
@@ -53,7 +53,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (-1,0);
+pos = (-11,0);
 ref = dieresis;
 }
 );
@@ -67,7 +67,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (5,0);
+pos = (-27,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/adieresis.glyph
index bbc4418e7..b8c97ccfa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (-5,0);
+pos = (-34,0);
 ref = dieresis;
 }
 );
@@ -27,7 +27,7 @@ pos = (-49,0);
 ref = dieresis;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -40,7 +40,7 @@ pos = (-30,0);
 ref = dieresis;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -49,7 +49,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (-37,0);
+pos = (-45,0);
 ref = dieresis;
 }
 );
@@ -66,7 +66,7 @@ pos = (-73,0);
 ref = dieresis;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 background = {
@@ -161,7 +161,7 @@ pos = (-38,0);
 ref = dieresis;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 228;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adieresiscyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/adieresiscyrillic.glyph
index 83300ee05..a8fcc2add 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adieresiscyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adieresiscyrillic.glyph
@@ -19,7 +19,7 @@ shapes = (
 ref = adieresis;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -28,7 +28,7 @@ shapes = (
 ref = adieresis;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -46,7 +46,7 @@ shapes = (
 ref = adieresis;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -55,7 +55,7 @@ shapes = (
 ref = adieresis;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 1235;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adieresismacron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/adieresismacron.1.glyph
index 66a36d262..e99a17a95 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adieresismacron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adieresismacron.1.glyph
@@ -27,7 +27,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (25,0);
+pos = (10,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -57,7 +57,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (-1,0);
+pos = (-10,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -72,7 +72,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (5,0);
+pos = (-27,0);
 ref = dieresismacroncomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adieresismacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/adieresismacron.glyph
index 44b06c754..e28b40939 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adieresismacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adieresismacron.glyph
@@ -11,7 +11,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (-5,0);
+pos = (-33,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -29,7 +29,7 @@ pos = (-49,0);
 ref = dieresismacroncomb.lc;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -43,7 +43,7 @@ pos = (-30,0);
 ref = dieresismacroncomb.lc;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -53,7 +53,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (-37,0);
+pos = (-44,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -71,7 +71,7 @@ pos = (-73,0);
 ref = dieresismacroncomb.lc;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -85,7 +85,7 @@ pos = (-38,0);
 ref = dieresismacroncomb.lc;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 479;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adotbelow.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/adotbelow.1.glyph
index 5d13a607e..adefc7387 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adotbelow.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adotbelow.1.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1158,0);
+pos = (1185,0);
 ref = dotbelow;
 }
 );
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1222,0);
+pos = (1210,0);
 ref = dotbelow;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1192,0);
+pos = (1323,0);
 ref = dotbelow;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1198,0);
+pos = (1127,0);
 ref = dotbelow;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1192,0);
+pos = (1270,0);
 ref = dotbelow;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1152,0);
+pos = (1065,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/adotbelow.glyph
index e68916c36..fb14ca9de 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1194,0);
+pos = (1167,0);
 ref = dotbelow;
 }
 );
@@ -23,11 +23,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1138,0);
+pos = (1269,0);
 ref = dotbelow;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1114,0);
+pos = (1141,0);
 ref = dotbelow;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -49,7 +49,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1164,0);
+pos = (1093,0);
 ref = dotbelow;
 }
 );
@@ -62,11 +62,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1126,0);
+pos = (1221,0);
 ref = dotbelow;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1122,0);
+pos = (1035,0);
 ref = dotbelow;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 7841;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adotmacron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/adotmacron.1.glyph
index 4cba09d7c..aaaf94fb1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adotmacron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adotmacron.1.glyph
@@ -14,7 +14,7 @@ ref = a.1;
 {
 alignment = 1;
 pos = (396,0);
-ref = dotmacroncomb.lc;
+ref = dotmacron.lc;
 }
 );
 width = 1190;
@@ -28,8 +28,8 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (382,0);
-ref = dotmacroncomb.lc;
+pos = (366,0);
+ref = dotmacron.lc;
 }
 );
 width = 1246;
@@ -44,7 +44,7 @@ ref = a.1;
 {
 alignment = 1;
 pos = (336,0);
-ref = dotmacroncomb.lc;
+ref = dotmacron.lc;
 }
 );
 width = 1322;
@@ -58,8 +58,8 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (356,0);
-ref = dotmacroncomb.lc;
+pos = (346,0);
+ref = dotmacron.lc;
 }
 );
 width = 1162;
@@ -73,8 +73,8 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (334,0);
-ref = dotmacroncomb.lc;
+pos = (302,0);
+ref = dotmacron.lc;
 }
 );
 width = 1274;
@@ -89,7 +89,7 @@ ref = a.1;
 {
 alignment = 1;
 pos = (408,0);
-ref = dotmacroncomb.lc;
+ref = dotmacron.lc;
 }
 );
 width = 1118;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/adotmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/adotmacron.glyph
index 4dd358eb7..941396ec7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/adotmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/adotmacron.glyph
@@ -11,8 +11,8 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (352,0);
-ref = dotmacroncomb.lc;
+pos = (323,0);
+ref = dotmacron.lc;
 }
 );
 width = 1148;
@@ -26,10 +26,10 @@ ref = a;
 {
 alignment = 1;
 pos = (282,0);
-ref = dotmacroncomb.lc;
+ref = dotmacron.lc;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -40,10 +40,10 @@ ref = a;
 {
 alignment = 1;
 pos = (366,0);
-ref = dotmacroncomb.lc;
+ref = dotmacron.lc;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -53,8 +53,8 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (320,0);
-ref = dotmacroncomb.lc;
+pos = (312,0);
+ref = dotmacron.lc;
 }
 );
 width = 1049;
@@ -68,10 +68,10 @@ ref = a;
 {
 alignment = 1;
 pos = (256,0);
-ref = dotmacroncomb.lc;
+ref = dotmacron.lc;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -82,10 +82,10 @@ ref = a;
 {
 alignment = 1;
 pos = (374,0);
-ref = dotmacroncomb.lc;
+ref = dotmacron.lc;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 481;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aeacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/aeacute.glyph
index 55c9b68d9..08ae2ffeb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aeacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aeacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (592,0);
+pos = (700,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (512,0);
+pos = (598,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (650,0);
+pos = (718,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (509,0);
+pos = (696,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (478,0);
+pos = (670,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (590,0);
+pos = (744,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aemacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/aemacron.glyph
index 7317ea4f2..a956cb7af 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aemacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aemacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (344,0);
+pos = (456,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (237,0);
+pos = (486,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (348,0);
+pos = (530,0);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (292,0);
+pos = (444,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (239,0);
+pos = (504,0);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = ae;
 },
 {
-pos = (340,0);
+pos = (490,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10052.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10052.glyph
index 15c94363a..990118da2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10052.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10052.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (280,372);
+pos = (388,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (248,372);
+pos = (334,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (352,372);
+pos = (420,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (249,434);
+pos = (436,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (212,434);
+pos = (404,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (284,434);
+pos = (438,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10061.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10061.glyph
index e6ab02d69..9451b2c78 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10061.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10061.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (322,372);
+pos = (430,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (334,372);
+pos = (420,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (358,372);
+pos = (426,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (291,434);
+pos = (478,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (310,434);
+pos = (502,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (288,434);
+pos = (442,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/agrave.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/agrave.1.glyph
index ab2b2c4c2..114384822 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/agrave.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/agrave.1.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (88,0);
+pos = (217,0);
 ref = grave;
 }
 );
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (88,0);
+pos = (200,0);
 ref = grave;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (66,0);
+pos = (152,0);
 ref = grave;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (8,0);
+pos = (228,0);
 ref = grave;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (-18,0);
+pos = (142,0);
 ref = grave;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (36,0);
+pos = (204,0);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/agrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/agrave.glyph
index a2ebfcedc..42916af57 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/agrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/agrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (58,0);
+pos = (157,0);
 ref = grave;
 }
 );
@@ -23,11 +23,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (12,0);
+pos = (98,0);
 ref = grave;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (58,0);
+pos = (187,0);
 ref = grave;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -49,7 +49,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (-28,0);
+pos = (194,0);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (-96,0);
+pos = (96,0);
 ref = grave;
 }
 );
@@ -75,11 +75,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (2,0);
+pos = (170,0);
 ref = grave;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 224;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ahookabove.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/ahookabove.1.glyph
index 733528db8..286590954 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ahookabove.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ahookabove.1.glyph
@@ -12,8 +12,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1104,0);
-ref = hookabovecmb;
+pos = (362,0);
+ref = hookabove;
 }
 );
 width = 1190;
@@ -26,8 +26,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1213,0);
-ref = hookabovecmb;
+pos = (345,0);
+ref = hookabove;
 }
 );
 width = 1246;
@@ -40,8 +40,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1334,0);
-ref = hookabovecmb;
+pos = (356,0);
+ref = hookabove;
 }
 );
 width = 1322;
@@ -54,8 +54,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1131,0);
-ref = hookabovecmb;
+pos = (293,0);
+ref = hookabove;
 }
 );
 width = 1162;
@@ -68,8 +68,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1308,0);
-ref = hookabovecmb;
+pos = (299,0);
+ref = hookabove;
 }
 );
 width = 1274;
@@ -82,8 +82,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1034,0);
-ref = hookabovecmb;
+pos = (312,0);
+ref = hookabove;
 }
 );
 width = 1118;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ahookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/ahookabove.glyph
index ff4309530..733f31da0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ahookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ahookabove.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (1183,0);
-ref = hookabovecmb;
+pos = (302,0);
+ref = hookabove;
 }
 );
 width = 1148;
@@ -23,11 +23,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1280,0);
-ref = hookabovecmb;
+pos = (302,0);
+ref = hookabove;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,21 +36,29 @@ shapes = (
 ref = a;
 },
 {
-pos = (1074,0);
-ref = hookabovecmb;
+pos = (332,0);
+ref = hookabove;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
+background = {
+shapes = (
+{
+pos = (192,0);
+ref = acute;
+}
+);
+};
 layerId = m007;
 shapes = (
 {
 ref = a;
 },
 {
-pos = (1095,0);
-ref = hookabovecmb;
+pos = (259,0);
+ref = hookabove;
 }
 );
 width = 1049;
@@ -62,8 +70,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (1230,0);
-ref = hookabovecmb;
+pos = (253,0);
+ref = hookabove;
 }
 );
 width = 1172;
@@ -75,11 +83,157 @@ shapes = (
 ref = a;
 },
 {
-pos = (1000,0);
-ref = hookabovecmb;
+pos = (278,0);
+ref = hookabove;
 }
 );
 width = 1000;
+},
+{
+associatedMasterId = m007;
+background = {
+shapes = (
+{
+pos = (192,0);
+ref = acute;
+}
+);
+};
+layerId = "B49BD977-6B1C-403C-97EF-BB41397CFDCE";
+name = "Apr 12, 23, 10:25";
+shapes = (
+{
+ref = a;
+},
+{
+closed = 1;
+nodes = (
+(660,1320,o),
+(692,1381,o),
+(692,1440,cs),
+(692,1516,o),
+(636,1558,o),
+(525,1558,cs),
+(370,1558,l),
+(370,1431,l),
+(499,1431,ls),
+(537,1431,o),
+(549,1411,o),
+(531,1376,cs),
+(461,1241,l),
+(596,1241,l)
+);
+}
+);
+width = 1049;
+},
+{
+associatedMasterId = m007;
+background = {
+shapes = (
+{
+pos = (192,0);
+ref = acute;
+}
+);
+};
+layerId = "98520F80-A5E6-479E-9609-6FDEA3B4D873";
+name = "Apr 12, 23, 10:28";
+shapes = (
+{
+ref = a;
+},
+{
+closed = 1;
+nodes = (
+(649,1310,ls),
+(731,1425,o),
+(676,1515,o),
+(525,1515,cs),
+(370,1515,l),
+(370,1392,l),
+(483,1392,ls),
+(531,1392,o),
+(541,1361,o),
+(514,1315,cs),
+(471,1241,l),
+(600,1241,l)
+);
+}
+);
+width = 1049;
+},
+{
+associatedMasterId = m007;
+background = {
+shapes = (
+{
+pos = (192,0);
+ref = acute;
+}
+);
+};
+layerId = "718E5ECA-504C-45C0-BAD9-5A588344B6C3";
+name = "Apr 12, 23, 10:29";
+shapes = (
+{
+ref = a;
+},
+{
+closed = 1;
+nodes = (
+(649,1310,ls),
+(731,1425,o),
+(676,1515,o),
+(525,1515,cs),
+(370,1515,l),
+(370,1392,l),
+(507,1392,ls),
+(537,1392,o),
+(545,1375,o),
+(528,1345,cs),
+(471,1241,l),
+(600,1241,l)
+);
+}
+);
+width = 1049;
+},
+{
+associatedMasterId = m007;
+background = {
+shapes = (
+{
+pos = (192,0);
+ref = acute;
+}
+);
+};
+layerId = "A420088F-1D64-4A70-B22E-2C09371B7FE2";
+name = "Apr 12, 23, 10:32";
+shapes = (
+{
+ref = a;
+},
+{
+closed = 1;
+nodes = (
+(649,1310,ls),
+(731,1425,o),
+(676,1515,o),
+(525,1515,cs),
+(370,1515,l),
+(370,1400,l),
+(507,1400,ls),
+(537,1400,o),
+(545,1386,o),
+(530,1359,cs),
+(468,1241,l),
+(600,1241,l)
+);
+}
+);
+width = 1049;
 }
 );
 unicode = 7843;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ainvertedbreve.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/ainvertedbreve.1.glyph
index 652070044..3a5700e68 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ainvertedbreve.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ainvertedbreve.1.glyph
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1223,0);
+pos = (1200,0);
 ref = breveinvnosp;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1332,0);
+pos = (1336,0);
 ref = breveinvnosp;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1132,0);
+pos = (1122,0);
 ref = breveinvnosp;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1304,0);
+pos = (1275,0);
 ref = breveinvnosp;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1059,0);
+pos = (1069,0);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ainvertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/ainvertedbreve.glyph
index f47576b6c..4fc8a8c18 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ainvertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ainvertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1193,0);
+pos = (1157,0);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1278,0);
+pos = (1282,0);
 ref = breveinvnosp;
 }
 );
@@ -40,7 +40,7 @@ pos = (1134,0);
 ref = breveinvnosp;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -49,7 +49,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (1096,0);
+pos = (1088,0);
 ref = breveinvnosp;
 }
 );
@@ -62,11 +62,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1226,0);
+pos = (1229,0);
 ref = breveinvnosp;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (1025,0);
+pos = (1035,0);
 ref = breveinvnosp;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 515;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/alphatonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/alphatonos.glyph
index 750aeaa1f..bf0f79cd7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/alphatonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/alphatonos.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (388,-186);
+pos = (388,0);
 ref = tonostop;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (258,-164);
+pos = (258,0);
 ref = tonostop;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (472,-196);
+pos = (468,0);
 ref = tonostop;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (364,-248);
+pos = (364,0);
 ref = tonostop;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (278,-226);
+pos = (278,0);
 ref = tonostop;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (464,-258);
+pos = (459,0);
 ref = tonostop;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/amacron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/amacron.1.glyph
index 608a4a3e7..e3a55c6b9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/amacron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/amacron.1.glyph
@@ -12,6 +12,7 @@ alignment = 1;
 ref = a.1;
 },
 {
+pos = (182,0);
 ref = macron;
 }
 );
@@ -25,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (26,0);
+pos = (122,0);
 ref = macron;
 }
 );
@@ -39,7 +40,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (5,0);
+pos = (254,0);
 ref = macron;
 }
 );
@@ -53,6 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
+pos = (142,0);
 ref = macron;
 }
 );
@@ -66,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (5,0);
+pos = (238,0);
 ref = macron;
 }
 );
@@ -80,7 +82,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (-4,0);
+pos = (146,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/amacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/amacron.glyph
index 49600e9e5..b577125ae 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/amacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/amacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (-4,0);
+pos = (79,0);
 ref = macron;
 }
 );
@@ -23,11 +23,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (-49,0);
+pos = (200,0);
 ref = macron;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (-30,0);
+pos = (152,0);
 ref = macron;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -49,7 +49,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (-36,0);
+pos = (108,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (-73,0);
+pos = (192,0);
 ref = macron;
 }
 );
@@ -75,11 +75,11 @@ shapes = (
 ref = a;
 },
 {
-pos = (-38,0);
+pos = (112,0);
 ref = macron;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 257;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aogonek.glyph b/src/Inter-Roman.glyphspackage/glyphs/aogonek.glyph
index 4827668a7..54f07fc20 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aogonek.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aogonek.glyph
@@ -27,7 +27,7 @@ pos = (590,0);
 ref = ogonek.a;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -40,7 +40,7 @@ pos = (632,0);
 ref = ogonek.a;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -66,7 +66,7 @@ pos = (525,0);
 ref = ogonek.a;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -79,7 +79,7 @@ pos = (573,0);
 ref = ogonek.a;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 261;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/arighthalfring.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/arighthalfring.1.glyph
index 5ec892c3a..38b53b578 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/arighthalfring.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/arighthalfring.1.glyph
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (480,0);
+pos = (464,0);
 ref = ringhalfright;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (419,0);
+pos = (409,0);
 ref = ringhalfright;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (505,0);
+pos = (473,0);
 ref = ringhalfright;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/arighthalfring.glyph b/src/Inter-Roman.glyphspackage/glyphs/arighthalfring.glyph
index c842146a0..69737848a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/arighthalfring.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/arighthalfring.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (450,0);
+pos = (421,0);
 ref = ringhalfright;
 }
 );
@@ -27,7 +27,7 @@ pos = (461,0);
 ref = ringhalfright;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -40,7 +40,7 @@ pos = (397,0);
 ref = ringhalfright;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -49,7 +49,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (383,0);
+pos = (375,0);
 ref = ringhalfright;
 }
 );
@@ -66,7 +66,7 @@ pos = (427,0);
 ref = ringhalfright;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -79,7 +79,7 @@ pos = (341,0);
 ref = ringhalfright;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 7834;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aring.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/aring.1.glyph
index 40eaf380d..07ec8bbe2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aring.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aring.1.glyph
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (322,0);
+pos = (306,0);
 ref = ring;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (280,0);
+pos = (270,0);
 ref = ring;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (222,0);
+pos = (190,0);
 ref = ring;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aring.glyph b/src/Inter-Roman.glyphspackage/glyphs/aring.glyph
index edb8bd9b8..b4cba241d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aring.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aring.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (292,0);
+pos = (263,0);
 ref = ring;
 }
 );
@@ -27,7 +27,7 @@ pos = (184,0);
 ref = ring;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -40,7 +40,7 @@ pos = (312,0);
 ref = ring;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -49,7 +49,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (244,0);
+pos = (236,0);
 ref = ring;
 }
 );
@@ -66,7 +66,7 @@ pos = (144,0);
 ref = ring;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -79,7 +79,7 @@ pos = (208,0);
 ref = ring;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 229;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aringacute.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/aringacute.1.glyph
index aa52a0cf0..500e37429 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aringacute.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aringacute.1.glyph
@@ -13,8 +13,8 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (302,-34);
-ref = ringacute.cn;
+pos = (342,0);
+ref = ringacute.lc;
 }
 );
 width = 1190;
@@ -28,8 +28,8 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (324,-68);
-ref = ringacute.cn;
+pos = (306,0);
+ref = ringacute.lc;
 }
 );
 width = 1246;
@@ -43,8 +43,8 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (320,-128);
-ref = ringacute.cn;
+pos = (238,0);
+ref = ringacute.lc;
 }
 );
 width = 1322;
@@ -58,8 +58,8 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (298,-130);
-ref = ringacute.cn;
+pos = (270,0);
+ref = ringacute.lc;
 }
 );
 width = 1162;
@@ -73,8 +73,8 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (320,-190);
-ref = ringacute.cn;
+pos = (190,0);
+ref = ringacute.lc;
 }
 );
 width = 1274;
@@ -88,8 +88,8 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (314,-96);
-ref = ringacute.cn;
+pos = (242,0);
+ref = ringacute.lc;
 }
 );
 width = 1118;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aringacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/aringacute.glyph
index 85ba28d4e..c00b91449 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aringacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aringacute.glyph
@@ -11,8 +11,8 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (294,-68);
-ref = ringacute.cn;
+pos = (263,0);
+ref = ringacute.lc;
 }
 );
 width = 1148;
@@ -72,11 +72,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (266,-128);
-ref = ringacute.cn;
+pos = (184,0);
+ref = ringacute.lc;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -86,11 +86,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (272,-34);
-ref = ringacute.cn;
+pos = (312,0);
+ref = ringacute.lc;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -100,8 +100,8 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (262,-130);
-ref = ringacute.cn;
+pos = (236,0);
+ref = ringacute.lc;
 }
 );
 width = 1049;
@@ -161,11 +161,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (242,-190);
-ref = ringacute.cn;
+pos = (144,0);
+ref = ringacute.lc;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -175,11 +175,11 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (280,-96);
-ref = ringacute.cn;
+pos = (208,0);
+ref = ringacute.lc;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 507;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aringbelow.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/aringbelow.1.glyph
index 566db745d..d4d4bc14e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aringbelow.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aringbelow.1.glyph
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (342,0);
+pos = (336,0);
 ref = uni02F3;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (318,0);
+pos = (316,0);
 ref = uni02F3;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (194,0);
+pos = (177,0);
 ref = uni02F3;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aringbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/aringbelow.glyph
index 8ebda633f..cfdb3de04 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aringbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aringbelow.glyph
@@ -11,7 +11,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (314,0);
+pos = (293,0);
 ref = uni02F3;
 }
 );
@@ -29,7 +29,7 @@ pos = (140,0);
 ref = uni02F3;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -43,7 +43,7 @@ pos = (390,0);
 ref = uni02F3;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -53,7 +53,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (284,0);
+pos = (282,0);
 ref = uni02F3;
 }
 );
@@ -71,7 +71,7 @@ pos = (128,0);
 ref = uni02F3;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -85,7 +85,7 @@ pos = (398,0);
 ref = uni02F3;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 7681;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aringogonek.glyph b/src/Inter-Roman.glyphspackage/glyphs/aringogonek.glyph
index 63f3322cf..5d1877457 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aringogonek.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aringogonek.glyph
@@ -14,7 +14,7 @@ pos = (632,0);
 ref = ogonek.a;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -40,7 +40,7 @@ pos = (590,0);
 ref = ogonek.a;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = m007;
@@ -66,7 +66,7 @@ pos = (525,0);
 ref = ogonek.a;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -79,7 +79,7 @@ pos = (573,0);
 ref = ogonek.a;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 60932;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/atilde.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/atilde.1.glyph
index e83768fa5..dd03dca74 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/atilde.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/atilde.1.glyph
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (114,0);
+pos = (98,0);
 ref = tilde;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (88,0);
+pos = (78,0);
 ref = tilde;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (142,0);
+pos = (110,0);
 ref = tilde;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/atilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/atilde.glyph
index 42e2817dd..3fe311094 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/atilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/atilde.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (84,0);
+pos = (55,0);
 ref = tilde;
 }
 );
@@ -27,7 +27,7 @@ pos = (104,0);
 ref = tilde;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -40,7 +40,7 @@ pos = (48,0);
 ref = tilde;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -49,7 +49,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (52,0);
+pos = (44,0);
 ref = tilde;
 }
 );
@@ -79,7 +79,7 @@ pos = (48,0);
 ref = tilde;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 227;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/aturn.glyph
index c4afd5dc1..e17343cc9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aturn.glyph
@@ -39,11 +39,11 @@ layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 angle = 180;
-pos = (1222,1118);
+pos = (1214,1118);
 ref = a;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 anchors = (
@@ -60,11 +60,11 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 angle = 180;
-pos = (1102,1118);
+pos = (1094,1118);
 ref = a;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 anchors = (
@@ -102,11 +102,11 @@ layerId = m009;
 shapes = (
 {
 angle = 180;
-pos = (1178,1056);
+pos = (1172,1056);
 ref = a;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 anchors = (
@@ -123,11 +123,11 @@ layerId = m011;
 shapes = (
 {
 angle = 180;
-pos = (1014,1056);
+pos = (1000,1056);
 ref = a;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 592;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/bdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/bdotbelow.glyph
index 0f57667db..4cee5f4a3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/bdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/bdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (1272,0);
+pos = (1266,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (1174,0);
+pos = (1305,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (1188,0);
+pos = (1215,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (1264,0);
+pos = (1195,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (1172,0);
+pos = (1267,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (1210,0);
+pos = (1123,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/blinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/blinebelow.glyph
index 720a3e9be..a520030ae 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/blinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/blinebelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = b;
 },
 {
-pos = (1264,0);
-ref = macronsubnosp;
+pos = (178,0);
+ref = macronsub;
 }
 );
 width = 1246;
@@ -23,8 +23,8 @@ shapes = (
 ref = b;
 },
 {
-pos = (1304,0);
-ref = macronsubnosp;
+pos = (222,0);
+ref = macronsub;
 }
 );
 width = 1322;
@@ -36,8 +36,8 @@ shapes = (
 ref = b;
 },
 {
-pos = (1205,0);
-ref = macronsubnosp;
+pos = (230,0);
+ref = macronsub;
 }
 );
 width = 1190;
@@ -49,8 +49,8 @@ shapes = (
 ref = b;
 },
 {
-pos = (1186,0);
-ref = macronsubnosp;
+pos = (210,0);
+ref = macronsub;
 }
 );
 width = 1160;
@@ -62,8 +62,8 @@ shapes = (
 ref = b;
 },
 {
-pos = (1265,0);
-ref = macronsubnosp;
+pos = (236,0);
+ref = macronsub;
 }
 );
 width = 1280;
@@ -75,8 +75,8 @@ shapes = (
 ref = b;
 },
 {
-pos = (1117,0);
-ref = macronsubnosp;
+pos = (204,0);
+ref = macronsub;
 }
 );
 width = 1118;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/breve.glyph b/src/Inter-Roman.glyphspackage/glyphs/breve.glyph
index d429d3c14..8d1f9fa26 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/breve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/breve.glyph
@@ -10,7 +10,7 @@ pos = (384,1118);
 },
 {
 name = top;
-pos = (384,1550);
+pos = (384,1557);
 }
 );
 background = {
@@ -21,25 +21,33 @@ ref = caron;
 }
 );
 };
+guides = (
+{
+pos = (0,1557);
+},
+{
+pos = (0,1283);
+}
+);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 closed = 1;
 nodes = (
-(557,1250,o),
-(685,1382,o),
-(685,1550,c),
-(557,1550,l),
-(557,1451,o),
-(476,1382,o),
-(384,1382,cs),
-(292,1382,o),
-(211,1451,o),
-(211,1550,c),
-(83,1550,l),
-(83,1382,o),
-(211,1250,o),
-(384,1250,cs)
+(544,1269,o),
+(669,1392,o),
+(669,1549,c),
+(541,1549,l),
+(541,1457,o),
+(476,1393,o),
+(384,1393,cs),
+(292,1393,o),
+(227,1457,o),
+(227,1549,c),
+(99,1549,l),
+(99,1392,o),
+(224,1269,o),
+(384,1269,cs)
 );
 }
 );
@@ -53,7 +61,7 @@ pos = (480,1118);
 },
 {
 name = top;
-pos = (480,1590);
+pos = (480,1582);
 }
 );
 background = {
@@ -64,25 +72,33 @@ ref = caron;
 }
 );
 };
+guides = (
+{
+pos = (0,1256);
+},
+{
+pos = (0,1582);
+}
+);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 closed = 1;
 nodes = (
-(704,1256,o),
-(872,1403,o),
-(872,1590,c),
-(658,1590,l),
-(658,1512,o),
-(580,1451,o),
-(480,1451,cs),
-(379,1451,o),
-(300,1512,o),
-(300,1590,c),
-(88,1590,l),
-(88,1403,o),
-(256,1256,o),
-(480,1256,cs)
+(704,1240,o),
+(872,1387,o),
+(872,1574,c),
+(658,1574,l),
+(658,1496,o),
+(580,1435,o),
+(480,1435,cs),
+(379,1435,o),
+(300,1496,o),
+(300,1574,c),
+(88,1574,l),
+(88,1387,o),
+(256,1240,o),
+(480,1240,cs)
 );
 }
 );
@@ -96,7 +112,7 @@ pos = (352,1118);
 },
 {
 name = top;
-pos = (352,1512);
+pos = (352,1532);
 }
 );
 background = {
@@ -107,25 +123,33 @@ ref = caron;
 }
 );
 };
+guides = (
+{
+pos = (0,1557);
+},
+{
+pos = (0,1283);
+}
+);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 closed = 1;
 nodes = (
-(498,1272,o),
-(614,1377,o),
-(614,1512,c),
-(568,1512,l),
-(568,1403,o),
-(473,1317,o),
-(352,1317,cs),
-(231,1317,o),
-(136,1403,o),
-(136,1512,c),
-(90,1512,l),
-(90,1377,o),
-(206,1272,o),
-(352,1272,cs)
+(499,1270,o),
+(614,1387,o),
+(614,1532,c),
+(568,1532,l),
+(568,1411,o),
+(471,1314,o),
+(352,1314,cs),
+(233,1314,o),
+(136,1411,o),
+(136,1532,c),
+(90,1532,l),
+(90,1387,o),
+(205,1270,o),
+(352,1270,cs)
 );
 }
 );
@@ -139,7 +163,7 @@ pos = (400,1056);
 },
 {
 name = top;
-pos = (400,1482);
+pos = (400,1508);
 }
 );
 background = {
@@ -150,25 +174,33 @@ ref = caron;
 }
 );
 };
+guides = (
+{
+pos = (0,1241);
+},
+{
+pos = (0,1515);
+}
+);
 layerId = m007;
 shapes = (
 {
 closed = 1;
 nodes = (
-(569,1208,o),
-(685,1328,o),
-(685,1480,c),
-(557,1480,l),
-(557,1393,o),
-(492,1332,o),
-(400,1332,cs),
-(308,1332,o),
-(243,1393,o),
-(243,1480,c),
-(115,1480,l),
-(115,1328,o),
-(231,1208,o),
-(400,1208,cs)
+(560,1228,o),
+(685,1351,o),
+(685,1508,c),
+(557,1508,l),
+(557,1416,o),
+(492,1352,o),
+(400,1352,cs),
+(308,1352,o),
+(243,1416,o),
+(243,1508,c),
+(115,1508,l),
+(115,1351,o),
+(240,1228,o),
+(400,1228,cs)
 );
 }
 );
@@ -182,7 +214,7 @@ pos = (352,1056);
 },
 {
 name = top;
-pos = (352,1456);
+pos = (352,1492);
 }
 );
 background = {
@@ -193,25 +225,33 @@ ref = caron;
 }
 );
 };
+guides = (
+{
+pos = (0,1515);
+},
+{
+pos = (0,1241);
+}
+);
 layerId = m011;
 shapes = (
 {
 closed = 1;
 nodes = (
-(498,1216,o),
-(614,1321,o),
-(614,1456,c),
-(568,1456,l),
-(568,1347,o),
-(471,1259,o),
-(352,1259,cs),
-(233,1259,o),
-(136,1347,o),
-(136,1456,c),
-(90,1456,l),
-(90,1321,o),
-(206,1216,o),
-(352,1216,cs)
+(499,1230,o),
+(614,1347,o),
+(614,1492,c),
+(568,1492,l),
+(568,1371,o),
+(471,1276,o),
+(352,1276,cs),
+(233,1276,o),
+(136,1371,o),
+(136,1492,c),
+(90,1492,l),
+(90,1347,o),
+(205,1230,o),
+(352,1230,cs)
 );
 }
 );
@@ -270,7 +310,7 @@ pos = (480,1056);
 },
 {
 name = top;
-pos = (480,1490);
+pos = (480,1507);
 }
 );
 background = {
@@ -281,26 +321,34 @@ ref = caron;
 }
 );
 };
+guides = (
+{
+pos = (0,1181);
+},
+{
+pos = (0,1507);
+}
+);
 layerId = m009;
 name = "Display Black";
 shapes = (
 {
 closed = 1;
 nodes = (
-(704,1156,o),
-(872,1303,o),
-(872,1490,c),
-(650,1490,l),
-(650,1406,o),
-(580,1347,o),
-(480,1347,cs),
-(379,1347,o),
-(308,1406,o),
-(308,1490,c),
-(88,1490,l),
-(88,1303,o),
-(256,1156,o),
-(480,1156,cs)
+(704,1165,o),
+(872,1312,o),
+(872,1499,c),
+(650,1499,l),
+(650,1415,o),
+(580,1356,o),
+(480,1356,cs),
+(379,1356,o),
+(308,1415,o),
+(308,1499,c),
+(88,1499,l),
+(88,1312,o),
+(256,1165,o),
+(480,1165,cs)
 );
 }
 );
@@ -397,7 +445,7 @@ nodes = (
 width = 800;
 }
 );
-note = "Harmonize with /caron";
+note = "Harmonize with /caron\012Mirrored in /breveinv.cn";
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/breveacutecomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/breveacutecomb.cn.glyph
index 3cb5455b4..491ecc11e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/breveacutecomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/breveacutecomb.cn.glyph
@@ -4,23 +4,33 @@ layers = (
 {
 anchors = (
 {
+name = _top;
+pos = (384,1118);
+},
+{
 name = top;
-pos = (384,1891);
+pos = (384,1890);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1529);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(459,1616,l),
-(651,1890,l),
-(457,1890,l),
-(317,1616,l)
-);
+alignment = -1;
+pos = (0,-28);
+ref = breve;
 },
 {
-ref = breve;
+alignment = -1;
+pos = (154,333);
+ref = acute;
 }
 );
 width = 768;
@@ -28,23 +38,34 @@ width = 768;
 {
 anchors = (
 {
+name = _top;
+pos = (480,1118);
+},
+{
 name = top;
-pos = (480,1888);
+pos = (480,1893);
+}
+);
+guides = (
+{
+pos = (0,1632);
+},
+{
+pos = (0,1555);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(568,1618,l),
-(810,1888,l),
-(514,1888,l),
-(384,1618,l)
-);
+alignment = -1;
+pos = (0,-27);
+ref = breve;
 },
 {
-ref = breve;
+alignment = -1;
+pos = (237,627);
+ref = acute;
+scale = (0.8,0.8);
 }
 );
 width = 960;
@@ -52,23 +73,36 @@ width = 960;
 {
 anchors = (
 {
+name = _top;
+pos = (352,1118);
+},
+{
 name = top;
-pos = (352,1846);
+pos = (352,1890);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1529);
+},
+{
+pos = (0,1681);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(368,1586,l),
-(564,1846,l),
-(506,1846,l),
-(322,1586,l)
-);
+alignment = -1;
+pos = (0,-28);
+ref = breve;
 },
 {
-ref = breve;
+alignment = -1;
+pos = (149,333);
+ref = acute;
 }
 );
 width = 704;
@@ -76,23 +110,36 @@ width = 704;
 {
 anchors = (
 {
+name = _top;
+pos = (400,1056);
+},
+{
 name = top;
-pos = (400,1812);
+pos = (400,1826);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+},
+{
+pos = (0,1465);
 }
 );
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(466,1545,l),
-(658,1819,l),
-(464,1819,l),
-(324,1545,l)
-);
+alignment = -1;
+pos = (0,-50);
+ref = breve;
 },
 {
-ref = breve;
+alignment = -1;
+pos = (250,311);
+ref = acute;
 }
 );
 width = 800;
@@ -100,23 +147,36 @@ width = 800;
 {
 anchors = (
 {
+name = _top;
+pos = (480,1056);
+},
+{
 name = top;
-pos = (480,1770);
+pos = (480,1878);
+}
+);
+guides = (
+{
+pos = (0,1584);
+},
+{
+pos = (0,1507);
+},
+{
+pos = (0,1728);
 }
 );
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(582,1534,l),
-(840,1770,l),
-(520,1770,l),
-(374,1534,l)
-);
+alignment = -1;
+ref = breve;
 },
 {
-ref = breve;
+alignment = -1;
+pos = (305,521);
+ref = acute;
+scale = (0.9,0.9);
 }
 );
 width = 960;
@@ -124,8 +184,12 @@ width = 960;
 {
 anchors = (
 {
+name = _top;
+pos = (352,1056);
+},
+{
 name = top;
-pos = (352,1764);
+pos = (352,1826);
 }
 );
 background = {
@@ -141,19 +205,28 @@ nodes = (
 }
 );
 };
+guides = (
+{
+pos = (0,1625);
+},
+{
+pos = (0,1465);
+},
+{
+pos = (0,1552);
+}
+);
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(363,1522,l),
-(539,1764,l),
-(481,1764,l),
-(312,1522,l)
-);
+alignment = -1;
+pos = (0,-50);
+ref = breve;
 },
 {
-ref = breve;
+alignment = -1;
+pos = (219,311);
+ref = acute;
 }
 );
 width = 704;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/brevehookcomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/brevehookcomb.cn.glyph
index 1becefc4a..6b7bdf0fe 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/brevehookcomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/brevehookcomb.cn.glyph
@@ -2,93 +2,216 @@
 glyphname = brevehookcomb.cn;
 layers = (
 {
+anchors = (
+{
+name = _top;
+pos = (384,1118);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1529);
+}
+);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = breve;
 },
 {
 alignment = -1;
-pos = (971,346);
-ref = hookabovecmb;
+pos = (124,333);
+ref = hookabove;
 }
 );
 width = 768;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (480,1118);
+}
+);
+guides = (
+{
+pos = (0,1632);
+},
+{
+pos = (0,1555);
+}
+);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
+alignment = -1;
+pos = (0,-27);
 ref = breve;
 },
 {
 alignment = -1;
-pos = (1144,362);
-ref = hookabovecmb;
+pos = (233,627);
+ref = hookabove;
+scale = (0.8,0.8);
 }
 );
 width = 960;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (352,1118);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1529);
+},
+{
+pos = (0,1681);
+}
+);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = breve;
 },
 {
 alignment = -1;
-pos = (874,306);
-ref = hookabovecmb;
+pos = (134,333);
+ref = hookabove;
 }
 );
 width = 704;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (400,1056);
+}
+);
 guides = (
 {
-pos = (559,1839);
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+},
+{
+pos = (0,1465);
 }
 );
 layerId = m007;
 shapes = (
 {
+alignment = -1;
+pos = (0,-50);
 ref = breve;
 },
 {
 alignment = -1;
-pos = (953,306);
-ref = hookabovecmb;
+pos = (137,311);
+ref = hookabove;
 }
 );
 width = 800;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (480,1056);
+}
+);
+guides = (
+{
+pos = (0,1584);
+},
+{
+pos = (0,1507);
+}
+);
 layerId = m009;
 shapes = (
 {
+alignment = -1;
 ref = breve;
 },
 {
 alignment = -1;
-pos = (1134,370);
-ref = hookabovecmb;
+pos = (192,521);
+ref = hookabove;
+scale = (0.9,0.9);
 }
 );
 width = 960;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (352,1056);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1625);
+},
+{
+pos = (0,1465);
+}
+);
 layerId = m011;
 shapes = (
 {
+alignment = -1;
+pos = (0,-50);
 ref = breve;
 },
 {
 alignment = -1;
-pos = (856,306);
-ref = hookabovecmb;
+pos = (128,311);
+ref = hookabove;
 }
 );
 width = 704;
+},
+{
+associatedMasterId = m009;
+guides = (
+{
+pos = (0,1587);
+}
+);
+layerId = "F0B23CB4-1F9E-4F92-BD34-4A491A3DBC73";
+name = "Apr 13, 23, 08:46";
+shapes = (
+{
+ref = breve;
+},
+{
+alignment = -1;
+pos = (1066,614);
+ref = hookabove;
+scale = (0.9,0.8);
+}
+);
+width = 960;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/breveinv.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/breveinv.cn.glyph
index dbfc2daa4..e92f1b1a0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/breveinv.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/breveinv.cn.glyph
@@ -11,7 +11,7 @@ pos = (362,1118);
 },
 {
 name = top;
-pos = (362,1512);
+pos = (362,1515);
 }
 );
 background = {
@@ -27,20 +27,20 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(216,1520,o),
-(100,1415,o),
-(100,1280,c),
-(143,1280,l),
-(143,1389,o),
-(241,1475,o),
-(362,1475,cs),
-(483,1475,o),
-(581,1389,o),
-(581,1280,c),
-(624,1280,l),
-(624,1415,o),
-(508,1520,o),
-(362,1520,cs)
+(216,1523,o),
+(100,1418,o),
+(100,1283,c),
+(143,1283,l),
+(143,1392,o),
+(241,1478,o),
+(362,1478,cs),
+(483,1478,o),
+(581,1392,o),
+(581,1283,c),
+(624,1283,l),
+(624,1418,o),
+(508,1523,o),
+(362,1523,cs)
 );
 }
 );
@@ -50,17 +50,16 @@ width = 724;
 anchors = (
 {
 name = _top;
-pos = (362,1056);
+pos = (352,1056);
 },
 {
 name = top;
-pos = (362,1448);
+pos = (352,1473);
 }
 );
 background = {
 shapes = (
 {
-pos = (-6,0);
 ref = circumflex;
 }
 );
@@ -70,67 +69,71 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(216,1456,o),
-(100,1351,o),
-(100,1216,c),
-(146,1216,l),
-(146,1325,o),
-(243,1413,o),
-(362,1413,cs),
-(481,1413,o),
-(578,1325,o),
-(578,1216,c),
-(624,1216,l),
-(624,1351,o),
-(508,1456,o),
-(362,1456,cs)
+(206,1481,o),
+(90,1376,o),
+(90,1241,c),
+(136,1241,l),
+(136,1350,o),
+(233,1438,o),
+(352,1438,cs),
+(471,1438,o),
+(568,1350,o),
+(568,1241,c),
+(614,1241,l),
+(614,1376,o),
+(498,1481,o),
+(352,1481,cs)
 );
 }
 );
-width = 724;
+width = 704;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (409,1118);
+pos = (416,1118);
 },
 {
 name = top;
-pos = (409,1550);
+pos = (416,1575);
 }
 );
 background = {
 shapes = (
 {
-pos = (-55,0);
 ref = circumflex;
 }
 );
 };
+guides = (
+{
+pos = (0,1283);
+}
+);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 closed = 1;
 nodes = (
-(236,1558,o),
-(108,1426,o),
-(108,1258,c),
-(236,1258,l),
-(236,1357,o),
-(317,1426,o),
-(409,1426,cs),
-(501,1426,o),
-(582,1357,o),
-(582,1258,c),
-(710,1258,l),
-(710,1426,o),
-(582,1558,o),
-(409,1558,cs)
+(243,1583,o),
+(115,1451,o),
+(115,1283,c),
+(243,1283,l),
+(243,1382,o),
+(324,1451,o),
+(416,1451,cs),
+(508,1451,o),
+(589,1382,o),
+(589,1283,c),
+(717,1283,l),
+(717,1451,o),
+(589,1583,o),
+(416,1583,cs)
 );
 }
 );
-width = 818;
+width = 832;
 },
 {
 anchors = (
@@ -140,13 +143,12 @@ pos = (400,1056);
 },
 {
 name = top;
-pos = (400,1480);
+pos = (400,1505);
 }
 );
 background = {
 shapes = (
 {
-pos = (-31,0);
 ref = circumflex;
 }
 );
@@ -156,20 +158,20 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(231,1488,o),
-(115,1368,o),
-(115,1216,c),
-(243,1216,l),
-(243,1303,o),
-(308,1364,o),
-(400,1364,cs),
-(492,1364,o),
-(557,1303,o),
-(557,1216,c),
-(685,1216,l),
-(685,1368,o),
-(569,1488,o),
-(400,1488,cs)
+(231,1513,o),
+(115,1393,o),
+(115,1241,c),
+(243,1241,l),
+(243,1328,o),
+(308,1389,o),
+(400,1389,cs),
+(492,1389,o),
+(557,1328,o),
+(557,1241,c),
+(685,1241,l),
+(685,1393,o),
+(569,1513,o),
+(400,1513,cs)
 );
 }
 );
@@ -179,17 +181,16 @@ width = 800;
 anchors = (
 {
 name = _top;
-pos = (500,1118);
+pos = (512,1118);
 },
 {
 name = top;
-pos = (500,1582);
+pos = (512,1582);
 }
 );
 background = {
 shapes = (
 {
-pos = (-140,0);
 ref = circumflex;
 }
 );
@@ -199,67 +200,71 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(276,1590,o),
-(108,1443,o),
-(108,1256,c),
-(320,1256,l),
-(320,1334,o),
-(399,1395,o),
-(500,1395,cs),
-(600,1395,o),
-(678,1334,o),
-(678,1256,c),
-(892,1256,l),
-(892,1443,o),
-(724,1590,o),
-(500,1590,cs)
+(288,1590,o),
+(120,1443,o),
+(120,1256,c),
+(332,1256,l),
+(332,1334,o),
+(411,1395,o),
+(512,1395,cs),
+(612,1395,o),
+(690,1334,o),
+(690,1256,c),
+(904,1256,l),
+(904,1443,o),
+(736,1590,o),
+(512,1590,cs)
 );
 }
 );
-width = 1000;
+width = 1024;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (500,1056);
+pos = (432,1056);
 },
 {
 name = top;
-pos = (500,1490);
+pos = (432,1507);
 }
 );
 background = {
 shapes = (
 {
-pos = (-124,0);
 ref = circumflex;
 }
 );
 };
+guides = (
+{
+pos = (0,1181);
+}
+);
 layerId = m009;
 shapes = (
 {
 closed = 1;
 nodes = (
-(276,1498,o),
-(108,1351,o),
-(108,1164,c),
-(328,1164,l),
-(328,1248,o),
-(399,1307,o),
-(500,1307,cs),
-(600,1307,o),
-(670,1248,o),
-(670,1164,c),
-(892,1164,l),
-(892,1351,o),
-(724,1498,o),
-(500,1498,cs)
+(208,1515,o),
+(40,1368,o),
+(40,1181,c),
+(260,1181,l),
+(260,1265,o),
+(331,1324,o),
+(432,1324,cs),
+(532,1324,o),
+(602,1265,o),
+(602,1181,c),
+(824,1181,l),
+(824,1368,o),
+(656,1515,o),
+(432,1515,cs)
 );
 }
 );
-width = 1000;
+width = 864;
 },
 {
 anchors = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/breveinvnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/breveinvnosp.glyph
index 3f9662625..87138a079 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/breveinvnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/breveinvnosp.glyph
@@ -3,14 +3,6 @@ color = (250,227,227,1);
 glyphname = breveinvnosp;
 layers = (
 {
-background = {
-shapes = (
-{
-pos = (-1063,0);
-ref = circumflex;
-}
-);
-};
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
@@ -22,33 +14,17 @@ ref = breveinv.cn;
 width = 0;
 },
 {
-background = {
-shapes = (
-{
-pos = (-1304,0);
-ref = circumflex;
-}
-);
-};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-1162,0);
+pos = (-1178,0);
 ref = breveinv.cn;
 }
 );
 width = 0;
 },
 {
-background = {
-shapes = (
-{
-pos = (-1011,0);
-ref = circumflex;
-}
-);
-};
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
@@ -60,14 +36,6 @@ ref = breveinv.cn;
 width = 0;
 },
 {
-background = {
-shapes = (
-{
-pos = (-996,0);
-ref = circumflex;
-}
-);
-};
 layerId = m007;
 shapes = (
 {
@@ -79,33 +47,17 @@ ref = breveinv.cn;
 width = 0;
 },
 {
-background = {
-shapes = (
-{
-pos = (-1272,0);
-ref = circumflex;
-}
-);
-};
 layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1150,0);
+pos = (-1085,0);
 ref = breveinv.cn;
 }
 );
 width = 0;
 },
 {
-background = {
-shapes = (
-{
-pos = (-895,0);
-ref = circumflex;
-}
-);
-};
 layerId = m011;
 shapes = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/breveinvsubnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/breveinvsubnosp.glyph
index 49f94928d..6cfb55d00 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/breveinvsubnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/breveinvsubnosp.glyph
@@ -6,29 +6,14 @@ layers = (
 anchors = (
 {
 name = _bottom;
-pos = (-605,0);
+pos = (-595,0);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-305,-261,o),
-(-418,-150,o),
-(-605,-150,cs),
-(-791,-150,o),
-(-907,-261,o),
-(-907,-418,c),
-(-747,-418,l),
-(-747,-343,o),
-(-709,-272,o),
-(-605,-272,cs),
-(-506,-272,o),
-(-465,-340,o),
-(-465,-418,c),
-(-305,-418,l)
-);
+pos = (-5,-1731);
+ref = breveinvnosp;
 }
 );
 width = 0;
@@ -37,29 +22,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-658,0);
+pos = (-665,0);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-260,-229,o),
-(-412,-96,o),
-(-658,-96,cs),
-(-904,-96,o),
-(-1060,-229,o),
-(-1060,-418,c),
-(-806,-418,l),
-(-806,-357,o),
-(-764,-298,o),
-(-658,-298,cs),
-(-552,-298,o),
-(-512,-357,o),
-(-512,-418,c),
-(-260,-418,l)
-);
+pos = (-15,-1715);
+ref = breveinvnosp;
 }
 );
 width = 0;
@@ -68,29 +38,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-576,0);
+pos = (-582,0);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-412,-203,o),
-(-473,-140,o),
-(-576,-140,cs),
-(-677,-140,o),
-(-738,-203,o),
-(-738,-306,c),
-(-692,-306,l),
-(-692,-228,o),
-(-651,-186,o),
-(-576,-186,cs),
-(-500,-186,o),
-(-458,-228,o),
-(-458,-306,c),
-(-412,-306,l)
-);
+pos = (0,-1663);
+ref = breveinvnosp;
 }
 );
 width = 0;
@@ -105,23 +60,8 @@ pos = (-564,0);
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-264,-261,o),
-(-377,-150,o),
-(-564,-150,cs),
-(-750,-150,o),
-(-866,-261,o),
-(-866,-418,c),
-(-706,-418,l),
-(-706,-343,o),
-(-668,-272,o),
-(-564,-272,cs),
-(-465,-272,o),
-(-424,-340,o),
-(-424,-418,c),
-(-264,-418,l)
-);
+pos = (0,-1691);
+ref = breveinvnosp;
 }
 );
 width = 0;
@@ -130,29 +70,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-642,0);
+pos = (-654,0);
 }
 );
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-244,-229,o),
-(-396,-96,o),
-(-642,-96,cs),
-(-888,-96,o),
-(-1044,-229,o),
-(-1044,-418,c),
-(-790,-418,l),
-(-790,-357,o),
-(-748,-298,o),
-(-642,-298,cs),
-(-536,-298,o),
-(-496,-357,o),
-(-496,-418,c),
-(-244,-418,l)
-);
+pos = (-1,-1622);
+ref = breveinvnosp;
 }
 );
 width = 0;
@@ -161,29 +86,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-514,0);
+pos = (-534,0);
 }
 );
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-350,-203,o),
-(-411,-140,o),
-(-514,-140,cs),
-(-615,-140,o),
-(-676,-203,o),
-(-676,-306,c),
-(-630,-306,l),
-(-630,-228,o),
-(-589,-186,o),
-(-514,-186,cs),
-(-438,-186,o),
-(-396,-228,o),
-(-396,-306,c),
-(-350,-306,l)
-);
+pos = (5,-1675);
+ref = breveinvnosp;
 }
 );
 width = 0;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/brevenosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/brevenosp.glyph
index 62f9f7311..61bf267ec 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/brevenosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/brevenosp.glyph
@@ -6,23 +6,9 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-448,1420,o),
-(-489,1353,o),
-(-588,1352,cs),
-(-689,1353,o),
-(-730,1420,o),
-(-730,1496,c),
-(-890,1496,l),
-(-890,1338,o),
-(-774,1228,o),
-(-588,1228,cs),
-(-404,1228,o),
-(-288,1338,o),
-(-288,1496,c),
-(-448,1496,l)
-);
+alignment = -1;
+pos = (-967,0);
+ref = breve;
 }
 );
 width = 0;
@@ -31,48 +17,20 @@ width = 0;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-557,1492,o),
-(-595,1434,o),
-(-702,1434,cs),
-(-810,1434,o),
-(-851,1495,o),
-(-850,1556,c),
-(-1100,1556,l),
-(-1101,1364,o),
-(-944,1233,o),
-(-702,1234,cs),
-(-458,1233,o),
-(-301,1364,o),
-(-300,1556,c),
-(-556,1556,l)
-);
+alignment = -1;
+pos = (-1145,0);
+ref = breve;
 }
 );
-width = 30;
+width = 0;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-404,1412,o),
-(-445,1370,o),
-(-520,1370,cs),
-(-596,1370,o),
-(-637,1412,o),
-(-638,1490,c),
-(-684,1490,l),
-(-684,1387,o),
-(-623,1324,o),
-(-520,1324,cs),
-(-419,1324,o),
-(-358,1387,o),
-(-358,1490,c),
-(-404,1490,l)
-);
+alignment = -1;
+pos = (-920,0);
+ref = breve;
 }
 );
 width = 0;
@@ -81,23 +39,9 @@ width = 0;
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-480,1420,o),
-(-521,1353,o),
-(-620,1352,cs),
-(-721,1353,o),
-(-762,1420,o),
-(-762,1496,c),
-(-922,1496,l),
-(-922,1338,o),
-(-806,1228,o),
-(-620,1228,cs),
-(-436,1228,o),
-(-320,1338,o),
-(-320,1496,c),
-(-480,1496,l)
-);
+alignment = -1;
+pos = (-959,0);
+ref = breve;
 }
 );
 width = 0;
@@ -106,23 +50,9 @@ width = 0;
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-573,1492,o),
-(-611,1434,o),
-(-718,1434,cs),
-(-826,1434,o),
-(-867,1495,o),
-(-866,1556,c),
-(-1116,1556,l),
-(-1117,1364,o),
-(-960,1233,o),
-(-718,1234,cs),
-(-474,1233,o),
-(-317,1364,o),
-(-316,1556,c),
-(-572,1556,l)
-);
+alignment = -1;
+pos = (-1128,0);
+ref = breve;
 }
 );
 width = 0;
@@ -131,23 +61,9 @@ width = 0;
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-468,1412,o),
-(-509,1370,o),
-(-584,1370,cs),
-(-660,1370,o),
-(-701,1412,o),
-(-702,1490,c),
-(-748,1490,l),
-(-748,1387,o),
-(-687,1324,o),
-(-584,1324,cs),
-(-483,1324,o),
-(-422,1387,o),
-(-422,1490,c),
-(-468,1490,l)
-);
+alignment = -1;
+pos = (-873,0);
+ref = breve;
 }
 );
 width = 0;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/brevesubnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/brevesubnosp.glyph
index 32a348a42..66788db5f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/brevesubnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/brevesubnosp.glyph
@@ -6,29 +6,15 @@ layers = (
 anchors = (
 {
 name = _bottom;
-pos = (-588,0);
+pos = (-599,0);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-448,-172,o),
-(-489,-241,o),
-(-590,-242,cs),
-(-689,-241,o),
-(-730,-175,o),
-(-730,-96,c),
-(-890,-96,l),
-(-890,-250,o),
-(-774,-367,o),
-(-588,-366,cs),
-(-404,-367,o),
-(-288,-256,o),
-(-288,-96,c),
-(-448,-96,l)
-);
+alignment = -1;
+pos = (-983,-1719);
+ref = breve;
 }
 );
 width = 0;
@@ -37,29 +23,15 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-704,-2);
+pos = (-670,0);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-554,-134,o),
-(-598,-198,o),
-(-702,-198,cs),
-(-810,-198,o),
-(-851,-137,o),
-(-850,-76,c),
-(-1100,-76,l),
-(-1101,-271,o),
-(-941,-399,o),
-(-704,-398,cs),
-(-455,-399,o),
-(-304,-259,o),
-(-302,-76,c),
-(-552,-76,l)
-);
+alignment = -1;
+pos = (-1150,-1721);
+ref = breve;
 }
 );
 width = 30;
@@ -68,29 +40,15 @@ width = 30;
 anchors = (
 {
 name = _bottom;
-pos = (-518,2);
+pos = (-575,0);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-409,-185,o),
-(-449,-227,o),
-(-526,-226,cs),
-(-601,-227,o),
-(-641,-185,o),
-(-642,-108,c),
-(-688,-108,l),
-(-688,-210,o),
-(-627,-273,o),
-(-526,-274,cs),
-(-423,-273,o),
-(-362,-210,o),
-(-362,-108,c),
-(-408,-108,l)
-);
+alignment = -1;
+pos = (-927,-1687);
+ref = breve;
 }
 );
 width = 0;
@@ -99,29 +57,15 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-620,0);
+pos = (-567,0);
 }
 );
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-480,-172,o),
-(-521,-241,o),
-(-622,-242,cs),
-(-721,-241,o),
-(-762,-175,o),
-(-762,-96,c),
-(-922,-96,l),
-(-922,-250,o),
-(-806,-367,o),
-(-620,-366,cs),
-(-436,-367,o),
-(-320,-256,o),
-(-320,-96,c),
-(-480,-96,l)
-);
+alignment = -1;
+pos = (-967,-1697);
+ref = breve;
 }
 );
 width = 0;
@@ -130,29 +74,15 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-720,-2);
+pos = (-651,0);
 }
 );
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-570,-134,o),
-(-614,-198,o),
-(-718,-198,cs),
-(-826,-198,o),
-(-867,-137,o),
-(-866,-76,c),
-(-1116,-76,l),
-(-1117,-271,o),
-(-957,-399,o),
-(-720,-398,cs),
-(-471,-399,o),
-(-320,-259,o),
-(-318,-76,c),
-(-568,-76,l)
-);
+alignment = -1;
+pos = (-1131,-1615);
+ref = breve;
 }
 );
 width = 0;
@@ -161,29 +91,15 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-582,2);
+pos = (-535,0);
 }
 );
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-473,-185,o),
-(-513,-227,o),
-(-590,-226,cs),
-(-665,-227,o),
-(-705,-185,o),
-(-706,-108,c),
-(-752,-108,l),
-(-752,-210,o),
-(-691,-273,o),
-(-590,-274,cs),
-(-487,-273,o),
-(-426,-210,o),
-(-426,-108,c),
-(-472,-108,l)
-);
+alignment = -1;
+pos = (-887,-1706);
+ref = breve;
 }
 );
 width = 0;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/brevetildecomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/brevetildecomb.cn.glyph
index 7a2657b76..730d454cb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/brevetildecomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/brevetildecomb.cn.glyph
@@ -9,34 +9,49 @@ pos = (384,1118);
 },
 {
 name = top;
-pos = (384,1885);
+pos = (384,1846);
 }
 );
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(557,1250,o),
-(685,1382,o),
-(685,1550,c),
-(557,1550,l),
-(557,1451,o),
-(476,1382,o),
-(384,1382,cs),
-(292,1382,o),
-(211,1451,o),
-(211,1550,c),
-(83,1550,l),
-(83,1382,o),
-(211,1250,o),
-(384,1250,cs)
+ref = breve;
+}
 );
+};
+guides = (
+{
+pos = (0,1529);
 },
 {
+pos = (0,1717);
+}
+);
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
 alignment = -1;
-pos = (-136,368);
+pos = (-124,329);
 ref = tilde;
+},
+{
+closed = 1;
+nodes = (
+(544,1249,o),
+(669,1372,o),
+(669,1529,c),
+(541,1529,l),
+(541,1437,o),
+(476,1373,o),
+(384,1373,cs),
+(292,1373,o),
+(227,1437,o),
+(227,1529,c),
+(99,1529,l),
+(99,1372,o),
+(224,1249,o),
+(384,1249,cs)
+);
 }
 );
 width = 768;
@@ -49,34 +64,46 @@ pos = (480,1118);
 },
 {
 name = top;
-pos = (480,1974);
+pos = (480,1886);
+}
+);
+guides = (
+{
+pos = (0,1632);
+},
+{
+pos = (0,1555);
+},
+{
+pos = (0,1765);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
+alignment = -1;
+pos = (-21,582);
+ref = tilde;
+scale = (1,0.83);
+},
+{
 closed = 1;
 nodes = (
-(704,1256,o),
-(872,1403,o),
-(872,1590,c),
-(658,1590,l),
-(658,1512,o),
-(580,1451,o),
-(480,1451,cs),
-(379,1451,o),
-(300,1512,o),
-(300,1590,c),
-(88,1590,l),
-(88,1403,o),
-(256,1256,o),
-(480,1256,cs)
+(704,1221,o),
+(872,1368,o),
+(872,1555,c),
+(658,1555,l),
+(658,1477,o),
+(580,1416,o),
+(480,1416,cs),
+(379,1416,o),
+(300,1477,o),
+(300,1555,c),
+(88,1555,l),
+(88,1368,o),
+(256,1221,o),
+(480,1221,cs)
 );
-},
-{
-alignment = -1;
-pos = (-32,406);
-ref = tilde;
 }
 );
 width = 960;
@@ -92,74 +119,229 @@ name = top;
 pos = (352,1823);
 }
 );
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1529);
+},
+{
+pos = (0,1681);
+}
+);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
+alignment = -1;
+pos = (-136,335);
+ref = tilde;
+},
+{
 closed = 1;
 nodes = (
-(498,1272,o),
-(614,1377,o),
-(614,1512,c),
-(568,1512,l),
-(568,1403,o),
-(473,1317,o),
-(352,1317,cs),
-(231,1317,o),
-(136,1403,o),
-(136,1512,c),
-(90,1512,l),
-(90,1377,o),
-(206,1272,o),
-(352,1272,cs)
+(499,1267,o),
+(614,1384,o),
+(614,1529,c),
+(568,1529,l),
+(568,1408,o),
+(471,1311,o),
+(352,1311,cs),
+(233,1311,o),
+(136,1408,o),
+(136,1529,c),
+(90,1529,l),
+(90,1384,o),
+(205,1267,o),
+(352,1267,cs)
 );
+}
+);
+width = 704;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (400,1056);
+},
+{
+name = top;
+pos = (400,1773);
+}
+);
+background = {
+shapes = (
+{
+ref = breve;
+}
+);
+};
+guides = (
+{
+pos = (0,1328);
 },
 {
+pos = (0,1465);
+},
+{
+pos = (0,1676);
+}
+);
+layerId = m007;
+shapes = (
+{
 alignment = -1;
-pos = (-136,370);
+pos = (-78,298);
 ref = tilde;
+},
+{
+closed = 1;
+nodes = (
+(560,1185,o),
+(685,1308,o),
+(685,1465,c),
+(557,1465,l),
+(557,1373,o),
+(492,1309,o),
+(400,1309,cs),
+(308,1309,o),
+(243,1373,o),
+(243,1465,c),
+(115,1465,l),
+(115,1308,o),
+(240,1185,o),
+(400,1185,cs)
+);
 }
 );
-width = 704;
+width = 800;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (400,1056);
+pos = (486,1056);
 },
 {
 name = top;
-pos = (400,1797);
+pos = (485,1867);
 }
 );
-layerId = m007;
+background = {
 shapes = (
 {
+ref = breve;
+}
+);
+};
+guides = (
+{
+pos = (0,1587);
+},
+{
+pos = (0,1507);
+},
+{
+pos = (0,1728);
+}
+);
+layerId = m009;
+shapes = (
+{
+alignment = -1;
+pos = (-18,514);
+ref = tilde;
+scale = (1,0.9);
+},
+{
 closed = 1;
 nodes = (
-(569,1208,o),
-(685,1328,o),
-(685,1480,c),
-(557,1480,l),
-(557,1393,o),
-(492,1332,o),
-(400,1332,cs),
-(308,1332,o),
-(243,1393,o),
-(243,1480,c),
-(119,1480,l),
-(119,1328,o),
-(231,1208,o),
-(400,1208,cs)
+(698,1173,o),
+(872,1320,o),
+(872,1507,c),
+(650,1507,l),
+(650,1423,o),
+(574,1364,o),
+(474,1364,cs),
+(373,1364,o),
+(297,1423,o),
+(297,1507,c),
+(99,1507,l),
+(99,1320,o),
+(250,1173,o),
+(474,1173,cs)
+);
+}
+);
+width = 960;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (352,1056);
+},
+{
+name = top;
+pos = (352,1757);
+}
 );
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1625);
 },
 {
+pos = (0,1465);
+}
+);
+layerId = m011;
+shapes = (
+{
 alignment = -1;
-pos = (-75,322);
+pos = (-80,305);
 ref = tilde;
+},
+{
+closed = 1;
+nodes = (
+(499,1203,o),
+(614,1320,o),
+(614,1465,c),
+(568,1465,l),
+(568,1344,o),
+(471,1249,o),
+(352,1249,cs),
+(233,1249,o),
+(136,1344,o),
+(136,1465,c),
+(90,1465,l),
+(90,1320,o),
+(205,1203,o),
+(352,1203,cs)
+);
 }
 );
-width = 800;
+width = 704;
+},
+{
+associatedMasterId = m009;
+layerId = "02AF1C6D-F5F2-4D81-B8D1-70D57DA9C4BD";
+name = "Apr 11, 23, 18:29";
+shapes = (
+{
+ref = breve;
+},
+{
+alignment = -1;
+pos = (-17,381);
+ref = tilde;
+}
+);
+width = 960;
 },
 {
 anchors = (
@@ -172,7 +354,14 @@ name = top;
 pos = (480,1869);
 }
 );
-layerId = m009;
+associatedMasterId = m009;
+guides = (
+{
+pos = (0,1587);
+}
+);
+layerId = "532F18A0-6A67-468E-BCBC-F2577CAB110B";
+name = "Apr 13, 23, 08:51";
 shapes = (
 {
 closed = 1;
@@ -204,55 +393,27 @@ width = 960;
 {
 anchors = (
 {
-name = _top;
-pos = (352,1056);
-},
-{
 name = top;
-pos = (352,1772);
+pos = (480,1862);
 }
 );
-layerId = m011;
-shapes = (
-{
-closed = 1;
-nodes = (
-(498,1216,o),
-(614,1321,o),
-(614,1456,c),
-(568,1456,l),
-(568,1347,o),
-(471,1259,o),
-(352,1259,cs),
-(233,1259,o),
-(136,1347,o),
-(136,1456,c),
-(90,1456,l),
-(90,1321,o),
-(206,1216,o),
-(352,1216,cs)
-);
-},
+associatedMasterId = m009;
+guides = (
 {
-alignment = -1;
-pos = (-80,320);
-ref = tilde;
+pos = (0,1587);
 }
 );
-width = 704;
-},
-{
-associatedMasterId = m009;
-layerId = "02AF1C6D-F5F2-4D81-B8D1-70D57DA9C4BD";
-name = "Apr 11, 23, 18:29";
+layerId = "139E0FC0-D429-4729-AE0F-A144D46957C7";
+name = "Apr 13, 23, 08:53";
 shapes = (
 {
 ref = breve;
 },
 {
 alignment = -1;
-pos = (-17,381);
+pos = (-28,521);
 ref = tilde;
+scale = (1,0.9);
 }
 );
 width = 960;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/cacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/cacute.glyph
index 9eaa411f9..1f11d73a3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/cacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/cacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (254,0);
+pos = (362,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (252,0);
+pos = (338,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (308,0);
+pos = (376,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (211,0);
+pos = (398,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (196,0);
+pos = (388,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (246,0);
+pos = (400,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/caron.glyph b/src/Inter-Roman.glyphspackage/glyphs/caron.glyph
index fe34641c1..0f03f501d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/caron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/caron.glyph
@@ -5,16 +5,17 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (466,1118);
+pos = (416,1118);
 },
 {
 name = top;
-pos = (466,1574);
+pos = (416,1557);
 }
 );
 background = {
 shapes = (
 {
+pos = (-48,0);
 ref = acute;
 }
 );
@@ -24,56 +25,62 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(152,1574,l),
-(152,1562,l),
-(386,1258,l),
-(544,1258,l),
-(780,1562,l),
-(780,1574,l),
-(616,1574,l),
-(466,1370,l),
-(314,1574,l)
+(102,1557,l),
+(102,1548,l),
+(332,1283,l),
+(498,1283,l),
+(730,1548,l),
+(730,1557,l),
+(558,1557,l),
+(416,1381,l),
+(272,1557,l)
 );
 }
 );
-width = 930;
+width = 832;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (646,1118);
+pos = (512,1118);
 },
 {
 name = top;
-pos = (646,1582);
+pos = (512,1582);
 }
 );
 background = {
 shapes = (
 {
+pos = (-134,0);
 ref = acute;
 }
 );
 };
+guides = (
+{
+pos = (0,1256);
+}
+);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 closed = 1;
 nodes = (
-(172,1582,l),
-(172,1576,l),
-(506,1256,l),
-(786,1256,l),
-(1120,1576,l),
-(1120,1582,l),
-(788,1582,l),
-(646,1416,l),
-(504,1582,l)
+(38,1582,l),
+(38,1576,l),
+(372,1256,l),
+(652,1256,l),
+(986,1576,l),
+(986,1582,l),
+(654,1582,l),
+(512,1416,l),
+(370,1582,l)
 );
 }
 );
-width = 1292;
+width = 1024;
 },
 {
 anchors = (
@@ -83,7 +90,7 @@ pos = (432,1118);
 },
 {
 name = top;
-pos = (432,1552);
+pos = (432,1557);
 }
 );
 background = {
@@ -98,34 +105,35 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(159,1552,l),
-(159,1546,l),
-(425,1272,l),
-(437,1272,l),
-(705,1546,l),
-(705,1552,l),
-(649,1552,l),
-(431,1328,l),
-(213,1552,l)
+(159,1557,l),
+(159,1551,l),
+(425,1277,l),
+(437,1277,l),
+(705,1551,l),
+(705,1557,l),
+(649,1557,l),
+(431,1333,l),
+(213,1557,l)
 );
 }
 );
-width = 862;
+width = 864;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (434,1056);
+pos = (400,1056);
 },
 {
 name = top;
-pos = (434,1490);
+pos = (400,1515);
 }
 );
 background = {
 shapes = (
 {
+pos = (-34,0);
 ref = acute;
 }
 );
@@ -135,71 +143,78 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(120,1490,l),
-(120,1489,l),
-(350,1216,l),
-(516,1216,l),
-(748,1489,l),
-(748,1490,l),
-(576,1490,l),
-(434,1314,l),
-(290,1490,l)
+(86,1515,l),
+(86,1514,l),
+(316,1241,l),
+(482,1241,l),
+(714,1514,l),
+(714,1515,l),
+(542,1515,l),
+(400,1339,l),
+(256,1515,l)
 );
 }
 );
-width = 866;
+width = 800;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (628,1056);
+pos = (432,1056);
 },
 {
 name = top;
-pos = (628,1490);
+pos = (432,1507);
 }
 );
 background = {
 shapes = (
 {
+pos = (-64,0);
 ref = acute;
 }
 );
 };
+guides = (
+{
+pos = (0,1181);
+}
+);
 layerId = m009;
 shapes = (
 {
 closed = 1;
 nodes = (
-(222,1490,l),
-(222,1489,l),
-(476,1164,l),
-(772,1164,l),
-(1034,1489,l),
-(1034,1490,l),
-(750,1490,l),
-(624,1330,l),
-(506,1490,l)
+(26,1507,l),
+(26,1506,l),
+(280,1181,l),
+(576,1181,l),
+(838,1506,l),
+(838,1507,l),
+(554,1507,l),
+(428,1347,l),
+(310,1507,l)
 );
 }
 );
-width = 1260;
+width = 864;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (368,1056);
+pos = (352,1056);
 },
 {
 name = top;
-pos = (368,1490);
+pos = (352,1515);
 }
 );
 background = {
 shapes = (
 {
+pos = (-16,0);
 ref = acute;
 }
 );
@@ -209,19 +224,19 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(93,1490,l),
-(93,1489,l),
-(345,1216,l),
-(389,1216,l),
-(643,1489,l),
-(643,1490,l),
-(584,1490,l),
-(367,1255,l),
-(153,1490,l)
+(77,1515,l),
+(77,1514,l),
+(329,1241,l),
+(373,1241,l),
+(627,1514,l),
+(627,1515,l),
+(569,1515,l),
+(351,1280,l),
+(136,1515,l)
 );
 }
 );
-width = 734;
+width = 704;
 },
 {
 anchors = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/caroncmb.glyph b/src/Inter-Roman.glyphspackage/glyphs/caroncmb.glyph
index 1e28dd245..fb771d308 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/caroncmb.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/caroncmb.glyph
@@ -7,7 +7,7 @@ layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (136,0);
+pos = (-1012,0);
 ref = caron;
 }
 );
@@ -18,7 +18,7 @@ layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (16,0);
+pos = (-1180,0);
 ref = caron;
 }
 );
@@ -29,7 +29,7 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (152,0);
+pos = (-1018,0);
 ref = caron;
 }
 );
@@ -40,7 +40,7 @@ layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (140,0);
+pos = (-957,0);
 ref = caron;
 }
 );
@@ -51,7 +51,7 @@ layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (16,0);
+pos = (-1087,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (167,0);
+pos = (-889,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/carondot.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/carondot.lc.glyph
new file mode 100644
index 000000000..83e746541
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/carondot.lc.glyph
@@ -0,0 +1,201 @@
+{
+glyphname = carondot.lc;
+layers = (
+{
+anchors = (
+{
+name = _top;
+pos = (414,1118);
+}
+);
+guides = (
+{
+pos = (0,1392);
+},
+{
+pos = (0,1717);
+},
+{
+pos = (0,1529);
+}
+);
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+alignment = -1;
+pos = (-2,-28);
+ref = caron;
+},
+{
+alignment = -1;
+pos = (170,297);
+ref = dotaccent;
+}
+);
+width = 828;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (574,1118);
+}
+);
+guides = (
+{
+pos = (1239,1765);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1555);
+}
+);
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+alignment = -1;
+pos = (62,-27);
+ref = caron;
+},
+{
+alignment = -1;
+pos = (287,685);
+ref = dotaccent;
+scale = (0.8578,0.7628);
+}
+);
+width = 1148;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (363,1118);
+}
+);
+guides = (
+{
+pos = (0,1529);
+},
+{
+pos = (0,1681);
+}
+);
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+alignment = -1;
+pos = (-69,-28);
+ref = caron;
+},
+{
+alignment = -1;
+pos = (177,261);
+ref = dotaccent;
+}
+);
+width = 726;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (414,1056);
+}
+);
+guides = (
+{
+pos = (0,1328);
+},
+{
+pos = (0,1465);
+},
+{
+pos = (0,1676);
+}
+);
+layerId = m007;
+shapes = (
+{
+alignment = -1;
+pos = (14,-50);
+ref = caron;
+},
+{
+alignment = -1;
+pos = (202,298);
+ref = dotaccent;
+}
+);
+width = 828;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (486,1056);
+}
+);
+guides = (
+{
+pos = (0,1728);
+},
+{
+pos = (0,1507);
+}
+);
+layerId = m009;
+shapes = (
+{
+alignment = -1;
+pos = (54,0);
+ref = caron;
+},
+{
+alignment = -1;
+pos = (166,384);
+ref = dotaccent;
+}
+);
+width = 972;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (365,1056);
+}
+);
+guides = (
+{
+pos = (894,1625);
+},
+{
+pos = (0,1625);
+},
+{
+pos = (0,1465);
+}
+);
+layerId = m011;
+shapes = (
+{
+alignment = -1;
+pos = (13,-50);
+ref = caron;
+},
+{
+alignment = -1;
+pos = (243,247);
+ref = dotaccent;
+}
+);
+width = 730;
+}
+);
+tags = (
+"TODO-opsz"
+);
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/carondot.uc.glyph b/src/Inter-Roman.glyphspackage/glyphs/carondot.uc.glyph
new file mode 100644
index 000000000..065768ee1
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/carondot.uc.glyph
@@ -0,0 +1,70 @@
+{
+case = minor;
+color = 4;
+glyphname = carondot.uc;
+layers = (
+{
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+pos = (0,372);
+ref = carondot.lc;
+}
+);
+width = 828;
+},
+{
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+pos = (0,372);
+ref = carondot.lc;
+}
+);
+width = 1148;
+},
+{
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+pos = (0,372);
+ref = carondot.lc;
+}
+);
+width = 726;
+},
+{
+layerId = m007;
+shapes = (
+{
+pos = (0,434);
+ref = carondot.lc;
+}
+);
+width = 828;
+},
+{
+layerId = m009;
+shapes = (
+{
+pos = (0,434);
+ref = carondot.lc;
+}
+);
+width = 972;
+},
+{
+layerId = m011;
+shapes = (
+{
+pos = (0,434);
+ref = carondot.lc;
+}
+);
+width = 730;
+}
+);
+tags = (
+"TODO-opsz"
+);
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/carondotcomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/carondotcomb.cn.glyph
deleted file mode 100644
index 83bcd0211..000000000
--- a/src/Inter-Roman.glyphspackage/glyphs/carondotcomb.cn.glyph
+++ /dev/null
@@ -1,267 +0,0 @@
-{
-color = 4;
-glyphname = carondotcomb.cn;
-layers = (
-{
-anchors = (
-{
-name = _top;
-pos = (-590,1262);
-}
-);
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-704,1545,o),
-(-663,1498,o),
-(-590,1498,cs),
-(-515,1498,o),
-(-474,1545,o),
-(-474,1606,cs),
-(-474,1667,o),
-(-512,1716,o),
-(-590,1716,cs),
-(-663,1716,o),
-(-704,1670,o),
-(-704,1606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-904,1458,l),
-(-904,1438,l),
-(-652,1222,l),
-(-532,1222,l),
-(-274,1440,l),
-(-274,1458,l),
-(-446,1458,l),
-(-590,1332,l),
-(-736,1458,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-706,1208);
-}
-);
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-864,1571,o),
-(-797,1519,o),
-(-706,1518,cs),
-(-617,1519,o),
-(-550,1571,o),
-(-550,1640,cs),
-(-550,1711,o),
-(-617,1766,o),
-(-706,1766,cs),
-(-797,1766,o),
-(-864,1711,o),
-(-864,1640,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-1154,1464,l),
-(-1154,1452,l),
-(-838,1208,l),
-(-568,1208,l),
-(-256,1446,l),
-(-256,1464,l),
-(-576,1464,l),
-(-704,1358,l),
-(-832,1464,l)
-);
-}
-);
-width = 26;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-520,1298);
-}
-);
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-564,1560,o),
-(-543,1539,o),
-(-518,1538,cs),
-(-492,1539,o),
-(-471,1560,o),
-(-472,1586,cs),
-(-471,1611,o),
-(-492,1632,o),
-(-518,1632,cs),
-(-543,1632,o),
-(-564,1611,o),
-(-564,1586,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-796,1468,l),
-(-796,1462,l),
-(-528,1232,l),
-(-516,1232,l),
-(-248,1462,l),
-(-248,1468,l),
-(-306,1468,l),
-(-522,1284,l),
-(-736,1468,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-622,1262);
-}
-);
-layerId = m007;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-736,1545,o),
-(-695,1498,o),
-(-622,1498,cs),
-(-547,1498,o),
-(-506,1545,o),
-(-506,1606,cs),
-(-506,1667,o),
-(-544,1716,o),
-(-622,1716,cs),
-(-695,1716,o),
-(-736,1670,o),
-(-736,1606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-936,1458,l),
-(-936,1438,l),
-(-684,1222,l),
-(-564,1222,l),
-(-306,1440,l),
-(-306,1458,l),
-(-478,1458,l),
-(-622,1332,l),
-(-768,1458,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-722,1208);
-}
-);
-layerId = m009;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-880,1571,o),
-(-813,1519,o),
-(-722,1518,cs),
-(-633,1519,o),
-(-566,1571,o),
-(-566,1640,cs),
-(-566,1711,o),
-(-633,1766,o),
-(-722,1766,cs),
-(-813,1766,o),
-(-880,1711,o),
-(-880,1640,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-1170,1464,l),
-(-1170,1452,l),
-(-854,1208,l),
-(-584,1208,l),
-(-272,1446,l),
-(-272,1464,l),
-(-592,1464,l),
-(-720,1358,l),
-(-848,1464,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-584,1298);
-}
-);
-layerId = m011;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-628,1560,o),
-(-607,1539,o),
-(-582,1538,cs),
-(-556,1539,o),
-(-535,1560,o),
-(-536,1586,cs),
-(-535,1611,o),
-(-556,1632,o),
-(-582,1632,cs),
-(-607,1632,o),
-(-628,1611,o),
-(-628,1586,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-860,1468,l),
-(-860,1462,l),
-(-592,1232,l),
-(-580,1232,l),
-(-312,1462,l),
-(-312,1468,l),
-(-370,1468,l),
-(-586,1284,l),
-(-800,1468,l)
-);
-}
-);
-width = 0;
-}
-);
-tags = (
-"TODO-opsz"
-);
-}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/carondotcomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/carondotcomb.lc.glyph
deleted file mode 100644
index 7ed0fc21e..000000000
--- a/src/Inter-Roman.glyphspackage/glyphs/carondotcomb.lc.glyph
+++ /dev/null
@@ -1,290 +0,0 @@
-{
-glyphname = carondotcomb.lc;
-layers = (
-{
-anchors = (
-{
-name = _top;
-pos = (-590,1292);
-},
-{
-name = mkmktop_acc;
-pos = (-590,1922);
-}
-);
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-904,1538,l),
-(-904,1528,l),
-(-652,1254,l),
-(-530,1254,l),
-(-274,1528,l),
-(-274,1538,l),
-(-446,1538,l),
-(-590,1374,l),
-(-736,1538,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-704,1652,o),
-(-666,1600,o),
-(-590,1600,cs),
-(-515,1600,o),
-(-474,1649,o),
-(-474,1710,cs),
-(-474,1772,o),
-(-515,1821,o),
-(-590,1822,cs),
-(-666,1821,o),
-(-704,1769,o),
-(-704,1710,cs)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-710,1292);
-},
-{
-name = mkmktop_acc;
-pos = (-710,2072);
-}
-);
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-1186,1536,l),
-(-1186,1528,l),
-(-832,1240,l),
-(-588,1240,l),
-(-236,1524,l),
-(-236,1536,l),
-(-552,1536,l),
-(-710,1414,l),
-(-864,1536,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-893,1687,o),
-(-815,1620,o),
-(-710,1620,cs),
-(-605,1620,o),
-(-529,1687,o),
-(-530,1780,cs),
-(-529,1876,o),
-(-602,1943,o),
-(-710,1944,cs),
-(-817,1943,o),
-(-893,1876,o),
-(-894,1780,cs)
-);
-}
-);
-width = 24;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-520,1292);
-},
-{
-name = mkmktop_acc;
-pos = (-520,1836);
-}
-);
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-788,1536,l),
-(-788,1530,l),
-(-520,1256,l),
-(-510,1256,l),
-(-242,1530,l),
-(-242,1536,l),
-(-296,1536,l),
-(-514,1312,l),
-(-734,1536,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-563,1650,o),
-(-542,1629,o),
-(-516,1630,cs),
-(-491,1629,o),
-(-470,1650,o),
-(-470,1676,cs),
-(-470,1701,o),
-(-491,1722,o),
-(-516,1722,cs),
-(-542,1722,o),
-(-563,1701,o),
-(-562,1676,cs)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-622,1292);
-},
-{
-name = mkmktop_acc;
-pos = (-622,1922);
-}
-);
-layerId = m007;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-936,1538,l),
-(-936,1528,l),
-(-684,1254,l),
-(-562,1254,l),
-(-306,1528,l),
-(-306,1538,l),
-(-478,1538,l),
-(-622,1374,l),
-(-768,1538,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-736,1652,o),
-(-698,1600,o),
-(-622,1600,cs),
-(-547,1600,o),
-(-506,1649,o),
-(-506,1710,cs),
-(-506,1772,o),
-(-547,1821,o),
-(-622,1822,cs),
-(-698,1821,o),
-(-736,1769,o),
-(-736,1710,cs)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-726,1292);
-},
-{
-name = mkmktop_acc;
-pos = (-726,2072);
-}
-);
-layerId = m009;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-1202,1536,l),
-(-1202,1528,l),
-(-848,1240,l),
-(-604,1240,l),
-(-252,1524,l),
-(-252,1536,l),
-(-568,1536,l),
-(-726,1414,l),
-(-880,1536,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-909,1687,o),
-(-831,1620,o),
-(-726,1620,cs),
-(-621,1620,o),
-(-545,1687,o),
-(-546,1780,cs),
-(-545,1876,o),
-(-618,1943,o),
-(-726,1944,cs),
-(-833,1943,o),
-(-909,1876,o),
-(-910,1780,cs)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-584,1292);
-},
-{
-name = mkmktop_acc;
-pos = (-584,1836);
-}
-);
-layerId = m011;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-852,1536,l),
-(-852,1530,l),
-(-584,1256,l),
-(-574,1256,l),
-(-306,1530,l),
-(-306,1536,l),
-(-360,1536,l),
-(-578,1312,l),
-(-798,1536,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-627,1650,o),
-(-606,1629,o),
-(-580,1630,cs),
-(-555,1629,o),
-(-534,1650,o),
-(-534,1676,cs),
-(-534,1701,o),
-(-555,1722,o),
-(-580,1722,cs),
-(-606,1722,o),
-(-627,1701,o),
-(-626,1676,cs)
-);
-}
-);
-width = 0;
-}
-);
-tags = (
-"TODO-opsz"
-);
-}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/caronnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/caronnosp.glyph
index e8b025e3f..320fff3ea 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/caronnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/caronnosp.glyph
@@ -5,18 +5,8 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-902,1518,l),
-(-902,1498,l),
-(-648,1254,l),
-(-530,1254,l),
-(-270,1502,l),
-(-270,1518,l),
-(-442,1518,l),
-(-588,1374,l),
-(-734,1518,l)
-);
+alignment = 1;
+ref = caroncmb;
 }
 );
 width = 0;
@@ -25,38 +15,18 @@ width = 0;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-1158,1534,l),
-(-1158,1522,l),
-(-840,1254,l),
-(-574,1254,l),
-(-262,1516,l),
-(-262,1534,l),
-(-578,1534,l),
-(-706,1400,l),
-(-834,1534,l)
-);
+alignment = 1;
+ref = caroncmb;
 }
 );
-width = 26;
+width = 0;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-734,1538,l),
-(-734,1534,l),
-(-540,1254,l),
-(-494,1254,l),
-(-298,1534,l),
-(-298,1538,l),
-(-350,1538,l),
-(-516,1300,l),
-(-682,1538,l)
-);
+alignment = 1;
+ref = caroncmb;
 }
 );
 width = 0;
@@ -65,18 +35,8 @@ width = 0;
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-934,1518,l),
-(-934,1498,l),
-(-680,1254,l),
-(-562,1254,l),
-(-302,1502,l),
-(-302,1518,l),
-(-474,1518,l),
-(-620,1374,l),
-(-766,1518,l)
-);
+alignment = 1;
+ref = caroncmb;
 }
 );
 width = 0;
@@ -85,18 +45,8 @@ width = 0;
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-1174,1534,l),
-(-1174,1522,l),
-(-856,1254,l),
-(-590,1254,l),
-(-278,1516,l),
-(-278,1534,l),
-(-594,1534,l),
-(-722,1400,l),
-(-850,1534,l)
-);
+alignment = 1;
+ref = caroncmb;
 }
 );
 width = 0;
@@ -105,18 +55,8 @@ width = 0;
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-798,1538,l),
-(-798,1534,l),
-(-604,1254,l),
-(-558,1254,l),
-(-362,1534,l),
-(-362,1538,l),
-(-414,1538,l),
-(-580,1300,l),
-(-746,1538,l)
-);
+alignment = 1;
+ref = caroncmb;
 }
 );
 width = 0;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/caronsubnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/caronsubnosp.glyph
index 4711b4c05..1e575c027 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/caronsubnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/caronsubnosp.glyph
@@ -6,7 +6,7 @@ layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-1044,-1670);
+pos = (-1002,-1722);
 ref = caron;
 }
 );
@@ -17,7 +17,7 @@ layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-1218,-1608);
+pos = (-1182,-1717);
 ref = caron;
 }
 );
@@ -28,7 +28,7 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-940,-1708);
+pos = (-1016,-1683);
 ref = caron;
 }
 );
@@ -39,7 +39,7 @@ layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-1044,-1670);
+pos = (-957,-1700);
 ref = caron;
 }
 );
@@ -50,7 +50,7 @@ layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1218,-1608);
+pos = (-1088,-1624);
 ref = caron;
 }
 );
@@ -61,7 +61,7 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-940,-1708);
+pos = (-880,-1700);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ccaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/ccaron.glyph
index d9c55fd0e..c78cac232 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ccaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ccaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (140,0);
+pos = (190,0);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (-4,0);
+pos = (130,0);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (128,0);
+pos = (162,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (-22,0);
+pos = (174,0);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (162,0);
+pos = (178,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ccedillaacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/ccedillaacute.glyph
index 3662d37a2..d9cc5e9e5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ccedillaacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ccedillaacute.glyph
@@ -14,7 +14,7 @@ pos = (326,0);
 ref = cedilla;
 },
 {
-pos = (254,0);
+pos = (362,0);
 ref = acute;
 }
 );
@@ -31,7 +31,7 @@ pos = (186,0);
 ref = cedilla;
 },
 {
-pos = (252,0);
+pos = (338,0);
 ref = acute;
 }
 );
@@ -48,7 +48,7 @@ pos = (374,0);
 ref = cedilla;
 },
 {
-pos = (308,0);
+pos = (376,0);
 ref = acute;
 }
 );
@@ -65,7 +65,7 @@ pos = (314,0);
 ref = cedilla;
 },
 {
-pos = (211,0);
+pos = (398,0);
 ref = acute;
 }
 );
@@ -82,7 +82,7 @@ pos = (166,0);
 ref = cedilla;
 },
 {
-pos = (196,0);
+pos = (388,0);
 ref = acute;
 }
 );
@@ -99,7 +99,7 @@ pos = (380,0);
 ref = cedilla;
 },
 {
-pos = (246,0);
+pos = (400,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ccircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/ccircumflex.glyph
index 160ca613e..1eb9ac7ba 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ccircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ccircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (142,0);
+pos = (190,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (2,0);
+pos = (130,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (130,0);
+pos = (162,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (-22,0);
+pos = (174,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = c;
 },
 {
-pos = (162,0);
+pos = (178,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/circumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/circumflex.glyph
index 2b0a0a082..fc497947d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/circumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/circumflex.glyph
@@ -5,11 +5,11 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (464,1118);
+pos = (416,1118);
 },
 {
 name = top;
-pos = (464,1574);
+pos = (416,1557);
 }
 );
 background = {
@@ -24,29 +24,29 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(464,1462,l),
-(614,1258,l),
-(778,1258,l),
-(778,1270,l),
-(542,1574,l),
-(384,1574,l),
-(150,1270,l),
-(150,1258,l),
-(312,1258,l)
+(416,1459,l),
+(558,1283,l),
+(730,1283,l),
+(730,1292,l),
+(498,1557,l),
+(332,1557,l),
+(102,1292,l),
+(102,1283,l),
+(272,1283,l)
 );
 }
 );
-width = 930;
+width = 832;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (640,1118);
+pos = (512,1118);
 },
 {
 name = top;
-pos = (640,1582);
+pos = (512,1582);
 }
 );
 background = {
@@ -56,24 +56,29 @@ ref = acute;
 }
 );
 };
+guides = (
+{
+pos = (0,1256);
+}
+);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 closed = 1;
 nodes = (
-(640,1422,l),
-(782,1256,l),
-(1114,1256,l),
-(1114,1262,l),
-(780,1582,l),
-(500,1582,l),
-(166,1262,l),
-(166,1256,l),
-(498,1256,l)
+(512,1422,l),
+(654,1256,l),
+(986,1256,l),
+(986,1262,l),
+(652,1582,l),
+(372,1582,l),
+(38,1262,l),
+(38,1256,l),
+(370,1256,l)
 );
 }
 );
-width = 1292;
+width = 1024;
 },
 {
 anchors = (
@@ -83,7 +88,7 @@ pos = (432,1118);
 },
 {
 name = top;
-pos = (432,1552);
+pos = (432,1563);
 }
 );
 background = {
@@ -98,15 +103,15 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(431,1504,l),
-(649,1280,l),
-(705,1280,l),
-(705,1286,l),
-(437,1560,l),
-(425,1560,l),
-(159,1286,l),
-(159,1280,l),
-(213,1280,l)
+(431,1507,l),
+(649,1283,l),
+(705,1283,l),
+(705,1289,l),
+(437,1563,l),
+(425,1563,l),
+(159,1289,l),
+(159,1283,l),
+(213,1283,l)
 );
 }
 );
@@ -116,11 +121,11 @@ width = 864;
 anchors = (
 {
 name = _top;
-pos = (432,1056);
+pos = (400,1056);
 },
 {
 name = top;
-pos = (432,1490);
+pos = (400,1515);
 }
 );
 background = {
@@ -135,34 +140,35 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(432,1392,l),
-(574,1216,l),
-(746,1216,l),
-(746,1217,l),
-(514,1490,l),
-(348,1490,l),
-(118,1217,l),
-(118,1216,l),
-(288,1216,l)
+(400,1417,l),
+(542,1241,l),
+(714,1241,l),
+(714,1242,l),
+(482,1515,l),
+(316,1515,l),
+(86,1242,l),
+(86,1241,l),
+(256,1241,l)
 );
 }
 );
-width = 866;
+width = 800;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (368,1056);
+pos = (352,1056);
 },
 {
 name = top;
-pos = (368,1490);
+pos = (352,1515);
 }
 );
 background = {
 shapes = (
 {
+pos = (-120,0);
 ref = acute;
 }
 );
@@ -172,19 +178,19 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(367,1451,l),
-(584,1216,l),
-(643,1216,l),
-(643,1217,l),
-(389,1490,l),
-(345,1490,l),
-(93,1217,l),
-(93,1216,l),
-(153,1216,l)
+(351,1476,l),
+(569,1241,l),
+(627,1241,l),
+(627,1242,l),
+(373,1515,l),
+(329,1515,l),
+(77,1242,l),
+(77,1241,l),
+(136,1241,l)
 );
 }
 );
-width = 732;
+width = 704;
 },
 {
 anchors = (
@@ -230,40 +236,45 @@ width = 1260;
 anchors = (
 {
 name = _top;
-pos = (628,1056);
+pos = (432,1056);
 },
 {
 name = top;
-pos = (628,1490);
+pos = (432,1507);
 }
 );
 background = {
 shapes = (
 {
-pos = (-22,0);
+pos = (-154,0);
 ref = acute;
 }
 );
 };
+guides = (
+{
+pos = (0,1181);
+}
+);
 layerId = m009;
 name = "Display Black";
 shapes = (
 {
 closed = 1;
 nodes = (
-(624,1324,l),
-(750,1164,l),
-(1034,1164,l),
-(1034,1165,l),
-(772,1490,l),
-(476,1490,l),
-(222,1165,l),
-(222,1164,l),
-(506,1164,l)
+(428,1341,l),
+(554,1181,l),
+(838,1181,l),
+(838,1182,l),
+(576,1507,l),
+(280,1507,l),
+(26,1182,l),
+(26,1181,l),
+(310,1181,l)
 );
 }
 );
-width = 1260;
+width = 864;
 }
 );
 note = "Harmonize with /breveinvnosp";
diff --git a/src/Inter-Roman.glyphspackage/glyphs/circumflexacutecomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/circumflexacutecomb.cn.glyph
index 42ef72624..b7a49ee36 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/circumflexacutecomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/circumflexacutecomb.cn.glyph
@@ -4,71 +4,111 @@ layers = (
 {
 anchors = (
 {
+name = _top;
+pos = (416,1118);
+},
+{
 name = top;
-pos = (464,1891);
+pos = (416,1891);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1717);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(748,1616,l),
-(940,1890,l),
-(746,1890,l),
-(606,1616,l)
-);
+alignment = -1;
+pos = (374,333);
+ref = acute;
 }
 );
-width = 930;
+width = 832;
 },
 {
 anchors = (
 {
+name = _top;
+pos = (512,1118);
+},
+{
 name = top;
-pos = (640,1888);
+pos = (512,1893);
+}
+);
+guides = (
+{
+pos = (0,1632);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1765);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
+alignment = -1;
+pos = (0,-27);
 ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(968,1618,l),
-(1210,1888,l),
-(914,1888,l),
-(784,1618,l)
-);
+alignment = -1;
+pos = (510,627);
+ref = acute;
+scale = (0.8,0.8);
 }
 );
-width = 1292;
+width = 1024;
 },
 {
 anchors = (
 {
+name = _top;
+pos = (432,1118);
+},
+{
 name = top;
-pos = (432,1846);
+pos = (432,1890);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1681);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
+alignment = -1;
+pos = (0,-31);
 ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(629,1586,l),
-(825,1846,l),
-(767,1846,l),
-(583,1586,l)
-);
+alignment = -1;
+pos = (360,333);
+ref = acute;
 }
 );
 width = 864;
@@ -76,74 +116,104 @@ width = 864;
 {
 anchors = (
 {
+name = _top;
+pos = (400,1056);
+},
+{
 name = top;
-pos = (432,1812);
+pos = (400,1812);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
 }
 );
 layerId = m007;
 shapes = (
 {
+alignment = -1;
+pos = (0,-50);
 ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(715,1545,l),
-(907,1819,l),
-(713,1819,l),
-(573,1545,l)
-);
+alignment = -1;
+pos = (424,311);
+ref = acute;
 }
 );
-width = 866;
+width = 800;
 },
 {
 anchors = (
 {
+name = _top;
+pos = (432,1056);
+},
+{
 name = top;
-pos = (628,1770);
+pos = (432,1770);
+}
+);
+guides = (
+{
+pos = (0,1584);
 }
 );
 layerId = m009;
 shapes = (
 {
+alignment = -1;
 ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(998,1534,l),
-(1256,1770,l),
-(936,1770,l),
-(790,1534,l)
-);
+alignment = -1;
+pos = (423,521);
+ref = acute;
+scale = (0.9,0.9);
 }
 );
-width = 1260;
+width = 864;
 },
 {
 anchors = (
 {
+name = _top;
+pos = (352,1056);
+},
+{
 name = top;
-pos = (368,1764);
+pos = (352,1826);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+},
+{
+pos = (0,1625);
 }
 );
 layerId = m011;
 shapes = (
 {
+alignment = -1;
+pos = (0,-50);
 ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(563,1522,l),
-(739,1764,l),
-(681,1764,l),
-(512,1522,l)
-);
+alignment = -1;
+pos = (367,311);
+ref = acute;
 }
 );
-width = 732;
+width = 704;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/circumflexgravecomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/circumflexgravecomb.cn.glyph
index a25b93910..5a63e14e0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/circumflexgravecomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/circumflexgravecomb.cn.glyph
@@ -4,73 +4,111 @@ layers = (
 {
 anchors = (
 {
+name = _top;
+pos = (416,1118);
+},
+{
 name = top;
-pos = (466,1891);
+pos = (416,1890);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1717);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (2,0);
+alignment = -1;
+pos = (0,-28);
 ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(678,1890,l),
-(484,1890,l),
-(676,1616,l),
-(818,1616,l)
-);
+alignment = -1;
+pos = (254,333);
+ref = grave;
 }
 );
-width = 930;
+width = 832;
 },
 {
 anchors = (
 {
+name = _top;
+pos = (512,1118);
+},
+{
 name = top;
-pos = (652,1888);
+pos = (512,1893);
+}
+);
+guides = (
+{
+pos = (0,1632);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1765);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (12,0);
+alignment = -1;
+pos = (0,-27);
 ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(993,1888,l),
-(697,1888,l),
-(939,1618,l),
-(1123,1618,l)
-);
+alignment = -1;
+pos = (489,627);
+ref = grave;
+scale = (0.8,0.8);
 }
 );
-width = 1292;
+width = 1049;
 },
 {
 anchors = (
 {
+name = _top;
+pos = (432,1118);
+},
+{
 name = top;
-pos = (432,1846);
+pos = (432,1890);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1681);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
+alignment = -1;
+pos = (0,-31);
 ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(513,1846,l),
-(455,1846,l),
-(651,1586,l),
-(697,1586,l)
-);
+alignment = -1;
+pos = (312,333);
+ref = grave;
 }
 );
 width = 864;
@@ -78,24 +116,39 @@ width = 864;
 {
 anchors = (
 {
+name = _top;
+pos = (400,1056);
+},
+{
 name = top;
-pos = (434,1812);
+pos = (400,1826);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+},
+{
+pos = (0,1676);
 }
 );
 layerId = m007;
 shapes = (
 {
-pos = (2,0);
+alignment = -1;
+pos = (0,-50);
 ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(609,1819,l),
-(415,1819,l),
-(607,1545,l),
-(749,1545,l)
-);
+alignment = -1;
+pos = (317,311);
+ref = grave;
 }
 );
 width = 866;
@@ -103,52 +156,70 @@ width = 866;
 {
 anchors = (
 {
+name = _top;
+pos = (432,1056);
+},
+{
 name = top;
-pos = (632,1770);
+pos = (432,1877);
+}
+);
+guides = (
+{
+pos = (0,1584);
 }
 );
 layerId = m009;
 shapes = (
 {
-pos = (4,0);
+alignment = -1;
 ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(876,1770,l),
-(556,1770,l),
-(814,1534,l),
-(1022,1534,l)
-);
+alignment = -1;
+pos = (289,521);
+ref = grave;
+scale = (0.9,0.9);
 }
 );
-width = 1260;
+width = 890;
 },
 {
 anchors = (
 {
+name = _top;
+pos = (352,1056);
+},
+{
 name = top;
-pos = (364,1764);
+pos = (352,1826);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+},
+{
+pos = (0,1625);
 }
 );
 layerId = m011;
 shapes = (
 {
-pos = (-4,0);
+alignment = -1;
+pos = (0,-50);
 ref = circumflex;
 },
 {
-closed = 1;
-nodes = (
-(455,1764,l),
-(397,1764,l),
-(573,1522,l),
-(624,1522,l)
-);
+alignment = -1;
+pos = (275,311);
+ref = grave;
 }
 );
-width = 732;
+width = 704;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/circumflexhookcomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/circumflexhookcomb.cn.glyph
index 3f543e7a0..dc27a4339 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/circumflexhookcomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/circumflexhookcomb.cn.glyph
@@ -2,88 +2,194 @@
 glyphname = circumflexhookcomb.cn;
 layers = (
 {
+anchors = (
+{
+name = _top;
+pos = (416,1118);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1717);
+}
+);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = circumflex;
 },
 {
 alignment = -1;
-pos = (1247,346);
-ref = hookabovecmb;
+pos = (355,333);
+ref = hookabove;
 }
 );
-width = 930;
+width = 832;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (512,1118);
+}
+);
+guides = (
+{
+pos = (0,1632);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1765);
+}
+);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
+alignment = -1;
+pos = (0,-27);
 ref = circumflex;
 },
 {
 alignment = -1;
-pos = (1585,361);
-ref = hookabovecmb;
+pos = (521,627);
+ref = hookabove;
+scale = (0.8,0.8);
 }
 );
-width = 1292;
+width = 1024;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (432,1118);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1681);
+}
+);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
+alignment = -1;
+pos = (0,-31);
 ref = circumflex;
 },
 {
 alignment = -1;
-pos = (1118,306);
-ref = hookabovecmb;
+pos = (378,333);
+ref = hookabove;
 }
 );
 width = 864;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (400,1056);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+}
+);
 layerId = m007;
 shapes = (
 {
+alignment = -1;
+pos = (0,-50);
 ref = circumflex;
 },
 {
 alignment = -1;
-pos = (1189,306);
-ref = hookabovecmb;
+pos = (325,311);
+ref = hookabove;
 }
 );
-width = 866;
+width = 800;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (432,1056);
+}
+);
+guides = (
+{
+pos = (0,1587);
+}
+);
 layerId = m009;
 shapes = (
 {
+alignment = -1;
 ref = circumflex;
 },
 {
 alignment = -1;
-pos = (1553,370);
-ref = hookabovecmb;
+pos = (392,524);
+ref = hookabove;
+scale = (0.9,0.9);
 }
 );
-width = 1260;
+width = 864;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (352,1056);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+},
+{
+pos = (0,1625);
+}
+);
 layerId = m011;
 shapes = (
 {
+alignment = -1;
+pos = (0,-50);
 ref = circumflex;
 },
 {
 alignment = -1;
-pos = (1040,306);
-ref = hookabovecmb;
+pos = (296,311);
+ref = hookabove;
 }
 );
-width = 732;
+width = 704;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/circumflexnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/circumflexnosp.glyph
index 31ff51134..dba42780f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/circumflexnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/circumflexnosp.glyph
@@ -7,7 +7,7 @@ layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-1066,0);
+pos = (-1007,0);
 ref = circumflex;
 }
 );
@@ -18,7 +18,7 @@ layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-1308,0);
+pos = (-1177,0);
 ref = circumflex;
 }
 );
@@ -40,7 +40,7 @@ layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-998,0);
+pos = (-950,0);
 ref = circumflex;
 }
 );
@@ -51,7 +51,7 @@ layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1279,0);
+pos = (-1079,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-892,0);
+pos = (-888,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/circumflexsubnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/circumflexsubnosp.glyph
index d52e002e1..006a766c7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/circumflexsubnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/circumflexsubnosp.glyph
@@ -6,14 +6,14 @@ layers = (
 anchors = (
 {
 name = _bottom;
-pos = (-592,0);
+pos = (-596,0);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-1056,-1676);
+pos = (-1012,-1722);
 ref = circumflex;
 }
 );
@@ -30,7 +30,7 @@ layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-1305,-1668);
+pos = (-1177,-1717);
 ref = circumflex;
 }
 );
@@ -40,14 +40,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-574,0);
+pos = (-577,0);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-1006,-1668);
+pos = (-1009,-1689);
 ref = circumflex;
 }
 );
@@ -57,14 +57,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-568,0);
+pos = (-566,0);
 }
 );
 layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-1000,-1658);
+pos = (-966,-1700);
 ref = circumflex;
 }
 );
@@ -74,14 +74,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-652,0);
+pos = (-650,0);
 }
 );
 layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1276,-1590);
+pos = (-1082,-1624);
 ref = circumflex;
 }
 );
@@ -91,14 +91,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-528,0);
+pos = (-524,0);
 }
 );
 layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-894,-1658);
+pos = (-876,-1700);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/circumflextildecomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/circumflextildecomb.cn.glyph
index d81e2d790..96f7fc320 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/circumflextildecomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/circumflextildecomb.cn.glyph
@@ -2,88 +2,194 @@
 glyphname = circumflextildecomb.cn;
 layers = (
 {
+anchors = (
+{
+name = _top;
+pos = (416,1118);
+}
+);
+guides = (
+{
+pos = (0,1392);
+},
+{
+pos = (0,1717);
+},
+{
+pos = (0,1616);
+}
+);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = circumflex;
 },
 {
 alignment = -1;
-pos = (-48,368);
+pos = (-96,330);
 ref = tilde;
 }
 );
-width = 930;
+width = 832;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (512,1118);
+}
+);
+guides = (
+{
+pos = (0,1392);
+},
+{
+pos = (0,1765);
+},
+{
+pos = (0,1632);
+}
+);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
+alignment = -1;
+pos = (0,-27);
 ref = circumflex;
 },
 {
 alignment = -1;
-pos = (128,406);
+pos = (0,582);
 ref = tilde;
+scale = (1,0.83);
 }
 );
-width = 1292;
+width = 1024;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (432,1118);
+}
+);
+guides = (
+{
+pos = (0,1392);
+},
+{
+pos = (0,1681);
+}
+);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
+alignment = -1;
+pos = (0,-31);
 ref = circumflex;
 },
 {
 alignment = -1;
-pos = (-72,370);
+pos = (-72,335);
 ref = tilde;
 }
 );
 width = 864;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (400,1056);
+}
+);
+guides = (
+{
+pos = (0,1328);
+},
+{
+pos = (0,1676);
+}
+);
 layerId = m007;
 shapes = (
 {
+alignment = -1;
+pos = (0,-50);
 ref = circumflex;
 },
 {
 alignment = -1;
-pos = (-48,322);
+pos = (-81,298);
 ref = tilde;
 }
 );
-width = 866;
+width = 800;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (432,1056);
+}
+);
+guides = (
+{
+pos = (0,1728);
 },
 {
+pos = (0,1587);
+}
+);
 layerId = m009;
 shapes = (
 {
+alignment = -1;
 ref = circumflex;
 },
 {
 alignment = -1;
-pos = (116,381);
+pos = (-80,514);
 ref = tilde;
+scale = (1,0.9);
 }
 );
-width = 1260;
+width = 864;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (355,1056);
+}
+);
+guides = (
+{
+pos = (0,1328);
+},
+{
+pos = (0,1625);
+},
+{
+pos = (0,1552);
+}
+);
 layerId = m011;
 shapes = (
 {
+alignment = -1;
+pos = (3,-50);
 ref = circumflex;
 },
 {
 alignment = -1;
-pos = (-80,320);
+pos = (-93,305);
 ref = tilde;
 }
 );
-width = 732;
+width = 710;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dblgravecmb.glyph b/src/Inter-Roman.glyphspackage/glyphs/dblgravecmb.glyph
index 041cb2448..61bcb1eaa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dblgravecmb.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dblgravecmb.glyph
@@ -6,19 +6,19 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (-472,1118);
+pos = (-576,1118);
+},
+{
+name = top;
+pos = (-576,1557);
 }
 );
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(-250,1258,l),
-(-390,1532,l),
-(-584,1532,l),
-(-392,1258,l)
-);
+alignment = -1;
+pos = (-745,0);
+ref = grave;
 }
 );
 };
@@ -27,19 +27,19 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(-546,1258,l),
-(-722,1532,l),
-(-936,1532,l),
-(-696,1258,l)
+(-342,1283,l),
+(-462,1557,l),
+(-656,1557,l),
+(-484,1283,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(-238,1258,l),
-(-348,1532,l),
-(-566,1532,l),
-(-388,1258,l)
+(-667,1283,l),
+(-835,1557,l),
+(-1029,1557,l),
+(-813,1283,l)
 );
 }
 );
@@ -49,13 +49,23 @@ width = 0;
 anchors = (
 {
 name = _top;
-pos = (-610,1118);
+pos = (-656,1118);
+},
+{
+name = top;
+pos = (-656,1582);
 }
 );
 background = {
 shapes = (
 {
-pos = (-970,0);
+alignment = -1;
+pos = (-922,0);
+ref = grave;
+},
+{
+alignment = -1;
+pos = (-1310,0);
 ref = grave;
 }
 );
@@ -65,19 +75,19 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(-660,1256,l),
-(-800,1582,l),
-(-1144,1582,l),
-(-926,1256,l)
+(-340,1256,l),
+(-438,1582,l),
+(-764,1582,l),
+(-604,1256,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(-274,1256,l),
-(-348,1582,l),
-(-672,1582,l),
-(-530,1256,l)
+(-702,1256,l),
+(-872,1582,l),
+(-1232,1582,l),
+(-974,1256,l)
 );
 }
 );
@@ -87,7 +97,11 @@ width = 0;
 anchors = (
 {
 name = _top;
-pos = (-558,1118);
+pos = (-576,1118);
+},
+{
+name = top;
+pos = (-576,1557);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -95,19 +109,19 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(-602,1280,l),
-(-818,1594,l),
-(-878,1594,l),
-(-648,1280,l)
+(-412,1283,l),
+(-557,1557,l),
+(-609,1557,l),
+(-458,1283,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(-442,1280,l),
-(-616,1594,l),
-(-674,1594,l),
-(-488,1280,l)
+(-686,1283,l),
+(-859,1557,l),
+(-915,1557,l),
+(-732,1283,l)
 );
 }
 );
@@ -149,13 +163,17 @@ width = 582;
 anchors = (
 {
 name = _top;
-pos = (-504,1056);
+pos = (-559,1056);
+},
+{
+name = top;
+pos = (-559,1515);
 }
 );
 background = {
 shapes = (
 {
-pos = (-896,0);
+pos = (-721,0);
 ref = grave;
 }
 );
@@ -165,19 +183,19 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(-576,1216,l),
-(-752,1490,l),
-(-966,1490,l),
-(-726,1216,l)
+(-337,1241,l),
+(-457,1515,l),
+(-651,1515,l),
+(-479,1241,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(-268,1216,l),
-(-378,1490,l),
-(-596,1490,l),
-(-418,1216,l)
+(-639,1241,l),
+(-807,1515,l),
+(-1001,1515,l),
+(-785,1241,l)
 );
 }
 );
@@ -187,40 +205,31 @@ width = 0;
 anchors = (
 {
 name = _top;
-pos = (-626,1056);
-}
-);
-background = {
-shapes = (
+pos = (-640,1056);
+},
 {
-closed = 1;
-nodes = (
-(-326,1164,l),
-(-528,1490,l),
-(-896,1490,l),
-(-590,1164,l)
-);
+name = top;
+pos = (-640,1542);
 }
 );
-};
 layerId = m009;
 shapes = (
 {
 closed = 1;
 nodes = (
-(-691,1164,l),
-(-831,1490,l),
-(-1175,1490,l),
-(-957,1164,l)
+(-308,1216,l),
+(-454,1542,l),
+(-780,1542,l),
+(-572,1216,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(-305,1164,l),
-(-379,1490,l),
-(-703,1490,l),
-(-561,1164,l)
+(-694,1216,l),
+(-912,1542,l),
+(-1272,1542,l),
+(-966,1216,l)
 );
 }
 );
@@ -262,34 +271,47 @@ width = 582;
 anchors = (
 {
 name = _top;
-pos = (-622,1056);
+pos = (-536,1056);
+},
+{
+name = top;
+pos = (-536,1515);
+}
+);
+background = {
+shapes = (
+{
+alignment = -1;
+pos = (-729,0);
+ref = grave;
 }
 );
+};
 layerId = m011;
 shapes = (
 {
 closed = 1;
 nodes = (
-(-666,1216,l),
-(-882,1490,l),
-(-942,1490,l),
-(-716,1216,l)
+(-389,1241,l),
+(-556,1515,l),
+(-611,1515,l),
+(-437,1241,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(-506,1216,l),
-(-680,1490,l),
-(-738,1490,l),
-(-553,1216,l)
+(-628,1241,l),
+(-822,1515,l),
+(-880,1515,l),
+(-678,1241,l)
 );
 }
 );
 width = 0;
 }
 );
-note = "match acutedblnosp";
+note = "Should be designed as a balance between isolated ideal spacing (to appear as one unit, not two separate strokes) yet is must work with /dieresis as it's used for /hungarumlaut";
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dcircumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/dcircumflexbelow.glyph
index 02838d792..bf141e971 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dcircumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dcircumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1172,0);
+pos = (1176,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1134,0);
+pos = (1137,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1102,0);
+pos = (1100,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1312,0);
+pos = (1310,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1058,0);
+pos = (1054,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ddotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/ddotbelow.glyph
index 2121993da..29d2b1f44 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ddotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ddotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1186,0);
+pos = (1180,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1220,0);
+pos = (1351,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1118,0);
+pos = (1145,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1172,0);
+pos = (1103,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1212,0);
+pos = (1307,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1152,0);
+pos = (1065,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/diaeresistonosnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/diaeresistonosnosp.glyph
index 23add43d4..15de48c01 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/diaeresistonosnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/diaeresistonosnosp.glyph
@@ -7,7 +7,7 @@ layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-1102,0);
+pos = (-1152,0);
 ref = dieresistonos;
 }
 );
@@ -18,18 +18,18 @@ layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-1324,0);
+pos = (-1287,0);
 ref = dieresistonos;
 }
 );
-width = 20;
+width = 0;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-972,0);
+pos = (-1062,0);
 ref = dieresistonos;
 }
 );
@@ -40,7 +40,7 @@ layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-1102,0);
+pos = (-1093,0);
 ref = dieresistonos;
 }
 );
@@ -51,7 +51,7 @@ layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1324,0);
+pos = (-1241,0);
 ref = dieresistonos;
 }
 );
@@ -62,7 +62,7 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-972,0);
+pos = (-934,0);
 ref = dieresistonos;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dialytikaperispomeni.glyph b/src/Inter-Roman.glyphspackage/glyphs/dialytikaperispomeni.glyph
new file mode 100644
index 000000000..11dee5921
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/dialytikaperispomeni.glyph
@@ -0,0 +1,216 @@
+{
+color = (204,240,242,1);
+glyphname = dialytikaperispomeni;
+layers = (
+{
+anchors = (
+{
+name = _top;
+pos = (448,1118);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1717);
+}
+);
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+alignment = -1;
+pos = (-152,-28);
+ref = dieresis;
+},
+{
+alignment = -1;
+pos = (-56,298);
+ref = tilde;
+}
+);
+width = 896;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (480,1118);
+}
+);
+guides = (
+{
+pos = (0,1392);
+},
+{
+pos = (0,1765);
+},
+{
+pos = (0,1632);
+}
+);
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+alignment = -1;
+pos = (-185,-24);
+ref = dieresis;
+},
+{
+alignment = -1;
+pos = (-24,582);
+ref = tilde;
+scale = (1,0.83);
+}
+);
+width = 960;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (416,1118);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1681);
+},
+{
+pos = (0,1681);
+}
+);
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+alignment = -1;
+pos = (-166,-28);
+ref = dieresis;
+},
+{
+alignment = -1;
+pos = (-72,335);
+ref = tilde;
+}
+);
+width = 832;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (480,1056);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+},
+{
+pos = (0,1676);
+}
+);
+layerId = m007;
+shapes = (
+{
+alignment = -1;
+pos = (-88,-50);
+ref = dieresis;
+},
+{
+alignment = -1;
+pos = (7,298);
+ref = tilde;
+}
+);
+width = 960;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (496,1056);
+}
+);
+guides = (
+{
+pos = (0,1728);
+},
+{
+pos = (0,1587);
+}
+);
+layerId = m009;
+shapes = (
+{
+alignment = -1;
+pos = (-153,0);
+ref = dieresis;
+},
+{
+alignment = -1;
+pos = (-8,514);
+ref = tilde;
+scale = (1,0.9);
+}
+);
+width = 992;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (352,1056);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+},
+{
+pos = (0,1625);
+}
+);
+layerId = m011;
+shapes = (
+{
+alignment = -1;
+pos = (-182,-50);
+ref = dieresis;
+},
+{
+alignment = -1;
+pos = (-88,305);
+ref = tilde;
+}
+);
+width = 704;
+}
+);
+tags = (
+"TODO-opsz"
+);
+unicode = 8129;
+userData = {
+interface.gridadjust.original = "{'width': 1269, 'leftMargin': 155, 'rightMargin': 151}";
+"interface.width-adjustments" = (
+-16
+);
+};
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresis.glyph
index ba588773a..bd8c0aa5f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresis.glyph
@@ -110,7 +110,7 @@ pos = (582,1118);
 },
 {
 name = top;
-pos = (582,1490);
+pos = (582,1467);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -118,35 +118,35 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(810,1337,o),
-(831,1358,o),
-(831,1384,cs),
-(831,1410,o),
-(810,1431,o),
-(784,1431,cs),
-(758,1431,o),
-(737,1410,o),
-(737,1384,cs),
-(737,1358,o),
-(758,1337,o),
-(784,1337,cs)
+(810,1373,o),
+(831,1394,o),
+(831,1420,cs),
+(831,1446,o),
+(810,1467,o),
+(784,1467,cs),
+(758,1467,o),
+(737,1446,o),
+(737,1420,cs),
+(737,1394,o),
+(758,1373,o),
+(784,1373,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(406,1337,o),
-(427,1358,o),
-(427,1384,cs),
-(427,1410,o),
-(406,1431,o),
-(380,1431,cs),
-(354,1431,o),
-(333,1410,o),
-(333,1384,cs),
-(333,1358,o),
-(354,1337,o),
-(380,1337,cs)
+(406,1373,o),
+(427,1394,o),
+(427,1420,cs),
+(427,1446,o),
+(406,1467,o),
+(380,1467,cs),
+(354,1467,o),
+(333,1446,o),
+(333,1420,cs),
+(333,1394,o),
+(354,1373,o),
+(380,1373,cs)
 );
 }
 );
@@ -210,14 +210,7 @@ pos = (649,1056);
 },
 {
 name = top;
-pos = (649,1505);
-}
-);
-guides = (
-{
-orientation = center;
-angle = 90;
-pos = (-1906,1892);
+pos = (649,1513);
 }
 );
 layerId = m009;
@@ -225,35 +218,35 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(978,1167,o),
-(1057,1243,o),
-(1057,1336,cs),
-(1057,1429,o),
-(978,1505,o),
-(881,1505,cs),
-(784,1505,o),
-(705,1429,o),
-(705,1336,cs),
-(705,1243,o),
-(784,1167,o),
-(881,1167,cs)
+(978,1175,o),
+(1057,1251,o),
+(1057,1344,cs),
+(1057,1437,o),
+(978,1513,o),
+(881,1513,cs),
+(784,1513,o),
+(705,1437,o),
+(705,1344,cs),
+(705,1251,o),
+(784,1175,o),
+(881,1175,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(514,1167,o),
-(593,1243,o),
-(593,1336,cs),
-(593,1429,o),
-(514,1505,o),
-(417,1505,cs),
-(320,1505,o),
-(241,1429,o),
-(241,1336,cs),
-(241,1243,o),
-(320,1167,o),
-(417,1167,cs)
+(514,1175,o),
+(593,1251,o),
+(593,1344,cs),
+(593,1437,o),
+(514,1513,o),
+(417,1513,cs),
+(320,1513,o),
+(241,1437,o),
+(241,1344,cs),
+(241,1251,o),
+(320,1175,o),
+(417,1175,cs)
 );
 }
 );
@@ -412,6 +405,58 @@ nodes = (
 }
 );
 width = 1164;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (649,1056);
+},
+{
+name = top;
+pos = (649,1547);
+}
+);
+associatedMasterId = m009;
+layerId = "8AEE898C-BC2D-4675-9538-59F740834A87";
+name = "Apr 14, 23, 13:04";
+shapes = (
+{
+closed = 1;
+nodes = (
+(978,1209,o),
+(1057,1285,o),
+(1057,1378,cs),
+(1057,1471,o),
+(978,1547,o),
+(881,1547,cs),
+(784,1547,o),
+(705,1471,o),
+(705,1378,cs),
+(705,1285,o),
+(784,1209,o),
+(881,1209,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(514,1209,o),
+(593,1285,o),
+(593,1378,cs),
+(593,1471,o),
+(514,1547,o),
+(417,1547,cs),
+(320,1547,o),
+(241,1471,o),
+(241,1378,cs),
+(241,1285,o),
+(320,1209,o),
+(417,1209,cs)
+);
+}
+);
+width = 1298;
 }
 );
 metricWidth = n;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresis.three.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresis.three.glyph
index 14d1d195b..69ca2b3a2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dieresis.three.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresis.three.glyph
@@ -6,13 +6,20 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (574,1304);
+pos = (574,1118);
 },
 {
 name = top;
-pos = (574,1676);
+pos = (574,1536);
 }
 );
+background = {
+shapes = (
+{
+ref = dieresis;
+}
+);
+};
 guides = (
 {
 pos = (322,1984);
@@ -78,64 +85,71 @@ width = 1148;
 anchors = (
 {
 name = _top;
-pos = (693,1304);
+pos = (693,1118);
 },
 {
 name = top;
-pos = (693,1676);
+pos = (693,1585);
 }
 );
+background = {
+shapes = (
+{
+ref = dieresis;
+}
+);
+};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 closed = 1;
 nodes = (
-(1252,1248,o),
-(1331,1324,o),
-(1331,1417,cs),
-(1331,1510,o),
-(1252,1586,o),
-(1155,1586,cs),
-(1058,1586,o),
-(979,1510,o),
-(979,1417,cs),
-(979,1324,o),
-(1058,1248,o),
-(1155,1248,cs)
+(1252,1247,o),
+(1331,1323,o),
+(1331,1416,cs),
+(1331,1509,o),
+(1252,1585,o),
+(1155,1585,cs),
+(1058,1585,o),
+(979,1509,o),
+(979,1416,cs),
+(979,1323,o),
+(1058,1247,o),
+(1155,1247,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(328,1248,o),
-(407,1324,o),
-(407,1417,cs),
-(407,1510,o),
-(328,1586,o),
-(231,1586,cs),
-(134,1586,o),
-(55,1510,o),
-(55,1417,cs),
-(55,1324,o),
-(134,1248,o),
-(231,1248,cs)
+(328,1247,o),
+(407,1323,o),
+(407,1416,cs),
+(407,1509,o),
+(328,1585,o),
+(231,1585,cs),
+(134,1585,o),
+(55,1509,o),
+(55,1416,cs),
+(55,1323,o),
+(134,1247,o),
+(231,1247,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(790,1248,o),
-(869,1324,o),
-(869,1417,cs),
-(869,1510,o),
-(790,1586,o),
-(693,1586,cs),
-(596,1586,o),
-(517,1510,o),
-(517,1417,cs),
-(517,1324,o),
-(596,1248,o),
-(693,1248,cs)
+(790,1247,o),
+(869,1323,o),
+(869,1416,cs),
+(869,1509,o),
+(790,1585,o),
+(693,1585,cs),
+(596,1585,o),
+(517,1509,o),
+(517,1416,cs),
+(517,1323,o),
+(596,1247,o),
+(693,1247,cs)
 );
 }
 );
@@ -145,48 +159,17 @@ width = 1386;
 anchors = (
 {
 name = _top;
-pos = (427,1304);
+pos = (427,1118);
 },
 {
 name = top;
-pos = (427,1676);
+pos = (427,1467);
 }
 );
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(314,1320,o),
-(335,1341,o),
-(335,1367,cs),
-(335,1393,o),
-(314,1414,o),
-(288,1414,cs),
-(262,1414,o),
-(241,1393,o),
-(241,1367,cs),
-(241,1341,o),
-(262,1320,o),
-(288,1320,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(594,1320,o),
-(615,1341,o),
-(615,1367,cs),
-(615,1393,o),
-(594,1414,o),
-(568,1414,cs),
-(542,1414,o),
-(521,1393,o),
-(521,1367,cs),
-(521,1341,o),
-(542,1320,o),
-(568,1320,cs)
-);
+ref = dieresis;
 }
 );
 };
@@ -195,52 +178,52 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(733,1320,o),
-(754,1341,o),
-(754,1367,cs),
-(754,1393,o),
-(733,1414,o),
-(707,1414,cs),
-(681,1414,o),
-(660,1393,o),
-(660,1367,cs),
-(660,1341,o),
-(681,1320,o),
-(707,1320,cs)
+(733,1373,o),
+(754,1394,o),
+(754,1420,cs),
+(754,1446,o),
+(733,1467,o),
+(707,1467,cs),
+(681,1467,o),
+(660,1446,o),
+(660,1420,cs),
+(660,1394,o),
+(681,1373,o),
+(707,1373,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(173,1320,o),
-(194,1341,o),
-(194,1367,cs),
-(194,1393,o),
-(173,1414,o),
-(147,1414,cs),
-(121,1414,o),
-(100,1393,o),
-(100,1367,cs),
-(100,1341,o),
-(121,1320,o),
-(147,1320,cs)
+(173,1373,o),
+(194,1394,o),
+(194,1420,cs),
+(194,1446,o),
+(173,1467,o),
+(147,1467,cs),
+(121,1467,o),
+(100,1446,o),
+(100,1420,cs),
+(100,1394,o),
+(121,1373,o),
+(147,1373,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(453,1320,o),
-(474,1341,o),
-(474,1367,cs),
-(474,1393,o),
-(453,1414,o),
-(427,1414,cs),
-(401,1414,o),
-(380,1393,o),
-(380,1367,cs),
-(380,1341,o),
-(401,1320,o),
-(427,1320,cs)
+(453,1373,o),
+(474,1394,o),
+(474,1420,cs),
+(474,1446,o),
+(453,1467,o),
+(427,1467,cs),
+(401,1467,o),
+(380,1446,o),
+(380,1420,cs),
+(380,1394,o),
+(401,1373,o),
+(427,1373,cs)
 );
 }
 );
@@ -250,13 +233,20 @@ width = 854;
 anchors = (
 {
 name = _top;
-pos = (574,1262);
+pos = (574,1056);
 },
 {
 name = top;
-pos = (574,1676);
+pos = (574,1494);
+}
+);
+background = {
+shapes = (
+{
+ref = dieresis;
 }
 );
+};
 guides = (
 {
 pos = (62,1984);
@@ -322,13 +312,20 @@ width = 1148;
 anchors = (
 {
 name = _top;
-pos = (696,1262);
+pos = (696,1056);
 },
 {
 name = top;
-pos = (696,1676);
+pos = (696,1547);
 }
 );
+background = {
+shapes = (
+{
+ref = dieresis;
+}
+);
+};
 guides = (
 {
 orientation = center;
@@ -341,52 +338,52 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1257,1166,o),
-(1336,1242,o),
-(1336,1335,cs),
-(1336,1428,o),
-(1257,1504,o),
-(1160,1504,cs),
-(1063,1504,o),
-(984,1428,o),
-(984,1335,cs),
-(984,1242,o),
-(1063,1166,o),
-(1160,1166,cs)
+(1257,1209,o),
+(1336,1285,o),
+(1336,1378,cs),
+(1336,1471,o),
+(1257,1547,o),
+(1160,1547,cs),
+(1063,1547,o),
+(984,1471,o),
+(984,1378,cs),
+(984,1285,o),
+(1063,1209,o),
+(1160,1209,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(329,1166,o),
-(408,1242,o),
-(408,1335,cs),
-(408,1428,o),
-(329,1504,o),
-(232,1504,cs),
-(135,1504,o),
-(56,1428,o),
-(56,1335,cs),
-(56,1242,o),
-(135,1166,o),
-(232,1166,cs)
+(329,1209,o),
+(408,1285,o),
+(408,1378,cs),
+(408,1471,o),
+(329,1547,o),
+(232,1547,cs),
+(135,1547,o),
+(56,1471,o),
+(56,1378,cs),
+(56,1285,o),
+(135,1209,o),
+(232,1209,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(793,1166,o),
-(872,1242,o),
-(872,1335,cs),
-(872,1428,o),
-(793,1504,o),
-(696,1504,cs),
-(599,1504,o),
-(520,1428,o),
-(520,1335,cs),
-(520,1242,o),
-(599,1166,o),
-(696,1166,cs)
+(793,1209,o),
+(872,1285,o),
+(872,1378,cs),
+(872,1471,o),
+(793,1547,o),
+(696,1547,cs),
+(599,1547,o),
+(520,1471,o),
+(520,1378,cs),
+(520,1285,o),
+(599,1209,o),
+(696,1209,cs)
 );
 }
 );
@@ -396,64 +393,71 @@ width = 1392;
 anchors = (
 {
 name = _top;
-pos = (427,1262);
+pos = (427,1056);
 },
 {
 name = top;
-pos = (427,1676);
+pos = (427,1425);
 }
 );
+background = {
+shapes = (
+{
+ref = dieresis;
+}
+);
+};
 layerId = m011;
 shapes = (
 {
 closed = 1;
 nodes = (
-(733,1278,o),
-(754,1299,o),
-(754,1325,cs),
-(754,1351,o),
-(733,1372,o),
-(707,1372,cs),
-(681,1372,o),
-(660,1351,o),
-(660,1325,cs),
-(660,1299,o),
-(681,1278,o),
-(707,1278,cs)
+(733,1331,o),
+(754,1352,o),
+(754,1378,cs),
+(754,1404,o),
+(733,1425,o),
+(707,1425,cs),
+(681,1425,o),
+(660,1404,o),
+(660,1378,cs),
+(660,1352,o),
+(681,1331,o),
+(707,1331,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(173,1278,o),
-(194,1299,o),
-(194,1325,cs),
-(194,1351,o),
-(173,1372,o),
-(147,1372,cs),
-(121,1372,o),
-(100,1351,o),
-(100,1325,cs),
-(100,1299,o),
-(121,1278,o),
-(147,1278,cs)
+(173,1331,o),
+(194,1352,o),
+(194,1378,cs),
+(194,1404,o),
+(173,1425,o),
+(147,1425,cs),
+(121,1425,o),
+(100,1404,o),
+(100,1378,cs),
+(100,1352,o),
+(121,1331,o),
+(147,1331,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(453,1278,o),
-(474,1299,o),
-(474,1325,cs),
-(474,1351,o),
-(453,1372,o),
-(427,1372,cs),
-(401,1372,o),
-(380,1351,o),
-(380,1325,cs),
-(380,1299,o),
-(401,1278,o),
-(427,1278,cs)
+(453,1331,o),
+(474,1352,o),
+(474,1378,cs),
+(474,1404,o),
+(453,1425,o),
+(427,1425,cs),
+(401,1425,o),
+(380,1404,o),
+(380,1378,cs),
+(380,1352,o),
+(401,1331,o),
+(427,1331,cs)
 );
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresisacutecomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresisacutecomb.lc.glyph
index cc66c78f7..09d02fb7d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dieresisacutecomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresisacutecomb.lc.glyph
@@ -2,90 +2,188 @@
 glyphname = dieresisacutecomb.lc;
 layers = (
 {
+anchors = (
+{
+name = _top;
+pos = (600,1118);
+}
+);
 guides = (
 {
 angle = 90;
 pos = (-4800,1920);
+},
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1717);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (257,333);
+pos = (367,333);
 ref = acute;
 }
 );
 width = 1200;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (665,1118);
+}
+);
+guides = (
+{
+pos = (0,1632);
+}
+);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
+alignment = -1;
+pos = (0,-24);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (277,365);
+pos = (416,627);
 ref = acute;
+scale = (0.8,0.8);
 }
 );
 width = 1330;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (582,1118);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1681);
+}
+);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (311,239);
+pos = (378,333);
 ref = acute;
 }
 );
 width = 1164;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (568,1056);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+}
+);
 layerId = m007;
 shapes = (
 {
+alignment = -1;
+pos = (0,-50);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (226,343);
+pos = (413,311);
 ref = acute;
 }
 );
 width = 1136;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (649,1056);
+}
+);
+guides = (
+{
+pos = (0,1584);
+}
+);
 layerId = m009;
 shapes = (
 {
+alignment = -1;
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (253,369);
+pos = (468,521);
 ref = acute;
+scale = (0.9,0.9);
 }
 );
 width = 1298;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (534,1056);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+},
+{
+pos = (0,1625);
+}
+);
 layerId = m011;
 shapes = (
 {
+alignment = -1;
+pos = (0,-50);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (256,323);
+pos = (406,311);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresiscaroncomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresiscaroncomb.lc.glyph
index ea04d663c..07f39487f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dieresiscaroncomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresiscaroncomb.lc.glyph
@@ -2,84 +2,196 @@
 glyphname = dieresiscaroncomb.lc;
 layers = (
 {
+anchors = (
+{
+name = _top;
+pos = (600,1118);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1717);
+}
+);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (135,336);
+pos = (184,333);
 ref = caron;
 }
 );
 width = 1200;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (665,1118);
+}
+);
+guides = (
+{
+pos = (0,1632);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1765);
+}
+);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
+alignment = -1;
+pos = (0,-24);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (19,363);
+pos = (247,627);
 ref = caron;
+scale = (0.8,0.8);
 }
 );
 width = 1330;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (582,1118);
+}
+);
+guides = (
+{
+pos = (0,1890);
+},
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1681);
+},
+{
+pos = (0,1681);
+}
+);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (152,280);
+pos = (150,333);
 ref = caron;
 }
 );
 width = 1164;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (568,1056);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+}
+);
 layerId = m007;
 shapes = (
 {
+alignment = -1;
+pos = (0,-50);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (135,343);
+pos = (168,311);
 ref = caron;
 }
 );
 width = 1136;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (649,1056);
+}
+);
+guides = (
+{
+pos = (0,1584);
+}
+);
 layerId = m009;
 shapes = (
 {
+alignment = -1;
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (19,377);
+pos = (257,521);
 ref = caron;
+scale = (0.9,0.9);
 }
 );
 width = 1298;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (534,1056);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+},
+{
+pos = (0,1625);
+}
+);
 layerId = m011;
 shapes = (
 {
+alignment = -1;
+pos = (0,-50);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (166,323);
+pos = (182,311);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresisgravecomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresisgravecomb.lc.glyph
index 852cfb1ab..1676752d5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dieresisgravecomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresisgravecomb.lc.glyph
@@ -2,84 +2,197 @@
 glyphname = dieresisgravecomb.lc;
 layers = (
 {
+anchors = (
+{
+name = _top;
+pos = (600,1118);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1717);
+}
+);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (46,333);
+pos = (169,333);
 ref = grave;
 }
 );
 width = 1200;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (665,1118);
+}
+);
+guides = (
+{
+pos = (0,1632);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1765);
+}
+);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
+alignment = -1;
+pos = (0,-24);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (53,365);
+pos = (241,627);
 ref = grave;
+scale = (0.8,0.8);
 }
 );
 width = 1330;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (582,1118);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1681);
+}
+);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (88,239);
+pos = (205,333);
 ref = grave;
 }
 );
 width = 1164;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (569,1056);
+}
+);
+guides = (
+{
+pos = (0,1328);
+},
+{
+pos = (0,1552);
+},
+{
+pos = (0,1676);
+}
+);
 layerId = m007;
 shapes = (
 {
+alignment = -1;
+pos = (0,-50);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (-7,343);
+pos = (217,311);
 ref = grave;
 }
 );
 width = 1136;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (649,1056);
+}
+);
+guides = (
+{
+pos = (0,1584);
+},
+{
+pos = (0,1728);
+}
+);
 layerId = m009;
 shapes = (
 {
+alignment = -1;
+pos = (0,1);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (-55,369);
+pos = (195,521);
 ref = grave;
+scale = (0.9,0.9);
 }
 );
 width = 1298;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (534,1056);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+},
+{
+pos = (0,1625);
+}
+);
 layerId = m011;
 shapes = (
 {
+alignment = -1;
+pos = (0,-50);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (32,323);
+pos = (198,311);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresismacroncomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresismacroncomb.lc.glyph
index 8a18de3b3..de6aff15f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dieresismacroncomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresismacroncomb.lc.glyph
@@ -2,90 +2,192 @@
 glyphname = dieresismacroncomb.lc;
 layers = (
 {
+anchors = (
+{
+name = _top;
+pos = (600,1118);
+}
+);
+guides = (
+{
+pos = (0,1717);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1717);
+}
+);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = 1;
+alignment = -1;
+pos = (0,-28);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (0,308);
+pos = (112,439);
 ref = macron;
+scale = (1,0.9);
 }
 );
 width = 1200;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (665,1118);
+}
+);
+guides = (
+{
+pos = (0,1765);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1765);
+}
+);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = 1;
+alignment = -1;
+pos = (0,-24);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (0,367);
+pos = (249,632);
 ref = macron;
+scale = (1,0.8);
 }
 );
 width = 1330;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (582,1118);
+}
+);
+guides = (
+{
+pos = (0,1681);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1681);
+}
+);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = 1;
+alignment = -1;
+pos = (0,-28);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (0,232);
+pos = (182,261);
 ref = macron;
 }
 );
 width = 1164;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (568,1056);
+}
+);
+guides = (
+{
+pos = (0,1640);
+},
+{
+pos = (0,1328);
+}
+);
 layerId = m007;
 shapes = (
 {
-alignment = 1;
+alignment = -1;
+pos = (0,-50);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (0,318);
+pos = (152,429);
 ref = macron;
+scale = (1,0.9);
 }
 );
 width = 1136;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (649,1056);
+}
+);
+guides = (
+{
+pos = (0,1704);
+}
+);
 layerId = m009;
 shapes = (
 {
-alignment = 1;
+alignment = -1;
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (0,360);
+pos = (265,516);
 ref = macron;
+scale = (1,0.9);
 }
 );
 width = 1298;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (534,1056);
+}
+);
+guides = (
+{
+pos = (0,1625);
+},
+{
+pos = (0,1328);
+},
+{
+pos = (0,1625);
+}
+);
 layerId = m011;
 shapes = (
 {
-alignment = 1;
+alignment = -1;
+pos = (0,-50);
 ref = dieresis;
 },
 {
 alignment = -1;
-pos = (0,250);
+pos = (150,247);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresisnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresisnosp.glyph
index 5abfbf492..4d5e015e4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dieresisnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresisnosp.glyph
@@ -3,17 +3,11 @@ color = (250,227,227,1);
 glyphname = dieresisnosp;
 layers = (
 {
-guides = (
-{
-angle = 90;
-pos = (-836,1740);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-1202,0);
+pos = (-1184,0);
 ref = dieresis;
 }
 );
@@ -24,18 +18,18 @@ layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-1224,0);
+pos = (-1334,0);
 ref = dieresis;
 }
 );
-width = 38;
+width = 0;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-1186,0);
+pos = (-1154,0);
 ref = dieresis;
 }
 );
@@ -52,7 +46,7 @@ layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-1202,0);
+pos = (-1128,0);
 ref = dieresis;
 }
 );
@@ -63,18 +57,18 @@ layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1224,0);
+pos = (-1291,0);
 ref = dieresis;
 }
 );
-width = 6;
+width = 0;
 },
 {
 layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-1186,0);
+pos = (-1062,0);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresistonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresistonos.glyph
index c86076572..8f09384eb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dieresistonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresistonos.glyph
@@ -6,7 +6,7 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (556,1292);
+pos = (544,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -14,45 +14,40 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(620,1408,l),
-(724,1676,l),
-(526,1676,l),
-(474,1408,l)
+(905,1304,o),
+(957,1356,o),
+(957,1420,cs),
+(957,1484,o),
+(905,1536,o),
+(841,1536,cs),
+(777,1536,o),
+(725,1484,o),
+(725,1420,cs),
+(725,1356,o),
+(777,1304,o),
+(841,1304,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(148,1306,o),
-(186,1260,o),
-(262,1260,cs),
-(337,1260,o),
-(378,1306,o),
-(378,1368,cs),
-(378,1428,o),
-(337,1478,o),
-(262,1478,cs),
-(186,1478,o),
-(148,1428,o),
-(148,1368,cs)
+(311,1304,o),
+(363,1356,o),
+(363,1420,cs),
+(363,1484,o),
+(311,1536,o),
+(247,1536,cs),
+(183,1536,o),
+(131,1484,o),
+(131,1420,cs),
+(131,1356,o),
+(183,1304,o),
+(247,1304,cs)
 );
 },
 {
-closed = 1;
-nodes = (
-(727,1303,o),
-(768,1257,o),
-(844,1256,cs),
-(919,1257,o),
-(960,1303,o),
-(960,1364,cs),
-(960,1428,o),
-(919,1478,o),
-(844,1478,cs),
-(768,1478,o),
-(727,1428,o),
-(728,1364,cs)
-);
+pos = (317,137);
+ref = tonostop;
 }
 );
 width = 1106;
@@ -61,7 +56,7 @@ width = 1106;
 anchors = (
 {
 name = _top;
-pos = (616,1292);
+pos = (624,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -69,45 +64,40 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(686,1432,l),
-(888,1822,l),
-(568,1822,l),
-(526,1432,l)
+(1068,1247,o),
+(1147,1323,o),
+(1147,1416,cs),
+(1147,1509,o),
+(1068,1585,o),
+(971,1585,cs),
+(874,1585,o),
+(795,1509,o),
+(795,1416,cs),
+(795,1323,o),
+(874,1247,o),
+(971,1247,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(112,1286,o),
-(193,1222,o),
-(280,1222,cs),
-(365,1222,o),
-(444,1286,o),
-(446,1364,cs),
-(444,1443,o),
-(365,1507,o),
-(280,1506,cs),
-(191,1507,o),
-(112,1443,o),
-(114,1364,cs)
+(374,1247,o),
+(453,1323,o),
+(453,1416,cs),
+(453,1509,o),
+(374,1585,o),
+(277,1585,cs),
+(180,1585,o),
+(101,1509,o),
+(101,1416,cs),
+(101,1323,o),
+(180,1247,o),
+(277,1247,cs)
 );
 },
 {
-closed = 1;
-nodes = (
-(790,1289,o),
-(865,1225,o),
-(958,1224,cs),
-(1040,1225,o),
-(1119,1286,o),
-(1120,1364,cs),
-(1119,1446,o),
-(1040,1507,o),
-(958,1506,cs),
-(865,1507,o),
-(790,1443,o),
-(792,1364,cs)
-);
+pos = (246,235);
+ref = tonostop;
 }
 );
 width = 1234;
@@ -116,7 +106,7 @@ width = 1234;
 anchors = (
 {
 name = _top;
-pos = (520,1292);
+pos = (480,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -124,45 +114,40 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(534,1394,l),
-(586,1588,l),
-(528,1588,l),
-(498,1394,l)
+(708,1373,o),
+(729,1394,o),
+(729,1420,cs),
+(729,1446,o),
+(708,1467,o),
+(682,1467,cs),
+(656,1467,o),
+(635,1446,o),
+(635,1420,cs),
+(635,1394,o),
+(656,1373,o),
+(682,1373,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(335,1343,o),
-(356,1321,o),
-(382,1320,cs),
-(407,1321,o),
-(428,1343,o),
-(428,1368,cs),
-(428,1393,o),
-(407,1414,o),
-(382,1414,cs),
-(356,1414,o),
-(335,1393,o),
-(334,1368,cs)
+(304,1373,o),
+(325,1394,o),
+(325,1420,cs),
+(325,1446,o),
+(304,1467,o),
+(278,1467,cs),
+(252,1467,o),
+(231,1446,o),
+(231,1420,cs),
+(231,1394,o),
+(252,1373,o),
+(278,1373,cs)
 );
 },
 {
-closed = 1;
-nodes = (
-(614,1343,o),
-(636,1321,o),
-(660,1320,cs),
-(687,1321,o),
-(707,1343,o),
-(706,1368,cs),
-(707,1393,o),
-(687,1414,o),
-(660,1414,cs),
-(636,1414,o),
-(614,1393,o),
-(614,1368,cs)
-);
+pos = (342,137);
+ref = tonostop;
 }
 );
 width = 1028;
@@ -171,7 +156,7 @@ width = 1028;
 anchors = (
 {
 name = _top;
-pos = (524,1292);
+pos = (528,1105);
 }
 );
 layerId = m007;
@@ -179,45 +164,41 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(588,1408,l),
-(692,1676,l),
-(494,1676,l),
-(442,1408,l)
+(881,1262,o),
+(933,1314,o),
+(933,1378,cs),
+(933,1442,o),
+(881,1494,o),
+(817,1494,cs),
+(753,1494,o),
+(701,1442,o),
+(701,1378,cs),
+(701,1314,o),
+(753,1262,o),
+(817,1262,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(116,1306,o),
-(154,1260,o),
-(230,1260,cs),
-(305,1260,o),
-(346,1306,o),
-(346,1368,cs),
-(346,1428,o),
-(305,1478,o),
-(230,1478,cs),
-(154,1478,o),
-(116,1428,o),
-(116,1368,cs)
+(303,1262,o),
+(355,1314,o),
+(355,1378,cs),
+(355,1442,o),
+(303,1494,o),
+(239,1494,cs),
+(175,1494,o),
+(123,1442,o),
+(123,1378,cs),
+(123,1314,o),
+(175,1262,o),
+(239,1262,cs)
 );
 },
 {
-closed = 1;
-nodes = (
-(695,1303,o),
-(736,1257,o),
-(812,1256,cs),
-(887,1257,o),
-(928,1303,o),
-(928,1364,cs),
-(928,1428,o),
-(887,1478,o),
-(812,1478,cs),
-(736,1478,o),
-(695,1428,o),
-(696,1364,cs)
-);
+alignment = -1;
+pos = (333,136);
+ref = tonostop;
 }
 );
 width = 1042;
@@ -226,7 +207,7 @@ width = 1042;
 anchors = (
 {
 name = _top;
-pos = (600,1292);
+pos = (592,1056);
 }
 );
 layerId = m009;
@@ -234,45 +215,40 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(670,1432,l),
-(872,1822,l),
-(552,1822,l),
-(510,1432,l)
+(1031,1175,o),
+(1110,1251,o),
+(1110,1344,cs),
+(1110,1437,o),
+(1031,1513,o),
+(934,1513,cs),
+(837,1513,o),
+(758,1437,o),
+(758,1344,cs),
+(758,1251,o),
+(837,1175,o),
+(934,1175,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(96,1286,o),
-(177,1222,o),
-(264,1222,cs),
-(349,1222,o),
-(428,1286,o),
-(430,1364,cs),
-(428,1443,o),
-(349,1507,o),
-(264,1506,cs),
-(175,1507,o),
-(96,1443,o),
-(98,1364,cs)
+(338,1175,o),
+(417,1251,o),
+(417,1344,cs),
+(417,1437,o),
+(338,1513,o),
+(241,1513,cs),
+(144,1513,o),
+(65,1437,o),
+(65,1344,cs),
+(65,1251,o),
+(144,1175,o),
+(241,1175,cs)
 );
 },
 {
-closed = 1;
-nodes = (
-(774,1289,o),
-(849,1225,o),
-(942,1224,cs),
-(1024,1225,o),
-(1103,1286,o),
-(1104,1364,cs),
-(1103,1446,o),
-(1024,1507,o),
-(942,1506,cs),
-(849,1507,o),
-(774,1443,o),
-(776,1364,cs)
-);
+pos = (223,163);
+ref = tonostop;
 }
 );
 width = 1202;
@@ -281,7 +257,7 @@ width = 1202;
 anchors = (
 {
 name = _top;
-pos = (456,1292);
+pos = (400,1056);
 }
 );
 layerId = m011;
@@ -289,45 +265,40 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(470,1394,l),
-(522,1588,l),
-(464,1588,l),
-(434,1394,l)
+(628,1331,o),
+(649,1352,o),
+(649,1378,cs),
+(649,1404,o),
+(628,1425,o),
+(602,1425,cs),
+(576,1425,o),
+(555,1404,o),
+(555,1378,cs),
+(555,1352,o),
+(576,1331,o),
+(602,1331,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(271,1343,o),
-(292,1321,o),
-(318,1320,cs),
-(343,1321,o),
-(364,1343,o),
-(364,1368,cs),
-(364,1393,o),
-(343,1414,o),
-(318,1414,cs),
-(292,1414,o),
-(271,1393,o),
-(270,1368,cs)
+(224,1331,o),
+(245,1352,o),
+(245,1378,cs),
+(245,1404,o),
+(224,1425,o),
+(198,1425,cs),
+(172,1425,o),
+(151,1404,o),
+(151,1378,cs),
+(151,1352,o),
+(172,1331,o),
+(198,1331,cs)
 );
 },
 {
-closed = 1;
-nodes = (
-(550,1343,o),
-(572,1321,o),
-(596,1320,cs),
-(623,1321,o),
-(643,1343,o),
-(642,1368,cs),
-(643,1393,o),
-(623,1414,o),
-(596,1414,cs),
-(572,1414,o),
-(550,1393,o),
-(550,1368,cs)
-);
+pos = (323,137);
+ref = tonostop;
 }
 );
 width = 900;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dieresistonos_narrow.glyph b/src/Inter-Roman.glyphspackage/glyphs/dieresistonos_narrow.glyph
new file mode 100644
index 000000000..0f2daba9d
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/dieresistonos_narrow.glyph
@@ -0,0 +1,340 @@
+{
+color = (204,240,242,1);
+glyphname = dieresistonos_narrow;
+layers = (
+{
+anchors = (
+{
+name = _top;
+pos = (528,1118);
+}
+);
+guides = (
+{
+pos = (0,1392);
+}
+);
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+closed = 1;
+nodes = (
+(781,1276,o),
+(833,1328,o),
+(833,1392,cs),
+(833,1456,o),
+(781,1508,o),
+(717,1508,cs),
+(653,1508,o),
+(601,1456,o),
+(601,1392,cs),
+(601,1328,o),
+(653,1276,o),
+(717,1276,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(403,1276,o),
+(455,1328,o),
+(455,1392,cs),
+(455,1456,o),
+(403,1508,o),
+(339,1508,cs),
+(275,1508,o),
+(223,1456,o),
+(223,1392,cs),
+(223,1328,o),
+(275,1276,o),
+(339,1276,cs)
+);
+},
+{
+pos = (299,277);
+ref = tonostop;
+}
+);
+width = 1106;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (608,1118);
+}
+);
+guides = (
+{
+pos = (0,1632);
+},
+{
+pos = (0,1392);
+}
+);
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+closed = 1;
+nodes = (
+(922,1223,o),
+(1001,1299,o),
+(1001,1392,cs),
+(1001,1485,o),
+(922,1561,o),
+(825,1561,cs),
+(728,1561,o),
+(649,1485,o),
+(649,1392,cs),
+(649,1299,o),
+(728,1223,o),
+(825,1223,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(488,1223,o),
+(567,1299,o),
+(567,1392,cs),
+(567,1485,o),
+(488,1561,o),
+(391,1561,cs),
+(294,1561,o),
+(215,1485,o),
+(215,1392,cs),
+(215,1299,o),
+(294,1223,o),
+(391,1223,cs)
+);
+},
+{
+pos = (309,627);
+ref = tonostop;
+scale = (0.8,0.8);
+}
+);
+width = 1234;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (480,1118);
+}
+);
+guides = (
+{
+pos = (0,1616);
+}
+);
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+closed = 1;
+nodes = (
+(644,1373,o),
+(665,1394,o),
+(665,1420,cs),
+(665,1446,o),
+(644,1467,o),
+(618,1467,cs),
+(592,1467,o),
+(571,1446,o),
+(571,1420,cs),
+(571,1394,o),
+(592,1373,o),
+(618,1373,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(368,1373,o),
+(389,1394,o),
+(389,1420,cs),
+(389,1446,o),
+(368,1467,o),
+(342,1467,cs),
+(316,1467,o),
+(295,1446,o),
+(295,1420,cs),
+(295,1394,o),
+(316,1373,o),
+(342,1373,cs)
+);
+},
+{
+pos = (336,137);
+ref = tonostop;
+}
+);
+width = 1028;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (528,1056);
+}
+);
+guides = (
+{
+pos = (0,1328);
+}
+);
+layerId = m007;
+shapes = (
+{
+closed = 1;
+nodes = (
+(781,1212,o),
+(833,1264,o),
+(833,1328,cs),
+(833,1392,o),
+(781,1444,o),
+(717,1444,cs),
+(653,1444,o),
+(601,1392,o),
+(601,1328,cs),
+(601,1264,o),
+(653,1212,o),
+(717,1212,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(403,1212,o),
+(455,1264,o),
+(455,1328,cs),
+(455,1392,o),
+(403,1444,o),
+(339,1444,cs),
+(275,1444,o),
+(223,1392,o),
+(223,1328,cs),
+(223,1264,o),
+(275,1212,o),
+(339,1212,cs)
+);
+},
+{
+pos = (334,231);
+ref = tonostop;
+}
+);
+width = 1042;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (592,1056);
+}
+);
+layerId = m009;
+shapes = (
+{
+closed = 1;
+nodes = (
+(903,1175,o),
+(982,1251,o),
+(982,1344,cs),
+(982,1437,o),
+(903,1513,o),
+(806,1513,cs),
+(709,1513,o),
+(630,1437,o),
+(630,1344,cs),
+(630,1251,o),
+(709,1175,o),
+(806,1175,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(474,1175,o),
+(553,1251,o),
+(553,1344,cs),
+(553,1437,o),
+(474,1513,o),
+(377,1513,cs),
+(280,1513,o),
+(201,1437,o),
+(201,1344,cs),
+(201,1251,o),
+(280,1175,o),
+(377,1175,cs)
+);
+},
+{
+pos = (270,479);
+ref = tonostop;
+scale = (0.9,0.9);
+}
+);
+width = 1202;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (400,1056);
+}
+);
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(564,1331,o),
+(585,1352,o),
+(585,1378,cs),
+(585,1404,o),
+(564,1425,o),
+(538,1425,cs),
+(512,1425,o),
+(491,1404,o),
+(491,1378,cs),
+(491,1352,o),
+(512,1331,o),
+(538,1331,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(288,1331,o),
+(309,1352,o),
+(309,1378,cs),
+(309,1404,o),
+(288,1425,o),
+(262,1425,cs),
+(236,1425,o),
+(215,1404,o),
+(215,1378,cs),
+(215,1352,o),
+(236,1331,o),
+(262,1331,cs)
+);
+},
+{
+pos = (326,137);
+ref = tonostop;
+}
+);
+width = 900;
+}
+);
+tags = (
+"TODO-opsz"
+);
+userData = {
+interface.gridadjust.original = "{'width': 1441.0, 'leftMargin': 144, 'rightMargin': 181.0}";
+"interface.width-adjustments" = (
+-16
+);
+};
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dlinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/dlinebelow.glyph
index 2a4075017..814b69110 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dlinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dlinebelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = d;
 },
 {
-pos = (1178,0);
-ref = macronsubnosp;
+pos = (92,0);
+ref = macronsub;
 }
 );
 width = 1246;
@@ -23,8 +23,8 @@ shapes = (
 ref = d;
 },
 {
-pos = (1350,0);
-ref = macronsubnosp;
+pos = (268,0);
+ref = macronsub;
 }
 );
 width = 1322;
@@ -36,8 +36,8 @@ shapes = (
 ref = d;
 },
 {
-pos = (1135,0);
-ref = macronsubnosp;
+pos = (160,0);
+ref = macronsub;
 }
 );
 width = 1190;
@@ -49,8 +49,8 @@ shapes = (
 ref = d;
 },
 {
-pos = (1094,0);
-ref = macronsubnosp;
+pos = (118,0);
+ref = macronsub;
 }
 );
 width = 1160;
@@ -62,8 +62,8 @@ shapes = (
 ref = d;
 },
 {
-pos = (1305,0);
-ref = macronsubnosp;
+pos = (276,0);
+ref = macronsub;
 }
 );
 width = 1280;
@@ -75,8 +75,8 @@ shapes = (
 ref = d;
 },
 {
-pos = (1059,0);
-ref = macronsubnosp;
+pos = (146,0);
+ref = macronsub;
 }
 );
 width = 1118;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/dotaccent.glyph
index c4e6ab0be..4c82da18b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dotaccent.glyph
@@ -76,7 +76,7 @@ pos = (186,1118);
 },
 {
 name = top;
-pos = (186,1431);
+pos = (186,1467);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -84,18 +84,18 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(212,1337,o),
-(233,1358,o),
-(233,1384,cs),
-(233,1410,o),
-(212,1431,o),
-(186,1431,cs),
-(160,1431,o),
-(139,1410,o),
-(139,1384,cs),
-(139,1358,o),
-(160,1337,o),
-(186,1337,cs)
+(212,1373,o),
+(233,1394,o),
+(233,1420,cs),
+(233,1446,o),
+(212,1467,o),
+(186,1467,cs),
+(160,1467,o),
+(139,1446,o),
+(139,1420,cs),
+(139,1394,o),
+(160,1373,o),
+(186,1373,cs)
 );
 }
 );
@@ -109,7 +109,7 @@ pos = (212,1056);
 },
 {
 name = top;
-pos = (212,1490);
+pos = (212,1494);
 }
 );
 layerId = m007;
@@ -142,7 +142,7 @@ pos = (320,1056);
 },
 {
 name = top;
-pos = (320,1505);
+pos = (320,1513);
 }
 );
 layerId = m009;
@@ -150,18 +150,18 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(417,1167,o),
-(496,1243,o),
-(496,1336,cs),
-(496,1429,o),
-(417,1505,o),
-(320,1505,cs),
-(223,1505,o),
-(144,1429,o),
-(144,1336,cs),
-(144,1243,o),
-(223,1167,o),
-(320,1167,cs)
+(417,1175,o),
+(496,1251,o),
+(496,1344,cs),
+(496,1437,o),
+(417,1513,o),
+(320,1513,cs),
+(223,1513,o),
+(144,1437,o),
+(144,1344,cs),
+(144,1251,o),
+(223,1175,o),
+(320,1175,cs)
 );
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/dotbelow.glyph
index 8f7aae467..91b2b553f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dotbelow.glyph
@@ -6,19 +6,14 @@ layers = (
 anchors = (
 {
 name = _bottom;
-pos = (-606,0);
-}
-);
-guides = (
-{
-pos = (-702,0);
+pos = (-600,0);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-850,-1722);
+pos = (-844,-1722);
 ref = dotaccent;
 }
 );
@@ -28,20 +23,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-536,0);
-}
-);
-guides = (
-{
-orientation = center;
-pos = (-702,0);
+pos = (-667,0);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-870,-1714);
+pos = (-1001,-1714);
 ref = dotaccent;
 }
 );
@@ -51,20 +40,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-558,0);
-}
-);
-guides = (
-{
-orientation = center;
-pos = (92,0);
+pos = (-585,0);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-744,-1650);
+pos = (-771,-1686);
 ref = dotaccent;
 }
 );
@@ -74,19 +57,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-638,0);
-}
-);
-guides = (
-{
-pos = (-994,0);
+pos = (-569,0);
 }
 );
 layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-850,-1700);
+pos = (-781,-1700);
 ref = dotaccent;
 }
 );
@@ -96,20 +74,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-552,0);
-}
-);
-guides = (
-{
-orientation = center;
-pos = (-798,0);
+pos = (-647,0);
 }
 );
 layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-870,-1616);
+pos = (-967,-1624);
 ref = dotaccent;
 }
 );
@@ -119,20 +91,14 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-622,0);
-}
-);
-guides = (
-{
-orientation = center;
-pos = (-36,0);
+pos = (-535,0);
 }
 );
 layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-744,-1700);
+pos = (-657,-1700);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dotdblsubnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/dotdblsubnosp.glyph
index a49b9ce6e..885fc947b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dotdblsubnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dotdblsubnosp.glyph
@@ -6,28 +6,15 @@ layers = (
 anchors = (
 {
 name = _bottom;
-pos = (-688,0);
-}
-);
-guides = (
-{
-pos = (-420,-344);
-showMeasurement = 1;
-},
-{
-angle = 90;
-pos = (-940,-236);
+pos = (-600,0);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (-297,0);
-ref = dotbelow;
-},
-{
-pos = (133,0);
-ref = dotbelow;
+alignment = -1;
+pos = (-1200,-1722);
+ref = dieresis;
 }
 );
 width = 0;
@@ -36,18 +23,15 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-768,0);
+pos = (-665,0);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (-523,0);
-ref = dotbelow;
-},
-{
-pos = (59,0);
-ref = dotbelow;
+alignment = -1;
+pos = (-1330,-1714);
+ref = dieresis;
 }
 );
 width = 0;
@@ -56,20 +40,15 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-608,0);
+pos = (-580,0);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-222,0);
-ref = dotbelow;
-},
-{
-alignment = -1;
-pos = (122,0);
-ref = dotbelow;
+pos = (-1162,-1686);
+ref = dieresis;
 }
 );
 width = 0;
@@ -78,24 +57,15 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-720,0);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (-1232,-236);
+pos = (-567,0);
 }
 );
 layerId = m007;
 shapes = (
 {
-pos = (-297,0);
-ref = dotbelow;
-},
-{
-pos = (133,0);
-ref = dotbelow;
+alignment = -1;
+pos = (-1135,-1700);
+ref = dieresis;
 }
 );
 width = 0;
@@ -104,18 +74,15 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-784,0);
+pos = (-651,0);
 }
 );
 layerId = m009;
 shapes = (
 {
-pos = (-523,0);
-ref = dotbelow;
-},
-{
-pos = (59,0);
-ref = dotbelow;
+alignment = -1;
+pos = (-1300,-1624);
+ref = dieresis;
 }
 );
 width = 0;
@@ -124,20 +91,15 @@ width = 0;
 anchors = (
 {
 name = _bottom;
-pos = (-608,0);
+pos = (-534,0);
 }
 );
 layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-158,0);
-ref = dotbelow;
-},
-{
-alignment = -1;
-pos = (186,0);
-ref = dotbelow;
+pos = (-1068,-1700);
+ref = dieresis;
 }
 );
 width = 0;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dotmacron.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/dotmacron.lc.glyph
new file mode 100644
index 000000000..5f415a082
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/dotmacron.lc.glyph
@@ -0,0 +1,190 @@
+{
+glyphname = dotmacron.lc;
+layers = (
+{
+anchors = (
+{
+name = _top;
+pos = (244,1118);
+}
+);
+guides = (
+{
+pos = (0,1392);
+},
+{
+pos = (0,1717);
+}
+);
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+alignment = -1;
+pos = (0,-28);
+ref = dotaccent;
+},
+{
+alignment = -1;
+pos = (-244,439);
+ref = macron;
+scale = (1,0.9);
+}
+);
+width = 488;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (334,1118);
+}
+);
+guides = (
+{
+pos = (0,1392);
+},
+{
+pos = (0,1765);
+}
+);
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+alignment = -1;
+pos = (0,-24);
+ref = dotaccent;
+},
+{
+alignment = -1;
+pos = (-81,632);
+ref = macron;
+scale = (1,0.8);
+}
+);
+width = 670;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (186,1118);
+}
+);
+guides = (
+{
+pos = (0,1392);
+},
+{
+pos = (0,1681);
+}
+);
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+alignment = -1;
+pos = (0,-28);
+ref = dotaccent;
+},
+{
+alignment = -1;
+pos = (-214,261);
+ref = macron;
+}
+);
+width = 372;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (212,1056);
+}
+);
+guides = (
+{
+pos = (0,1328);
+},
+{
+pos = (0,1640);
+}
+);
+layerId = m007;
+shapes = (
+{
+alignment = -1;
+pos = (0,-50);
+ref = dotaccent;
+},
+{
+alignment = -1;
+pos = (-204,429);
+ref = macron;
+scale = (1,0.9);
+}
+);
+width = 424;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (320,1056);
+}
+);
+guides = (
+{
+pos = (0,1704);
+}
+);
+layerId = m009;
+shapes = (
+{
+alignment = -1;
+ref = dotaccent;
+},
+{
+alignment = -1;
+pos = (-65,516);
+ref = macron;
+scale = (1,0.9);
+}
+);
+width = 638;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (122,1056);
+}
+);
+guides = (
+{
+pos = (0,1328);
+},
+{
+pos = (0,1625);
+}
+);
+layerId = m011;
+shapes = (
+{
+alignment = -1;
+pos = (0,-50);
+ref = dotaccent;
+},
+{
+alignment = -1;
+pos = (-262,247);
+ref = macron;
+}
+);
+width = 244;
+}
+);
+metricWidth = dotaccent;
+tags = (
+"TODO-opsz"
+);
+unicode = 57612;
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dotmacroncomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/dotmacroncomb.lc.glyph
deleted file mode 100644
index 5f3631272..000000000
--- a/src/Inter-Roman.glyphspackage/glyphs/dotmacroncomb.lc.glyph
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-glyphname = dotmacroncomb.lc;
-layers = (
-{
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-shapes = (
-{
-ref = dotaccent;
-},
-{
-alignment = -1;
-pos = (-356,308);
-ref = macron;
-}
-);
-width = 488;
-},
-{
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-shapes = (
-{
-ref = dotaccent;
-},
-{
-alignment = -1;
-pos = (-331,367);
-ref = macron;
-}
-);
-width = 670;
-},
-{
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-shapes = (
-{
-ref = dotaccent;
-},
-{
-alignment = -1;
-pos = (-396,232);
-ref = macron;
-}
-);
-width = 372;
-},
-{
-layerId = m007;
-shapes = (
-{
-ref = dotaccent;
-},
-{
-alignment = -1;
-pos = (-356,318);
-ref = macron;
-}
-);
-width = 424;
-},
-{
-layerId = m009;
-shapes = (
-{
-ref = dotaccent;
-},
-{
-alignment = -1;
-pos = (-329,360);
-ref = macron;
-}
-);
-width = 638;
-},
-{
-layerId = m011;
-shapes = (
-{
-ref = dotaccent;
-},
-{
-alignment = -1;
-pos = (-412,250);
-ref = macron;
-}
-);
-width = 244;
-}
-);
-metricWidth = dotaccent;
-tags = (
-"TODO-opsz"
-);
-unicode = 57612;
-}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dotmacroncomb.uc.glyph b/src/Inter-Roman.glyphspackage/glyphs/dotmacroncomb.uc.glyph
index e3d1d8431..f3f8215fa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dotmacroncomb.uc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dotmacroncomb.uc.glyph
@@ -11,11 +11,8 @@ pos = (-812,2700);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-ref = dotaccent;
-},
-{
-pos = (-356,418);
-ref = macron;
+alignment = 1;
+ref = dotmacron.lc;
 }
 );
 width = 488;
@@ -24,30 +21,18 @@ width = 488;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-ref = dotaccent;
-},
-{
-pos = (-331,482);
-ref = macron;
+alignment = 1;
+ref = dotmacron.lc;
 }
 );
 width = 670;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (-720,2228);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-ref = dotaccent;
-},
-{
-pos = (-396,313);
-ref = macron;
+alignment = 1;
+ref = dotmacron.lc;
 }
 );
 width = 372;
@@ -56,11 +41,8 @@ width = 372;
 layerId = m007;
 shapes = (
 {
-ref = dotaccent;
-},
-{
-pos = (-356,434);
-ref = macron;
+alignment = 1;
+ref = dotmacron.lc;
 }
 );
 width = 424;
@@ -69,11 +51,8 @@ width = 424;
 layerId = m009;
 shapes = (
 {
-ref = dotaccent;
-},
-{
-pos = (-329,449);
-ref = macron;
+alignment = 1;
+ref = dotmacron.lc;
 }
 );
 width = 638;
@@ -88,11 +67,8 @@ pos = (-848,2228);
 layerId = m011;
 shapes = (
 {
-ref = dotaccent;
-},
-{
-pos = (-412,369);
-ref = macron;
+alignment = 1;
+ref = dotmacron.lc;
 }
 );
 width = 244;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dotnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/dotnosp.glyph
index 9941a5294..9caba6439 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dotnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dotnosp.glyph
@@ -18,18 +18,18 @@ layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-1000,62);
+pos = (-1000,0);
 ref = dotaccent;
 }
 );
-width = 46;
+width = 0;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-728,-38);
+pos = (-771,0);
 ref = dotaccent;
 }
 );
@@ -40,7 +40,7 @@ layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-830,0);
+pos = (-773,0);
 ref = dotaccent;
 }
 );
@@ -51,18 +51,18 @@ layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1000,62);
+pos = (-976,0);
 ref = dotaccent;
 }
 );
-width = 14;
+width = 0;
 },
 {
 layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-728,-38);
+pos = (-656,0);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/eacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/eacute.glyph
index f28c6495c..0af4ec29b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/eacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/eacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (248,0);
+pos = (356,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (232,0);
+pos = (318,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (310,0);
+pos = (378,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (199,0);
+pos = (386,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (189,0);
+pos = (381,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (242,0);
+pos = (396,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ecaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/ecaron.glyph
index e76eccfab..c0fbfe9a9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ecaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ecaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (134,0);
+pos = (184,0);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-24,0);
+pos = (110,0);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (116,0);
+pos = (150,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-29,0);
+pos = (167,0);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (158,0);
+pos = (174,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ecircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/ecircumflex.glyph
index a47d4c4e2..c49fc1450 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ecircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ecircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (136,0);
+pos = (184,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-18,0);
+pos = (110,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (118,0);
+pos = (150,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-29,0);
+pos = (167,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (158,0);
+pos = (174,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexacute.glyph
index 3765d5b8d..dde407782 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexacute.glyph
@@ -11,7 +11,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (136,0);
+pos = (184,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -25,7 +25,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-18,0);
+pos = (110,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -53,7 +53,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (118,0);
+pos = (150,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -67,7 +67,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-29,0);
+pos = (167,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -81,7 +81,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (158,0);
+pos = (174,0);
 ref = circumflexacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexbelow.glyph
index 3f6ccc6e3..379392178 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1192,0);
+pos = (1196,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1164,0);
+pos = (1167,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1118,0);
+pos = (1116,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1251,0);
+pos = (1249,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1054,0);
+pos = (1050,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexdotbelow.glyph
index 714baef09..1640127ac 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexdotbelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = e;
 },
 {
-pos = (136,0);
+pos = (184,0);
 ref = circumflex;
 },
 {
-pos = (1206,0);
+pos = (1200,0);
 ref = dotbelow;
 }
 );
@@ -27,11 +27,11 @@ shapes = (
 ref = e;
 },
 {
-pos = (-18,0);
+pos = (110,0);
 ref = circumflex;
 },
 {
-pos = (1158,0);
+pos = (1289,0);
 ref = dotbelow;
 }
 );
@@ -48,7 +48,7 @@ pos = (158,0);
 ref = circumflex;
 },
 {
-pos = (1148,0);
+pos = (1175,0);
 ref = dotbelow;
 }
 );
@@ -61,11 +61,11 @@ shapes = (
 ref = e;
 },
 {
-pos = (118,0);
+pos = (150,0);
 ref = circumflex;
 },
 {
-pos = (1188,0);
+pos = (1119,0);
 ref = dotbelow;
 }
 );
@@ -78,11 +78,11 @@ shapes = (
 ref = e;
 },
 {
-pos = (-29,0);
+pos = (167,0);
 ref = circumflex;
 },
 {
-pos = (1151,0);
+pos = (1246,0);
 ref = dotbelow;
 }
 );
@@ -95,11 +95,11 @@ shapes = (
 ref = e;
 },
 {
-pos = (158,0);
+pos = (174,0);
 ref = circumflex;
 },
 {
-pos = (1148,0);
+pos = (1061,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexgrave.glyph
index 19db62682..8baa34b00 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexgrave.glyph
@@ -11,7 +11,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (134,0);
+pos = (184,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -25,7 +25,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-30,0);
+pos = (110,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -39,7 +39,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (90,-122);
+pos = (158,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -53,7 +53,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (116,0);
+pos = (150,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -67,7 +67,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-33,0);
+pos = (167,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -81,7 +81,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (90,-184);
+pos = (174,0);
 ref = circumflexgravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexhookabove.glyph
index 6062a1a54..327ef846f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ecircumflexhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ecircumflexhookabove.glyph
@@ -11,7 +11,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (136,0);
+pos = (184,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -25,7 +25,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-18,0);
+pos = (110,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -53,7 +53,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (118,0);
+pos = (150,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -67,7 +67,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-29,0);
+pos = (167,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -81,7 +81,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (158,0);
+pos = (174,0);
 ref = circumflexhookcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ecircumflextilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/ecircumflextilde.glyph
index 1bb849ae1..f86dd028e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ecircumflextilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ecircumflextilde.glyph
@@ -11,7 +11,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (136,0);
+pos = (184,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -25,7 +25,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-18,0);
+pos = (110,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -39,7 +39,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (160,-228);
+pos = (158,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -53,7 +53,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (118,0);
+pos = (150,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -67,7 +67,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-29,0);
+pos = (167,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -81,7 +81,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (160,-290);
+pos = (171,0);
 ref = circumflextildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/edblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/edblgrave.glyph
index f7fab8e1f..00786497b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/edblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/edblgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1072,0);
+pos = (1176,0);
 ref = dblgravecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1232,0);
+pos = (1278,0);
 ref = dblgravecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1148,0);
+pos = (1166,0);
 ref = dblgravecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1054,0);
+pos = (1109,0);
 ref = dblgravecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1225,0);
+pos = (1239,0);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1148,0);
+pos = (1062,0);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/edotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/edotbelow.glyph
index 7d3ec96a2..ba9eaa902 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/edotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/edotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1206,0);
+pos = (1200,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1158,0);
+pos = (1289,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1148,0);
+pos = (1175,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1188,0);
+pos = (1119,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1151,0);
+pos = (1246,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1148,0);
+pos = (1061,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/egrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/egrave.glyph
index 4a3f80135..4b956d8a6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/egrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/egrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (62,0);
+pos = (190,0);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (18,0);
+pos = (104,0);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (96,0);
+pos = (225,0);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-10,0);
+pos = (220,0);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-73,0);
+pos = (119,0);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (32,0);
+pos = (200,0);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ehookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/ehookabove.glyph
index bb9ed0dee..43deccf06 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ehookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ehookabove.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (1187,0);
-ref = hookabovecmb;
+pos = (335,0);
+ref = hookabove;
 }
 );
 width = 1188;
@@ -23,8 +23,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (1286,0);
-ref = hookabovecmb;
+pos = (308,0);
+ref = hookabove;
 }
 );
 width = 1242;
@@ -36,8 +36,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (1112,0);
-ref = hookabovecmb;
+pos = (370,0);
+ref = hookabove;
 }
 );
 width = 1172;
@@ -49,8 +49,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (1113,0);
-ref = hookabovecmb;
+pos = (285,0);
+ref = hookabove;
 }
 );
 width = 1098;
@@ -62,8 +62,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (1253,0);
-ref = hookabovecmb;
+pos = (276,0);
+ref = hookabove;
 }
 );
 width = 1194;
@@ -75,8 +75,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (1030,0);
-ref = hookabovecmb;
+pos = (308,0);
+ref = hookabove;
 }
 );
 width = 1048;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/einvertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/einvertedbreve.glyph
index 3921fe519..6e55d0e3e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/einvertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/einvertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1197,0);
+pos = (1190,0);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1284,0);
+pos = (1288,0);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1249,0);
+pos = (1252,0);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1055,0);
+pos = (1065,0);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/emacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/emacron.glyph
index 51b9a12f4..8e0209f98 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/emacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/emacron.glyph
@@ -10,6 +10,7 @@ shapes = (
 ref = e;
 },
 {
+pos = (112,0);
 ref = macron;
 }
 );
@@ -22,7 +23,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-43,0);
+pos = (206,0);
 ref = macron;
 }
 );
@@ -35,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (8,0);
+pos = (190,0);
 ref = macron;
 }
 );
@@ -48,7 +49,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-18,0);
+pos = (134,0);
 ref = macron;
 }
 );
@@ -61,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-50,0);
+pos = (215,0);
 ref = macron;
 }
 );
@@ -74,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-8,0);
+pos = (142,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/emacronacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/emacronacute.glyph
index c66909ddd..1c6d04a70 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/emacronacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/emacronacute.glyph
@@ -11,6 +11,7 @@ ref = e;
 },
 {
 alignment = 1;
+pos = (112,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -24,7 +25,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-43,0);
+pos = (206,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -38,7 +39,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (8,0);
+pos = (190,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -52,7 +53,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-18,0);
+pos = (134,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -66,7 +67,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-50,0);
+pos = (215,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -80,7 +81,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-8,0);
+pos = (142,0);
 ref = macronacutecomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/emacrongrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/emacrongrave.glyph
index 84a435feb..9080bd591 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/emacrongrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/emacrongrave.glyph
@@ -11,6 +11,7 @@ ref = e;
 },
 {
 alignment = 1;
+pos = (112,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -24,7 +25,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-43,0);
+pos = (206,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -38,7 +39,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (8,0);
+pos = (190,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -52,7 +53,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-18,0);
+pos = (134,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -66,7 +67,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-50,0);
+pos = (215,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -80,7 +81,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (-8,0);
+pos = (142,0);
 ref = macrongravecomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/epsilontonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/epsilontonos.glyph
index ceace41f4..2e4a2d2d7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/epsilontonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/epsilontonos.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (340,-186);
+pos = (340,0);
 ref = tonostop;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (230,-164);
+pos = (230,0);
 ref = tonostop;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (412,-196);
+pos = (408,0);
 ref = tonostop;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (340,-248);
+pos = (340,0);
 ref = tonostop;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (230,-226);
+pos = (230,0);
 ref = tonostop;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (412,-258);
+pos = (407,0);
 ref = tonostop;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/etatonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/etatonos.glyph
index 78b0ab87f..211f98f45 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/etatonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/etatonos.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (378,-186);
+pos = (378,0);
 ref = tonostop;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (292,-164);
+pos = (292,0);
 ref = tonostop;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (452,-196);
+pos = (448,0);
 ref = tonostop;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (378,-248);
+pos = (378,0);
 ref = tonostop;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (292,-226);
+pos = (292,0);
 ref = tonostop;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (452,-258);
+pos = (447,0);
 ref = tonostop;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/etildebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/etildebelow.glyph
index 3a1df64c5..37730f402 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/etildebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/etildebelow.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (1171,0);
+pos = (1173,0);
 ref = tildesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ezhcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/ezhcaron.glyph
index 32fc04e1d..a1a930bdf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ezhcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ezhcaron.glyph
@@ -10,7 +10,7 @@ ref = dzeabkhasiancyrillic;
 },
 {
 alignment = 1;
-pos = (189,0);
+pos = (239,0);
 ref = caron;
 }
 );
@@ -24,7 +24,7 @@ ref = dzeabkhasiancyrillic;
 },
 {
 alignment = 1;
-pos = (45,0);
+pos = (179,0);
 ref = caron;
 }
 );
@@ -52,7 +52,7 @@ ref = dzeabkhasiancyrillic;
 },
 {
 alignment = 1;
-pos = (182,0);
+pos = (216,0);
 ref = caron;
 }
 );
@@ -66,7 +66,7 @@ ref = dzeabkhasiancyrillic;
 },
 {
 alignment = 1;
-pos = (44,0);
+pos = (240,0);
 ref = caron;
 }
 );
@@ -80,7 +80,7 @@ ref = dzeabkhasiancyrillic;
 },
 {
 alignment = 1;
-pos = (197,62);
+pos = (213,62);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/firsttonechinese.glyph b/src/Inter-Roman.glyphspackage/glyphs/firsttonechinese.glyph
index 73279b99d..754716b17 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/firsttonechinese.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/firsttonechinese.glyph
@@ -5,67 +5,55 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (-32,0);
 ref = macron;
 }
 );
-width = 920;
+width = 976;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (94,0);
 ref = macron;
 }
 );
-width = 1318;
+width = 832;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (-108,0);
 ref = macron;
 }
 );
-width = 680;
+width = 800;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (-32,0);
 ref = macron;
 }
 );
-width = 856;
+width = 832;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (94,0);
 ref = macron;
 }
 );
-width = 1286;
+width = 768;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (-108,0);
 ref = macron;
 }
 );
-width = 552;
+width = 768;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/gacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/gacute.glyph
index 34cbfc3c4..824c2a0a0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/gacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/gacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (274,0);
+pos = (382,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (278,0);
+pos = (364,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (316,0);
+pos = (384,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (195,0);
+pos = (382,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (228,0);
+pos = (420,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (246,0);
+pos = (400,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/gcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/gcaron.glyph
index 69ceca92d..1d3427e82 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/gcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/gcaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (160,0);
+pos = (210,0);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (22,0);
+pos = (156,0);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (112,0);
+pos = (146,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (10,0);
+pos = (206,0);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (162,0);
+pos = (178,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/gcircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/gcircumflex.glyph
index 39ae5329d..49d0de01b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/gcircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/gcircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (162,0);
+pos = (210,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (28,0);
+pos = (156,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (114,0);
+pos = (146,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (10,0);
+pos = (206,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (162,0);
+pos = (178,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/gjecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/gjecyrillic.glyph
index 53f45e641..5e45d5990 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/gjecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/gjecyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (146,0);
+pos = (254,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (130,0);
+pos = (216,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (214,0);
+pos = (282,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (115,0);
+pos = (302,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (94,0);
+pos = (286,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (146,0);
+pos = (300,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/gmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/gmacron.glyph
index 4784a7daf..1da7cb8b6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/gmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/gmacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (26,0);
+pos = (138,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (3,0);
+pos = (252,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (14,0);
+pos = (196,0);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (-22,0);
+pos = (130,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (-11,0);
+pos = (254,0);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (-4,0);
+pos = (146,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/grave.glyph b/src/Inter-Roman.glyphspackage/glyphs/grave.glyph
index 9d165bcac..7e0d2f3d5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/grave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/grave.glyph
@@ -6,17 +6,11 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (538,1118);
+pos = (410,1118);
 },
 {
 name = top;
-pos = (538,1532);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (538,1621);
+pos = (410,1557);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -24,24 +18,29 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(622,1258,l),
-(482,1532,l),
-(288,1532,l),
-(480,1258,l)
+(494,1283,l),
+(354,1557,l),
+(160,1557,l),
+(352,1283,l)
 );
 }
 );
-width = 890;
+width = 654;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (604,1118);
+pos = (518,1118);
 },
 {
 name = top;
-pos = (604,1582);
+pos = (518,1582);
+}
+);
+guides = (
+{
+pos = (0,1256);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -49,24 +48,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(738,1256,l),
-(598,1582,l),
-(256,1582,l),
-(474,1256,l)
+(652,1256,l),
+(514,1582,l),
+(170,1582,l),
+(388,1256,l)
 );
 }
 );
-width = 994;
+width = 822;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (494,1118);
+pos = (365,1118);
 },
 {
 name = top;
-pos = (490,1594);
+pos = (361,1557);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -74,24 +73,29 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(518,1280,l),
-(314,1594,l),
-(256,1594,l),
-(472,1280,l)
+(393,1283,l),
+(240,1557,l),
+(180,1557,l),
+(347,1283,l)
 );
 }
 );
-width = 774;
+width = 573;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (560,1056);
+pos = (330,1056);
 },
 {
 name = top;
-pos = (560,1490);
+pos = (330,1515);
+}
+);
+guides = (
+{
+pos = (0,1241);
 }
 );
 layerId = m007;
@@ -99,30 +103,36 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(644,1216,l),
-(504,1490,l),
-(310,1490,l),
-(502,1216,l)
+(414,1241,l),
+(274,1515,l),
+(80,1515,l),
+(272,1241,l)
 );
 }
 );
-width = 911;
+width = 494;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (672,1056);
+pos = (480,1056);
 },
 {
 name = top;
-pos = (672,1490);
+pos = (480,1507);
 }
 );
 guides = (
 {
 angle = 90;
-pos = (672,1107);
+pos = (480,1107);
+},
+{
+pos = (0,1181);
+},
+{
+pos = (0,1507);
 }
 );
 layerId = m009;
@@ -130,24 +140,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(826,1164,l),
-(624,1490,l),
-(256,1490,l),
-(562,1164,l)
+(634,1181,l),
+(432,1507,l),
+(64,1507,l),
+(370,1181,l)
 );
 }
 );
-width = 1082;
+width = 698;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (494,1056);
+pos = (326,1056);
 },
 {
 name = top;
-pos = (490,1490);
+pos = (322,1515);
 }
 );
 layerId = m011;
@@ -155,18 +165,16 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(520,1216,l),
-(326,1490,l),
-(268,1490,l),
-(469,1216,l)
+(352,1241,l),
+(158,1515,l),
+(100,1515,l),
+(301,1241,l)
 );
 }
 );
-width = 774;
+width = 452;
 }
 );
-metricLeft = "=|acute";
-metricRight = "=|acute";
 note = "mirrored version of acute";
 tags = (
 "TODO-opsz"
diff --git a/src/Inter-Roman.glyphspackage/glyphs/gravecomb.glyph b/src/Inter-Roman.glyphspackage/glyphs/gravecomb.glyph
index 5521ecd38..fd605e181 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/gravecomb.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/gravecomb.glyph
@@ -3,29 +3,12 @@ color = (250,227,227,1);
 glyphname = gravecomb;
 layers = (
 {
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(-434,1240,l),
-(-612,1576,l),
-(-814,1576,l),
-(-586,1240,l)
-);
-}
-);
-};
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-870,1536,l),
-(-606,1240,l),
-(-436,1240,l),
-(-628,1536,l)
-);
+alignment = -1;
+pos = (-1016,0);
+ref = grave;
 }
 );
 width = 0;
@@ -34,56 +17,31 @@ width = 0;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-1058,1536,l),
-(-760,1216,l),
-(-456,1216,l),
-(-666,1536,l)
-);
+alignment = -1;
+pos = (-1192,0);
+ref = grave;
 }
 );
-width = 46;
+width = 0;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-680,1536,l),
-(-478,1254,l),
-(-424,1254,l),
-(-608,1536,l)
-);
+alignment = -1;
+pos = (-966,0);
+ref = grave;
 }
 );
 width = 0;
 },
 {
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(-434,1240,l),
-(-612,1576,l),
-(-814,1576,l),
-(-586,1240,l)
-);
-}
-);
-};
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-902,1536,l),
-(-638,1240,l),
-(-468,1240,l),
-(-660,1536,l)
-);
+alignment = -1;
+pos = (-899,0);
+ref = grave;
 }
 );
 width = 0;
@@ -92,28 +50,20 @@ width = 0;
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-1074,1536,l),
-(-776,1216,l),
-(-472,1216,l),
-(-682,1536,l)
-);
+alignment = -1;
+pos = (-1145,0);
+ref = grave;
 }
 );
-width = 14;
+width = 0;
 },
 {
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-744,1536,l),
-(-542,1254,l),
-(-488,1254,l),
-(-672,1536,l)
-);
+alignment = -1;
+pos = (-875,0);
+ref = grave;
 }
 );
 width = 0;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/graveleftnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/graveleftnosp.glyph
index a15c2f999..cf7ff5c02 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/graveleftnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/graveleftnosp.glyph
@@ -6,9 +6,8 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (-286,0);
-ref = grave;
+alignment = 1;
+ref = gravecomb;
 }
 );
 width = 0;
@@ -17,9 +16,8 @@ width = 0;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (-404,0);
-ref = grave;
+alignment = 1;
+ref = gravecomb;
 }
 );
 width = 0;
@@ -28,9 +26,8 @@ width = 0;
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (-216,0);
-ref = grave;
+alignment = 1;
+ref = gravecomb;
 }
 );
 width = 0;
@@ -39,9 +36,8 @@ width = 0;
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (-286,0);
-ref = grave;
+alignment = 1;
+ref = gravecomb;
 }
 );
 width = 0;
@@ -50,9 +46,8 @@ width = 0;
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (-404,0);
-ref = grave;
+alignment = 1;
+ref = gravecomb;
 }
 );
 width = 0;
@@ -61,9 +56,8 @@ width = 0;
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (-216,0);
-ref = grave;
+alignment = 1;
+ref = gravecomb;
 }
 );
 width = 0;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/hbrevebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/hbrevebelow.glyph
index a98c0e890..c12f6deac 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/hbrevebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/hbrevebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1190,0);
+pos = (1201,0);
 ref = brevesubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1368,2);
+pos = (1334,0);
 ref = brevesubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1100,-2);
+pos = (1157,0);
 ref = brevesubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1192,0);
+pos = (1139,0);
 ref = brevesubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1368,2);
+pos = (1299,0);
 ref = brevesubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1116,-2);
+pos = (1069,0);
 ref = brevesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/hcircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/hcircumflex.glyph
index a379b8b0c..bf03ec682 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/hcircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/hcircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-221,372);
+pos = (-173,372);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-345,372);
+pos = (-217,372);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-219,434);
+pos = (-187,434);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-342,434);
+pos = (-146,434);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-211,434);
+pos = (-195,434);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/hdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/hdotbelow.glyph
index 55f815f75..960ce7ccf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/hdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/hdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1208,0);
+pos = (1202,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1200,0);
+pos = (1331,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1140,0);
+pos = (1167,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1210,0);
+pos = (1141,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1200,0);
+pos = (1295,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (1156,0);
+pos = (1069,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/hlinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/hlinebelow.glyph
index 3b7280b9b..945d462f8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/hlinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/hlinebelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (1200,0);
-ref = macronsubnosp;
+pos = (114,0);
+ref = macronsub;
 }
 );
 width = 1212;
@@ -23,8 +23,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (1330,0);
-ref = macronsubnosp;
+pos = (248,0);
+ref = macronsub;
 }
 );
 width = 1330;
@@ -36,8 +36,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (1157,0);
-ref = macronsubnosp;
+pos = (182,0);
+ref = macronsub;
 }
 );
 width = 1164;
@@ -49,8 +49,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (1132,0);
-ref = macronsubnosp;
+pos = (156,0);
+ref = macronsub;
 }
 );
 width = 1138;
@@ -62,8 +62,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (1293,0);
-ref = macronsubnosp;
+pos = (264,0);
+ref = macronsub;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (1063,0);
-ref = macronsubnosp;
+pos = (150,0);
+ref = macronsub;
 }
 );
 width = 1068;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/hookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/hookabove.glyph
new file mode 100644
index 000000000..78808b7a6
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/hookabove.glyph
@@ -0,0 +1,647 @@
+{
+color = (250,227,227,1);
+glyphname = hookabove;
+layers = (
+{
+anchors = (
+{
+name = _top;
+pos = (265,1118);
+}
+);
+background = {
+shapes = (
+{
+pos = (-80,0);
+ref = acute;
+}
+);
+};
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+closed = 1;
+nodes = (
+(376,1351,ls),
+(454,1467,o),
+(394,1557,o),
+(237,1557,cs),
+(100,1557,l),
+(100,1442,l),
+(237,1442,ls),
+(267,1442,o),
+(274,1428,o),
+(260,1401,cs),
+(198,1283,l),
+(330,1283,l)
+);
+}
+);
+width = 510;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (314,1118);
+}
+);
+background = {
+shapes = (
+{
+pos = (-98,0);
+ref = acute;
+}
+);
+};
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+closed = 1;
+nodes = (
+(471,1320,ls),
+(559,1418,o),
+(552,1582,o),
+(277,1582,cs),
+(100,1582,l),
+(100,1399,l),
+(277,1399,ls),
+(282,1399,o),
+(283,1396,o),
+(281,1392,cs),
+(199,1256,l),
+(413,1256,l)
+);
+}
+);
+width = 621;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (220,1118);
+}
+);
+background = {
+shapes = (
+{
+pos = (-55,0);
+ref = acute;
+},
+{
+closed = 1;
+nodes = (
+(326,1351,ls),
+(404,1467,o),
+(344,1557,o),
+(187,1557,cs),
+(50,1557,l),
+(50,1442,l),
+(187,1442,ls),
+(217,1442,o),
+(224,1428,o),
+(210,1401,cs),
+(148,1283,l),
+(280,1283,l)
+);
+}
+);
+};
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+closed = 1;
+nodes = (
+(292,1364,ls),
+(359,1475,o),
+(339,1557,o),
+(205,1557,cs),
+(100,1557,l),
+(100,1513,l),
+(205,1513,ls),
+(301,1513,o),
+(301,1468,o),
+(251,1379,cs),
+(197,1283,l),
+(243,1283,l)
+);
+}
+);
+width = 429;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (323,1056);
+}
+);
+background = {
+shapes = (
+{
+pos = (-62,0);
+ref = acute;
+}
+);
+};
+layerId = m009;
+shapes = (
+{
+closed = 1;
+nodes = (
+(499,1245,ls),
+(587,1349,o),
+(587,1507,o),
+(284,1507,cs),
+(100,1507,l),
+(100,1308,l),
+(269,1308,ls),
+(274,1308,o),
+(276,1305,o),
+(273,1301,cs),
+(199,1181,l),
+(445,1181,l)
+);
+}
+);
+width = 650;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (218,1056);
+}
+);
+background = {
+shapes = (
+{
+pos = (-59,0);
+ref = acute;
+},
+{
+closed = 1;
+nodes = (
+(335,1309,ls),
+(413,1425,o),
+(353,1515,o),
+(196,1515,cs),
+(59,1515,l),
+(59,1400,l),
+(196,1400,ls),
+(226,1400,o),
+(233,1386,o),
+(219,1359,cs),
+(157,1241,l),
+(289,1241,l)
+);
+}
+);
+};
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(305,1322,ls),
+(381,1427,o),
+(339,1515,o),
+(205,1515,cs),
+(100,1515,l),
+(100,1469,l),
+(205,1469,ls),
+(301,1469,o),
+(322,1422,o),
+(263,1337,cs),
+(196,1241,l),
+(246,1241,l)
+);
+}
+);
+width = 443;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (-565,1056);
+}
+);
+associatedMasterId = m007;
+layerId = "35411DDE-B01E-4F9A-AA58-ADFF614AB5E6";
+name = "Apr 11, 23, 17:32";
+shapes = (
+{
+closed = 1;
+nodes = (
+(-411,1318,o),
+(-382,1360,o),
+(-382,1419,cs),
+(-382,1508,o),
+(-462,1582,o),
+(-578,1582,cs),
+(-749,1582,l),
+(-749,1442,l),
+(-578,1442,ls),
+(-540,1442,o),
+(-529,1419,o),
+(-546,1387,cs),
+(-631,1232,l),
+(-531,1173,l)
+);
+}
+);
+width = 0;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (-579,1118);
+}
+);
+associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+background = {
+shapes = (
+{
+pos = (-805,0);
+ref = acute;
+}
+);
+};
+layerId = "416DAF5F-701C-417F-A2C3-826FA34E6049";
+name = "Apr 11, 23, 17:35";
+shapes = (
+{
+closed = 1;
+nodes = (
+(-443,1368,o),
+(-433,1400,o),
+(-433,1428,cs),
+(-433,1493,o),
+(-488,1538,o),
+(-580,1538,cs),
+(-725,1538,l),
+(-725,1492,l),
+(-580,1492,ls),
+(-485,1492,o),
+(-453,1442,o),
+(-502,1360,cs),
+(-573,1242,l),
+(-540,1221,l)
+);
+}
+);
+width = 0;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (-646,1056);
+}
+);
+associatedMasterId = m009;
+layerId = "F4970EE5-29C3-4417-A878-39F7813AFBEC";
+name = "Apr 11, 23, 17:36";
+shapes = (
+{
+closed = 1;
+nodes = (
+(-482,1263,o),
+(-426,1325,o),
+(-426,1394,cs),
+(-426,1509,o),
+(-532,1570,o),
+(-682,1570,cs),
+(-867,1570,l),
+(-867,1342,l),
+(-702,1342,ls),
+(-697,1342,o),
+(-696,1339,o),
+(-698,1335,cs),
+(-771,1186,l),
+(-624,1135,l)
+);
+}
+);
+width = 0;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (-664,1118);
+}
+);
+associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+layerId = "177F48AE-D2E3-489C-A0E5-EC6F52D44105";
+name = "Apr 11, 23, 17:38";
+shapes = (
+{
+closed = 1;
+nodes = (
+(-500,1343,o),
+(-444,1405,o),
+(-444,1474,cs),
+(-444,1589,o),
+(-550,1650,o),
+(-700,1650,cs),
+(-885,1650,l),
+(-885,1422,l),
+(-720,1422,ls),
+(-715,1422,o),
+(-714,1419,o),
+(-716,1415,cs),
+(-789,1266,l),
+(-642,1215,l)
+);
+}
+);
+width = 0;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (-563,1056);
+}
+);
+associatedMasterId = m007;
+background = {
+shapes = (
+{
+pos = (-893,0);
+ref = acute;
+}
+);
+};
+layerId = "E4630327-6B7D-40F2-903D-5F1AE6090C94";
+name = "Apr 12, 23, 10:30";
+shapes = (
+{
+closed = 1;
+nodes = (
+(-427,1320,o),
+(-395,1381,o),
+(-395,1440,cs),
+(-395,1516,o),
+(-451,1558,o),
+(-562,1558,cs),
+(-717,1558,l),
+(-717,1431,l),
+(-588,1431,ls),
+(-550,1431,o),
+(-538,1411,o),
+(-556,1376,cs),
+(-626,1241,l),
+(-491,1241,l)
+);
+}
+);
+width = 0;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (-563,1056);
+}
+);
+associatedMasterId = m007;
+background = {
+shapes = (
+{
+pos = (-909,0);
+ref = acute;
+}
+);
+};
+layerId = "E2288BC9-4720-4D6B-AB15-5E348A4E431A";
+name = "Apr 12, 23, 10:39";
+shapes = (
+{
+closed = 1;
+nodes = (
+(-478,1274,ls),
+(-387,1404,o),
+(-482,1515,o),
+(-667,1515,cs),
+(-731,1515,l),
+(-731,1402,l),
+(-708,1402,ls),
+(-577,1402,o),
+(-556,1366,o),
+(-622,1259,cs),
+(-633,1241,l),
+(-501,1241,l)
+);
+}
+);
+width = 0;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (-563,1056);
+}
+);
+associatedMasterId = m007;
+background = {
+shapes = (
+{
+pos = (-907,0);
+ref = acute;
+}
+);
+};
+layerId = "2ADA3DC0-72DC-4253-8604-666DF5C4C3CB";
+name = "Apr 12, 23, 10:43";
+shapes = (
+{
+closed = 1;
+nodes = (
+(-449,1310,ls),
+(-367,1425,o),
+(-422,1515,o),
+(-573,1515,cs),
+(-728,1515,l),
+(-728,1400,l),
+(-591,1400,ls),
+(-561,1400,o),
+(-553,1386,o),
+(-568,1359,cs),
+(-630,1241,l),
+(-498,1241,l)
+);
+}
+);
+width = 0;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (265,1056);
+}
+);
+background = {
+shapes = (
+{
+pos = (-79,0);
+ref = acute;
+}
+);
+};
+layerId = m007;
+name = Display;
+shapes = (
+{
+closed = 1;
+nodes = (
+(376,1309,ls),
+(454,1425,o),
+(394,1515,o),
+(237,1515,cs),
+(100,1515,l),
+(100,1400,l),
+(237,1400,ls),
+(267,1400,o),
+(274,1386,o),
+(260,1359,cs),
+(198,1241,l),
+(330,1241,l)
+);
+}
+);
+width = 510;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (-654,1056);
+}
+);
+associatedMasterId = m009;
+background = {
+shapes = (
+{
+pos = (-1063,0);
+ref = acute;
+}
+);
+};
+layerId = "1D872E34-6138-4358-ADCF-E371A4194CC2";
+name = "Apr 12, 23, 11:20";
+shapes = (
+{
+closed = 1;
+nodes = (
+(-425,1299,o),
+(-402,1334,o),
+(-402,1403,cs),
+(-402,1509,o),
+(-485,1569,o),
+(-634,1569,cs),
+(-819,1569,l),
+(-819,1359,l),
+(-654,1359,ls),
+(-649,1359,o),
+(-648,1356,o),
+(-650,1352,cs),
+(-757,1173,l),
+(-543,1173,l)
+);
+}
+);
+width = 0;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (-664,1118);
+}
+);
+associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+background = {
+shapes = (
+{
+pos = (-1076,0);
+ref = acute;
+}
+);
+};
+layerId = "0501E864-74B5-4734-8A0D-349C876FEDB4";
+name = "Apr 13, 23, 08:41";
+shapes = (
+{
+closed = 1;
+nodes = (
+(-482,1360,o),
+(-430,1437,o),
+(-430,1506,cs),
+(-430,1621,o),
+(-514,1650,o),
+(-664,1650,cs),
+(-849,1650,l),
+(-849,1446,l),
+(-688,1446,ls),
+(-679,1446,o),
+(-676,1440,o),
+(-680,1431,cs),
+(-754,1256,l),
+(-556,1256,l)
+);
+}
+);
+width = 0;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (-654,1056);
+}
+);
+associatedMasterId = m009;
+background = {
+shapes = (
+{
+pos = (-1023,0);
+ref = acute;
+}
+);
+};
+layerId = "EE6E4DBA-AE06-4361-A2F6-602244302330";
+name = "Apr 13, 23, 08:42";
+shapes = (
+{
+closed = 1;
+nodes = (
+(-490,1280,ls),
+(-402,1378,o),
+(-409,1542,o),
+(-684,1542,cs),
+(-861,1542,l),
+(-861,1359,l),
+(-684,1359,ls),
+(-679,1359,o),
+(-678,1356,o),
+(-680,1352,cs),
+(-762,1216,l),
+(-548,1216,l)
+);
+}
+);
+width = 0;
+}
+);
+tags = (
+"TODO-opsz"
+);
+unicode = 60936;
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/hookabovecmb.glyph b/src/Inter-Roman.glyphspackage/glyphs/hookabovecmb.glyph
deleted file mode 100644
index d85f1a0ce..000000000
--- a/src/Inter-Roman.glyphspackage/glyphs/hookabovecmb.glyph
+++ /dev/null
@@ -1,426 +0,0 @@
-{
-color = (250,227,227,1);
-glyphname = hookabovecmb;
-layers = (
-{
-anchors = (
-{
-name = _top;
-pos = (-587,1118);
-}
-);
-background = {
-shapes = (
-{
-pos = (-926,0);
-ref = acute;
-}
-);
-};
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-452,1341,o),
-(-416,1400,o),
-(-416,1459,cs),
-(-416,1535,o),
-(-480,1577,o),
-(-594,1577,cs),
-(-749,1577,l),
-(-749,1450,l),
-(-616,1450,ls),
-(-578,1450,o),
-(-570,1430,o),
-(-588,1395,cs),
-(-658,1258,l),
-(-516,1258,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-664,1118);
-}
-);
-background = {
-shapes = (
-{
-pos = (-1076,0);
-ref = acute;
-}
-);
-};
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-482,1360,o),
-(-430,1437,o),
-(-430,1506,cs),
-(-430,1621,o),
-(-514,1650,o),
-(-664,1650,cs),
-(-849,1650,l),
-(-849,1446,l),
-(-688,1446,ls),
-(-679,1446,o),
-(-676,1440,o),
-(-680,1431,cs),
-(-754,1256,l),
-(-556,1256,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-522,1118);
-}
-);
-background = {
-shapes = (
-{
-pos = (-797,0);
-ref = acute;
-}
-);
-};
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-401,1408,o),
-(-390,1433,o),
-(-390,1466,cs),
-(-390,1531,o),
-(-442,1578,o),
-(-534,1578,cs),
-(-639,1578,l),
-(-639,1532,l),
-(-534,1532,ls),
-(-439,1532,o),
-(-411,1480,o),
-(-463,1400,cs),
-(-541,1280,l),
-(-495,1280,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-654,1056);
-}
-);
-background = {
-shapes = (
-{
-pos = (-1063,0);
-ref = acute;
-}
-);
-};
-layerId = m009;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-425,1290,o),
-(-402,1325,o),
-(-402,1394,cs),
-(-402,1500,o),
-(-485,1560,o),
-(-634,1560,cs),
-(-819,1560,l),
-(-819,1350,l),
-(-654,1350,ls),
-(-649,1350,o),
-(-648,1347,o),
-(-650,1343,cs),
-(-757,1164,l),
-(-543,1164,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-504,1056);
-}
-);
-background = {
-shapes = (
-{
-pos = (-781,0);
-ref = acute;
-}
-);
-};
-layerId = m011;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-382,1344,o),
-(-370,1369,o),
-(-370,1402,cs),
-(-370,1467,o),
-(-425,1514,o),
-(-517,1514,cs),
-(-622,1514,l),
-(-622,1468,l),
-(-517,1468,ls),
-(-422,1468,o),
-(-387,1415,o),
-(-442,1336,cs),
-(-526,1216,l),
-(-476,1216,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-565,1056);
-}
-);
-associatedMasterId = m007;
-layerId = "35411DDE-B01E-4F9A-AA58-ADFF614AB5E6";
-name = "Apr 11, 23, 17:32";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-411,1318,o),
-(-382,1360,o),
-(-382,1419,cs),
-(-382,1508,o),
-(-462,1582,o),
-(-578,1582,cs),
-(-749,1582,l),
-(-749,1442,l),
-(-578,1442,ls),
-(-540,1442,o),
-(-529,1419,o),
-(-546,1387,cs),
-(-631,1232,l),
-(-531,1173,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-563,1056);
-}
-);
-background = {
-shapes = (
-{
-pos = (-893,0);
-ref = acute;
-}
-);
-};
-layerId = m007;
-name = Display;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-427,1295,o),
-(-395,1356,o),
-(-395,1415,cs),
-(-395,1491,o),
-(-451,1533,o),
-(-562,1533,cs),
-(-717,1533,l),
-(-717,1406,l),
-(-588,1406,ls),
-(-550,1406,o),
-(-538,1386,o),
-(-556,1351,cs),
-(-626,1216,l),
-(-491,1216,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-579,1118);
-}
-);
-associatedMasterId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-background = {
-shapes = (
-{
-pos = (-805,0);
-ref = acute;
-}
-);
-};
-layerId = "416DAF5F-701C-417F-A2C3-826FA34E6049";
-name = "Apr 11, 23, 17:35";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-443,1368,o),
-(-433,1400,o),
-(-433,1428,cs),
-(-433,1493,o),
-(-488,1538,o),
-(-580,1538,cs),
-(-725,1538,l),
-(-725,1492,l),
-(-580,1492,ls),
-(-485,1492,o),
-(-453,1442,o),
-(-502,1360,cs),
-(-573,1242,l),
-(-540,1221,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-646,1056);
-}
-);
-associatedMasterId = m009;
-layerId = "F4970EE5-29C3-4417-A878-39F7813AFBEC";
-name = "Apr 11, 23, 17:36";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-482,1263,o),
-(-426,1325,o),
-(-426,1394,cs),
-(-426,1509,o),
-(-532,1570,o),
-(-682,1570,cs),
-(-867,1570,l),
-(-867,1342,l),
-(-702,1342,ls),
-(-697,1342,o),
-(-696,1339,o),
-(-698,1335,cs),
-(-771,1186,l),
-(-624,1135,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-664,1118);
-}
-);
-associatedMasterId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-layerId = "177F48AE-D2E3-489C-A0E5-EC6F52D44105";
-name = "Apr 11, 23, 17:38";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-500,1343,o),
-(-444,1405,o),
-(-444,1474,cs),
-(-444,1589,o),
-(-550,1650,o),
-(-700,1650,cs),
-(-885,1650,l),
-(-885,1422,l),
-(-720,1422,ls),
-(-715,1422,o),
-(-714,1419,o),
-(-716,1415,cs),
-(-789,1266,l),
-(-642,1215,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-563,1056);
-}
-);
-associatedMasterId = m007;
-background = {
-shapes = (
-{
-pos = (-893,0);
-ref = acute;
-}
-);
-};
-layerId = "0A2C4732-518D-4305-858E-0550EAD4FAC6";
-name = "Apr 11, 23, 17:42";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-420,1299,o),
-(-377,1360,o),
-(-377,1419,cs),
-(-377,1508,o),
-(-446,1542,o),
-(-562,1542,cs),
-(-717,1542,l),
-(-717,1410,l),
-(-584,1410,ls),
-(-546,1410,o),
-(-533,1390,o),
-(-552,1355,cs),
-(-626,1216,l),
-(-484,1216,l)
-);
-}
-);
-width = 0;
-}
-);
-tags = (
-"TODO-opsz"
-);
-unicode = 60936;
-}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/hungarumlaut.glyph b/src/Inter-Roman.glyphspackage/glyphs/hungarumlaut.glyph
index 5980ad7b5..525d273d8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/hungarumlaut.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/hungarumlaut.glyph
@@ -3,314 +3,73 @@ color = (204,240,242,1);
 glyphname = hungarumlaut;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (352,1292);
-},
-{
-name = mkmktop_acc;
-pos = (352,1620);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(248,1228,l),
-(474,1566,l),
-(274,1566,l),
-(96,1228,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(546,1228,l),
-(772,1566,l),
-(572,1566,l),
-(394,1228,l)
-);
-}
-);
-};
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(546,1228,l),
-(812,1536,l),
-(620,1536,l),
-(396,1228,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(232,1228,l),
-(448,1536,l),
-(258,1536,l),
-(96,1228,l)
-);
-}
-);
-width = 756;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (390,1292);
-},
-{
-name = mkmktop_acc;
-pos = (390,1650);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(712,1240,l),
-(930,1566,l),
-(588,1566,l),
-(448,1240,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(298,1240,l),
-(516,1566,l),
-(174,1566,l),
-(34,1240,l)
-);
+pos = (-326,0);
+ref = dblgravecmb;
+scale = (-1,1);
 }
 );
-};
-guides = (
-{
-pos = (4,1240);
+width = 545;
 },
 {
-pos = (4,764);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(716,1240,l),
-(994,1536,l),
-(686,1536,l),
-(450,1240,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(300,1240,l),
-(552,1536,l),
-(244,1536,l),
-(30,1240,l)
-);
+pos = (-340,0);
+ref = dblgravecmb;
+scale = (-1,1);
 }
 );
-width = 1076;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (328,1292);
+width = 642;
 },
 {
-name = mkmktop_acc;
-pos = (328,1602);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(412,1222,l),
-(686,1536,l),
-(626,1536,l),
-(366,1222,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(198,1222,l),
-(414,1536,l),
-(354,1536,l),
-(152,1222,l)
-);
-}
-);
-width = 564;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (320,1292);
-},
-{
-name = mkmktop_acc;
-pos = (320,1620);
+pos = (-384,0);
+ref = dblgravecmb;
+scale = (-1,1);
 }
 );
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(248,1228,l),
-(474,1566,l),
-(274,1566,l),
-(96,1228,l)
-);
+width = 399;
 },
 {
-closed = 1;
-nodes = (
-(546,1228,l),
-(772,1566,l),
-(572,1566,l),
-(394,1228,l)
-);
-}
-);
-};
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(514,1228,l),
-(780,1536,l),
-(588,1536,l),
-(364,1228,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(200,1228,l),
-(416,1536,l),
-(226,1536,l),
-(64,1228,l)
-);
-}
-);
-width = 692;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (374,1292);
-},
-{
-name = mkmktop_acc;
-pos = (374,1650);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(712,1240,l),
-(930,1566,l),
-(588,1566,l),
-(448,1240,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(298,1240,l),
-(516,1566,l),
-(174,1566,l),
-(34,1240,l)
-);
+pos = (-341,0);
+ref = dblgravecmb;
+scale = (-1,1);
 }
 );
-};
-guides = (
-{
-pos = (-92,1240);
+width = 479;
 },
 {
-pos = (-92,764);
-}
-);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(700,1240,l),
-(978,1536,l),
-(670,1536,l),
-(434,1240,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(284,1240,l),
-(536,1536,l),
-(228,1536,l),
-(14,1240,l)
-);
+pos = (-340,0);
+ref = dblgravecmb;
+scale = (-1,1);
 }
 );
-width = 1044;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (264,1292);
+width = 620;
 },
 {
-name = mkmktop_acc;
-pos = (264,1602);
-}
-);
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(348,1222,l),
-(622,1536,l),
-(562,1536,l),
-(302,1222,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(134,1222,l),
-(350,1536,l),
-(290,1536,l),
-(88,1222,l)
-);
+pos = (-381,0);
+ref = dblgravecmb;
+scale = (-1,1);
 }
 );
-width = 436;
+width = 335;
 }
 );
+note = "\"DOUBLE ACUTE ACCENT\"\012See /acutedblnosp for combining variant";
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/iacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/iacute.glyph
index 3e2793d67..e153512aa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/iacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/iacute.glyph
@@ -10,7 +10,6 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-108,0);
 ref = acute;
 }
 );
@@ -23,7 +22,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-88,0);
+pos = (-2,0);
 ref = acute;
 }
 );
@@ -36,7 +35,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-60,0);
+pos = (8,0);
 ref = acute;
 }
 );
@@ -49,7 +48,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-138,0);
+pos = (49,0);
 ref = acute;
 }
 );
@@ -62,7 +61,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-124,0);
+pos = (68,0);
 ref = acute;
 }
 );
@@ -75,7 +74,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-127,0);
+pos = (27,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/icaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/icaron.glyph
index 30e0d82d7..4b315dd1f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/icaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/icaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-222,0);
+pos = (-172,0);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-344,0);
+pos = (-210,0);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-221,0);
+pos = (-187,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-342,0);
+pos = (-146,0);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-211,0);
+pos = (-195,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/icircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/icircumflex.glyph
index 6dc8a6fca..6681cca1d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/icircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/icircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-220,0);
+pos = (-172,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-338,0);
+pos = (-210,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-219,0);
+pos = (-187,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-342,0);
+pos = (-146,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-211,0);
+pos = (-195,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/idblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/idblgrave.glyph
index cc8204a6d..875306709 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/idblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/idblgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (716,0);
+pos = (820,0);
 ref = dblgravecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (912,0);
+pos = (958,0);
 ref = dblgravecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (778,0);
+pos = (796,0);
 ref = dblgravecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (717,0);
+pos = (772,0);
 ref = dblgravecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (912,0);
+pos = (926,0);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (779,0);
+pos = (693,0);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/idieresis.double.glyph b/src/Inter-Roman.glyphspackage/glyphs/idieresis.double.glyph
index ea64d4014..f8c4e1d26 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/idieresis.double.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/idieresis.double.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless.double;
 },
 {
-pos = (-88,-186);
+pos = (-88,0);
 ref = dieresis.three;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = idotless.double;
 },
 {
-pos = (-87,-186);
+pos = (-87,0);
 ref = dieresis.three;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = idotless.double;
 },
 {
-pos = (15,-186);
+pos = (15,0);
 ref = dieresis.three;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = idotless.double;
 },
 {
-pos = (-148,-206);
+pos = (-148,0);
 ref = dieresis.three;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = idotless.double;
 },
 {
-pos = (-124,-206);
+pos = (-124,0);
 ref = dieresis.three;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = idotless.double;
 },
 {
-pos = (-113,-206);
+pos = (-113,0);
 ref = dieresis.three;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/idieresisacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/idieresisacute.glyph
index 4485ca9d4..da78e3998 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/idieresisacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/idieresisacute.glyph
@@ -17,7 +17,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-357,0);
+pos = (-356,0);
 ref = dieresisacutecomb.lc;
 }
 );
@@ -63,7 +63,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-356,0);
+pos = (-355,0);
 ref = dieresisacutecomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/idotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/idotbelow.glyph
index ab3c680e7..51722a22a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/idotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/idotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (850,0);
+pos = (844,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (842,0);
+pos = (973,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (778,0);
+pos = (805,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (851,0);
+pos = (782,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (838,0);
+pos = (933,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (779,0);
+pos = (692,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/igrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/igrave.glyph
index f5b3bdd57..dec186214 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/igrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/igrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-294,0);
+pos = (-166,0);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-302,0);
+pos = (-216,0);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-274,0);
+pos = (-145,0);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-347,0);
+pos = (-117,0);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-386,0);
+pos = (-194,0);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-337,0);
+pos = (-169,0);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ihookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/ihookabove.glyph
index bd37c1ff7..376e37dec 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ihookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ihookabove.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (831,0);
-ref = hookabovecmb;
+pos = (-21,0);
+ref = hookabove;
 }
 );
 width = 486;
@@ -23,8 +23,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (966,0);
-ref = hookabovecmb;
+pos = (-12,0);
+ref = hookabove;
 }
 );
 width = 606;
@@ -36,8 +36,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (742,0);
-ref = hookabovecmb;
+ref = hookabove;
 }
 );
 width = 442;
@@ -49,8 +48,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (776,0);
-ref = hookabovecmb;
+pos = (-52,0);
+ref = hookabove;
 }
 );
 width = 426;
@@ -62,8 +61,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (940,0);
-ref = hookabovecmb;
+pos = (-37,0);
+ref = hookabove;
 }
 );
 width = 572;
@@ -75,8 +74,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (661,0);
-ref = hookabovecmb;
+pos = (-61,0);
+ref = hookabove;
 }
 );
 width = 314;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/iinvertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/iinvertedbreve.glyph
index 4b2f7b2b9..50abcbff4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/iinvertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/iinvertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (841,0);
+pos = (834,0);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (964,0);
+pos = (968,0);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (936,0);
+pos = (939,0);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (686,0);
+pos = (696,0);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/imacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/imacron.glyph
index cd42cd604..deb73c525 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/imacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/imacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-356,0);
+pos = (-244,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-363,0);
+pos = (-114,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-362,0);
+pos = (-180,0);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-355,0);
+pos = (-203,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-363,0);
+pos = (-98,0);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-377,0);
+pos = (-227,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/imacroncyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/imacroncyrillic.glyph
index 3ca6228b7..fd25e18f8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/imacroncyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/imacroncyrillic.glyph
@@ -10,6 +10,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
+pos = (112,0);
 ref = macron;
 }
 );
@@ -22,6 +23,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
+pos = (249,0);
 ref = macron;
 }
 );
@@ -34,6 +36,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
+pos = (182,0);
 ref = macron;
 }
 );
@@ -46,6 +49,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
+pos = (152,0);
 ref = macron;
 }
 );
@@ -58,6 +62,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
+pos = (265,0);
 ref = macron;
 }
 );
@@ -70,7 +75,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (-16,0);
+pos = (134,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/iota.glyph b/src/Inter-Roman.glyphspackage/glyphs/iota.glyph
index 0fc4bbc91..02c50726e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/iota.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/iota.glyph
@@ -1,7 +1,7 @@
 {
 glyphname = iota;
-kernLeft = iotadieresisgreek;
-kernRight = iotadieresisgreek;
+kernLeft = iota;
+kernRight = iota;
 layers = (
 {
 anchors = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/iotadieresistonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/iotadieresistonos.glyph
index 9bcbf275a..03c1799cf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/iotadieresistonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/iotadieresistonos.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-320,-174);
-ref = dieresistonos;
+pos = (-292,0);
+ref = dieresistonos_narrow;
 }
 );
 width = 544;
@@ -23,8 +23,8 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-282,-174);
-ref = dieresistonos;
+pos = (-274,0);
+ref = dieresistonos_narrow;
 }
 );
 width = 734;
@@ -36,8 +36,8 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-298,-174);
-ref = dieresistonos;
+pos = (-258,0);
+ref = dieresistonos_narrow;
 }
 );
 width = 442;
@@ -49,8 +49,8 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-320,-236);
-ref = dieresistonos;
+pos = (-324,0);
+ref = dieresistonos_narrow;
 }
 );
 width = 480;
@@ -62,8 +62,8 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-282,-236);
-ref = dieresistonos;
+pos = (-274,0);
+ref = dieresistonos_narrow;
 }
 );
 width = 702;
@@ -75,8 +75,8 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-298,-236);
-ref = dieresistonos;
+pos = (-242,0);
+ref = dieresistonos_narrow;
 }
 );
 width = 314;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/iotatonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/iotatonos.glyph
index ee0ec75b1..25f8d49de 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/iotatonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/iotatonos.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (14,-186);
+pos = (14,0);
 ref = tonostop;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-38,-164);
+pos = (-38,0);
 ref = tonostop;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (92,-196);
+pos = (88,0);
 ref = tonostop;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (14,-248);
+pos = (14,0);
 ref = tonostop;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-38,-226);
+pos = (-38,0);
 ref = tonostop;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (92,-258);
+pos = (87,0);
 ref = tonostop;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/itildebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/itildebelow.glyph
index 6c767b07a..8f445bd3d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/itildebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/itildebelow.glyph
@@ -42,7 +42,7 @@ shapes = (
 ref = i;
 },
 {
-pos = (801,0);
+pos = (803,0);
 ref = tildesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/izhitsadblgravecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/izhitsadblgravecyrillic.glyph
index b7384e1c2..e3f883d32 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/izhitsadblgravecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/izhitsadblgravecyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = izhitsacyrillic;
 },
 {
-pos = (1042,0);
+pos = (1146,0);
 ref = dblgravecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = izhitsacyrillic;
 },
 {
-pos = (1230,0);
+pos = (1276,0);
 ref = dblgravecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = izhitsacyrillic;
 },
 {
-pos = (1094,0);
+pos = (1112,0);
 ref = dblgravecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = izhitsacyrillic;
 },
 {
-pos = (1036,0);
+pos = (1091,0);
 ref = dblgravecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = izhitsacyrillic;
 },
 {
-pos = (1228,0);
+pos = (1242,0);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = izhitsacyrillic;
 },
 {
-pos = (1093,0);
+pos = (1007,0);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/jcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/jcaron.glyph
index af71444c4..4100a965e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/jcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/jcaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-223,0);
+pos = (-173,0);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-343,0);
+pos = (-209,0);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-223,0);
+pos = (-189,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-340,0);
+pos = (-144,0);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-205,0);
+pos = (-189,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/jcircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/jcircumflex.glyph
index 8f479ae9c..7a9ad8fdc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/jcircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/jcircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-221,0);
+pos = (-173,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-337,0);
+pos = (-209,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-221,0);
+pos = (-189,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-340,0);
+pos = (-144,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-205,0);
+pos = (-189,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/kacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/kacute.glyph
index de2e78a89..d237655e3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/kacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/kacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-109,372);
+pos = (-1,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-87,372);
+pos = (-1,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-59,372);
+pos = (9,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-138,434);
+pos = (49,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-124,434);
+pos = (68,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-127,434);
+pos = (27,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/kcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/kcaron.glyph
index cea4c4a9e..b423a153d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/kcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/kcaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-223,372);
+pos = (-173,372);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-343,372);
+pos = (-209,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-221,434);
+pos = (-187,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-342,434);
+pos = (-146,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (-211,434);
+pos = (-195,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/kdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/kdotbelow.glyph
index 784ce4193..563dc6b63 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/kdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/kdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (1182,0);
+pos = (1176,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (1164,0);
+pos = (1295,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (1096,0);
+pos = (1123,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (1184,0);
+pos = (1115,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (1164,0);
+pos = (1259,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (1096,0);
+pos = (1009,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/kjecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/kjecyrillic.glyph
index 9dfc5f879..8ce8fb788 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/kjecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/kjecyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = kacyrillic;
 },
 {
-pos = (198,0);
+pos = (306,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = kacyrillic;
 },
 {
-pos = (242,0);
+pos = (328,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = kacyrillic;
 },
 {
-pos = (206,0);
+pos = (274,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = kacyrillic;
 },
 {
-pos = (167,0);
+pos = (354,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = kacyrillic;
 },
 {
-pos = (206,0);
+pos = (398,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = kacyrillic;
 },
 {
-pos = (138,0);
+pos = (292,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/klinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/klinebelow.glyph
index 088970c4c..8691ea4e9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/klinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/klinebelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = k;
 },
 {
-pos = (1174,0);
-ref = macronsubnosp;
+pos = (88,0);
+ref = macronsub;
 }
 );
 width = 1114;
@@ -23,8 +23,8 @@ shapes = (
 ref = k;
 },
 {
-pos = (1294,0);
-ref = macronsubnosp;
+pos = (212,0);
+ref = macronsub;
 }
 );
 width = 1242;
@@ -36,8 +36,8 @@ shapes = (
 ref = k;
 },
 {
-pos = (1113,0);
-ref = macronsubnosp;
+pos = (138,0);
+ref = macronsub;
 }
 );
 width = 998;
@@ -49,8 +49,8 @@ shapes = (
 ref = k;
 },
 {
-pos = (1106,0);
-ref = macronsubnosp;
+pos = (130,0);
+ref = macronsub;
 }
 );
 width = 1041;
@@ -62,8 +62,8 @@ shapes = (
 ref = k;
 },
 {
-pos = (1257,0);
-ref = macronsubnosp;
+pos = (228,0);
+ref = macronsub;
 }
 );
 width = 1202;
@@ -75,8 +75,8 @@ shapes = (
 ref = k;
 },
 {
-pos = (1003,0);
-ref = macronsubnosp;
+pos = (90,0);
+ref = macronsub;
 }
 );
 width = 848;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/lacute.glyph
index 43e9afb6e..30ca2fdaf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-109,372);
+pos = (-1,372);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-87,372);
+pos = (-1,372);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-59,372);
+pos = (9,372);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-138,434);
+pos = (49,434);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-124,434);
+pos = (68,434);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-127,434);
+pos = (27,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lacute.ss02.glyph b/src/Inter-Roman.glyphspackage/glyphs/lacute.ss02.glyph
index 6249ce2b2..662d3108f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lacute.ss02.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lacute.ss02.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (-109,372);
+pos = (-1,372);
 ref = acute;
 }
 );
@@ -26,7 +26,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (-87,372);
+pos = (-1,372);
 ref = acute;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (-59,372);
+pos = (9,372);
 ref = acute;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (-138,434);
+pos = (49,434);
 ref = acute;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (-123,434);
+pos = (69,434);
 ref = acute;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (-127,434);
+pos = (27,434);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.glyph
index 76ee88542..5f0c0fb49 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (834,0);
+pos = (838,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (796,0);
+pos = (799,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (780,0);
+pos = (778,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (937,0);
+pos = (935,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (686,0);
+pos = (682,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.ss02.glyph b/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.ss02.glyph
index 301b233ab..ca72b4cf8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.ss02.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.ss02.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (898,0);
+pos = (902,0);
 ref = circumflexsubnosp;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (868,0);
+pos = (871,0);
 ref = circumflexsubnosp;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (846,0);
+pos = (844,0);
 ref = circumflexsubnosp;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (994,0);
+pos = (992,0);
 ref = circumflexsubnosp;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (758,0);
+pos = (754,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ldotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/ldotbelow.glyph
index 7c680e3bc..ec6c9f640 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ldotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ldotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (848,0);
+pos = (842,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (838,0);
+pos = (969,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (780,0);
+pos = (807,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (850,0);
+pos = (781,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (837,0);
+pos = (932,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (780,0);
+pos = (693,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ldotbelow.ss02.glyph b/src/Inter-Roman.glyphspackage/glyphs/ldotbelow.ss02.glyph
index 68898f23c..2ca78d299 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ldotbelow.ss02.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ldotbelow.ss02.glyph
@@ -12,7 +12,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (912,0);
+pos = (906,0);
 ref = dotbelow;
 }
 );
@@ -26,7 +26,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (894,0);
+pos = (1025,0);
 ref = dotbelow;
 }
 );
@@ -40,7 +40,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (852,0);
+pos = (879,0);
 ref = dotbelow;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (916,0);
+pos = (847,0);
 ref = dotbelow;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (894,0);
+pos = (989,0);
 ref = dotbelow;
 }
 );
@@ -82,7 +82,7 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (852,0);
+pos = (765,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.glyph
index 431632ffa..8a60e5d1d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = l;
 },
 {
-pos = (848,0);
+pos = (842,0);
 ref = dotbelow;
 },
 {
-pos = (-357,372);
+pos = (-245,372);
 ref = macron;
 }
 );
@@ -27,11 +27,11 @@ shapes = (
 ref = l;
 },
 {
-pos = (838,0);
+pos = (969,0);
 ref = dotbelow;
 },
 {
-pos = (-362,372);
+pos = (-113,372);
 ref = macron;
 }
 );
@@ -44,11 +44,11 @@ shapes = (
 ref = l;
 },
 {
-pos = (780,0);
+pos = (807,0);
 ref = dotbelow;
 },
 {
-pos = (-361,372);
+pos = (-179,372);
 ref = macron;
 }
 );
@@ -61,11 +61,11 @@ shapes = (
 ref = l;
 },
 {
-pos = (850,0);
+pos = (781,0);
 ref = dotbelow;
 },
 {
-pos = (-355,434);
+pos = (-203,434);
 ref = macron;
 }
 );
@@ -78,11 +78,11 @@ shapes = (
 ref = l;
 },
 {
-pos = (837,0);
+pos = (932,0);
 ref = dotbelow;
 },
 {
-pos = (-363,434);
+pos = (-98,434);
 ref = macron;
 }
 );
@@ -95,11 +95,11 @@ shapes = (
 ref = l;
 },
 {
-pos = (780,0);
+pos = (693,0);
 ref = dotbelow;
 },
 {
-pos = (-377,434);
+pos = (-227,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.ss02.glyph b/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.ss02.glyph
index 8de510b1b..4705851fc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.ss02.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.ss02.glyph
@@ -12,11 +12,11 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (912,0);
+pos = (906,0);
 ref = dotbelow;
 },
 {
-pos = (-357,372);
+pos = (-245,372);
 ref = macron;
 }
 );
@@ -30,11 +30,11 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (894,0);
+pos = (1025,0);
 ref = dotbelow;
 },
 {
-pos = (-362,372);
+pos = (-113,372);
 ref = macron;
 }
 );
@@ -48,11 +48,11 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (852,0);
+pos = (879,0);
 ref = dotbelow;
 },
 {
-pos = (-361,372);
+pos = (-179,372);
 ref = macron;
 }
 );
@@ -66,11 +66,11 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (916,0);
+pos = (847,0);
 ref = dotbelow;
 },
 {
-pos = (-355,434);
+pos = (-203,434);
 ref = macron;
 }
 );
@@ -84,11 +84,11 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (894,0);
+pos = (989,0);
 ref = dotbelow;
 },
 {
-pos = (-362,434);
+pos = (-97,434);
 ref = macron;
 }
 );
@@ -102,11 +102,11 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (852,0);
+pos = (765,0);
 ref = dotbelow;
 },
 {
-pos = (-377,434);
+pos = (-227,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/llinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/llinebelow.glyph
index 6e3f17226..cc56332d6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/llinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/llinebelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = l;
 },
 {
-pos = (840,0);
-ref = macronsubnosp;
+pos = (-246,0);
+ref = macronsub;
 }
 );
 width = 486;
@@ -23,8 +23,8 @@ shapes = (
 ref = l;
 },
 {
-pos = (968,0);
-ref = macronsubnosp;
+pos = (-114,0);
+ref = macronsub;
 }
 );
 width = 606;
@@ -36,8 +36,8 @@ shapes = (
 ref = l;
 },
 {
-pos = (797,0);
-ref = macronsubnosp;
+pos = (-178,0);
+ref = macronsub;
 }
 );
 width = 442;
@@ -49,8 +49,8 @@ shapes = (
 ref = l;
 },
 {
-pos = (772,0);
-ref = macronsubnosp;
+pos = (-204,0);
+ref = macronsub;
 }
 );
 width = 426;
@@ -62,8 +62,8 @@ shapes = (
 ref = l;
 },
 {
-pos = (930,0);
-ref = macronsubnosp;
+pos = (-99,0);
+ref = macronsub;
 }
 );
 width = 572;
@@ -75,8 +75,8 @@ shapes = (
 ref = l;
 },
 {
-pos = (687,0);
-ref = macronsubnosp;
+pos = (-226,0);
+ref = macronsub;
 }
 );
 width = 314;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/llinebelow.ss02.glyph b/src/Inter-Roman.glyphspackage/glyphs/llinebelow.ss02.glyph
index cd0b47844..0cbc592f7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/llinebelow.ss02.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/llinebelow.ss02.glyph
@@ -12,8 +12,8 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (904,0);
-ref = macronsubnosp;
+pos = (-182,0);
+ref = macronsub;
 }
 );
 width = 530;
@@ -26,8 +26,8 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (1024,0);
-ref = macronsubnosp;
+pos = (-58,0);
+ref = macronsub;
 }
 );
 width = 674;
@@ -40,8 +40,8 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (869,0);
-ref = macronsubnosp;
+pos = (-106,0);
+ref = macronsub;
 }
 );
 width = 450;
@@ -54,8 +54,8 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (838,0);
-ref = macronsubnosp;
+pos = (-138,0);
+ref = macronsub;
 }
 );
 width = 455;
@@ -68,8 +68,8 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (987,0);
-ref = macronsubnosp;
+pos = (-42,0);
+ref = macronsub;
 }
 );
 width = 604;
@@ -82,8 +82,8 @@ alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (759,0);
-ref = macronsubnosp;
+pos = (-154,0);
+ref = macronsub;
 }
 );
 width = 322;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macron.glyph b/src/Inter-Roman.glyphspackage/glyphs/macron.glyph
index 736027285..3510955b4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macron.glyph
@@ -6,11 +6,11 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (600,1118);
+pos = (488,1118);
 },
 {
 name = top;
-pos = (600,1493);
+pos = (488,1489);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -18,24 +18,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(260,1493,l),
-(260,1347,l),
-(940,1347,l),
-(940,1493,l)
+(212,1489,l),
+(212,1351,l),
+(764,1351,l),
+(764,1489,l)
 );
 }
 );
-width = 1200;
+width = 976;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (665,1118);
+pos = (416,1118);
 },
 {
 name = top;
-pos = (665,1540);
+pos = (416,1532);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -43,24 +43,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(301,1540,l),
-(301,1292,l),
-(1029,1292,l),
-(1029,1540,l)
+(116,1532,l),
+(116,1300,l),
+(716,1300,l),
+(716,1532,l)
 );
 }
 );
-width = 1330;
+width = 832;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (582,1118);
+pos = (400,1118);
 },
 {
 name = top;
-pos = (582,1407);
+pos = (400,1443);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -68,24 +68,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(349,1407,l),
-(349,1361,l),
-(815,1361,l),
-(815,1407,l)
+(167,1443,l),
+(167,1397,l),
+(633,1397,l),
+(633,1443,l)
 );
 }
 );
-width = 1164;
+width = 800;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (568,1056);
+pos = (416,1056);
 },
 {
 name = top;
-pos = (568,1451);
+pos = (416,1416);
 }
 );
 layerId = m007;
@@ -93,24 +93,24 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(228,1451,l),
-(228,1305,l),
-(908,1305,l),
-(908,1451,l)
+(140,1416,l),
+(140,1276,l),
+(692,1276,l),
+(692,1416,l)
 );
 }
 );
-width = 1136;
+width = 832;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (534,1056);
+pos = (384,1056);
 },
 {
 name = top;
-pos = (534,1401);
+pos = (384,1401);
 }
 );
 layerId = m011;
@@ -118,14 +118,14 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(269,1401,l),
-(269,1355,l),
-(799,1355,l),
-(799,1401,l)
+(152,1401,l),
+(152,1355,l),
+(616,1355,l),
+(616,1401,l)
 );
 }
 );
-width = 1068;
+width = 768;
 },
 {
 anchors = (
@@ -158,11 +158,11 @@ width = 1298;
 anchors = (
 {
 name = _top;
-pos = (649,1056);
+pos = (384,1056);
 },
 {
 name = top;
-pos = (649,1460);
+pos = (384,1436);
 }
 );
 layerId = m009;
@@ -171,14 +171,14 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(285,1460,l),
-(285,1212,l),
-(1013,1212,l),
-(1013,1460,l)
+(84,1436,l),
+(84,1204,l),
+(684,1204,l),
+(684,1436,l)
 );
 }
 );
-width = 1298;
+width = 768;
 },
 {
 anchors = (
@@ -208,7 +208,6 @@ nodes = (
 width = 1330;
 }
 );
-metricWidth = n;
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macronacutecomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/macronacutecomb.cn.glyph
index 145da0a70..b5fe58a14 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macronacutecomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macronacutecomb.cn.glyph
@@ -11,7 +11,7 @@ pos = (0,372);
 ref = macronacutecomb.lc;
 }
 );
-width = 1200;
+width = 976;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -22,7 +22,7 @@ pos = (0,372);
 ref = macronacutecomb.lc;
 }
 );
-width = 1330;
+width = 832;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -33,7 +33,7 @@ pos = (0,372);
 ref = macronacutecomb.lc;
 }
 );
-width = 1164;
+width = 800;
 },
 {
 layerId = m007;
@@ -44,7 +44,7 @@ pos = (0,434);
 ref = macronacutecomb.lc;
 }
 );
-width = 1136;
+width = 832;
 },
 {
 layerId = m009;
@@ -55,7 +55,7 @@ pos = (0,434);
 ref = macronacutecomb.lc;
 }
 );
-width = 1298;
+width = 768;
 },
 {
 layerId = m011;
@@ -66,7 +66,7 @@ pos = (0,434);
 ref = macronacutecomb.lc;
 }
 );
-width = 1068;
+width = 768;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macronacutecomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/macronacutecomb.lc.glyph
index 4e84505dc..ae240bf5b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macronacutecomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macronacutecomb.lc.glyph
@@ -2,130 +2,195 @@
 glyphname = macronacutecomb.lc;
 layers = (
 {
-background = {
-shapes = (
+anchors = (
+{
+name = _top;
+pos = (488,1118);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
 {
-ref = macrongravecomb.lc;
+pos = (0,1392);
+},
+{
+pos = (0,1717);
 }
 );
-};
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (248,369);
+pos = (258,333);
 ref = acute;
 }
 );
-width = 1200;
+width = 976;
 },
 {
-background = {
-shapes = (
+anchors = (
+{
+name = _top;
+pos = (416,1118);
+}
+);
+guides = (
+{
+pos = (0,1632);
+},
 {
-ref = macrongravecomb.lc;
+pos = (0,1392);
+},
+{
+pos = (0,1765);
 }
 );
-};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
+alignment = -1;
+pos = (0,-24);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (275,369);
+pos = (175,627);
 ref = acute;
+scale = (0.8,0.8);
 }
 );
-width = 1330;
+width = 832;
 },
 {
-background = {
-shapes = (
+anchors = (
+{
+name = _top;
+pos = (400,1118);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
 {
-ref = macrongravecomb.lc;
+pos = (0,1392);
+},
+{
+pos = (0,1681);
 }
 );
-};
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (302,210);
+pos = (202,333);
 ref = acute;
 }
 );
-width = 1164;
+width = 800;
 },
 {
-background = {
-shapes = (
+anchors = (
+{
+name = _top;
+pos = (416,1056);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
 {
-ref = macrongravecomb.lc;
+pos = (0,1328);
 }
 );
-};
 layerId = m007;
 shapes = (
 {
+alignment = -1;
+pos = (0,-18);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (217,338);
+pos = (263,311);
 ref = acute;
 }
 );
-width = 1136;
+width = 832;
 },
 {
-background = {
-shapes = (
+anchors = (
+{
+name = _top;
+pos = (384,1056);
+}
+);
+guides = (
 {
-ref = macrongravecomb.lc;
+pos = (0,1584);
 }
 );
-};
 layerId = m009;
 shapes = (
 {
+alignment = -1;
+pos = (0,8);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (239,370);
+pos = (211,521);
 ref = acute;
+scale = (0.9,0.9);
 }
 );
-width = 1298;
+width = 768;
 },
 {
-background = {
-shapes = (
+anchors = (
+{
+name = _top;
+pos = (384,1056);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
 {
-ref = macrongravecomb.lc;
+pos = (0,1328);
+},
+{
+pos = (0,1625);
 }
 );
-};
 layerId = m011;
 shapes = (
 {
+alignment = -1;
+pos = (0,-50);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (250,274);
+pos = (264,311);
 ref = acute;
 }
 );
-width = 1068;
+width = 768;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macroncomb.glyph b/src/Inter-Roman.glyphspackage/glyphs/macroncomb.glyph
index 05bd60ba5..e5b8cfc88 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macroncomb.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macroncomb.glyph
@@ -18,7 +18,7 @@ layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-1310,0);
+pos = (-1082,0);
 ref = macron;
 }
 );
@@ -29,7 +29,7 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-914,0);
+pos = (-991,0);
 ref = macron;
 }
 );
@@ -40,7 +40,7 @@ layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-1076,0);
+pos = (-975,0);
 ref = macron;
 }
 );
@@ -51,7 +51,7 @@ layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1310,0);
+pos = (-1030,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macrondieresiscomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/macrondieresiscomb.cn.glyph
index 33b602e8e..6932a9c9d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macrondieresiscomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macrondieresiscomb.cn.glyph
@@ -11,7 +11,7 @@ pos = (0,372);
 ref = macrondieresiscomb.lc;
 }
 );
-width = 1200;
+width = 976;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -22,7 +22,7 @@ pos = (0,372);
 ref = macrondieresiscomb.lc;
 }
 );
-width = 1330;
+width = 832;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -33,7 +33,7 @@ pos = (0,372);
 ref = macrondieresiscomb.lc;
 }
 );
-width = 1164;
+width = 800;
 },
 {
 layerId = m007;
@@ -44,7 +44,7 @@ pos = (0,434);
 ref = macrondieresiscomb.lc;
 }
 );
-width = 1136;
+width = 832;
 },
 {
 layerId = m009;
@@ -55,7 +55,7 @@ pos = (0,434);
 ref = macrondieresiscomb.lc;
 }
 );
-width = 1298;
+width = 768;
 },
 {
 layerId = m011;
@@ -66,7 +66,7 @@ pos = (0,434);
 ref = macrondieresiscomb.lc;
 }
 );
-width = 1068;
+width = 768;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macrondieresiscomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/macrondieresiscomb.lc.glyph
index e44601679..f17826c05 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macrondieresiscomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macrondieresiscomb.lc.glyph
@@ -2,130 +2,193 @@
 glyphname = macrondieresiscomb.lc;
 layers = (
 {
-background = {
-shapes = (
+anchors = (
 {
-ref = dieresismacroncomb.lc;
+name = _top;
+pos = (488,1118);
+}
+);
+guides = (
+{
+pos = (0,1717);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1717);
 }
 );
-};
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (-1,308);
+pos = (-112,297);
 ref = dieresis;
 }
 );
-width = 1200;
+width = 976;
 },
 {
-background = {
-shapes = (
+anchors = (
+{
+name = _top;
+pos = (416,1118);
+}
+);
+guides = (
+{
+pos = (0,1765);
+},
 {
-ref = dieresismacroncomb.lc;
+pos = (0,1392);
+},
+{
+pos = (0,1765);
 }
 );
-};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
+alignment = -1;
+pos = (0,-24);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (0,372);
+pos = (-249,349);
 ref = dieresis;
 }
 );
-width = 1330;
+width = 832;
 },
 {
-background = {
-shapes = (
+anchors = (
+{
+name = _top;
+pos = (400,1118);
+}
+);
+guides = (
+{
+pos = (0,1681);
+},
 {
-ref = dieresismacroncomb.lc;
+pos = (0,1392);
+},
+{
+pos = (0,1681);
 }
 );
-};
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (1,232);
+pos = (-182,261);
 ref = dieresis;
 }
 );
-width = 1164;
+width = 800;
 },
 {
-background = {
-shapes = (
+anchors = (
 {
-ref = dieresismacroncomb.lc;
+name = _top;
+pos = (416,1056);
+}
+);
+guides = (
+{
+pos = (0,1676);
+},
+{
+pos = (0,1328);
 }
 );
-};
 layerId = m007;
 shapes = (
 {
+alignment = -1;
+pos = (0,-18);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (-1,318);
+pos = (-152,298);
 ref = dieresis;
 }
 );
-width = 1136;
+width = 832;
 },
 {
-background = {
-shapes = (
+anchors = (
+{
+name = _top;
+pos = (384,1056);
+}
+);
+guides = (
 {
-ref = dieresismacroncomb.lc;
+pos = (0,1728);
 }
 );
-};
 layerId = m009;
 shapes = (
 {
+alignment = -1;
+pos = (0,8);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (0,360);
+pos = (-265,384);
 ref = dieresis;
 }
 );
-width = 1298;
+width = 768;
 },
 {
-background = {
-shapes = (
+anchors = (
 {
-ref = dieresismacroncomb.lc;
+name = _top;
+pos = (384,1056);
+}
+);
+guides = (
+{
+pos = (0,1625);
+},
+{
+pos = (0,1328);
+},
+{
+pos = (0,1625);
 }
 );
-};
 layerId = m011;
 shapes = (
 {
+alignment = -1;
+pos = (0,-50);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (1,250);
+pos = (-150,247);
 ref = dieresis;
 }
 );
-width = 1068;
+width = 768;
 },
 {
 anchors = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macrongravecomb.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/macrongravecomb.cn.glyph
index b95baafec..43189ebeb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macrongravecomb.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macrongravecomb.cn.glyph
@@ -20,7 +20,7 @@ pos = (0,372);
 ref = macrongravecomb.lc;
 }
 );
-width = 1200;
+width = 976;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -31,7 +31,7 @@ pos = (0,372);
 ref = macrongravecomb.lc;
 }
 );
-width = 1330;
+width = 832;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -42,7 +42,7 @@ pos = (0,372);
 ref = macrongravecomb.lc;
 }
 );
-width = 1164;
+width = 800;
 },
 {
 background = {
@@ -62,7 +62,7 @@ pos = (0,434);
 ref = macrongravecomb.lc;
 }
 );
-width = 1136;
+width = 832;
 },
 {
 layerId = m009;
@@ -73,7 +73,7 @@ pos = (0,434);
 ref = macrongravecomb.lc;
 }
 );
-width = 1298;
+width = 768;
 },
 {
 layerId = m011;
@@ -84,7 +84,7 @@ pos = (0,434);
 ref = macrongravecomb.lc;
 }
 );
-width = 1068;
+width = 768;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macrongravecomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/macrongravecomb.lc.glyph
index 9af1eba91..716ae3fa9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macrongravecomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macrongravecomb.lc.glyph
@@ -2,88 +2,195 @@
 glyphname = macrongravecomb.lc;
 layers = (
 {
+anchors = (
+{
+name = _top;
+pos = (488,1118);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1717);
+}
+);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (62,369);
+pos = (70,333);
 ref = grave;
 }
 );
-width = 1200;
+width = 976;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (416,1118);
+}
+);
+guides = (
+{
+pos = (0,1632);
+},
+{
+pos = (0,1392);
 },
 {
+pos = (0,1765);
+}
+);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
+alignment = -1;
+pos = (0,-24);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (61,369);
+pos = (17,627);
 ref = grave;
+scale = (0.8,0.8);
 }
 );
-width = 1330;
+width = 832;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (400,1118);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
 },
 {
+pos = (0,1681);
+}
+);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (120,210);
+pos = (36,333);
 ref = grave;
 }
 );
-width = 1164;
+width = 800;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (416,1056);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+}
+);
 layerId = m007;
 shapes = (
 {
+alignment = -1;
+pos = (0,-18);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (8,338);
+pos = (76,311);
 ref = grave;
 }
 );
-width = 1136;
+width = 832;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (384,1056);
+}
+);
+guides = (
+{
+pos = (0,1584);
+}
+);
 layerId = m009;
 shapes = (
 {
+alignment = -1;
+pos = (0,8);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (-23,370);
+pos = (-68,521);
 ref = grave;
+scale = (0.9,0.9);
 }
 );
-width = 1298;
+width = 768;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (384,1056);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+},
+{
+pos = (0,1625);
+}
+);
 layerId = m011;
 shapes = (
 {
+alignment = -1;
+pos = (0,-50);
 ref = macron;
 },
 {
 alignment = -1;
-pos = (64,274);
+pos = (63,311);
 ref = grave;
 }
 );
-width = 1068;
+width = 768;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macronsub.glyph b/src/Inter-Roman.glyphspackage/glyphs/macronsub.glyph
index 07a12c11f..edd4e951a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macronsub.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macronsub.glyph
@@ -1,71 +1,102 @@
 {
+case = minor;
 glyphname = macronsub;
 layers = (
 {
+anchors = (
+{
+name = _bottom;
+pos = (488,0);
+}
+);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (-32,-1600);
+pos = (0,-1722);
 ref = macron;
 }
 );
-width = 920;
+width = 976;
 },
 {
+anchors = (
+{
+name = _bottom;
+pos = (416,0);
+}
+);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (-46,-1640);
+pos = (0,-1714);
 ref = macron;
 }
 );
-width = 1042;
+width = 832;
 },
 {
+anchors = (
+{
+name = _bottom;
+pos = (400,0);
+}
+);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (-24,-1576);
+pos = (0,-1686);
 ref = macron;
 }
 );
-width = 846;
+width = 800;
 },
 {
+anchors = (
+{
+name = _bottom;
+pos = (416,0);
+}
+);
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (-32,-1600);
+pos = (0,-1700);
 ref = macron;
 }
 );
-width = 856;
+width = 832;
 },
 {
+anchors = (
+{
+name = _bottom;
+pos = (384,0);
+}
+);
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (-46,-1640);
+pos = (0,-1658);
 ref = macron;
 }
 );
-width = 1010;
+width = 768;
 },
 {
+anchors = (
+{
+name = _bottom;
+pos = (384,0);
+}
+);
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (-24,-1576);
+pos = (0,-1700);
 ref = macron;
 }
 );
-width = 718;
+width = 768;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macronsubnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/macronsubnosp.glyph
index 8e4759959..1f5d65c06 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macronsubnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macronsubnosp.glyph
@@ -3,103 +3,67 @@ color = (250,227,227,1);
 glyphname = macronsubnosp;
 layers = (
 {
-anchors = (
-{
-name = _bottom;
-pos = (-598,0);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-1198,-1722);
-ref = macron;
+pos = (-1090,0);
+ref = macronsub;
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _bottom;
-pos = (-666,0);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-1331,-1714);
-ref = macron;
+pos = (-1081,0);
+ref = macronsub;
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _bottom;
-pos = (-575,0);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-1157,-1650);
-ref = macron;
+pos = (-990,0);
+ref = macronsub;
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _bottom;
-pos = (-560,0);
-}
-);
 layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-1128,-1700);
-ref = macron;
+pos = (-980,64);
+ref = macronsub;
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _bottom;
-pos = (-645,0);
-}
-);
 layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1294,-1616);
-ref = macron;
+pos = (-1033,82);
+ref = macronsub;
 }
 );
 width = 0;
 },
 {
-anchors = (
-{
-name = _bottom;
-pos = (-529,0);
-}
-);
 layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-1063,-1700);
-ref = macron;
+pos = (-925,0);
+ref = macronsub;
 }
 );
 width = 0;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/macute.glyph b/src/Inter-Roman.glyphspackage/glyphs/macute.glyph
index ef50e2c2b..8d5ddfa7a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/macute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/macute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = m;
 },
 {
-pos = (538,0);
+pos = (646,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = m;
 },
 {
-pos = (576,0);
+pos = (662,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = m;
 },
 {
-pos = (576,0);
+pos = (644,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = m;
 },
 {
-pos = (509,0);
+pos = (696,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = m;
 },
 {
-pos = (534,0);
+pos = (726,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = m;
 },
 {
-pos = (539,0);
+pos = (693,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/mdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/mdotbelow.glyph
index d64aa5b50..9a4d09b68 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/mdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/mdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = m;
 },
 {
-pos = (1496,0);
+pos = (1490,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = m;
 },
 {
-pos = (1502,0);
+pos = (1633,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = m;
 },
 {
-pos = (1414,0);
+pos = (1441,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = m;
 },
 {
-pos = (1497,0);
+pos = (1428,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = m;
 },
 {
-pos = (1502,0);
+pos = (1597,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = m;
 },
 {
-pos = (1445,0);
+pos = (1358,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/nacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/nacute.glyph
index 80b9e4cb0..eb18e5530 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/nacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/nacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (248,0);
+pos = (356,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (274,0);
+pos = (360,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (304,0);
+pos = (372,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (217,0);
+pos = (404,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (238,0);
+pos = (430,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (252,0);
+pos = (406,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ncaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/ncaron.glyph
index e4ffa4b20..d57975953 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ncaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ncaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (134,0);
+pos = (184,0);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (18,0);
+pos = (152,0);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (134,0);
+pos = (168,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (20,0);
+pos = (216,0);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (168,0);
+pos = (184,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ncircumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/ncircumflexbelow.glyph
index 585b1d0b3..5b76ce97b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ncircumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ncircumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1192,0);
+pos = (1196,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1156,0);
+pos = (1159,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1136,0);
+pos = (1134,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1300,0);
+pos = (1298,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1062,0);
+pos = (1058,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ndotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/ndotbelow.glyph
index 04e2cd278..fdbfd0e19 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ndotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ndotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1206,0);
+pos = (1200,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1200,0);
+pos = (1331,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1140,0);
+pos = (1167,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1206,0);
+pos = (1137,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1200,0);
+pos = (1295,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (1156,0);
+pos = (1069,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/nlinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/nlinebelow.glyph
index 0ae73976a..af2a5c448 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/nlinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/nlinebelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (1198,0);
-ref = macronsubnosp;
+pos = (112,0);
+ref = macronsub;
 }
 );
 width = 1200;
@@ -23,8 +23,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (1330,0);
-ref = macronsubnosp;
+pos = (248,0);
+ref = macronsub;
 }
 );
 width = 1330;
@@ -36,8 +36,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (1157,0);
-ref = macronsubnosp;
+pos = (182,0);
+ref = macronsub;
 }
 );
 width = 1164;
@@ -49,8 +49,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (1128,0);
-ref = macronsubnosp;
+pos = (152,0);
+ref = macronsub;
 }
 );
 width = 1136;
@@ -62,8 +62,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (1293,0);
-ref = macronsubnosp;
+pos = (264,0);
+ref = macronsub;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (1063,0);
-ref = macronsubnosp;
+pos = (150,0);
+ref = macronsub;
 }
 );
 width = 1068;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/oacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/oacute.glyph
index 6f99b517a..b2a0555d2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/oacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/oacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (258,0);
+pos = (366,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (250,0);
+pos = (336,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (314,0);
+pos = (382,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (211,0);
+pos = (398,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (212,0);
+pos = (404,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (246,0);
+pos = (400,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ocaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/ocaron.glyph
index 5fa47448b..269745b14 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ocaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ocaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (144,0);
+pos = (194,0);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-6,0);
+pos = (128,0);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (128,0);
+pos = (162,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-6,0);
+pos = (190,0);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (162,0);
+pos = (178,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ocircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/ocircumflex.glyph
index 23f3c670c..e1baee44f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ocircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ocircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (146,0);
+pos = (194,0);
 ref = circumflex;
 }
 );
@@ -23,6 +23,7 @@ shapes = (
 ref = o;
 },
 {
+pos = (128,0);
 ref = circumflex;
 }
 );
@@ -48,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (130,0);
+pos = (162,0);
 ref = circumflex;
 }
 );
@@ -61,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-6,0);
+pos = (190,0);
 ref = circumflex;
 }
 );
@@ -74,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (162,0);
+pos = (178,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ocircumflexacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/ocircumflexacute.glyph
index 4cabaf6ef..f731aead8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ocircumflexacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ocircumflexacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (146,0);
+pos = (194,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -23,6 +23,7 @@ shapes = (
 ref = o;
 },
 {
+pos = (128,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -48,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (130,0);
+pos = (162,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -61,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-6,0);
+pos = (190,0);
 ref = circumflexacutecomb.cn;
 }
 );
@@ -74,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (162,0);
+pos = (178,0);
 ref = circumflexacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ocircumflexdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/ocircumflexdotbelow.glyph
index 1a8af2f57..87d0819f1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ocircumflexdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ocircumflexdotbelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = o;
 },
 {
-pos = (146,0);
+pos = (194,0);
 ref = circumflex;
 },
 {
-pos = (1216,0);
+pos = (1210,0);
 ref = dotbelow;
 }
 );
@@ -27,10 +27,11 @@ shapes = (
 ref = o;
 },
 {
+pos = (128,0);
 ref = circumflex;
 },
 {
-pos = (1176,0);
+pos = (1307,0);
 ref = dotbelow;
 }
 );
@@ -47,7 +48,7 @@ pos = (162,0);
 ref = circumflex;
 },
 {
-pos = (1152,0);
+pos = (1179,0);
 ref = dotbelow;
 }
 );
@@ -60,11 +61,11 @@ shapes = (
 ref = o;
 },
 {
-pos = (130,0);
+pos = (162,0);
 ref = circumflex;
 },
 {
-pos = (1200,0);
+pos = (1131,0);
 ref = dotbelow;
 }
 );
@@ -77,11 +78,11 @@ shapes = (
 ref = o;
 },
 {
-pos = (-6,0);
+pos = (190,0);
 ref = circumflex;
 },
 {
-pos = (1174,0);
+pos = (1269,0);
 ref = dotbelow;
 }
 );
@@ -94,11 +95,11 @@ shapes = (
 ref = o;
 },
 {
-pos = (162,0);
+pos = (178,0);
 ref = circumflex;
 },
 {
-pos = (1152,0);
+pos = (1065,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ocircumflexgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/ocircumflexgrave.glyph
index 828af3fc1..18bb262ad 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ocircumflexgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ocircumflexgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (144,0);
+pos = (194,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-12,0);
+pos = (128,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (94,-122);
+pos = (162,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (128,0);
+pos = (162,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-10,0);
+pos = (190,0);
 ref = circumflexgravecomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (94,-184);
+pos = (178,0);
 ref = circumflexgravecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ocircumflexhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/ocircumflexhookabove.glyph
index bd8998c92..182c11c3d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ocircumflexhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ocircumflexhookabove.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (146,0);
+pos = (194,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -23,6 +23,7 @@ shapes = (
 ref = o;
 },
 {
+pos = (128,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -48,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (130,0);
+pos = (162,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -61,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-6,0);
+pos = (190,0);
 ref = circumflexhookcomb.cn;
 }
 );
@@ -74,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (162,0);
+pos = (178,0);
 ref = circumflexhookcomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ocircumflextilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/ocircumflextilde.glyph
index edc5a43da..fd30c35ff 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ocircumflextilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ocircumflextilde.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (146,0);
+pos = (194,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -23,6 +23,7 @@ shapes = (
 ref = o;
 },
 {
+pos = (128,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -35,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (164,-228);
+pos = (162,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -48,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (130,0);
+pos = (162,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -61,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-6,0);
+pos = (190,0);
 ref = circumflextildecomb.cn;
 }
 );
@@ -74,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (164,-290);
+pos = (175,0);
 ref = circumflextildecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/odblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/odblgrave.glyph
index d41faf219..cc579abd4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/odblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/odblgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1082,0);
+pos = (1186,0);
 ref = dblgravecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1250,0);
+pos = (1296,0);
 ref = dblgravecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1152,0);
+pos = (1170,0);
 ref = dblgravecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1066,0);
+pos = (1121,0);
 ref = dblgravecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1248,0);
+pos = (1262,0);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1152,0);
+pos = (1066,0);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/odotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/odotbelow.glyph
index 2a449a4fc..c7042cbbe 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/odotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/odotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1216,0);
+pos = (1210,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1176,0);
+pos = (1307,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1152,0);
+pos = (1179,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1200,0);
+pos = (1131,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1174,0);
+pos = (1269,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1152,0);
+pos = (1065,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ograve.glyph b/src/Inter-Roman.glyphspackage/glyphs/ograve.glyph
index 501a6021b..7fdee799d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ograve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ograve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (72,0);
+pos = (200,0);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (36,0);
+pos = (122,0);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (100,0);
+pos = (229,0);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (2,0);
+pos = (232,0);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-50,0);
+pos = (142,0);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (36,0);
+pos = (204,0);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ohookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/ohookabove.glyph
index fc8fb19cb..fd47247d4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ohookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ohookabove.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (1197,0);
-ref = hookabovecmb;
+pos = (345,0);
+ref = hookabove;
 }
 );
 width = 1222;
@@ -23,8 +23,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (1304,0);
-ref = hookabovecmb;
+pos = (326,0);
+ref = hookabove;
 }
 );
 width = 1280;
@@ -36,8 +36,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (1116,0);
-ref = hookabovecmb;
+pos = (374,0);
+ref = hookabove;
 }
 );
 width = 1186;
@@ -49,8 +49,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (1125,0);
-ref = hookabovecmb;
+pos = (297,0);
+ref = hookabove;
 }
 );
 width = 1124;
@@ -62,8 +62,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (1276,0);
-ref = hookabovecmb;
+pos = (299,0);
+ref = hookabove;
 }
 );
 width = 1244;
@@ -75,8 +75,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (1034,0);
-ref = hookabovecmb;
+pos = (312,0);
+ref = hookabove;
 }
 );
 width = 1058;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ohornacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/ohornacute.glyph
index b9e85ee1f..5e210cf09 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ohornacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ohornacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (258,0);
+pos = (366,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (250,0);
+pos = (336,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (314,0);
+pos = (382,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (211,0);
+pos = (398,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (212,0);
+pos = (404,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (246,0);
+pos = (400,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ohorndotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/ohorndotbelow.glyph
index 90032131c..acb7c8375 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ohorndotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ohorndotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1216,0);
+pos = (1210,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1176,0);
+pos = (1307,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1152,0);
+pos = (1179,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1200,0);
+pos = (1131,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1174,0);
+pos = (1269,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1152,0);
+pos = (1065,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ohorngrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/ohorngrave.glyph
index fd6dbffea..f97fb4533 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ohorngrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ohorngrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (72,0);
+pos = (200,0);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (36,0);
+pos = (122,0);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (100,0);
+pos = (229,0);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (2,0);
+pos = (232,0);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (-50,0);
+pos = (142,0);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (36,0);
+pos = (204,0);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ohornhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/ohornhookabove.glyph
index 0593e91d2..77ea84533 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ohornhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ohornhookabove.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1197,0);
-ref = hookabovecmb;
+pos = (345,0);
+ref = hookabove;
 }
 );
 width = 1222;
@@ -23,8 +23,8 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1304,0);
-ref = hookabovecmb;
+pos = (326,0);
+ref = hookabove;
 }
 );
 width = 1280;
@@ -36,8 +36,8 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1116,0);
-ref = hookabovecmb;
+pos = (374,0);
+ref = hookabove;
 }
 );
 width = 1186;
@@ -49,8 +49,8 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1125,0);
-ref = hookabovecmb;
+pos = (297,0);
+ref = hookabove;
 }
 );
 width = 1124;
@@ -62,8 +62,8 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1276,0);
-ref = hookabovecmb;
+pos = (299,0);
+ref = hookabove;
 }
 );
 width = 1244;
@@ -75,8 +75,8 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (1034,0);
-ref = hookabovecmb;
+pos = (312,0);
+ref = hookabove;
 }
 );
 width = 1058;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ohorntilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/ohorntilde.glyph
index 75eb2d09c..27de21220 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ohorntilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ohorntilde.glyph
@@ -24,8 +24,9 @@ ref = ohorn;
 },
 {
 alignment = -1;
-pos = (128,40);
+pos = (288,422);
 ref = tilde;
+scale = (0.6847,0.7019);
 }
 );
 width = 1280;
@@ -64,8 +65,9 @@ ref = ohorn;
 },
 {
 alignment = -1;
-pos = (110,48);
+pos = (254,41);
 ref = tilde;
+scale = (0.7276,1);
 }
 );
 width = 1244;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ohungarumlaut.glyph b/src/Inter-Roman.glyphspackage/glyphs/ohungarumlaut.glyph
index f460c7129..d6ab621f5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ohungarumlaut.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ohungarumlaut.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (258,-174);
+pos = (360,0);
 ref = hungarumlaut;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (250,-174);
+pos = (324,0);
 ref = hungarumlaut;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (266,-174);
+pos = (402,0);
 ref = hungarumlaut;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (242,-236);
+pos = (344,0);
 ref = hungarumlaut;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (248,-236);
+pos = (322,0);
 ref = hungarumlaut;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (266,-236);
+pos = (375,0);
 ref = hungarumlaut;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/oinvertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/oinvertedbreve.glyph
index 214621977..c6b379983 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/oinvertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/oinvertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1207,0);
+pos = (1200,0);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1302,0);
+pos = (1306,0);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1272,0);
+pos = (1275,0);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1059,0);
+pos = (1069,0);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/omacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/omacron.glyph
index 4d7bdb40e..e1915fc0e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/omacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/omacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (10,0);
+pos = (122,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-25,0);
+pos = (224,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (12,0);
+pos = (194,0);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-6,0);
+pos = (146,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-27,0);
+pos = (238,0);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-4,0);
+pos = (146,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/omacronacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/omacronacute.glyph
index b53d5552e..85481589d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/omacronacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/omacronacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (10,0);
+pos = (122,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-25,0);
+pos = (224,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (12,0);
+pos = (194,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-6,0);
+pos = (146,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-27,0);
+pos = (238,0);
 ref = macronacutecomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-4,0);
+pos = (146,0);
 ref = macronacutecomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/omacrongrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/omacrongrave.glyph
index d62ba1b7d..a99effa8d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/omacrongrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/omacrongrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (10,0);
+pos = (122,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-25,0);
+pos = (224,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (12,0);
+pos = (194,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-6,0);
+pos = (146,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-27,0);
+pos = (238,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-4,0);
+pos = (146,0);
 ref = macrongravecomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/omegatonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/omegatonos.glyph
index da13864fb..631812593 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/omegatonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/omegatonos.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (590,-186);
+pos = (590,0);
 ref = tonostop;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (517,-164);
+pos = (517,0);
 ref = tonostop;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (659,-196);
+pos = (655,0);
 ref = tonostop;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (590,-248);
+pos = (590,0);
 ref = tonostop;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (514,-226);
+pos = (514,0);
 ref = tonostop;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (659,-258);
+pos = (654,0);
 ref = tonostop;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/omicrontonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/omicrontonos.glyph
index 5feb4fb70..9e92c8ea6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/omicrontonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/omicrontonos.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (388,-186);
+pos = (388,0);
 ref = tonostop;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (268,-164);
+pos = (268,0);
 ref = tonostop;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (464,-196);
+pos = (460,0);
 ref = tonostop;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (372,-248);
+pos = (372,0);
 ref = tonostop;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (266,-226);
+pos = (266,0);
 ref = tonostop;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (464,-258);
+pos = (459,0);
 ref = tonostop;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/oogonekmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/oogonekmacron.glyph
index e3f61f701..9c40f32ab 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/oogonekmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/oogonekmacron.glyph
@@ -11,7 +11,7 @@ ref = oogonek;
 },
 {
 alignment = 1;
-pos = (10,0);
+pos = (122,0);
 ref = macron;
 }
 );
@@ -25,7 +25,7 @@ ref = oogonek;
 },
 {
 alignment = 1;
-pos = (-25,0);
+pos = (224,0);
 ref = macron;
 }
 );
@@ -39,7 +39,7 @@ ref = oogonek;
 },
 {
 alignment = 1;
-pos = (12,0);
+pos = (194,0);
 ref = macron;
 }
 );
@@ -53,7 +53,7 @@ ref = oogonek;
 },
 {
 alignment = 1;
-pos = (-6,0);
+pos = (146,0);
 ref = macron;
 }
 );
@@ -67,7 +67,7 @@ ref = oogonek;
 },
 {
 alignment = 1;
-pos = (-27,0);
+pos = (238,0);
 ref = macron;
 }
 );
@@ -81,7 +81,7 @@ ref = oogonek;
 },
 {
 alignment = 1;
-pos = (-4,0);
+pos = (146,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/oslashacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/oslashacute.glyph
index 19cd73c8b..3aaeb0154 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/oslashacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/oslashacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = oslash;
 },
 {
-pos = (258,0);
+pos = (366,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = oslash;
 },
 {
-pos = (250,-2);
+pos = (336,-2);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = oslash;
 },
 {
-pos = (314,2);
+pos = (382,2);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = oslash;
 },
 {
-pos = (211,0);
+pos = (398,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = oslash;
 },
 {
-pos = (212,0);
+pos = (404,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = oslash;
 },
 {
-pos = (246,0);
+pos = (400,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/otildeacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/otildeacute.glyph
index d092104cc..ab7c0ee40 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/otildeacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/otildeacute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (82,0);
+pos = (81,0);
 ref = tildeacute.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/otildedieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/otildedieresis.glyph
index 0edc170e2..c25e93b46 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/otildedieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/otildedieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1200,-170);
+pos = (98,0);
 ref = tildedieresiscomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1344,-180);
+pos = (128,0);
 ref = tildedieresiscomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1118,-164);
+pos = (90,0);
 ref = tildedieresiscomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1184,-232);
+pos = (81,0);
 ref = tildedieresiscomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1342,-242);
+pos = (126,0);
 ref = tildedieresiscomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1118,-226);
+pos = (82,0);
 ref = tildedieresiscomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/pacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/pacute.glyph
index 99b8fa57b..89e8ea082 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/pacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/pacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = p;
 },
 {
-pos = (306,0);
+pos = (414,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = p;
 },
 {
-pos = (338,0);
+pos = (424,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = p;
 },
 {
-pos = (348,0);
+pos = (416,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = p;
 },
 {
-pos = (297,0);
+pos = (484,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = p;
 },
 {
-pos = (229,0);
+pos = (421,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = p;
 },
 {
-pos = (304,0);
+pos = (458,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/quoteleft.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/quoteleft.1.glyph
new file mode 100644
index 000000000..1a1809dab
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/quoteleft.1.glyph
@@ -0,0 +1,201 @@
+{
+glyphname = quoteleft.1;
+kernLeft = quotedbl;
+kernRight = quotedbl;
+layers = (
+{
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+closed = 1;
+nodes = (
+(264,1454,o),
+(160,1303,o),
+(160,1097,cs),
+(160,986,o),
+(229,927,o),
+(316,927,cs),
+(396,927,o),
+(459,989,o),
+(459,1068,cs),
+(459,1141,o),
+(405,1188,o),
+(324,1188,cs),
+(251,1188,o),
+(180,1150,o),
+(180,1052,c),
+(206,1052,l),
+(206,1097,ls),
+(206,1280,o),
+(292,1414,o),
+(458,1464,c),
+(443,1506,l)
+);
+}
+);
+width = 619;
+},
+{
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(204,1454,o),
+(100,1303,o),
+(100,1097,cs),
+(100,986,o),
+(169,927,o),
+(256,927,cs),
+(336,927,o),
+(399,989,o),
+(399,1068,cs),
+(399,1141,o),
+(345,1188,o),
+(264,1188,cs),
+(191,1188,o),
+(120,1150,o),
+(120,1052,c),
+(146,1052,l),
+(146,1097,ls),
+(146,1280,o),
+(232,1414,o),
+(398,1464,c),
+(383,1506,l)
+);
+}
+);
+width = 499;
+},
+{
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+closed = 1;
+nodes = (
+(234,1459,o),
+(140,1335,o),
+(140,1141,cs),
+(140,1013,o),
+(207,935,o),
+(312,935,cs),
+(397,935,o),
+(460,996,o),
+(460,1076,cs),
+(460,1157,o),
+(410,1217,o),
+(337,1217,cs),
+(259,1217,o),
+(185,1149,o),
+(185,1060,c),
+(245,1060,l),
+(245,1141,ls),
+(245,1295,o),
+(301,1371,o),
+(456,1422,c),
+(423,1514,l)
+);
+}
+);
+width = 600;
+},
+{
+layerId = m007;
+shapes = (
+{
+closed = 1;
+nodes = (
+(174,1459,o),
+(80,1335,o),
+(80,1141,cs),
+(80,1013,o),
+(147,935,o),
+(252,935,cs),
+(337,935,o),
+(400,996,o),
+(400,1076,cs),
+(400,1157,o),
+(350,1217,o),
+(277,1217,cs),
+(199,1217,o),
+(125,1149,o),
+(125,1060,c),
+(185,1060,l),
+(185,1141,ls),
+(185,1295,o),
+(241,1371,o),
+(396,1422,c),
+(363,1514,l)
+);
+}
+);
+width = 480;
+},
+{
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+closed = 1;
+nodes = (
+(224,1421,o),
+(140,1248,o),
+(140,1024,cs),
+(140,861,o),
+(242,785,o),
+(364,785,cs),
+(492,785,o),
+(577,868,o),
+(577,985,cs),
+(577,1102,o),
+(492,1181,o),
+(380,1181,cs),
+(266,1181,o),
+(235,1099,o),
+(235,985,c),
+(292,985,l),
+(292,1096,ls),
+(292,1205,o),
+(343,1310,o),
+(549,1377,c),
+(505,1514,l)
+);
+}
+);
+width = 717;
+},
+{
+layerId = m009;
+shapes = (
+{
+closed = 1;
+nodes = (
+(148,1421,o),
+(64,1248,o),
+(64,1024,cs),
+(64,861,o),
+(166,785,o),
+(288,785,cs),
+(416,785,o),
+(501,868,o),
+(501,985,cs),
+(501,1102,o),
+(416,1181,o),
+(304,1181,cs),
+(190,1181,o),
+(159,1099,o),
+(159,985,c),
+(216,985,l),
+(216,1096,ls),
+(216,1205,o),
+(267,1310,o),
+(473,1377,c),
+(429,1514,l)
+);
+}
+);
+width = 565;
+}
+);
+metricLeft = "=|quoteright.1";
+metricRight = "=|quoteleft.1";
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/quoteleft.glyph b/src/Inter-Roman.glyphspackage/glyphs/quoteleft.glyph
index 4385263ad..89a61be38 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/quoteleft.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/quoteleft.glyph
@@ -139,6 +139,23 @@ nodes = (
 }
 );
 width = 570;
+},
+{
+associatedMasterId = m007;
+layerId = "1A98C103-6392-48F7-ACBC-993E797A27B8";
+name = "Apr 13, 23, 12:50";
+shapes = (
+{
+closed = 1;
+nodes = (
+(262,1001,l),
+(350,1490,l),
+(226,1490,l),
+(80,1001,l)
+);
+}
+);
+width = 430;
 }
 );
 metricRight = "=|quoteleft";
diff --git a/src/Inter-Roman.glyphspackage/glyphs/quoteright.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/quoteright.1.glyph
new file mode 100644
index 000000000..5196da5f7
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/quoteright.1.glyph
@@ -0,0 +1,253 @@
+{
+glyphname = quoteright.1;
+layers = (
+{
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+closed = 1;
+nodes = (
+(355,979,o),
+(459,1130,o),
+(459,1336,cs),
+(459,1447,o),
+(390,1506,o),
+(303,1506,cs),
+(223,1506,o),
+(160,1444,o),
+(160,1365,cs),
+(160,1292,o),
+(214,1245,o),
+(295,1245,cs),
+(368,1245,o),
+(439,1283,o),
+(439,1381,c),
+(413,1381,l),
+(413,1336,ls),
+(413,1153,o),
+(327,1019,o),
+(161,969,c),
+(176,927,l)
+);
+}
+);
+width = 619;
+},
+{
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(142,1510,o),
+(79,1449,o),
+(79,1369,cs),
+(79,1288,o),
+(129,1228,o),
+(202,1228,cs),
+(236,1228,o),
+(265,1240,o),
+(288,1263,c),
+(285,1147,o),
+(217,1067,o),
+(83,1023,c),
+(116,931,l),
+(305,986,o),
+(399,1110,o),
+(399,1304,cs),
+(399,1432,o),
+(332,1510,o),
+(227,1510,cs)
+);
+}
+);
+};
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(295,979,o),
+(399,1130,o),
+(399,1336,cs),
+(399,1447,o),
+(330,1506,o),
+(243,1506,cs),
+(163,1506,o),
+(100,1444,o),
+(100,1365,cs),
+(100,1292,o),
+(154,1245,o),
+(235,1245,cs),
+(308,1245,o),
+(379,1283,o),
+(379,1381,c),
+(353,1381,l),
+(353,1336,ls),
+(353,1153,o),
+(267,1019,o),
+(101,969,c),
+(116,927,l)
+);
+}
+);
+width = 499;
+},
+{
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+closed = 1;
+nodes = (
+(346,990,o),
+(440,1114,o),
+(440,1308,cs),
+(440,1436,o),
+(373,1514,o),
+(268,1514,cs),
+(183,1514,o),
+(120,1453,o),
+(120,1373,cs),
+(120,1292,o),
+(170,1232,o),
+(243,1232,cs),
+(321,1232,o),
+(395,1300,o),
+(395,1389,c),
+(335,1389,l),
+(335,1308,ls),
+(335,1154,o),
+(279,1078,o),
+(124,1027,c),
+(157,935,l)
+);
+}
+);
+width = 580;
+},
+{
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(133,1514,o),
+(70,1453,o),
+(70,1373,cs),
+(70,1292,o),
+(120,1232,o),
+(193,1232,cs),
+(227,1232,o),
+(256,1244,o),
+(279,1267,c),
+(276,1151,o),
+(208,1071,o),
+(74,1027,c),
+(107,935,l),
+(296,990,o),
+(390,1114,o),
+(390,1308,cs),
+(390,1436,o),
+(323,1514,o),
+(218,1514,cs)
+);
+}
+);
+};
+layerId = m007;
+shapes = (
+{
+closed = 1;
+nodes = (
+(296,990,o),
+(390,1114,o),
+(390,1308,cs),
+(390,1436,o),
+(323,1514,o),
+(218,1514,cs),
+(133,1514,o),
+(70,1453,o),
+(70,1373,cs),
+(70,1292,o),
+(120,1232,o),
+(193,1232,cs),
+(271,1232,o),
+(345,1300,o),
+(345,1389,c),
+(285,1389,l),
+(285,1308,ls),
+(285,1154,o),
+(229,1078,o),
+(74,1027,c),
+(107,935,l)
+);
+}
+);
+width = 470;
+},
+{
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+closed = 1;
+nodes = (
+(493,878,o),
+(577,1051,o),
+(577,1275,cs),
+(577,1438,o),
+(475,1514,o),
+(353,1514,cs),
+(225,1514,o),
+(140,1431,o),
+(140,1314,cs),
+(140,1197,o),
+(225,1118,o),
+(337,1118,cs),
+(451,1118,o),
+(482,1200,o),
+(482,1314,c),
+(425,1314,l),
+(425,1203,ls),
+(425,1094,o),
+(374,989,o),
+(168,922,c),
+(212,785,l)
+);
+}
+);
+width = 717;
+},
+{
+layerId = m009;
+shapes = (
+{
+closed = 1;
+nodes = (
+(403,878,o),
+(487,1051,o),
+(487,1275,cs),
+(487,1438,o),
+(385,1514,o),
+(263,1514,cs),
+(135,1514,o),
+(50,1431,o),
+(50,1314,cs),
+(50,1197,o),
+(135,1118,o),
+(247,1118,cs),
+(361,1118,o),
+(392,1200,o),
+(392,1314,c),
+(335,1314,l),
+(335,1203,ls),
+(335,1094,o),
+(284,989,o),
+(78,922,c),
+(122,785,l)
+);
+}
+);
+width = 552;
+}
+);
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/racute.glyph b/src/Inter-Roman.glyphspackage/glyphs/racute.glyph
index d441ea5b6..134e4a172 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/racute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/racute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (70,0);
+pos = (178,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (92,0);
+pos = (178,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (148,0);
+pos = (216,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (16,0);
+pos = (203,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (56,0);
+pos = (248,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (80,0);
+pos = (234,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/rcaron.glyph
index 35e0a5cc9..0d56cf117 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rcaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (-44,0);
+pos = (6,0);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (-164,0);
+pos = (-30,0);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (-67,0);
+pos = (-33,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (-162,0);
+pos = (34,0);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (-4,0);
+pos = (12,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rdblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/rdblgrave.glyph
index 964a40c0c..5edfda48c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rdblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rdblgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (894,0);
+pos = (998,0);
 ref = dblgravecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (1092,0);
+pos = (1138,0);
 ref = dblgravecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (986,0);
+pos = (1004,0);
 ref = dblgravecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (871,0);
+pos = (926,0);
 ref = dblgravecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (1092,0);
+pos = (1106,0);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (986,0);
+pos = (900,0);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/rdotbelow.glyph
index 4e2ed8c61..201e887e6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (848,0);
+pos = (842,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (842,0);
+pos = (973,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (780,0);
+pos = (807,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (848,0);
+pos = (779,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (838,0);
+pos = (933,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (780,0);
+pos = (693,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rdotbelowmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/rdotbelowmacron.glyph
index e1325c2bd..66a95de39 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rdotbelowmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rdotbelowmacron.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = r;
 },
 {
-pos = (848,0);
+pos = (842,0);
 ref = dotbelow;
 },
 {
-pos = (-178,0);
+pos = (-66,0);
 ref = macron;
 }
 );
@@ -27,11 +27,11 @@ shapes = (
 ref = r;
 },
 {
-pos = (842,0);
+pos = (973,0);
 ref = dotbelow;
 },
 {
-pos = (-183,0);
+pos = (66,0);
 ref = macron;
 }
 );
@@ -44,11 +44,11 @@ shapes = (
 ref = r;
 },
 {
-pos = (780,0);
+pos = (807,0);
 ref = dotbelow;
 },
 {
-pos = (-154,0);
+pos = (28,0);
 ref = macron;
 }
 );
@@ -61,11 +61,11 @@ shapes = (
 ref = r;
 },
 {
-pos = (848,0);
+pos = (779,0);
 ref = dotbelow;
 },
 {
-pos = (-201,0);
+pos = (-49,0);
 ref = macron;
 }
 );
@@ -78,11 +78,11 @@ shapes = (
 ref = r;
 },
 {
-pos = (838,0);
+pos = (933,0);
 ref = dotbelow;
 },
 {
-pos = (-183,0);
+pos = (82,0);
 ref = macron;
 }
 );
@@ -95,11 +95,11 @@ shapes = (
 ref = r;
 },
 {
-pos = (780,0);
+pos = (693,0);
 ref = dotbelow;
 },
 {
-pos = (-170,0);
+pos = (-20,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ring.uc.glyph b/src/Inter-Roman.glyphspackage/glyphs/ring.uc.glyph
index 62ed4e774..45629f7a0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ring.uc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ring.uc.glyph
@@ -13,35 +13,35 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(331,1606,o),
-(405,1680,o),
-(405,1771,cs),
-(405,1862,o),
-(331,1936,o),
-(240,1936,cs),
-(149,1936,o),
-(75,1862,o),
-(75,1771,cs),
-(75,1680,o),
-(149,1606,o),
-(240,1606,cs)
+(331,1627,o),
+(405,1701,o),
+(405,1792,cs),
+(405,1883,o),
+(331,1957,o),
+(240,1957,cs),
+(149,1957,o),
+(75,1883,o),
+(75,1792,cs),
+(75,1701,o),
+(149,1627,o),
+(240,1627,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(174,1652,o),
-(121,1705,o),
-(121,1771,cs),
-(121,1837,o),
-(174,1890,o),
-(240,1890,cs),
-(306,1890,o),
-(359,1837,o),
-(359,1771,cs),
-(359,1705,o),
-(306,1652,o),
-(240,1652,cs)
+(174,1673,o),
+(121,1726,o),
+(121,1792,cs),
+(121,1858,o),
+(174,1911,o),
+(240,1911,cs),
+(306,1911,o),
+(359,1858,o),
+(359,1792,cs),
+(359,1726,o),
+(306,1673,o),
+(240,1673,cs)
 );
 }
 );
@@ -59,35 +59,35 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(449,1561,o),
-(566,1673,o),
-(566,1812,cs),
-(566,1951,o),
-(449,2063,o),
-(304,2063,cs),
-(159,2063,o),
-(42,1951,o),
-(42,1812,cs),
-(42,1673,o),
-(159,1561,o),
-(304,1561,cs)
+(449,1541,o),
+(566,1653,o),
+(566,1792,cs),
+(566,1931,o),
+(449,2043,o),
+(304,2043,cs),
+(159,2043,o),
+(42,1931,o),
+(42,1792,cs),
+(42,1653,o),
+(159,1541,o),
+(304,1541,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(234,1686,o),
-(178,1742,o),
-(178,1812,cs),
-(178,1882,o),
-(234,1938,o),
-(304,1938,cs),
-(374,1938,o),
-(430,1882,o),
-(430,1812,cs),
-(430,1742,o),
-(374,1686,o),
-(304,1686,cs)
+(234,1666,o),
+(178,1722,o),
+(178,1792,cs),
+(178,1862,o),
+(234,1918,o),
+(304,1918,cs),
+(374,1918,o),
+(430,1862,o),
+(430,1792,cs),
+(430,1722,o),
+(374,1666,o),
+(304,1666,cs)
 );
 }
 );
@@ -105,35 +105,35 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(589,1571,o),
-(717,1688,o),
-(717,1833,cs),
-(717,1978,o),
-(589,2095,o),
-(432,2095,cs),
-(275,2095,o),
-(147,1978,o),
-(147,1833,cs),
-(147,1688,o),
-(275,1571,o),
-(432,1571,cs)
+(607,1548,o),
+(717,1651,o),
+(717,1788,cs),
+(717,1925,o),
+(607,2028,o),
+(432,2028,cs),
+(257,2028,o),
+(147,1925,o),
+(147,1788,cs),
+(147,1651,o),
+(257,1548,o),
+(432,1548,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(368,1718,o),
-(317,1769,o),
-(317,1833,cs),
-(317,1897,o),
-(368,1948,o),
-(432,1948,cs),
-(496,1948,o),
-(547,1897,o),
-(547,1833,cs),
-(547,1769,o),
-(496,1718,o),
-(432,1718,cs)
+(363,1685,o),
+(320,1725,o),
+(320,1788,cs),
+(320,1851,o),
+(363,1891,o),
+(432,1891,cs),
+(501,1891,o),
+(544,1851,o),
+(544,1788,cs),
+(544,1725,o),
+(501,1685,o),
+(432,1685,cs)
 );
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ringacute.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/ringacute.lc.glyph
new file mode 100644
index 000000000..ac1d62842
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/ringacute.lc.glyph
@@ -0,0 +1,239 @@
+{
+glyphname = ringacute.lc;
+layers = (
+{
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+alignment = 1;
+ref = ring;
+},
+{
+closed = 1;
+nodes = (
+(379,1752,l),
+(567,1932,l),
+(385,1932,l),
+(239,1752,l)
+);
+}
+);
+width = 608;
+},
+{
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+alignment = 1;
+ref = ring;
+},
+{
+closed = 1;
+nodes = (
+(554,1796,l),
+(772,2026,l),
+(464,2026,l),
+(318,1796,l)
+);
+}
+);
+width = 864;
+},
+{
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+ref = ring;
+},
+{
+closed = 1;
+nodes = (
+(264,1672,l),
+(392,1812,l),
+(334,1812,l),
+(218,1672,l)
+);
+}
+);
+width = 488;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (306,1186);
+}
+);
+associatedMasterId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+layerId = "887D6A25-F5CC-449B-B7EA-0C78F999CB46";
+name = "Mar 28, 21, 10:43";
+shapes = (
+{
+closed = 1;
+nodes = (
+(401,1082,o),
+(477,1158,o),
+(478,1250,cs),
+(477,1344,o),
+(401,1420,o),
+(306,1420,cs),
+(212,1420,o),
+(134,1344,o),
+(134,1250,cs),
+(134,1158,o),
+(212,1082,o),
+(306,1082,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(268,1181,o),
+(236,1213,o),
+(236,1250,cs),
+(236,1286,o),
+(268,1318,o),
+(306,1318,cs),
+(346,1318,o),
+(375,1286,o),
+(376,1250,cs),
+(375,1213,o),
+(346,1181,o),
+(306,1182,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(354,1466,l),
+(576,1646,l),
+(378,1646,l),
+(232,1466,l)
+);
+}
+);
+width = 734;
+},
+{
+layerId = m007;
+shapes = (
+{
+alignment = 1;
+ref = ring;
+},
+{
+closed = 1;
+nodes = (
+(360,1670,l),
+(548,1850,l),
+(366,1850,l),
+(220,1670,l)
+);
+}
+);
+width = 576;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (306,1186);
+}
+);
+associatedMasterId = m007;
+layerId = "0440AB72-C1B2-423B-8F29-482E6D9B057D";
+name = "Mar 28, 21, 10:43";
+shapes = (
+{
+closed = 1;
+nodes = (
+(401,1082,o),
+(477,1158,o),
+(478,1250,cs),
+(477,1344,o),
+(401,1420,o),
+(306,1420,cs),
+(212,1420,o),
+(134,1344,o),
+(134,1250,cs),
+(134,1158,o),
+(212,1082,o),
+(306,1082,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(268,1181,o),
+(236,1213,o),
+(236,1250,cs),
+(236,1286,o),
+(268,1318,o),
+(306,1318,cs),
+(346,1318,o),
+(375,1286,o),
+(376,1250,cs),
+(375,1213,o),
+(346,1181,o),
+(306,1182,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(354,1466,l),
+(576,1646,l),
+(378,1646,l),
+(232,1466,l)
+);
+}
+);
+width = 734;
+},
+{
+layerId = m009;
+shapes = (
+{
+ref = ring;
+},
+{
+closed = 1;
+nodes = (
+(552,1689,l),
+(770,1919,l),
+(462,1919,l),
+(316,1689,l)
+);
+}
+);
+width = 864;
+},
+{
+layerId = m011;
+shapes = (
+{
+ref = ring;
+},
+{
+closed = 1;
+nodes = (
+(310,1620,l),
+(438,1760,l),
+(380,1760,l),
+(264,1620,l)
+);
+}
+);
+width = 576;
+}
+);
+tags = (
+"TODO-opsz"
+);
+userData = {
+interface.gridadjust.original = "{'width': 958, 'leftMargin': 213, 'rightMargin': 92}";
+"interface.width-adjustments" = (
+-16
+);
+};
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ringacute.cn.glyph b/src/Inter-Roman.glyphspackage/glyphs/ringacute.uc.glyph
index 63f12c591..6aaf258ca 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ringacute.cn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ringacute.uc.glyph
@@ -1,83 +1,64 @@
 {
-glyphname = ringacute.cn;
+glyphname = ringacute.uc;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (302,1186);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
+alignment = 1;
+ref = ring.uc;
+},
+{
 closed = 1;
 nodes = (
-(370,1562,l),
-(558,1742,l),
-(376,1742,l),
-(230,1562,l)
+(370,2089,l),
+(558,2269,l),
+(376,2269,l),
+(230,2089,l)
 );
-},
-{
-pos = (-18,-408);
-ref = ring.uc;
-scale = (1,0.95);
 }
 );
-width = 606;
+width = 608;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (350,1246);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
+alignment = 1;
+pos = (0,47);
+ref = ring.uc;
+scale = (1,0.95);
+},
+{
 closed = 1;
 nodes = (
-(468,1652,l),
-(686,1882,l),
-(378,1882,l),
-(232,1652,l)
+(554,2029,l),
+(772,2259,l),
+(464,2259,l),
+(318,2029,l)
 );
-},
-{
-pos = (-94,-336);
-ref = ring.uc;
-scale = (1,0.95);
 }
 );
-width = 698;
+width = 864;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (280,1152);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
+alignment = 1;
+ref = ring.uc;
+},
+{
 closed = 1;
 nodes = (
-(298,1410,l),
-(426,1550,l),
-(368,1550,l),
-(252,1410,l)
+(268,2016,l),
+(396,2156,l),
+(338,2156,l),
+(222,2016,l)
 );
-},
-{
-pos = (34,-446);
-ref = ring.uc;
-scale = (1,0.95);
 }
 );
-width = 558;
+width = 480;
 },
 {
 anchors = (
@@ -137,30 +118,23 @@ nodes = (
 width = 734;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (270,1186);
-}
-);
 layerId = m007;
 shapes = (
 {
+alignment = 1;
+ref = ring.uc;
+},
+{
 closed = 1;
 nodes = (
-(338,1562,l),
-(526,1742,l),
-(344,1742,l),
-(198,1562,l)
+(361,2103,l),
+(549,2283,l),
+(367,2283,l),
+(221,2103,l)
 );
-},
-{
-pos = (-18,-408);
-ref = ring.uc;
-scale = (1,0.95);
 }
 );
-width = 542;
+width = 576;
 },
 {
 anchors = (
@@ -220,56 +194,43 @@ nodes = (
 width = 734;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (334,1246);
-}
-);
 layerId = m009;
 shapes = (
 {
+alignment = 1;
+ref = ring.uc;
+scale = (1,0.95);
+},
+{
 closed = 1;
 nodes = (
-(452,1652,l),
-(670,1882,l),
-(362,1882,l),
-(216,1652,l)
+(551,2009,l),
+(769,2239,l),
+(461,2239,l),
+(315,2009,l)
 );
-},
-{
-pos = (-94,-336);
-ref = ring.uc;
-scale = (1,0.95);
 }
 );
-width = 666;
+width = 864;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (216,1152);
-}
-);
 layerId = m011;
 shapes = (
 {
+alignment = 1;
+ref = ring.uc;
+},
+{
 closed = 1;
 nodes = (
-(234,1410,l),
-(362,1550,l),
-(304,1550,l),
-(188,1410,l)
+(313,2027,l),
+(441,2167,l),
+(383,2167,l),
+(267,2027,l)
 );
-},
-{
-pos = (34,-446);
-ref = ring.uc;
-scale = (1,0.95);
 }
 );
-width = 430;
+width = 578;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ringnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/ringnosp.glyph
index 471281235..3af96fd77 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ringnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ringnosp.glyph
@@ -7,7 +7,7 @@ layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-928,46);
+pos = (-896,0);
 ref = ring;
 }
 );
@@ -18,18 +18,18 @@ layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-1032,-18);
+pos = (-1098,0);
 ref = ring;
 }
 );
-width = 38;
+width = 0;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-866,84);
+pos = (-818,0);
 ref = ring;
 }
 );
@@ -40,7 +40,7 @@ layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-928,46);
+pos = (-856,0);
 ref = ring;
 }
 );
@@ -51,18 +51,18 @@ layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1032,-18);
+pos = (-1080,0);
 ref = ring;
 }
 );
-width = 6;
+width = 0;
 },
 {
 layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-866,84);
+pos = (-826,0);
 ref = ring;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ringsubnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/ringsubnosp.glyph
index b84938d65..4374d662f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ringsubnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ringsubnosp.glyph
@@ -7,7 +7,7 @@ layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 alignment = -1;
-pos = (-928,-1670);
+pos = (-900,-1742);
 ref = ring;
 }
 );
@@ -18,18 +18,18 @@ layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 alignment = -1;
-pos = (-1038,-1550);
+pos = (-1095,-1759);
 ref = ring;
 }
 );
-width = 38;
+width = 0;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-862,-1742);
+pos = (-813,-1665);
 ref = ring;
 }
 );
@@ -40,7 +40,7 @@ layerId = m007;
 shapes = (
 {
 alignment = -1;
-pos = (-928,-1670);
+pos = (-853,-1700);
 ref = ring;
 }
 );
@@ -51,18 +51,18 @@ layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1038,-1550);
+pos = (-1081,-1658);
 ref = ring;
 }
 );
-width = 6;
+width = 0;
 },
 {
 layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (-862,-1742);
+pos = (-819,-1700);
 ref = ring;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rinvertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/rinvertedbreve.glyph
index 5d459bb86..df5111fdc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rinvertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rinvertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (1019,0);
+pos = (1012,0);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (1144,0);
+pos = (1148,0);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (1116,0);
+pos = (1119,0);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (893,0);
+pos = (903,0);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rlinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/rlinebelow.glyph
index 0fc9a1d4a..2ffd0a809 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rlinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rlinebelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (840,0);
-ref = macronsubnosp;
+pos = (-246,0);
+ref = macronsub;
 }
 );
 width = 762;
@@ -23,8 +23,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (972,0);
-ref = macronsubnosp;
+pos = (-110,0);
+ref = macronsub;
 }
 );
 width = 888;
@@ -36,8 +36,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (797,0);
-ref = macronsubnosp;
+pos = (-178,0);
+ref = macronsub;
 }
 );
 width = 666;
@@ -49,8 +49,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (770,0);
-ref = macronsubnosp;
+pos = (-206,0);
+ref = macronsub;
 }
 );
 width = 660;
@@ -62,8 +62,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (931,0);
-ref = macronsubnosp;
+pos = (-98,0);
+ref = macronsub;
 }
 );
 width = 852;
@@ -75,8 +75,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (687,0);
-ref = macronsubnosp;
+pos = (-226,0);
+ref = macronsub;
 }
 );
 width = 538;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/sacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/sacute.glyph
index 02680c9ff..9fcef05f3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/sacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/sacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (196,0);
+pos = (304,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (214,0);
+pos = (300,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (238,0);
+pos = (306,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (136,0);
+pos = (323,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (166,0);
+pos = (358,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (177,0);
+pos = (331,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/scaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/scaron.glyph
index b752ab653..3358cfab9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/scaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/scaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (82,0);
+pos = (132,0);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (-42,0);
+pos = (92,0);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (53,0);
+pos = (87,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (-52,0);
+pos = (144,0);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (93,0);
+pos = (109,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/scarondotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/scarondotaccent.glyph
index 44202e9e1..90e0ed80c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/scarondotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/scarondotaccent.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (1138,-174);
-ref = carondotcomb.lc;
+pos = (134,0);
+ref = carondot.lc;
 }
 );
 width = 1070;
@@ -23,8 +23,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (1314,-174);
-ref = carondotcomb.lc;
+pos = (30,0);
+ref = carondot.lc;
 }
 );
 width = 1204;
@@ -36,8 +36,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (1038,-174);
-ref = carondotcomb.lc;
+pos = (155,0);
+ref = carondot.lc;
 }
 );
 width = 1010;
@@ -49,8 +49,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (1109,-236);
-ref = carondotcomb.lc;
+pos = (73,0);
+ref = carondot.lc;
 }
 );
 width = 972;
@@ -62,8 +62,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (1302,-236);
-ref = carondotcomb.lc;
+pos = (90,0);
+ref = carondot.lc;
 }
 );
 width = 1144;
@@ -75,8 +75,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (1045,-236);
-ref = carondotcomb.lc;
+pos = (96,0);
+ref = carondot.lc;
 }
 );
 width = 915;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/scircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/scircumflex.glyph
index 3d41530fb..66d971905 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/scircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/scircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (84,0);
+pos = (132,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (-36,0);
+pos = (92,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (55,0);
+pos = (87,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (-52,0);
+pos = (144,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (93,0);
+pos = (109,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/sdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/sdotbelow.glyph
index 5b582b9de..8fa2455ef 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/sdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/sdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1154,0);
+pos = (1148,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1140,0);
+pos = (1271,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1076,0);
+pos = (1103,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1125,0);
+pos = (1056,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1128,0);
+pos = (1223,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1083,0);
+pos = (996,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/sdotbelowdotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/sdotbelowdotaccent.glyph
index 88f54123b..500d6e711 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/sdotbelowdotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/sdotbelowdotaccent.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1154,0);
+pos = (1148,0);
 ref = dotbelow;
 },
 {
@@ -27,7 +27,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1140,0);
+pos = (1271,0);
 ref = dotbelow;
 },
 {
@@ -44,7 +44,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1076,0);
+pos = (1103,0);
 ref = dotbelow;
 },
 {
@@ -61,7 +61,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1125,0);
+pos = (1056,0);
 ref = dotbelow;
 },
 {
@@ -78,7 +78,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1128,0);
+pos = (1223,0);
 ref = dotbelow;
 },
 {
@@ -95,7 +95,7 @@ shapes = (
 ref = s;
 },
 {
-pos = (1083,0);
+pos = (996,0);
 ref = dotbelow;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/seven.glyph b/src/Inter-Roman.glyphspackage/glyphs/seven.glyph
index 22f76558f..c03a3cc5e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/seven.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/seven.glyph
@@ -1,5 +1,6 @@
 {
 glyphname = seven;
+kernLeft = seven;
 kernRight = seven;
 layers = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tcircumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/tcircumflexbelow.glyph
index 078a2d370..96f662fa5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tcircumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tcircumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (1008,0);
+pos = (1012,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (978,0);
+pos = (981,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (938,0);
+pos = (936,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (1128,0);
+pos = (1126,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (876,0);
+pos = (872,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/tdotbelow.glyph
index 21a1e9368..06609002e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (1022,0);
+pos = (1016,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (1000,0);
+pos = (1131,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (962,0);
+pos = (989,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (1008,0);
+pos = (939,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (1028,0);
+pos = (1123,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (970,0);
+pos = (883,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/tilde.glyph
index f7f927540..d998a9d83 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tilde.glyph
@@ -92,7 +92,7 @@ pos = (504,1118);
 },
 {
 name = top;
-pos = (504,1490);
+pos = (504,1498);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -100,26 +100,26 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(709,1296,o),
-(766,1354,o),
-(782,1449,c),
-(735,1449,l),
-(719,1373,o),
-(682,1342,o),
-(625,1342,cs),
-(543,1342,o),
-(504,1460,o),
-(380,1460,cs),
-(295,1460,o),
-(234,1394,o),
-(226,1303,c),
-(272,1303,l),
-(278,1372,o),
-(322,1414,o),
-(388,1414,cs),
-(480,1414,o),
-(521,1296,o),
-(633,1296,cs)
+(709,1338,o),
+(766,1396,o),
+(782,1491,c),
+(735,1491,l),
+(719,1415,o),
+(682,1384,o),
+(625,1384,cs),
+(543,1384,o),
+(504,1502,o),
+(380,1502,cs),
+(295,1502,o),
+(234,1436,o),
+(226,1345,c),
+(272,1345,l),
+(278,1414,o),
+(322,1456,o),
+(388,1456,cs),
+(480,1456,o),
+(521,1338,o),
+(633,1338,cs)
 );
 }
 );
@@ -207,7 +207,7 @@ pos = (512,1056);
 },
 {
 name = top;
-pos = (514,1490);
+pos = (514,1498);
 }
 );
 layerId = m009;
@@ -215,26 +215,26 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(796,1176,o),
-(905,1284,o),
-(908,1490,c),
-(712,1490,l),
-(710,1420,o),
-(690,1381,o),
-(634,1381,cs),
-(565,1381,o),
-(514,1496,o),
-(364,1496,cs),
-(226,1496,o),
-(120,1394,o),
-(116,1184,c),
-(314,1184,l),
-(317,1257,o),
-(343,1296,o),
-(390,1296,cs),
-(464,1296,o),
-(508,1176,o),
-(660,1176,cs)
+(796,1184,o),
+(905,1292,o),
+(908,1498,c),
+(712,1498,l),
+(710,1428,o),
+(690,1389,o),
+(634,1389,cs),
+(565,1389,o),
+(514,1504,o),
+(364,1504,cs),
+(226,1504,o),
+(120,1402,o),
+(116,1192,c),
+(314,1192,l),
+(317,1265,o),
+(343,1304,o),
+(390,1304,cs),
+(464,1304,o),
+(508,1184,o),
+(660,1184,cs)
 );
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tildeacute.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/tildeacute.lc.glyph
index 3575accd9..f346fd4ca 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tildeacute.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tildeacute.lc.glyph
@@ -2,84 +2,190 @@
 glyphname = tildeacute.lc;
 layers = (
 {
+anchors = (
+{
+name = _top;
+pos = (512,1118);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1717);
+}
+);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
+alignment = -1;
+pos = (0,-27);
 ref = tilde;
 },
 {
 alignment = -1;
-pos = (169,333);
+pos = (271,333);
 ref = acute;
 }
 );
 width = 1024;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (512,1118);
+}
+);
+guides = (
+{
+pos = (0,1632);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1765);
+}
+);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
+alignment = -1;
+pos = (0,-24);
 ref = tilde;
 },
 {
 alignment = -1;
-pos = (130,365);
+pos = (260,627);
 ref = acute;
+scale = (0.8,0.8);
 }
 );
 width = 1024;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (504,1118);
+}
+);
+guides = (
+{
+pos = (0,1616);
+},
+{
+pos = (0,1392);
+},
+{
+pos = (0,1681);
+}
+);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
+alignment = -1;
+pos = (0,-28);
 ref = tilde;
 },
 {
 alignment = -1;
-pos = (209,239);
+pos = (296,333);
 ref = acute;
 }
 );
 width = 1018;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (481,1056);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+}
+);
 layerId = m007;
 shapes = (
 {
+alignment = -1;
+pos = (0,-49);
 ref = tilde;
 },
 {
 alignment = -1;
-pos = (147,343);
+pos = (319,311);
 ref = acute;
 }
 );
 width = 960;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (512,1056);
+}
+);
+guides = (
+{
+pos = (0,1584);
+}
+);
 layerId = m009;
 shapes = (
 {
+alignment = -1;
 ref = tilde;
 },
 {
 alignment = -1;
-pos = (124,369);
+pos = (315,521);
 ref = acute;
+scale = (0.9,0.9);
 }
 );
 width = 992;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (448,1056);
+}
+);
+guides = (
+{
+pos = (0,1552);
+},
+{
+pos = (0,1328);
+},
+{
+pos = (0,1625);
+}
+);
 layerId = m011;
 shapes = (
 {
+alignment = -1;
+pos = (0,-50);
 ref = tilde;
 },
 {
 alignment = -1;
-pos = (161,323);
+pos = (316,311);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tildeacutecomb.uc.glyph b/src/Inter-Roman.glyphspackage/glyphs/tildeacutecomb.uc.glyph
index 5188a5e20..0f7880941 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tildeacutecomb.uc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tildeacutecomb.uc.glyph
@@ -5,12 +5,8 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-ref = tilde;
-},
-{
-alignment = -1;
-pos = (209,239);
-ref = acute;
+alignment = 1;
+ref = tildeacute.lc;
 }
 );
 width = 1018;
@@ -19,12 +15,8 @@ width = 1018;
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-ref = tilde;
-},
-{
-alignment = -1;
-pos = (169,333);
-ref = acute;
+alignment = 1;
+ref = tildeacute.lc;
 }
 );
 width = 1024;
@@ -33,12 +25,8 @@ width = 1024;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-ref = tilde;
-},
-{
-alignment = -1;
-pos = (130,365);
-ref = acute;
+alignment = 1;
+ref = tildeacute.lc;
 }
 );
 width = 1024;
@@ -47,12 +35,8 @@ width = 1024;
 layerId = m007;
 shapes = (
 {
-ref = tilde;
-},
-{
-alignment = -1;
-pos = (147,343);
-ref = acute;
+alignment = 1;
+ref = tildeacute.lc;
 }
 );
 width = 960;
@@ -61,12 +45,8 @@ width = 960;
 layerId = m009;
 shapes = (
 {
-ref = tilde;
-},
-{
-alignment = -1;
-pos = (124,377);
-ref = acute;
+alignment = 1;
+ref = tildeacute.lc;
 }
 );
 width = 992;
@@ -75,12 +55,8 @@ width = 992;
 layerId = m011;
 shapes = (
 {
-ref = tilde;
-},
-{
-alignment = -1;
-pos = (161,323);
-ref = acute;
+alignment = 1;
+ref = tildeacute.lc;
 }
 );
 width = 896;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tildedieresiscomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/tildedieresiscomb.lc.glyph
index ac111fe5a..88f63c05f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tildedieresiscomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tildedieresiscomb.lc.glyph
@@ -5,451 +5,192 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (-590,1288);
+pos = (512,1118);
+}
+);
+guides = (
+{
+pos = (0,1717);
 },
 {
-name = mkmktop_acc;
-pos = (-590,1896);
+pos = (0,1392);
+},
+{
+pos = (0,1717);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-916,1626,o),
-(-879,1574,o),
-(-800,1574,cs),
-(-724,1574,o),
-(-687,1623,o),
-(-686,1684,cs),
-(-687,1745,o),
-(-727,1795,o),
-(-800,1794,cs),
-(-876,1795,o),
-(-916,1745,o),
-(-916,1684,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-486,1620,o),
-(-448,1574,o),
-(-372,1574,cs),
-(-297,1574,o),
-(-256,1620,o),
-(-256,1682,cs),
-(-256,1743,o),
-(-297,1792,o),
-(-372,1792,cs),
-(-448,1792,o),
-(-486,1743,o),
-(-486,1680,cs)
-);
+alignment = -1;
+pos = (0,-27);
+ref = tilde;
 },
 {
-closed = 1;
-nodes = (
-(-364,1455,o),
-(-407,1405,o),
-(-462,1406,cs),
-(-567,1405,o),
-(-617,1498,o),
-(-728,1498,cs),
-(-849,1498,o),
-(-945,1393,o),
-(-946,1246,c),
-(-814,1240,l),
-(-815,1297,o),
-(-771,1350,o),
-(-718,1350,cs),
-(-608,1350,o),
-(-585,1257,o),
-(-450,1256,cs),
-(-329,1257,o),
-(-230,1353,o),
-(-230,1504,c),
-(-364,1516,l)
-);
+alignment = -1;
+pos = (-88,297);
+ref = dieresis;
 }
 );
-width = 0;
+width = 1024;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-704,1298);
+pos = (512,1118);
+}
+);
+guides = (
+{
+pos = (0,1765);
+},
+{
+pos = (0,1392);
 },
 {
-name = mkmktop_acc;
-pos = (-704,2036);
+pos = (0,1765);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-1152,1699,o),
-(-1076,1635,o),
-(-990,1634,cs),
-(-899,1635,o),
-(-823,1699,o),
-(-824,1778,cs),
-(-823,1859,o),
-(-902,1920,o),
-(-990,1920,cs),
-(-1073,1920,o),
-(-1152,1859,o),
-(-1152,1778,cs)
-);
+alignment = -1;
+pos = (0,-24);
+ref = tilde;
 },
 {
-closed = 1;
-nodes = (
-(-593,1699,o),
-(-515,1638,o),
-(-428,1638,cs),
-(-340,1638,o),
-(-265,1699,o),
-(-264,1780,cs),
-(-265,1859,o),
-(-340,1920,o),
-(-428,1920,cs),
-(-515,1920,o),
-(-593,1859,o),
-(-594,1780,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-500,1492,o),
-(-538,1472,o),
-(-578,1472,cs),
-(-681,1472,o),
-(-765,1551,o),
-(-872,1550,cs),
-(-1015,1551,o),
-(-1117,1411,o),
-(-1118,1272,c),
-(-910,1260,l),
-(-911,1321,o),
-(-876,1341,o),
-(-834,1342,cs),
-(-727,1341,o),
-(-669,1260,o),
-(-542,1260,cs),
-(-396,1260,o),
-(-294,1399,o),
-(-294,1544,c),
-(-500,1554,l)
-);
+alignment = -1;
+pos = (-153,514);
+ref = dieresis;
+scale = (1,0.8944);
 }
 );
-width = 26;
+width = 1024;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-524,1282);
+pos = (504,1118);
+}
+);
+guides = (
+{
+pos = (0,1681);
+},
+{
+pos = (0,1392);
 },
 {
-name = mkmktop_acc;
-pos = (-524,1812);
+pos = (0,1681);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-771,1575,o),
-(-750,1553,o),
-(-724,1554,cs),
-(-699,1553,o),
-(-678,1575,o),
-(-678,1600,cs),
-(-678,1625,o),
-(-699,1647,o),
-(-724,1646,cs),
-(-750,1647,o),
-(-771,1625,o),
-(-770,1600,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-361,1575,o),
-(-340,1553,o),
-(-314,1554,cs),
-(-289,1553,o),
-(-268,1575,o),
-(-268,1600,cs),
-(-268,1625,o),
-(-289,1647,o),
-(-314,1646,cs),
-(-340,1647,o),
-(-361,1625,o),
-(-360,1600,cs)
-);
+alignment = -1;
+pos = (0,-28);
+ref = tilde;
 },
 {
-closed = 1;
-nodes = (
-(-340,1411,o),
-(-371,1364,o),
-(-430,1362,cs),
-(-508,1362,o),
-(-537,1482,o),
-(-642,1482,cs),
-(-727,1482,o),
-(-777,1419,o),
-(-786,1328,c),
-(-744,1322,l),
-(-735,1388,o),
-(-704,1436,o),
-(-644,1436,cs),
-(-563,1436,o),
-(-526,1316,o),
-(-428,1316,cs),
-(-348,1317,o),
-(-297,1380,o),
-(-288,1470,c),
-(-330,1476,l)
-);
+alignment = -1;
+pos = (-73,261);
+ref = dieresis;
 }
 );
-width = 0;
+width = 1018;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-622,1288);
+pos = (481,1056);
+}
+);
+guides = (
+{
+pos = (0,1676);
 },
 {
-name = mkmktop_acc;
-pos = (-622,1896);
+pos = (0,1328);
 }
 );
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-948,1626,o),
-(-911,1574,o),
-(-832,1574,cs),
-(-756,1574,o),
-(-719,1623,o),
-(-718,1684,cs),
-(-719,1745,o),
-(-759,1795,o),
-(-832,1794,cs),
-(-908,1795,o),
-(-948,1745,o),
-(-948,1684,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-518,1620,o),
-(-480,1574,o),
-(-404,1574,cs),
-(-329,1574,o),
-(-288,1620,o),
-(-288,1682,cs),
-(-288,1743,o),
-(-329,1792,o),
-(-404,1792,cs),
-(-480,1792,o),
-(-518,1743,o),
-(-518,1680,cs)
-);
+alignment = -1;
+pos = (0,-49);
+ref = tilde;
 },
 {
-closed = 1;
-nodes = (
-(-396,1455,o),
-(-439,1405,o),
-(-494,1406,cs),
-(-599,1405,o),
-(-649,1498,o),
-(-760,1498,cs),
-(-881,1498,o),
-(-977,1393,o),
-(-978,1246,c),
-(-846,1240,l),
-(-847,1297,o),
-(-803,1350,o),
-(-750,1350,cs),
-(-640,1350,o),
-(-617,1257,o),
-(-482,1256,cs),
-(-361,1257,o),
-(-262,1353,o),
-(-262,1504,c),
-(-396,1516,l)
-);
+alignment = -1;
+pos = (-88,298);
+ref = dieresis;
 }
 );
-width = 0;
+width = 960;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-720,1298);
-},
+pos = (496,1056);
+}
+);
+guides = (
 {
-name = mkmktop_acc;
-pos = (-720,2036);
+pos = (0,1728);
 }
 );
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-1168,1699,o),
-(-1092,1635,o),
-(-1006,1634,cs),
-(-915,1635,o),
-(-839,1699,o),
-(-840,1778,cs),
-(-839,1859,o),
-(-918,1920,o),
-(-1006,1920,cs),
-(-1089,1920,o),
-(-1168,1859,o),
-(-1168,1778,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-609,1699,o),
-(-531,1638,o),
-(-444,1638,cs),
-(-356,1638,o),
-(-281,1699,o),
-(-280,1780,cs),
-(-281,1859,o),
-(-356,1920,o),
-(-444,1920,cs),
-(-531,1920,o),
-(-609,1859,o),
-(-610,1780,cs)
-);
+alignment = -1;
+pos = (-24,0);
+ref = tilde;
 },
 {
-closed = 1;
-nodes = (
-(-516,1492,o),
-(-554,1472,o),
-(-594,1472,cs),
-(-697,1472,o),
-(-781,1551,o),
-(-888,1550,cs),
-(-1031,1551,o),
-(-1133,1411,o),
-(-1134,1272,c),
-(-926,1260,l),
-(-927,1321,o),
-(-892,1341,o),
-(-850,1342,cs),
-(-743,1341,o),
-(-685,1260,o),
-(-558,1260,cs),
-(-412,1260,o),
-(-310,1399,o),
-(-310,1544,c),
-(-516,1554,l)
-);
+alignment = -1;
+pos = (-145,507);
+ref = dieresis;
+scale = (1,0.9084);
 }
 );
-width = 0;
+width = 992;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-588,1282);
+pos = (448,1056);
+}
+);
+guides = (
+{
+pos = (0,1625);
 },
 {
-name = mkmktop_acc;
-pos = (-588,1812);
+pos = (0,1328);
+},
+{
+pos = (0,1625);
 }
 );
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-835,1575,o),
-(-814,1553,o),
-(-788,1554,cs),
-(-763,1553,o),
-(-742,1575,o),
-(-742,1600,cs),
-(-742,1625,o),
-(-763,1647,o),
-(-788,1646,cs),
-(-814,1647,o),
-(-835,1625,o),
-(-834,1600,cs)
-);
+alignment = -1;
+pos = (0,-50);
+ref = tilde;
 },
 {
-closed = 1;
-nodes = (
-(-425,1575,o),
-(-404,1553,o),
-(-378,1554,cs),
-(-353,1553,o),
-(-332,1575,o),
-(-332,1600,cs),
-(-332,1625,o),
-(-353,1647,o),
-(-378,1646,cs),
-(-404,1647,o),
-(-425,1625,o),
-(-424,1600,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-404,1411,o),
-(-435,1364,o),
-(-494,1362,cs),
-(-572,1362,o),
-(-601,1482,o),
-(-706,1482,cs),
-(-791,1482,o),
-(-841,1419,o),
-(-850,1328,c),
-(-808,1322,l),
-(-799,1388,o),
-(-768,1436,o),
-(-708,1436,cs),
-(-627,1436,o),
-(-590,1316,o),
-(-492,1316,cs),
-(-412,1317,o),
-(-361,1380,o),
-(-352,1470,c),
-(-394,1476,l)
-);
+alignment = -1;
+pos = (-86,247);
+ref = dieresis;
 }
 );
-width = 0;
+width = 896;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tildemacroncomb.lc.glyph b/src/Inter-Roman.glyphspackage/glyphs/tildemacroncomb.lc.glyph
index 32ed947d9..f87c5c7e9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tildemacroncomb.lc.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tildemacroncomb.lc.glyph
@@ -5,301 +5,181 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (-590,1288);
+pos = (512,1118);
+}
+);
+guides = (
+{
+pos = (0,1392);
 },
 {
-name = mkmktop_acc;
-pos = (-590,1906);
+pos = (0,1717);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-364,1455,o),
-(-407,1405,o),
-(-462,1406,cs),
-(-567,1405,o),
-(-617,1498,o),
-(-728,1498,cs),
-(-849,1498,o),
-(-945,1393,o),
-(-946,1246,c),
-(-814,1240,l),
-(-815,1297,o),
-(-771,1350,o),
-(-718,1350,cs),
-(-608,1350,o),
-(-585,1257,o),
-(-450,1256,cs),
-(-329,1257,o),
-(-230,1353,o),
-(-230,1504,c),
-(-364,1516,l)
-);
+alignment = -1;
+pos = (0,-27);
+ref = tilde;
 },
 {
-closed = 1;
-nodes = (
-(-926,1772,l),
-(-926,1620,l),
-(-242,1620,l),
-(-242,1772,l)
-);
+alignment = -1;
+pos = (24,439);
+ref = macron;
+scale = (1,0.9);
 }
 );
-width = 0;
+width = 1024;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-702,1298);
+pos = (512,1118);
+}
+);
+guides = (
+{
+pos = (0,1392);
 },
 {
-name = mkmktop_acc;
-pos = (-702,2024);
+pos = (0,1765);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-497,1492,o),
-(-535,1472,o),
-(-576,1472,cs),
-(-677,1472,o),
-(-761,1551,o),
-(-870,1550,cs),
-(-1015,1551,o),
-(-1113,1405,o),
-(-1114,1272,c),
-(-908,1260,l),
-(-907,1321,o),
-(-872,1341,o),
-(-832,1342,cs),
-(-724,1341,o),
-(-665,1260,o),
-(-538,1260,cs),
-(-392,1260,o),
-(-290,1399,o),
-(-290,1544,c),
-(-498,1554,l)
-);
+alignment = -1;
+pos = (0,-24);
+ref = tilde;
 },
 {
-closed = 1;
-nodes = (
-(-1068,1864,l),
-(-1068,1682,l),
-(-338,1682,l),
-(-338,1864,l)
-);
+alignment = -1;
+pos = (98,632);
+ref = macron;
+scale = (1,0.8);
 }
 );
-width = 30;
+width = 1024;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-524,1282);
+pos = (504,1118);
+}
+);
+guides = (
+{
+pos = (0,1392);
 },
 {
-name = mkmktop_acc;
-pos = (-524,1836);
+pos = (0,1681);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(-331,1411,o),
-(-362,1364,o),
-(-420,1362,cs),
-(-500,1362,o),
-(-529,1482,o),
-(-632,1482,cs),
-(-719,1482,o),
-(-769,1419,o),
-(-778,1328,c),
-(-736,1322,l),
-(-727,1388,o),
-(-695,1436,o),
-(-636,1436,cs),
-(-554,1436,o),
-(-517,1316,o),
-(-418,1316,cs),
-(-339,1317,o),
-(-289,1380,o),
-(-280,1470,c),
-(-322,1476,l)
-);
+alignment = -1;
+pos = (0,-28);
+ref = tilde;
 },
 {
-closed = 1;
-nodes = (
-(-764,1624,l),
-(-764,1576,l),
-(-298,1576,l),
-(-298,1624,l)
-);
+alignment = -1;
+pos = (104,261);
+ref = macron;
 }
 );
-width = 0;
+width = 1018;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-622,1288);
+pos = (481,1056);
+}
+);
+guides = (
+{
+pos = (0,1328);
 },
 {
-name = mkmktop_acc;
-pos = (-622,1906);
+pos = (0,1640);
 }
 );
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-396,1455,o),
-(-439,1405,o),
-(-494,1406,cs),
-(-599,1405,o),
-(-649,1498,o),
-(-760,1498,cs),
-(-881,1498,o),
-(-977,1393,o),
-(-978,1246,c),
-(-846,1240,l),
-(-847,1297,o),
-(-803,1350,o),
-(-750,1350,cs),
-(-640,1350,o),
-(-617,1257,o),
-(-482,1256,cs),
-(-361,1257,o),
-(-262,1353,o),
-(-262,1504,c),
-(-396,1516,l)
-);
+alignment = -1;
+pos = (0,-49);
+ref = tilde;
 },
 {
-closed = 1;
-nodes = (
-(-958,1772,l),
-(-958,1620,l),
-(-274,1620,l),
-(-274,1772,l)
-);
+alignment = -1;
+pos = (64,429);
+ref = macron;
+scale = (1,0.9);
 }
 );
-width = 0;
+width = 960;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-718,1298);
-},
+pos = (512,1056);
+}
+);
+guides = (
 {
-name = mkmktop_acc;
-pos = (-718,2024);
+pos = (0,1704);
 }
 );
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-513,1492,o),
-(-551,1472,o),
-(-592,1472,cs),
-(-693,1472,o),
-(-777,1551,o),
-(-886,1550,cs),
-(-1031,1551,o),
-(-1129,1405,o),
-(-1130,1272,c),
-(-924,1260,l),
-(-923,1321,o),
-(-888,1341,o),
-(-848,1342,cs),
-(-740,1341,o),
-(-681,1260,o),
-(-554,1260,cs),
-(-408,1260,o),
-(-306,1399,o),
-(-306,1544,c),
-(-514,1554,l)
-);
+alignment = -1;
+ref = tilde;
 },
 {
-closed = 1;
-nodes = (
-(-1084,1864,l),
-(-1084,1682,l),
-(-354,1682,l),
-(-354,1864,l)
-);
+alignment = -1;
+pos = (130,516);
+ref = macron;
+scale = (1,0.9);
 }
 );
-width = 0;
+width = 992;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-588,1282);
+pos = (448,1056);
+}
+);
+guides = (
+{
+pos = (0,1328);
 },
 {
-name = mkmktop_acc;
-pos = (-588,1836);
+pos = (0,1625);
 }
 );
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-395,1411,o),
-(-426,1364,o),
-(-484,1362,cs),
-(-564,1362,o),
-(-593,1482,o),
-(-696,1482,cs),
-(-783,1482,o),
-(-833,1419,o),
-(-842,1328,c),
-(-800,1322,l),
-(-791,1388,o),
-(-759,1436,o),
-(-700,1436,cs),
-(-618,1436,o),
-(-581,1316,o),
-(-482,1316,cs),
-(-403,1317,o),
-(-353,1380,o),
-(-344,1470,c),
-(-386,1476,l)
-);
+alignment = -1;
+pos = (0,-50);
+ref = tilde;
 },
 {
-closed = 1;
-nodes = (
-(-828,1624,l),
-(-828,1576,l),
-(-362,1576,l),
-(-362,1624,l)
-);
+alignment = -1;
+pos = (64,247);
+ref = macron;
 }
 );
-width = 0;
+width = 896;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tildesubnosp.glyph b/src/Inter-Roman.glyphspackage/glyphs/tildesubnosp.glyph
index e49df3959..7dfec42bb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tildesubnosp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tildesubnosp.glyph
@@ -40,14 +40,14 @@ width = 30;
 anchors = (
 {
 name = _bottom;
-pos = (-581,0);
+pos = (-583,0);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (-1090,-1650);
+pos = (-1087,-1686);
 ref = tilde;
 }
 );
@@ -81,7 +81,7 @@ layerId = m009;
 shapes = (
 {
 alignment = -1;
-pos = (-1160,-1616);
+pos = (-1160,-1624);
 ref = tilde;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tlinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/tlinebelow.glyph
index fd109129d..c02062a98 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tlinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tlinebelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = t;
 },
 {
-pos = (1014,0);
-ref = macronsubnosp;
+pos = (-72,0);
+ref = macronsub;
 }
 );
 width = 744;
@@ -23,8 +23,8 @@ shapes = (
 ref = t;
 },
 {
-pos = (1130,0);
-ref = macronsubnosp;
+pos = (48,0);
+ref = macronsub;
 }
 );
 width = 830;
@@ -36,8 +36,8 @@ shapes = (
 ref = t;
 },
 {
-pos = (979,0);
-ref = macronsubnosp;
+pos = (4,0);
+ref = macronsub;
 }
 );
 width = 712;
@@ -49,8 +49,8 @@ shapes = (
 ref = t;
 },
 {
-pos = (930,0);
-ref = macronsubnosp;
+pos = (-46,0);
+ref = macronsub;
 }
 );
 width = 626;
@@ -62,8 +62,8 @@ shapes = (
 ref = t;
 },
 {
-pos = (1121,0);
-ref = macronsubnosp;
+pos = (92,0);
+ref = macronsub;
 }
 );
 width = 852;
@@ -75,8 +75,8 @@ shapes = (
 ref = t;
 },
 {
-pos = (877,0);
-ref = macronsubnosp;
+pos = (-36,0);
+ref = macronsub;
 }
 );
 width = 584;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/tonos.glyph
index 6ee7b93ea..355e0c6b2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tonos.glyph
@@ -30,7 +30,7 @@ shapes = (
 ref = tonostop;
 }
 );
-width = 916;
+width = 822;
 },
 {
 anchors = (
@@ -75,7 +75,7 @@ shapes = (
 ref = tonostop;
 }
 );
-width = 884;
+width = 774;
 },
 {
 anchors = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tonostop.glyph b/src/Inter-Roman.glyphspackage/glyphs/tonostop.glyph
index baf0f64d2..a2cd7d48e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tonostop.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tonostop.glyph
@@ -5,7 +5,12 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (222,1304);
+pos = (222,1118);
+}
+);
+guides = (
+{
+pos = (0,1283);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -13,10 +18,10 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(282,1242,l),
-(398,1582,l),
-(212,1582,l),
-(162,1242,l)
+(282,1283,l),
+(382,1557,l),
+(196,1557,l),
+(162,1283,l)
 );
 }
 );
@@ -26,7 +31,12 @@ width = 546;
 anchors = (
 {
 name = _top;
-pos = (372,1282);
+pos = (372,1118);
+}
+);
+guides = (
+{
+pos = (0,1256);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -34,20 +44,25 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(478,1256,l),
-(686,1606,l),
-(350,1606,l),
-(254,1256,l)
+(480,1256,l),
+(624,1582,l),
+(288,1582,l),
+(256,1256,l)
 );
 }
 );
-width = 916;
+width = 822;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (130,1314);
+pos = (134,1118);
+}
+);
+guides = (
+{
+pos = (0,1283);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -55,10 +70,10 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(156,1234,l),
-(208,1568,l),
-(150,1568,l),
-(120,1234,l)
+(156,1283,l),
+(207,1557,l),
+(158,1557,l),
+(120,1283,l)
 );
 }
 );
@@ -68,7 +83,12 @@ width = 326;
 anchors = (
 {
 name = _top;
-pos = (190,1304);
+pos = (190,1056);
+}
+);
+guides = (
+{
+pos = (0,1241);
 }
 );
 layerId = m007;
@@ -76,10 +96,10 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(250,1242,l),
-(366,1582,l),
-(180,1582,l),
-(130,1242,l)
+(250,1241,l),
+(339,1515,l),
+(169,1515,l),
+(130,1241,l)
 );
 }
 );
@@ -89,7 +109,15 @@ width = 482;
 anchors = (
 {
 name = _top;
-pos = (356,1282);
+pos = (356,1056);
+}
+);
+guides = (
+{
+pos = (0,1181);
+},
+{
+pos = (0,1507);
 }
 );
 layerId = m009;
@@ -97,20 +125,25 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(462,1256,l),
-(670,1606,l),
-(334,1606,l),
-(238,1256,l)
+(465,1181,l),
+(609,1507,l),
+(273,1507,l),
+(241,1181,l)
 );
 }
 );
-width = 884;
+width = 774;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (66,1314);
+pos = (71,1056);
+}
+);
+guides = (
+{
+pos = (0,1241);
 }
 );
 layerId = m011;
@@ -118,10 +151,10 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(92,1234,l),
-(144,1568,l),
-(86,1568,l),
-(56,1234,l)
+(92,1241,l),
+(144,1515,l),
+(94,1515,l),
+(56,1241,l)
 );
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/u.glyph b/src/Inter-Roman.glyphspackage/glyphs/u.glyph
index 02c27890c..6b67f31e4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/u.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/u.glyph
@@ -79,18 +79,18 @@ shapes = (
 closed = 1;
 nodes = (
 (826,378,o),
-(763,311,o),
+(763,312,o),
 (664,312,cs),
-(562,311,o),
+(562,312,o),
 (504,378,o),
 (504,488,cs),
 (504,1118,l),
 (102,1118,l),
 (102,404,ls),
 (102,160,o),
-(257,-15,o),
+(257,-14,o),
 (492,-14,cs),
-(658,-15,o),
+(658,-14,o),
 (786,70,o),
 (834,212,c),
 (846,212,l),
@@ -199,9 +199,9 @@ nodes = (
 (198,1118,l),
 (198,366,ls),
 (198,143,o),
-(355,-15,o),
+(355,-14,o),
 (578,-14,cs),
-(733,-15,o),
+(733,-14,o),
 (861,61,o),
 (914,178,c),
 (920,178,l),
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/uacute.glyph
index 25918caeb..96158c7fd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (244,0);
+pos = (352,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (276,0);
+pos = (362,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (302,0);
+pos = (370,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (219,0);
+pos = (406,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (240,0);
+pos = (432,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (250,0);
+pos = (404,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ucaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/ucaron.glyph
index 094e0fd57..82ba3b628 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ucaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ucaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (130,0);
+pos = (180,0);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (20,0);
+pos = (154,0);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (136,0);
+pos = (170,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (22,0);
+pos = (218,0);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (166,0);
+pos = (182,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ucircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/ucircumflex.glyph
index 7262d1e0a..10bcc97bb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ucircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ucircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (132,0);
+pos = (180,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (26,0);
+pos = (154,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (138,0);
+pos = (170,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (22,0);
+pos = (218,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (166,0);
+pos = (182,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ucircumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/ucircumflexbelow.glyph
index 60ac361b3..09d946130 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ucircumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ucircumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1188,0);
+pos = (1192,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1156,0);
+pos = (1159,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1138,0);
+pos = (1136,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1378,0);
+pos = (1376,0);
 ref = circumflexsubnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1056,0);
+pos = (1052,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/udblgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/udblgrave.glyph
index 9361143db..f68a0a4fc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/udblgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/udblgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1068,0);
+pos = (1172,0);
 ref = dblgravecmb;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1276,0);
+pos = (1322,0);
 ref = dblgravecmb;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1140,0);
+pos = (1158,0);
 ref = dblgravecmb;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1074,0);
+pos = (1129,0);
 ref = dblgravecmb;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1276,0);
+pos = (1290,0);
 ref = dblgravecmb;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1156,0);
+pos = (1070,0);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/udieresisacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/udieresisacute.glyph
index 5269e3cb2..291ce86d8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/udieresisacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/udieresisacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (-5,0);
+pos = (-4,0);
 ref = dieresisacutecomb.lc;
 }
 );
@@ -48,7 +48,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1,0);
+pos = (2,0);
 ref = dieresisacutecomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/udieresisbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/udieresisbelow.glyph
index 2947f7e79..a0bfa0c90 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/udieresisbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/udieresisbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1284,0);
+pos = (1196,0);
 ref = dotdblsubnosp;
 }
 );
@@ -30,7 +30,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1510,0);
+pos = (1407,0);
 ref = dotdblsubnosp;
 }
 );
@@ -43,7 +43,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1190,0);
+pos = (1162,0);
 ref = dotdblsubnosp;
 }
 );
@@ -56,7 +56,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1290,0);
+pos = (1137,0);
 ref = dotdblsubnosp;
 }
 );
@@ -76,7 +76,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1510,0);
+pos = (1377,0);
 ref = dotdblsubnosp;
 }
 );
@@ -89,7 +89,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1136,0);
+pos = (1062,0);
 ref = dotdblsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/udieresiscaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/udieresiscaron.glyph
index 96ad8e904..1cdff00b1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/udieresiscaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/udieresiscaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (-5,0);
+pos = (-4,0);
 ref = dieresiscaroncomb.lc;
 }
 );
@@ -48,7 +48,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1,0);
+pos = (2,0);
 ref = dieresiscaroncomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/udieresisgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/udieresisgrave.glyph
index df139183d..f4cc6f1db 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/udieresisgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/udieresisgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (-5,0);
+pos = (-4,0);
 ref = dieresisgravecomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/udieresismacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/udieresismacron.glyph
index f1d155b7f..3ae1871c2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/udieresismacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/udieresismacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (-5,0);
+pos = (-4,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -48,7 +48,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1,0);
+pos = (2,0);
 ref = dieresismacroncomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/udotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/udotbelow.glyph
index 64a17a658..4522796b6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/udotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/udotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1202,0);
+pos = (1196,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1278,0);
+pos = (1409,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1140,0);
+pos = (1167,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1208,0);
+pos = (1139,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1278,0);
+pos = (1373,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1150,0);
+pos = (1063,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ugrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/ugrave.glyph
index 2d380ac8c..8a3f567b3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ugrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ugrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (58,0);
+pos = (186,0);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (62,0);
+pos = (148,0);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (88,0);
+pos = (217,0);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (10,0);
+pos = (240,0);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (-22,0);
+pos = (170,0);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (40,0);
+pos = (208,0);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/uhookabove.glyph
index a84997be5..796050c00 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uhookabove.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (1183,0);
-ref = hookabovecmb;
+pos = (331,0);
+ref = hookabove;
 }
 );
 width = 1190;
@@ -23,8 +23,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (1330,0);
-ref = hookabovecmb;
+pos = (352,0);
+ref = hookabove;
 }
 );
 width = 1330;
@@ -36,8 +36,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (1104,0);
-ref = hookabovecmb;
+pos = (362,0);
+ref = hookabove;
 }
 );
 width = 1164;
@@ -49,8 +49,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (1133,0);
-ref = hookabovecmb;
+pos = (305,0);
+ref = hookabove;
 }
 );
 width = 1140;
@@ -62,8 +62,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (1304,0);
-ref = hookabovecmb;
+pos = (327,0);
+ref = hookabove;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (1038,0);
-ref = hookabovecmb;
+pos = (316,0);
+ref = hookabove;
 }
 );
 width = 1068;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uhornacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/uhornacute.glyph
index 27eeef41a..7ee947162 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uhornacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uhornacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (244,0);
+pos = (352,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (276,0);
+pos = (362,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (302,0);
+pos = (370,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (219,0);
+pos = (406,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (240,0);
+pos = (432,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (250,0);
+pos = (404,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uhorndotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/uhorndotbelow.glyph
index bc20d7096..284ed79cc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uhorndotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uhorndotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1202,0);
+pos = (1196,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1278,0);
+pos = (1409,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1140,0);
+pos = (1167,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1208,0);
+pos = (1139,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1278,0);
+pos = (1373,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1150,0);
+pos = (1063,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uhorngrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/uhorngrave.glyph
index 0ffe7fbed..b3d16d7ea 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uhorngrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uhorngrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (58,0);
+pos = (186,0);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (62,0);
+pos = (148,0);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (88,0);
+pos = (217,0);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (10,0);
+pos = (240,0);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (-22,0);
+pos = (170,0);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (40,0);
+pos = (208,0);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uhornhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/uhornhookabove.glyph
index 1d001a72d..a367a608d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uhornhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uhornhookabove.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1183,0);
-ref = hookabovecmb;
+pos = (331,0);
+ref = hookabove;
 }
 );
 width = 1248;
@@ -23,8 +23,8 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1330,0);
-ref = hookabovecmb;
+pos = (352,0);
+ref = hookabove;
 }
 );
 width = 1426;
@@ -36,8 +36,8 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1104,0);
-ref = hookabovecmb;
+pos = (362,0);
+ref = hookabove;
 }
 );
 width = 1200;
@@ -49,8 +49,8 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1133,0);
-ref = hookabovecmb;
+pos = (305,0);
+ref = hookabove;
 }
 );
 width = 1206;
@@ -62,8 +62,8 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1304,0);
-ref = hookabovecmb;
+pos = (327,0);
+ref = hookabove;
 }
 );
 width = 1391;
@@ -75,8 +75,8 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (1038,0);
-ref = hookabovecmb;
+pos = (316,0);
+ref = hookabove;
 }
 );
 width = 1150;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uhungarumlaut.glyph b/src/Inter-Roman.glyphspackage/glyphs/uhungarumlaut.glyph
index 10a6f2d46..80693be21 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uhungarumlaut.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uhungarumlaut.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (244,-174);
+pos = (346,0);
 ref = hungarumlaut;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (276,-174);
+pos = (350,0);
 ref = hungarumlaut;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (254,-174);
+pos = (390,0);
 ref = hungarumlaut;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (250,-236);
+pos = (352,0);
 ref = hungarumlaut;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (276,-236);
+pos = (350,0);
 ref = hungarumlaut;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (270,-236);
+pos = (379,0);
 ref = hungarumlaut;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uhungarumlautcyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/uhungarumlautcyrillic.glyph
index 28004b477..accd0d692 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uhungarumlautcyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uhungarumlautcyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (218,-174);
+pos = (320,0);
 ref = hungarumlaut;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (226,-174);
+pos = (300,0);
 ref = hungarumlaut;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (208,-174);
+pos = (344,0);
 ref = hungarumlaut;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (212,-236);
+pos = (314,0);
 ref = hungarumlaut;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (218,-236);
+pos = (292,0);
 ref = hungarumlaut;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (224,-236);
+pos = (333,0);
 ref = hungarumlaut;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uinvertedbreve.glyph b/src/Inter-Roman.glyphspackage/glyphs/uinvertedbreve.glyph
index 9e7e320fa..1a2fe6fc0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uinvertedbreve.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uinvertedbreve.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1193,0);
+pos = (1186,0);
 ref = breveinvnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1328,0);
+pos = (1332,0);
 ref = breveinvnosp;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1300,0);
+pos = (1303,0);
 ref = breveinvnosp;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1063,0);
+pos = (1073,0);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/umacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/umacron.glyph
index 1149c3ef2..a453d12b1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/umacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/umacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (-4,0);
+pos = (108,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1,0);
+pos = (250,0);
 ref = macron;
 }
 );
@@ -36,6 +36,7 @@ shapes = (
 ref = u;
 },
 {
+pos = (182,0);
 ref = macron;
 }
 );
@@ -48,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (2,0);
+pos = (154,0);
 ref = macron;
 }
 );
@@ -61,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1,0);
+pos = (266,0);
 ref = macron;
 }
 );
@@ -74,6 +75,7 @@ shapes = (
 ref = u;
 },
 {
+pos = (150,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/umacroncyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/umacroncyrillic.glyph
index 1c65aaa9b..1c59ab79f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/umacroncyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/umacroncyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-30,0);
+pos = (82,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-49,0);
+pos = (200,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-46,0);
+pos = (136,0);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-36,0);
+pos = (116,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-57,0);
+pos = (208,0);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-46,0);
+pos = (104,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/umacrondieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/umacrondieresis.glyph
index 21e6e195c..3ccb9b846 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/umacrondieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/umacrondieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (-4,0);
+pos = (108,0);
 ref = macrondieresiscomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1,0);
+pos = (250,0);
 ref = macrondieresiscomb.lc;
 }
 );
@@ -36,6 +36,7 @@ shapes = (
 ref = u;
 },
 {
+pos = (182,0);
 ref = macrondieresiscomb.lc;
 }
 );
@@ -48,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (2,0);
+pos = (154,0);
 ref = macrondieresiscomb.lc;
 }
 );
@@ -61,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1,0);
+pos = (266,0);
 ref = macrondieresiscomb.lc;
 }
 );
@@ -74,6 +75,7 @@ shapes = (
 ref = u;
 },
 {
+pos = (150,0);
 ref = macrondieresiscomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni01F_8.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni01F_8.glyph
index 7e08dfa58..276a2b312 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni01F_8.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni01F_8.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (232,372);
+pos = (360,372);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (138,372);
+pos = (224,372);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (296,372);
+pos = (425,372);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (182,434);
+pos = (412,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (86,434);
+pos = (278,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (232,434);
+pos = (400,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni01F_9.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni01F_9.glyph
index 5d45081f1..c4d9a89f8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni01F_9.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni01F_9.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (62,0);
+pos = (190,0);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (60,0);
+pos = (146,0);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (90,0);
+pos = (219,0);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (8,0);
+pos = (238,0);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (-24,0);
+pos = (168,0);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (42,0);
+pos = (210,0);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni021E_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni021E_.glyph
index 9937f6a74..7f1c4c8d6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni021E_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni021E_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (290,372);
+pos = (340,372);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (122,372);
+pos = (256,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (291,434);
+pos = (325,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (116,434);
+pos = (312,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = H;
 },
 {
-pos = (322,434);
+pos = (338,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni021F_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni021F_.glyph
index cd67ad22c..747dfde3c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni021F_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni021F_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-223,372);
+pos = (-173,372);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-351,372);
+pos = (-217,372);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-221,434);
+pos = (-187,434);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-342,434);
+pos = (-146,434);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (-211,434);
+pos = (-195,434);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0227.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0227.1.glyph
index 0e558895d..8850c0c5c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0227.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0227.1.glyph
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (382,0);
+pos = (366,0);
 ref = dotaccent;
 }
 );
@@ -54,7 +54,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (356,0);
+pos = (346,0);
 ref = dotaccent;
 }
 );
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (334,0);
+pos = (302,0);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0227.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0227.glyph
index fa94761bd..9ea024163 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0227.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0227.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (352,0);
+pos = (323,0);
 ref = dotaccent;
 }
 );
@@ -27,7 +27,7 @@ pos = (282,0);
 ref = dotaccent;
 }
 );
-width = 1222;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -40,7 +40,7 @@ pos = (366,0);
 ref = dotaccent;
 }
 );
-width = 1102;
+width = 1094;
 },
 {
 layerId = m007;
@@ -49,7 +49,7 @@ shapes = (
 ref = a;
 },
 {
-pos = (320,0);
+pos = (312,0);
 ref = dotaccent;
 }
 );
@@ -66,7 +66,7 @@ pos = (256,0);
 ref = dotaccent;
 }
 );
-width = 1178;
+width = 1172;
 },
 {
 layerId = m011;
@@ -79,7 +79,7 @@ pos = (374,0);
 ref = dotaccent;
 }
 );
-width = 1014;
+width = 1000;
 }
 );
 unicode = 551;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni022A_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni022A_.glyph
index 777d10d22..bd16952e5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni022A_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni022A_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (180,0);
+pos = (181,0);
 ref = dieresismacroncomb.uc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (198,0);
+pos = (199,0);
 ref = dieresismacroncomb.uc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni022B_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni022B_.glyph
index d8c397671..7a5b0a331 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni022B_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni022B_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (9,0);
+pos = (10,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (-7,0);
+pos = (-6,0);
 ref = dieresismacroncomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni022D_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni022D_.glyph
index ce6f7a4e1..8aa08e0be 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni022D_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni022D_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1200,-170);
+pos = (98,0);
 ref = tildemacroncomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1342,-180);
+pos = (128,0);
 ref = tildemacroncomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1118,-164);
+pos = (90,0);
 ref = tildemacroncomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1184,-232);
+pos = (81,0);
 ref = tildemacroncomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1340,-242);
+pos = (110,0);
 ref = tildemacroncomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1118,-226);
+pos = (82,0);
 ref = tildemacroncomb.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0231.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0231.glyph
index afc6bb58a..3e1cf6a12 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0231.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0231.glyph
@@ -11,7 +11,7 @@ ref = o;
 },
 {
 pos = (366,0);
-ref = dotmacroncomb.lc;
+ref = dotmacron.lc;
 }
 );
 width = 1222;
@@ -24,7 +24,7 @@ ref = o;
 },
 {
 pos = (306,0);
-ref = dotmacroncomb.lc;
+ref = dotmacron.lc;
 }
 );
 width = 1280;
@@ -37,7 +37,7 @@ ref = o;
 },
 {
 pos = (408,0);
-ref = dotmacroncomb.lc;
+ref = dotmacron.lc;
 }
 );
 width = 1186;
@@ -50,7 +50,7 @@ ref = o;
 },
 {
 pos = (350,0);
-ref = dotmacroncomb.lc;
+ref = dotmacron.lc;
 }
 );
 width = 1124;
@@ -63,7 +63,7 @@ ref = o;
 },
 {
 pos = (302,0);
-ref = dotmacroncomb.lc;
+ref = dotmacron.lc;
 }
 );
 width = 1244;
@@ -76,7 +76,7 @@ ref = o;
 },
 {
 pos = (408,0);
-ref = dotmacroncomb.lc;
+ref = dotmacron.lc;
 }
 );
 width = 1058;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0232.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0232.glyph
index 4d955219a..bd1c6c238 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0232.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0232.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (80,372);
+pos = (192,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (129,372);
+pos = (378,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (42,372);
+pos = (224,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (80,434);
+pos = (232,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (99,434);
+pos = (364,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (44,434);
+pos = (194,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0233.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0233.glyph
index e76f3eeec..c43f2d12b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0233.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0233.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-30,0);
+pos = (82,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-49,0);
+pos = (200,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-46,0);
+pos = (136,0);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-36,0);
+pos = (116,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-57,0);
+pos = (208,0);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-46,0);
+pos = (104,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0400.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0400.glyph
index af79a8bb5..7d50732a3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0400.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0400.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (90,372);
+pos = (218,372);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (34,372);
+pos = (120,372);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (140,372);
+pos = (269,372);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (36,434);
+pos = (266,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (-42,434);
+pos = (150,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = E;
 },
 {
-pos = (76,434);
+pos = (244,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni040D_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni040D_.glyph
index 47f27d0e5..e1fbde87e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni040D_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni040D_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (234,372);
+pos = (362,372);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (136,372);
+pos = (222,372);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (296,372);
+pos = (425,372);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (176,434);
+pos = (406,434);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (84,434);
+pos = (276,434);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (232,434);
+pos = (400,434);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0450.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0450.glyph
index 2b0e605da..d66761353 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0450.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0450.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (62,0);
+pos = (190,0);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (18,0);
+pos = (104,0);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (96,0);
+pos = (225,0);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-10,0);
+pos = (220,0);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (-73,0);
+pos = (119,0);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = e;
 },
 {
-pos = (32,0);
+pos = (200,0);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni045D_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni045D_.glyph
index dae42e027..7814d6582 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni045D_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni045D_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (62,0);
+pos = (190,0);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (61,0);
+pos = (147,0);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (88,0);
+pos = (217,0);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (8,0);
+pos = (238,0);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (-23,0);
+pos = (169,0);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (24,0);
+pos = (192,0);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1E_2D_.ccmp.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1E_2D_.ccmp.glyph
index a9d9501f7..8c214bb26 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1E_2D_.ccmp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1E_2D_.ccmp.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (801,0);
+pos = (803,0);
 ref = tildesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1E_C_B_.ccmp.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1E_C_B_.ccmp.glyph
index 7e83defe7..3d48e968c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1E_C_B_.ccmp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1E_C_B_.ccmp.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (850,0);
+pos = (844,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (842,0);
+pos = (973,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (778,0);
+pos = (805,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (851,0);
+pos = (782,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (838,0);
+pos = (933,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (779,0);
+pos = (692,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_00.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_00.glyph
index 8c04762d4..0705adfa4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_00.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_00.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (372,-64);
+pos = (372,0);
 ref = uni1FBD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (462,-64);
+pos = (462,0);
 ref = uni1FBD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (320,-64);
+pos = (320,0);
 ref = uni1FBD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (348,-126);
+pos = (348,0);
 ref = uni1FBD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (482,-126);
+pos = (482,0);
 ref = uni1FBD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (312,-126);
+pos = (312,0);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_01.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_01.glyph
index 1cd3968b1..270d889ee 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_01.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_01.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (336,-58);
+pos = (336,0);
 ref = uni1FFE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (248,-58);
+pos = (248,0);
 ref = uni1FFE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (392,-58);
+pos = (392,0);
 ref = uni1FFE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (312,-120);
+pos = (312,0);
 ref = uni1FFE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (268,-120);
+pos = (268,0);
 ref = uni1FFE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (384,-120);
+pos = (384,0);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_02.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_02.glyph
index d22d718bd..ae4fc6778 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_02.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_02.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (150,-64);
+pos = (150,0);
 ref = uni1FCD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (92,-64);
+pos = (92,0);
 ref = uni1FCD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (236,-64);
+pos = (236,0);
 ref = uni1FCD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (126,-126);
+pos = (126,0);
 ref = uni1FCD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (112,-126);
+pos = (112,0);
 ref = uni1FCD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (228,-126);
+pos = (228,0);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_03.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_03.glyph
index 456efe326..07901f395 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_03.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_03.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (112,-58);
+pos = (112,0);
 ref = uni1FDD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (190,-60);
+pos = (190,0);
 ref = uni1FDD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (250,-58);
+pos = (250,0);
 ref = uni1FDD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (88,-120);
+pos = (88,0);
 ref = uni1FDD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (210,-122);
+pos = (210,0);
 ref = uni1FDD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (242,-120);
+pos = (242,0);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_04.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_04.glyph
index c2ec58b9f..048d71d71 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_04.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_04.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (226,-58);
+pos = (226,0);
 ref = uni1FCE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (164,-58);
+pos = (164,0);
 ref = uni1FCE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (362,-58);
+pos = (362,0);
 ref = uni1FCE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (202,-120);
+pos = (202,0);
 ref = uni1FCE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (184,-120);
+pos = (184,0);
 ref = uni1FCE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (354,-120);
+pos = (354,0);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_05.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_05.glyph
index d221a068f..3de8250f2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_05.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_05.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (182,-58);
+pos = (182,0);
 ref = uni1FDE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (170,-60);
+pos = (170,0);
 ref = uni1FDE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (286,-58);
+pos = (286,0);
 ref = uni1FDE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (158,-120);
+pos = (158,0);
 ref = uni1FDE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (190,-122);
+pos = (190,0);
 ref = uni1FDE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (278,-120);
+pos = (278,0);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_06.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_06.glyph
index bb39fecef..7428fbe0c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_06.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_06.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (260,-64);
+pos = (260,0);
 ref = uni1FCF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (266,-64);
+pos = (266,0);
 ref = uni1FCF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (274,-64);
+pos = (274,0);
 ref = uni1FCF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (236,-126);
+pos = (236,0);
 ref = uni1FCF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (286,-126);
+pos = (286,0);
 ref = uni1FCF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (266,-126);
+pos = (266,0);
 ref = uni1FCF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_07.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_07.glyph
index df043abda..8041387b9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_07.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_07.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (234,-64);
+pos = (234,0);
 ref = uni1FDF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (190,-64);
+pos = (190,0);
 ref = uni1FDF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (264,-64);
+pos = (264,0);
 ref = uni1FDF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (210,-126);
+pos = (210,0);
 ref = uni1FDF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (210,-126);
+pos = (210,0);
 ref = uni1FDF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (256,-126);
+pos = (256,0);
 ref = uni1FDF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_10.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_10.glyph
index 79ea75667..12ccc8060 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_10.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_10.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (324,-64);
+pos = (324,0);
 ref = uni1FBD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (434,-64);
+pos = (434,0);
 ref = uni1FBD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (260,-64);
+pos = (260,0);
 ref = uni1FBD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (324,-126);
+pos = (324,0);
 ref = uni1FBD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (434,-126);
+pos = (434,0);
 ref = uni1FBD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (260,-126);
+pos = (260,0);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_11.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_11.glyph
index 0af5b718d..493710b00 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_11.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_11.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (288,-58);
+pos = (288,0);
 ref = uni1FFE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (220,-58);
+pos = (220,0);
 ref = uni1FFE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (332,-58);
+pos = (332,0);
 ref = uni1FFE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (288,-120);
+pos = (288,0);
 ref = uni1FFE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (220,-120);
+pos = (220,0);
 ref = uni1FFE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (332,-120);
+pos = (332,0);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_12.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_12.glyph
index 2ea8f9fc2..23808b99f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_12.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_12.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (102,-64);
+pos = (102,0);
 ref = uni1FCD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (64,-64);
+pos = (64,0);
 ref = uni1FCD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (176,-64);
+pos = (176,0);
 ref = uni1FCD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (102,-126);
+pos = (102,0);
 ref = uni1FCD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (64,-126);
+pos = (64,0);
 ref = uni1FCD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (176,-126);
+pos = (176,0);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_13.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_13.glyph
index 706c0316f..4468aadcb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_13.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_13.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (64,-58);
+pos = (64,0);
 ref = uni1FDD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (162,-60);
+pos = (162,0);
 ref = uni1FDD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (190,-58);
+pos = (190,0);
 ref = uni1FDD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (64,-120);
+pos = (64,0);
 ref = uni1FDD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (162,-122);
+pos = (162,0);
 ref = uni1FDD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (190,-120);
+pos = (190,0);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_14.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_14.glyph
index b8ab1c547..b3341aed8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_14.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_14.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (178,-58);
+pos = (178,0);
 ref = uni1FCE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (136,-58);
+pos = (136,0);
 ref = uni1FCE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (302,-58);
+pos = (302,0);
 ref = uni1FCE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (178,-120);
+pos = (178,0);
 ref = uni1FCE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (136,-120);
+pos = (136,0);
 ref = uni1FCE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (302,-120);
+pos = (302,0);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_15.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_15.glyph
index 663cf70cf..382fa0b09 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_15.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_15.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (134,-58);
+pos = (134,0);
 ref = uni1FDE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (142,-60);
+pos = (142,0);
 ref = uni1FDE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (226,-58);
+pos = (226,0);
 ref = uni1FDE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (134,-120);
+pos = (134,0);
 ref = uni1FDE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (142,-122);
+pos = (142,0);
 ref = uni1FDE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (226,-120);
+pos = (226,0);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_20.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_20.glyph
index 2feafb2d2..79d3f139d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_20.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_20.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (362,-64);
+pos = (362,0);
 ref = uni1FBD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (496,-64);
+pos = (496,0);
 ref = uni1FBD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (300,-64);
+pos = (300,0);
 ref = uni1FBD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (362,-126);
+pos = (362,0);
 ref = uni1FBD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (496,-126);
+pos = (496,0);
 ref = uni1FBD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (300,-126);
+pos = (300,0);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_21.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_21.glyph
index f35c8385d..aceba90a2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_21.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_21.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (326,-58);
+pos = (326,0);
 ref = uni1FFE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (282,-58);
+pos = (282,0);
 ref = uni1FFE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (372,-58);
+pos = (372,0);
 ref = uni1FFE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (326,-120);
+pos = (326,0);
 ref = uni1FFE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (282,-120);
+pos = (282,0);
 ref = uni1FFE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (372,-120);
+pos = (372,0);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_22.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_22.glyph
index b8ed25119..17af6ca06 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_22.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_22.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (140,-64);
+pos = (140,0);
 ref = uni1FCD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (126,-64);
+pos = (126,0);
 ref = uni1FCD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (216,-64);
+pos = (216,0);
 ref = uni1FCD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (140,-126);
+pos = (140,0);
 ref = uni1FCD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (126,-126);
+pos = (126,0);
 ref = uni1FCD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (216,-126);
+pos = (216,0);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_23.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_23.glyph
index 20e7745cd..16fe152be 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_23.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_23.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (102,-58);
+pos = (102,0);
 ref = uni1FDD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (224,-60);
+pos = (224,0);
 ref = uni1FDD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (230,-58);
+pos = (230,0);
 ref = uni1FDD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (102,-120);
+pos = (102,0);
 ref = uni1FDD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (224,-122);
+pos = (224,0);
 ref = uni1FDD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (230,-120);
+pos = (230,0);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_24.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_24.glyph
index 44e3b4ebb..c8f7c271b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_24.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_24.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (216,-58);
+pos = (216,0);
 ref = uni1FCE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (198,-58);
+pos = (198,0);
 ref = uni1FCE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (342,-58);
+pos = (342,0);
 ref = uni1FCE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (216,-120);
+pos = (216,0);
 ref = uni1FCE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (198,-120);
+pos = (198,0);
 ref = uni1FCE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (342,-120);
+pos = (342,0);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_25.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_25.glyph
index ff4f84174..a40099e24 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_25.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_25.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (172,-58);
+pos = (172,0);
 ref = uni1FDE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (204,-60);
+pos = (204,0);
 ref = uni1FDE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (266,-58);
+pos = (266,0);
 ref = uni1FDE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (172,-120);
+pos = (172,0);
 ref = uni1FDE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (204,-122);
+pos = (204,0);
 ref = uni1FDE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (266,-120);
+pos = (266,0);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_26.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_26.glyph
index e4a942344..3feefa3a8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_26.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_26.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (250,-64);
+pos = (250,0);
 ref = uni1FCF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (300,-64);
+pos = (300,0);
 ref = uni1FCF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (254,-64);
+pos = (254,0);
 ref = uni1FCF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (250,-126);
+pos = (250,0);
 ref = uni1FCF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (300,-126);
+pos = (300,0);
 ref = uni1FCF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (254,-126);
+pos = (254,0);
 ref = uni1FCF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_27.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_27.glyph
index f02a98466..fcd2238bf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_27.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_27.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (224,-64);
+pos = (224,0);
 ref = uni1FDF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (224,-64);
+pos = (224,0);
 ref = uni1FDF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (244,-64);
+pos = (244,0);
 ref = uni1FDF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (224,-126);
+pos = (224,0);
 ref = uni1FDF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (224,-126);
+pos = (224,0);
 ref = uni1FDF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (244,-126);
+pos = (244,0);
 ref = uni1FDF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_30.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_30.glyph
index 5f49f1283..a3eaf7f60 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_30.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_30.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-2,-64);
+pos = (-2,0);
 ref = uni1FBD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (166,-64);
+pos = (166,0);
 ref = uni1FBD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-60,-64);
+pos = (-60,0);
 ref = uni1FBD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-2,-126);
+pos = (-2,0);
 ref = uni1FBD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (166,-126);
+pos = (166,0);
 ref = uni1FBD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-60,-126);
+pos = (-60,0);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_31.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_31.glyph
index a93860598..0a2606744 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_31.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_31.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-38,-58);
+pos = (-38,0);
 ref = uni1FFE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-48,-58);
+pos = (-48,0);
 ref = uni1FFE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (12,-58);
+pos = (12,0);
 ref = uni1FFE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-38,-120);
+pos = (-38,0);
 ref = uni1FFE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-48,-120);
+pos = (-48,0);
 ref = uni1FFE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (12,-120);
+pos = (12,0);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_32.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_32.glyph
index 28fb1cadf..85d48276d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_32.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_32.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-224,-64);
+pos = (-224,0);
 ref = uni1FCD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-204,-64);
+pos = (-204,0);
 ref = uni1FCD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-144,-64);
+pos = (-144,0);
 ref = uni1FCD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-224,-126);
+pos = (-224,0);
 ref = uni1FCD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-204,-126);
+pos = (-204,0);
 ref = uni1FCD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-144,-126);
+pos = (-144,0);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_33.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_33.glyph
index 4c511c62d..e7828c8e7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_33.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_33.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-262,-58);
+pos = (-262,0);
 ref = uni1FDD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-106,-60);
+pos = (-106,0);
 ref = uni1FDD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-130,-58);
+pos = (-130,0);
 ref = uni1FDD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-262,-120);
+pos = (-262,0);
 ref = uni1FDD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-106,-122);
+pos = (-106,0);
 ref = uni1FDD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-130,-120);
+pos = (-130,0);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_34.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_34.glyph
index 4b98d78d5..06466bc47 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_34.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_34.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-148,-58);
+pos = (-148,0);
 ref = uni1FCE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-132,-58);
+pos = (-132,0);
 ref = uni1FCE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-18,-58);
+pos = (-18,0);
 ref = uni1FCE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-148,-120);
+pos = (-148,0);
 ref = uni1FCE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-132,-120);
+pos = (-132,0);
 ref = uni1FCE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-18,-120);
+pos = (-18,0);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_35.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_35.glyph
index a2ec2b4b0..8845a7cb0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_35.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_35.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-192,-58);
+pos = (-192,0);
 ref = uni1FDE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-126,-60);
+pos = (-126,0);
 ref = uni1FDE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-94,-58);
+pos = (-94,0);
 ref = uni1FDE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-192,-120);
+pos = (-192,0);
 ref = uni1FDE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-126,-122);
+pos = (-126,0);
 ref = uni1FDE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-94,-120);
+pos = (-94,0);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_36.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_36.glyph
index 460a3405e..b1af785fd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_36.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_36.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-114,-64);
+pos = (-114,0);
 ref = uni1FCF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-30,-64);
+pos = (-30,0);
 ref = uni1FCF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-106,-64);
+pos = (-106,0);
 ref = uni1FCF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-114,-126);
+pos = (-114,0);
 ref = uni1FCF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-30,-126);
+pos = (-30,0);
 ref = uni1FCF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-106,-126);
+pos = (-106,0);
 ref = uni1FCF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_37.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_37.glyph
index a099c90eb..9040c5118 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_37.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_37.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-140,-64);
+pos = (-140,0);
 ref = uni1FDF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-106,-64);
+pos = (-106,0);
 ref = uni1FDF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-116,-64);
+pos = (-116,0);
 ref = uni1FDF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-140,-126);
+pos = (-140,0);
 ref = uni1FDF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-106,-126);
+pos = (-106,0);
 ref = uni1FDF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-116,-126);
+pos = (-116,0);
 ref = uni1FDF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_40.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_40.glyph
index 9880981b3..3e60fe250 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_40.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_40.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (372,-64);
+pos = (372,0);
 ref = uni1FBD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (472,-64);
+pos = (472,0);
 ref = uni1FBD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (312,-64);
+pos = (312,0);
 ref = uni1FBD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (356,-126);
+pos = (356,0);
 ref = uni1FBD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (470,-126);
+pos = (470,0);
 ref = uni1FBD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (312,-126);
+pos = (312,0);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_41.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_41.glyph
index 85c966ef3..c486ca061 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_41.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_41.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (336,-58);
+pos = (336,0);
 ref = uni1FFE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (258,-58);
+pos = (258,0);
 ref = uni1FFE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (384,-58);
+pos = (384,0);
 ref = uni1FFE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (320,-120);
+pos = (320,0);
 ref = uni1FFE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (256,-120);
+pos = (256,0);
 ref = uni1FFE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (384,-120);
+pos = (384,0);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_42.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_42.glyph
index 998862251..a0a3a1556 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_42.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_42.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (150,-64);
+pos = (150,0);
 ref = uni1FCD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (102,-64);
+pos = (102,0);
 ref = uni1FCD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (228,-64);
+pos = (228,0);
 ref = uni1FCD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (134,-126);
+pos = (134,0);
 ref = uni1FCD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (100,-126);
+pos = (100,0);
 ref = uni1FCD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (228,-126);
+pos = (228,0);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_43.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_43.glyph
index dedf94e31..aa98e7319 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_43.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_43.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (112,-58);
+pos = (112,0);
 ref = uni1FDD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (200,-60);
+pos = (200,0);
 ref = uni1FDD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (242,-58);
+pos = (242,0);
 ref = uni1FDD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (96,-120);
+pos = (96,0);
 ref = uni1FDD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (198,-122);
+pos = (198,0);
 ref = uni1FDD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (242,-120);
+pos = (242,0);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_44.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_44.glyph
index d3d3d9153..fae4bb80f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_44.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_44.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (226,-58);
+pos = (226,0);
 ref = uni1FCE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (174,-58);
+pos = (174,0);
 ref = uni1FCE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (354,-58);
+pos = (354,0);
 ref = uni1FCE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (210,-120);
+pos = (210,0);
 ref = uni1FCE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (172,-120);
+pos = (172,0);
 ref = uni1FCE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (354,-120);
+pos = (354,0);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_45.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_45.glyph
index f5e87c908..fcdbc2d60 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_45.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_45.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (182,-58);
+pos = (182,0);
 ref = uni1FDE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (180,-60);
+pos = (180,0);
 ref = uni1FDE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (278,-58);
+pos = (278,0);
 ref = uni1FDE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (166,-120);
+pos = (166,0);
 ref = uni1FDE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (178,-122);
+pos = (178,0);
 ref = uni1FDE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (278,-120);
+pos = (278,0);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_50.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_50.glyph
index a10cc1c5f..7512f6894 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_50.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_50.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (336,-64);
+pos = (352,0);
 ref = uni1FBD;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (420,-64);
+pos = (488,0);
 ref = uni1FBD;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (296,-64);
+pos = (296,0);
 ref = uni1FBD;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (338,-126);
+pos = (354,0);
 ref = uni1FBD;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (420,-126);
+pos = (489,0);
 ref = uni1FBD;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (296,-126);
+pos = (306,0);
 ref = uni1FBD;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_51.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_51.glyph
index 60a5ab385..20cb5486b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_51.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_51.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (300,-58);
+pos = (316,0);
 ref = uni1FFE;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (206,-58);
+pos = (274,0);
 ref = uni1FFE;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (368,-58);
+pos = (368,0);
 ref = uni1FFE;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (302,-120);
+pos = (318,0);
 ref = uni1FFE;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (206,-120);
+pos = (275,0);
 ref = uni1FFE;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (368,-120);
+pos = (378,0);
 ref = uni1FFE;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_52.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_52.glyph
index acc6f7dc8..7f85b965f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_52.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_52.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (114,-64);
+pos = (130,0);
 ref = uni1FCD;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (50,-64);
+pos = (118,0);
 ref = uni1FCD;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (212,-64);
+pos = (212,0);
 ref = uni1FCD;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (116,-126);
+pos = (132,0);
 ref = uni1FCD;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (50,-126);
+pos = (119,0);
 ref = uni1FCD;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (212,-126);
+pos = (222,0);
 ref = uni1FCD;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_53.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_53.glyph
index d4dc83dc3..2ea013b0d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_53.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_53.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (76,-58);
+pos = (92,0);
 ref = uni1FDD;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (148,-60);
+pos = (216,0);
 ref = uni1FDD;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (226,-58);
+pos = (226,0);
 ref = uni1FDD;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (78,-120);
+pos = (94,0);
 ref = uni1FDD;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (148,-122);
+pos = (217,0);
 ref = uni1FDD;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (226,-120);
+pos = (236,0);
 ref = uni1FDD;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_54.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_54.glyph
index 005ce3a3c..31670ea17 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_54.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_54.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (190,-58);
+pos = (206,0);
 ref = uni1FCE;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (122,-58);
+pos = (190,0);
 ref = uni1FCE;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (338,-58);
+pos = (338,0);
 ref = uni1FCE;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (192,-120);
+pos = (208,0);
 ref = uni1FCE;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (122,-120);
+pos = (191,0);
 ref = uni1FCE;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (338,-120);
+pos = (348,0);
 ref = uni1FCE;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_55.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_55.glyph
index 3bff69831..c91d5c2af 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_55.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_55.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (146,-58);
+pos = (162,0);
 ref = uni1FDE;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (128,-60);
+pos = (196,0);
 ref = uni1FDE;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (262,-58);
+pos = (262,0);
 ref = uni1FDE;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (148,-120);
+pos = (164,0);
 ref = uni1FDE;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (128,-122);
+pos = (197,0);
 ref = uni1FDE;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (262,-120);
+pos = (272,0);
 ref = uni1FDE;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_56.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_56.glyph
index b6ade54b8..501ce287f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_56.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_56.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (224,-64);
+pos = (240,0);
 ref = uni1FCF;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (224,-64);
+pos = (292,0);
 ref = uni1FCF;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (250,-64);
+pos = (250,0);
 ref = uni1FCF;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (226,-126);
+pos = (242,0);
 ref = uni1FCF;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (224,-126);
+pos = (293,0);
 ref = uni1FCF;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (250,-126);
+pos = (260,0);
 ref = uni1FCF;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_57.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_57.glyph
index 7e2ff136e..38d3e0c12 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_57.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_57.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (198,-64);
+pos = (214,0);
 ref = uni1FDF;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (148,-64);
+pos = (216,0);
 ref = uni1FDF;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (240,-64);
+pos = (240,0);
 ref = uni1FDF;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (200,-126);
+pos = (216,0);
 ref = uni1FDF;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (148,-126);
+pos = (217,0);
 ref = uni1FDF;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (240,-126);
+pos = (250,0);
 ref = uni1FDF;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_60.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_60.glyph
index f803555cb..e31ddeeb5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_60.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_60.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (574,-64);
+pos = (574,0);
 ref = uni1FBD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (721,-64);
+pos = (721,0);
 ref = uni1FBD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (507,-64);
+pos = (507,0);
 ref = uni1FBD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (574,-126);
+pos = (574,0);
 ref = uni1FBD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (718,-126);
+pos = (718,0);
 ref = uni1FBD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (507,-126);
+pos = (507,0);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_61.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_61.glyph
index cceaead29..3945c343f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_61.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_61.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (538,-58);
+pos = (538,0);
 ref = uni1FFE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (507,-58);
+pos = (507,0);
 ref = uni1FFE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (579,-58);
+pos = (579,0);
 ref = uni1FFE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (538,-120);
+pos = (538,0);
 ref = uni1FFE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (504,-120);
+pos = (504,0);
 ref = uni1FFE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (579,-120);
+pos = (579,0);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_62.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_62.glyph
index 9dc921741..6712af299 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_62.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_62.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (352,-64);
+pos = (352,0);
 ref = uni1FCD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (351,-64);
+pos = (351,0);
 ref = uni1FCD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (423,-64);
+pos = (423,0);
 ref = uni1FCD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (352,-126);
+pos = (352,0);
 ref = uni1FCD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (348,-126);
+pos = (348,0);
 ref = uni1FCD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (423,-126);
+pos = (423,0);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_63.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_63.glyph
index eec372240..f04b8cae5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_63.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_63.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (314,-58);
+pos = (314,0);
 ref = uni1FDD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (449,-60);
+pos = (449,0);
 ref = uni1FDD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (437,-58);
+pos = (437,0);
 ref = uni1FDD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (314,-120);
+pos = (314,0);
 ref = uni1FDD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (446,-122);
+pos = (446,0);
 ref = uni1FDD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (437,-120);
+pos = (437,0);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_64.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_64.glyph
index d16f02423..90f2980b8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_64.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_64.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (428,-58);
+pos = (428,0);
 ref = uni1FCE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (423,-58);
+pos = (423,0);
 ref = uni1FCE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (549,-58);
+pos = (549,0);
 ref = uni1FCE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (428,-120);
+pos = (428,0);
 ref = uni1FCE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (420,-120);
+pos = (420,0);
 ref = uni1FCE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (549,-120);
+pos = (549,0);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_65.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_65.glyph
index 14e08a5d8..f37c03599 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_65.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_65.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (384,-58);
+pos = (384,0);
 ref = uni1FDE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (429,-60);
+pos = (429,0);
 ref = uni1FDE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (473,-58);
+pos = (473,0);
 ref = uni1FDE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (384,-120);
+pos = (384,0);
 ref = uni1FDE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (426,-122);
+pos = (426,0);
 ref = uni1FDE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (473,-120);
+pos = (473,0);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_66.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_66.glyph
index 4878b00b2..9a9ca0c2d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_66.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_66.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (462,-64);
+pos = (462,0);
 ref = uni1FCF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (525,-64);
+pos = (525,0);
 ref = uni1FCF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (461,-64);
+pos = (461,0);
 ref = uni1FCF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (462,-126);
+pos = (462,0);
 ref = uni1FCF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (522,-126);
+pos = (522,0);
 ref = uni1FCF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (461,-126);
+pos = (461,0);
 ref = uni1FCF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_67.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_67.glyph
index f32b0ba42..a9b3ffb92 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_67.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_67.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (436,-64);
+pos = (436,0);
 ref = uni1FDF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (449,-64);
+pos = (449,0);
 ref = uni1FDF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (451,-64);
+pos = (451,0);
 ref = uni1FDF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (436,-126);
+pos = (436,0);
 ref = uni1FDF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (446,-126);
+pos = (446,0);
 ref = uni1FDF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (451,-126);
+pos = (451,0);
 ref = uni1FDF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_70.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_70.glyph
index 5d6ef5ea8..6e3d5b318 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_70.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_70.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (252,-78);
+pos = (252,0);
 ref = uni1FEF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (226,-64);
+pos = (226,0);
 ref = uni1FEF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (316,-86);
+pos = (316,0);
 ref = uni1FEF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (228,-140);
+pos = (228,0);
 ref = uni1FEF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (246,-126);
+pos = (246,0);
 ref = uni1FEF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (308,-148);
+pos = (308,0);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_71.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_71.glyph
index 1812bce02..0a56ee18a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_71.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_71.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (336,-186);
+pos = (336,0);
 ref = uni1FFD;
 }
 );
@@ -22,7 +22,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (306,-186);
+pos = (306,0);
 ref = uni1FFD;
 }
 );
@@ -35,7 +35,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (360,-186);
+pos = (360,0);
 ref = uni1FFD;
 }
 );
@@ -48,7 +48,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (312,-248);
+pos = (312,0);
 ref = uni1FFD;
 }
 );
@@ -61,7 +61,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (326,-248);
+pos = (326,0);
 ref = uni1FFD;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (352,-248);
+pos = (352,0);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_72.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_72.glyph
index 084bea028..089891524 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_72.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_72.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (204,-78);
+pos = (204,0);
 ref = uni1FEF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (198,-64);
+pos = (198,0);
 ref = uni1FEF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (256,-86);
+pos = (256,0);
 ref = uni1FEF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (204,-140);
+pos = (204,0);
 ref = uni1FEF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (198,-126);
+pos = (198,0);
 ref = uni1FEF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (256,-148);
+pos = (256,0);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_73.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_73.glyph
index 095962fab..40624b111 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_73.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_73.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (288,-186);
+pos = (288,0);
 ref = uni1FFD;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (278,-186);
+pos = (278,0);
 ref = uni1FFD;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (300,-186);
+pos = (300,0);
 ref = uni1FFD;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (288,-248);
+pos = (288,0);
 ref = uni1FFD;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (278,-248);
+pos = (278,0);
 ref = uni1FFD;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = epsilon;
 },
 {
-pos = (300,-248);
+pos = (300,0);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_74.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_74.glyph
index e12bb47c2..78f27e1b7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_74.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_74.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (242,-78);
+pos = (242,0);
 ref = uni1FEF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (260,-64);
+pos = (260,0);
 ref = uni1FEF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (296,-86);
+pos = (296,0);
 ref = uni1FEF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (242,-140);
+pos = (242,0);
 ref = uni1FEF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (260,-126);
+pos = (260,0);
 ref = uni1FEF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (296,-148);
+pos = (296,0);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_75.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_75.glyph
index 7423f1ff8..64bb0098f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_75.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_75.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (326,-186);
+pos = (326,0);
 ref = uni1FFD;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (340,-186);
+pos = (340,0);
 ref = uni1FFD;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (340,-186);
+pos = (340,0);
 ref = uni1FFD;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (326,-248);
+pos = (326,0);
 ref = uni1FFD;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (340,-248);
+pos = (340,0);
 ref = uni1FFD;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = eta;
 },
 {
-pos = (340,-248);
+pos = (340,0);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_76.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_76.glyph
index 5913de190..db9a27d61 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_76.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_76.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-122,-78);
+pos = (-122,0);
 ref = uni1FEF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-70,-64);
+pos = (-70,0);
 ref = uni1FEF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-64,-86);
+pos = (-64,0);
 ref = uni1FEF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-122,-140);
+pos = (-122,0);
 ref = uni1FEF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-70,-126);
+pos = (-70,0);
 ref = uni1FEF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-64,-148);
+pos = (-64,0);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_77.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_77.glyph
index 136f75e5e..3752ac915 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_77.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_77.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-38,-186);
+pos = (-38,0);
 ref = uni1FFD;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (10,-186);
+pos = (10,0);
 ref = uni1FFD;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-20,-186);
+pos = (-20,0);
 ref = uni1FFD;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-38,-248);
+pos = (-38,0);
 ref = uni1FFD;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (10,-248);
+pos = (10,0);
 ref = uni1FFD;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-20,-248);
+pos = (-20,0);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_78.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_78.glyph
index 04a91de41..59e9a9455 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_78.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_78.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (252,-78);
+pos = (252,0);
 ref = uni1FEF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (236,-64);
+pos = (236,0);
 ref = uni1FEF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (308,-86);
+pos = (308,0);
 ref = uni1FEF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (236,-140);
+pos = (236,0);
 ref = uni1FEF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (234,-126);
+pos = (234,0);
 ref = uni1FEF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (308,-148);
+pos = (308,0);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_79.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_79.glyph
index d3430eb6b..556ac0624 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_79.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_79.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (336,-186);
+pos = (336,0);
 ref = uni1FFD;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (316,-186);
+pos = (316,0);
 ref = uni1FFD;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (352,-186);
+pos = (352,0);
 ref = uni1FFD;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (320,-248);
+pos = (320,0);
 ref = uni1FFD;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (314,-248);
+pos = (314,0);
 ref = uni1FFD;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (352,-248);
+pos = (352,0);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_7A_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_7A_.glyph
index 0692b1745..da2b2d6d8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_7A_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_7A_.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (216,-78);
+pos = (232,0);
 ref = uni1FEF;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (184,-64);
+pos = (252,0);
 ref = uni1FEF;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (292,-86);
+pos = (292,0);
 ref = uni1FEF;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (218,-140);
+pos = (234,0);
 ref = uni1FEF;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (184,-126);
+pos = (253,0);
 ref = uni1FEF;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (292,-148);
+pos = (302,0);
 ref = uni1FEF;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_7B_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_7B_.glyph
index d6a28db79..41ccf360e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_7B_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_7B_.glyph
@@ -8,11 +8,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (300,-186);
+pos = (316,0);
 ref = uni1FFD;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -21,11 +21,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (264,-186);
+pos = (332,0);
 ref = uni1FFD;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -34,11 +34,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (336,-186);
+pos = (336,0);
 ref = uni1FFD;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -47,11 +47,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (302,-248);
+pos = (318,0);
 ref = uni1FFD;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -60,11 +60,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (264,-248);
+pos = (333,0);
 ref = uni1FFD;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -73,11 +73,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (336,-248);
+pos = (346,0);
 ref = uni1FFD;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_7C_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_7C_.glyph
index 70113770b..dcd65ed1e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_7C_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_7C_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (454,-78);
+pos = (454,0);
 ref = uni1FEF;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (485,-64);
+pos = (485,0);
 ref = uni1FEF;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (503,-86);
+pos = (503,0);
 ref = uni1FEF;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (454,-140);
+pos = (454,0);
 ref = uni1FEF;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (482,-126);
+pos = (482,0);
 ref = uni1FEF;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (503,-148);
+pos = (503,0);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_7D_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_7D_.glyph
index 34b20add1..990a53e6f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_7D_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_7D_.glyph
@@ -8,7 +8,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (538,-186);
+pos = (538,0);
 ref = uni1FFD;
 }
 );
@@ -21,7 +21,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (565,-186);
+pos = (565,0);
 ref = uni1FFD;
 }
 );
@@ -34,7 +34,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (547,-186);
+pos = (547,0);
 ref = uni1FFD;
 }
 );
@@ -47,7 +47,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (538,-248);
+pos = (538,0);
 ref = uni1FFD;
 }
 );
@@ -60,7 +60,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (562,-248);
+pos = (562,0);
 ref = uni1FFD;
 }
 );
@@ -73,7 +73,7 @@ shapes = (
 ref = omega;
 },
 {
-pos = (547,-248);
+pos = (547,0);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_80.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_80.glyph
index b93ba8041..0a38c021e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_80.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_80.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (372,-64);
+pos = (372,0);
 ref = uni1FBD;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (462,-64);
+pos = (462,0);
 ref = uni1FBD;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (320,-64);
+pos = (320,0);
 ref = uni1FBD;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (348,-126);
+pos = (348,0);
 ref = uni1FBD;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (482,-126);
+pos = (482,0);
 ref = uni1FBD;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (312,-126);
+pos = (312,0);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_81.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_81.glyph
index 350dc2a9e..ba7639cd0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_81.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_81.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (336,-58);
+pos = (336,0);
 ref = uni1FFE;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (248,-58);
+pos = (248,0);
 ref = uni1FFE;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (392,-58);
+pos = (392,0);
 ref = uni1FFE;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (312,-120);
+pos = (312,0);
 ref = uni1FFE;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (268,-120);
+pos = (268,0);
 ref = uni1FFE;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (384,-120);
+pos = (384,0);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_82.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_82.glyph
index cf34c0c70..55daa396c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_82.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_82.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (150,-64);
+pos = (150,0);
 ref = uni1FCD;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (92,-64);
+pos = (92,0);
 ref = uni1FCD;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (236,-64);
+pos = (236,0);
 ref = uni1FCD;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (126,-126);
+pos = (126,0);
 ref = uni1FCD;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (112,-126);
+pos = (112,0);
 ref = uni1FCD;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (228,-126);
+pos = (228,0);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_83.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_83.glyph
index f2f77c7d5..bd1da067e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_83.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_83.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (112,-58);
+pos = (112,0);
 ref = uni1FDD;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (190,-60);
+pos = (190,0);
 ref = uni1FDD;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (250,-58);
+pos = (250,0);
 ref = uni1FDD;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (88,-120);
+pos = (88,0);
 ref = uni1FDD;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (210,-122);
+pos = (210,0);
 ref = uni1FDD;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (242,-120);
+pos = (242,0);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_84.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_84.glyph
index 2dcf0b413..2d438f12f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_84.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_84.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (226,-58);
+pos = (226,0);
 ref = uni1FCE;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (164,-58);
+pos = (164,0);
 ref = uni1FCE;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (362,-58);
+pos = (362,0);
 ref = uni1FCE;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (202,-120);
+pos = (202,0);
 ref = uni1FCE;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (184,-120);
+pos = (184,0);
 ref = uni1FCE;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (354,-120);
+pos = (354,0);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_85.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_85.glyph
index 565699e3c..b7ca0d907 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_85.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_85.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (182,-58);
+pos = (182,0);
 ref = uni1FDE;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (170,-60);
+pos = (170,0);
 ref = uni1FDE;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (286,-58);
+pos = (286,0);
 ref = uni1FDE;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (158,-120);
+pos = (158,0);
 ref = uni1FDE;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (190,-122);
+pos = (190,0);
 ref = uni1FDE;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (278,-120);
+pos = (278,0);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_86.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_86.glyph
index 3a84ac0be..978b2039f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_86.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_86.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (260,-64);
+pos = (260,0);
 ref = uni1FCF;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (266,-64);
+pos = (266,0);
 ref = uni1FCF;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (274,-64);
+pos = (274,0);
 ref = uni1FCF;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (236,-126);
+pos = (236,0);
 ref = uni1FCF;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (286,-126);
+pos = (286,0);
 ref = uni1FCF;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (266,-126);
+pos = (266,0);
 ref = uni1FCF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_87.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_87.glyph
index eff195faf..35956e0a5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_87.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_87.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (234,-64);
+pos = (234,0);
 ref = uni1FDF;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (190,-64);
+pos = (190,0);
 ref = uni1FDF;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (264,-64);
+pos = (264,0);
 ref = uni1FDF;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (210,-126);
+pos = (210,0);
 ref = uni1FDF;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (210,-126);
+pos = (210,0);
 ref = uni1FDF;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (256,-126);
+pos = (256,0);
 ref = uni1FDF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_90.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_90.glyph
index 104352c8d..6d85a3d65 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_90.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_90.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (362,-64);
+pos = (362,0);
 ref = uni1FBD;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (496,-64);
+pos = (496,0);
 ref = uni1FBD;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (300,-64);
+pos = (300,0);
 ref = uni1FBD;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (362,-126);
+pos = (362,0);
 ref = uni1FBD;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (496,-126);
+pos = (496,0);
 ref = uni1FBD;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (300,-126);
+pos = (300,0);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_91.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_91.glyph
index b004f683d..d2fcb7c69 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_91.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_91.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (326,-58);
+pos = (326,0);
 ref = uni1FFE;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (282,-58);
+pos = (282,0);
 ref = uni1FFE;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (372,-58);
+pos = (372,0);
 ref = uni1FFE;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (326,-120);
+pos = (326,0);
 ref = uni1FFE;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (282,-120);
+pos = (282,0);
 ref = uni1FFE;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (372,-120);
+pos = (372,0);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_92.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_92.glyph
index 210b13bd2..4da826405 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_92.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_92.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (140,-64);
+pos = (140,0);
 ref = uni1FCD;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (126,-64);
+pos = (126,0);
 ref = uni1FCD;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (216,-64);
+pos = (216,0);
 ref = uni1FCD;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (140,-126);
+pos = (140,0);
 ref = uni1FCD;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (126,-126);
+pos = (126,0);
 ref = uni1FCD;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (216,-126);
+pos = (216,0);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_93.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_93.glyph
index b50495884..4e63d022f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_93.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_93.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (102,-58);
+pos = (102,0);
 ref = uni1FDD;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (224,-60);
+pos = (224,0);
 ref = uni1FDD;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (230,-58);
+pos = (230,0);
 ref = uni1FDD;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (102,-120);
+pos = (102,0);
 ref = uni1FDD;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (224,-122);
+pos = (224,0);
 ref = uni1FDD;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (230,-120);
+pos = (230,0);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_94.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_94.glyph
index 0c9b5e410..33288809b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_94.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_94.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (216,-58);
+pos = (216,0);
 ref = uni1FCE;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (198,-58);
+pos = (198,0);
 ref = uni1FCE;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (342,-58);
+pos = (342,0);
 ref = uni1FCE;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (216,-120);
+pos = (216,0);
 ref = uni1FCE;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (198,-120);
+pos = (198,0);
 ref = uni1FCE;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (342,-120);
+pos = (342,0);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_95.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_95.glyph
index e0462aa13..f27d09dd1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_95.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_95.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (172,-58);
+pos = (172,0);
 ref = uni1FDE;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (204,-60);
+pos = (204,0);
 ref = uni1FDE;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (266,-58);
+pos = (266,0);
 ref = uni1FDE;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (172,-120);
+pos = (172,0);
 ref = uni1FDE;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (204,-122);
+pos = (204,0);
 ref = uni1FDE;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (266,-120);
+pos = (266,0);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_96.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_96.glyph
index 7701b7cbc..fa2cae387 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_96.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_96.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (250,-64);
+pos = (250,0);
 ref = uni1FCF;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (300,-64);
+pos = (300,0);
 ref = uni1FCF;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (254,-64);
+pos = (254,0);
 ref = uni1FCF;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (250,-126);
+pos = (250,0);
 ref = uni1FCF;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (300,-126);
+pos = (300,0);
 ref = uni1FCF;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (254,-126);
+pos = (254,0);
 ref = uni1FCF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_97.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_97.glyph
index 430189025..272a74e8c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_97.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_97.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (224,-64);
+pos = (224,0);
 ref = uni1FDF;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (224,-64);
+pos = (224,0);
 ref = uni1FDF;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (244,-64);
+pos = (244,0);
 ref = uni1FDF;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (224,-126);
+pos = (224,0);
 ref = uni1FDF;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (224,-126);
+pos = (224,0);
 ref = uni1FDF;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (244,-126);
+pos = (244,0);
 ref = uni1FDF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_0.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_0.glyph
index 8901a8e6f..f8dbc877d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_0.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_0.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (574,-64);
+pos = (574,0);
 ref = uni1FBD;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (721,-64);
+pos = (721,0);
 ref = uni1FBD;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (507,-64);
+pos = (507,0);
 ref = uni1FBD;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (574,-126);
+pos = (574,0);
 ref = uni1FBD;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (718,-126);
+pos = (718,0);
 ref = uni1FBD;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (507,-126);
+pos = (507,0);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_1.glyph
index 75a6a7751..645c68435 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_1.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (538,-58);
+pos = (538,0);
 ref = uni1FFE;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (507,-58);
+pos = (507,0);
 ref = uni1FFE;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (579,-58);
+pos = (579,0);
 ref = uni1FFE;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (538,-120);
+pos = (538,0);
 ref = uni1FFE;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (504,-120);
+pos = (504,0);
 ref = uni1FFE;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (579,-120);
+pos = (579,0);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_2.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_2.glyph
index 1ca9304c9..734672909 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_2.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_2.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (352,-64);
+pos = (352,0);
 ref = uni1FCD;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (351,-64);
+pos = (351,0);
 ref = uni1FCD;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (423,-64);
+pos = (423,0);
 ref = uni1FCD;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (352,-126);
+pos = (352,0);
 ref = uni1FCD;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (348,-126);
+pos = (348,0);
 ref = uni1FCD;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (423,-126);
+pos = (423,0);
 ref = uni1FCD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_3.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_3.glyph
index 751855203..8239e4b6b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_3.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_3.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (314,-58);
+pos = (314,0);
 ref = uni1FDD;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (449,-60);
+pos = (449,0);
 ref = uni1FDD;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (437,-58);
+pos = (437,0);
 ref = uni1FDD;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (314,-120);
+pos = (314,0);
 ref = uni1FDD;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (446,-122);
+pos = (446,0);
 ref = uni1FDD;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (437,-120);
+pos = (437,0);
 ref = uni1FDD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_4.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_4.glyph
index ef109eb03..b4c6f9f7c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_4.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_4.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (428,-58);
+pos = (428,0);
 ref = uni1FCE;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (423,-58);
+pos = (423,0);
 ref = uni1FCE;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (549,-58);
+pos = (549,0);
 ref = uni1FCE;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (428,-120);
+pos = (428,0);
 ref = uni1FCE;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (420,-120);
+pos = (420,0);
 ref = uni1FCE;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (549,-120);
+pos = (549,0);
 ref = uni1FCE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_5.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_5.glyph
index fefe0aca4..f4e47c06c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_5.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_5.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (384,-58);
+pos = (384,0);
 ref = uni1FDE;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (429,-60);
+pos = (429,0);
 ref = uni1FDE;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (473,-58);
+pos = (473,0);
 ref = uni1FDE;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (384,-120);
+pos = (384,0);
 ref = uni1FDE;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (426,-122);
+pos = (426,0);
 ref = uni1FDE;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (473,-120);
+pos = (473,0);
 ref = uni1FDE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_6.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_6.glyph
index 45e747bff..32655b522 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_6.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_6.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (462,-64);
+pos = (462,0);
 ref = uni1FCF;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (525,-64);
+pos = (525,0);
 ref = uni1FCF;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (461,-64);
+pos = (461,0);
 ref = uni1FCF;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (462,-126);
+pos = (462,0);
 ref = uni1FCF;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (522,-126);
+pos = (522,0);
 ref = uni1FCF;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (461,-126);
+pos = (461,0);
 ref = uni1FCF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_7.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_7.glyph
index 182e1b804..832be63c0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_7.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_A_7.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (436,-64);
+pos = (436,0);
 ref = uni1FDF;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (449,-64);
+pos = (449,0);
 ref = uni1FDF;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (451,-64);
+pos = (451,0);
 ref = uni1FDF;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (436,-126);
+pos = (436,0);
 ref = uni1FDF;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (446,-126);
+pos = (446,0);
 ref = uni1FDF;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (451,-126);
+pos = (451,0);
 ref = uni1FDF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_1.glyph
index 737186ce3..abac1a957 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_1.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (10,0);
+pos = (122,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (-35,0);
+pos = (214,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (20,0);
+pos = (202,0);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (-14,0);
+pos = (138,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (-15,0);
+pos = (250,0);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (-4,0);
+pos = (146,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_2.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_2.glyph
index 4e0d3dfaf..f865b3eec 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_2.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_2.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (252,-78);
+pos = (252,0);
 ref = uni1FEF;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (226,-64);
+pos = (226,0);
 ref = uni1FEF;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (316,-86);
+pos = (316,0);
 ref = uni1FEF;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (228,-140);
+pos = (228,0);
 ref = uni1FEF;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (246,-126);
+pos = (246,0);
 ref = uni1FEF;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (308,-148);
+pos = (308,0);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_4.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_4.glyph
index 59e899859..94b2d48e6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_4.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_4.glyph
@@ -14,7 +14,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (336,-186);
+pos = (336,0);
 ref = uni1FFD;
 }
 );
@@ -31,7 +31,7 @@ pos = (306,0);
 ref = uni1FBE;
 },
 {
-pos = (306,-186);
+pos = (306,0);
 ref = uni1FFD;
 }
 );
@@ -48,7 +48,7 @@ pos = (426,0);
 ref = uni1FBE;
 },
 {
-pos = (360,-186);
+pos = (360,0);
 ref = uni1FFD;
 }
 );
@@ -65,7 +65,7 @@ pos = (370,0);
 ref = uni1FBE;
 },
 {
-pos = (312,-248);
+pos = (312,0);
 ref = uni1FFD;
 }
 );
@@ -82,7 +82,7 @@ pos = (362,0);
 ref = uni1FBE;
 },
 {
-pos = (326,-248);
+pos = (326,0);
 ref = uni1FFD;
 }
 );
@@ -99,7 +99,7 @@ pos = (384,0);
 ref = uni1FBE;
 },
 {
-pos = (352,-248);
+pos = (352,0);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_9.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_9.glyph
index 09d15b2b2..1040d0130 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_9.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_9.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (92,372);
+pos = (204,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (149,372);
+pos = (398,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (50,372);
+pos = (232,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (100,434);
+pos = (252,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (119,434);
+pos = (384,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = A;
 },
 {
-pos = (52,434);
+pos = (202,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_D_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_D_.glyph
index dc698b641..782b4d950 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_D_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_B_D_.glyph
@@ -6,7 +6,7 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (238,1182);
+pos = (238,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -33,7 +33,7 @@ width = 546;
 anchors = (
 {
 name = _top;
-pos = (168,1182);
+pos = (168,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -43,7 +43,7 @@ closed = 1;
 nodes = (
 (142,1496,l),
 (142,1396,ls),
-(143,1329,o),
+(142,1329,o),
 (128,1274,o),
 (64,1246,c),
 (154,1134,l),
@@ -60,7 +60,7 @@ width = 378;
 anchors = (
 {
 name = _top;
-pos = (282,1182);
+pos = (282,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -70,12 +70,12 @@ closed = 1;
 nodes = (
 (328,1496,l),
 (328,1464,ls),
-(329,1338,o),
+(328,1338,o),
 (305,1269,o),
 (210,1158,c),
 (244,1142,l),
 (348,1247,o),
-(375,1326,o),
+(376,1326,o),
 (376,1458,cs),
 (376,1496,l)
 );
@@ -87,7 +87,7 @@ width = 648;
 anchors = (
 {
 name = _top;
-pos = (206,1182);
+pos = (206,1056);
 }
 );
 layerId = m007;
@@ -114,7 +114,7 @@ width = 482;
 anchors = (
 {
 name = _top;
-pos = (152,1182);
+pos = (152,1056);
 }
 );
 layerId = m009;
@@ -124,7 +124,7 @@ closed = 1;
 nodes = (
 (126,1496,l),
 (126,1396,ls),
-(127,1329,o),
+(126,1329,o),
 (112,1274,o),
 (48,1246,c),
 (138,1134,l),
@@ -141,7 +141,7 @@ width = 346;
 anchors = (
 {
 name = _top;
-pos = (218,1182);
+pos = (218,1056);
 }
 );
 layerId = m011;
@@ -151,12 +151,12 @@ closed = 1;
 nodes = (
 (264,1496,l),
 (264,1464,ls),
-(265,1338,o),
+(264,1338,o),
 (241,1269,o),
 (146,1158,c),
 (180,1142,l),
 (284,1247,o),
-(311,1326,o),
+(312,1326,o),
 (312,1458,cs),
 (312,1496,l)
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_1.glyph
deleted file mode 100644
index a0cec6872..000000000
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_1.glyph
+++ /dev/null
@@ -1,442 +0,0 @@
-{
-color = (204,240,242,1);
-glyphname = uni1FC1;
-layers = (
-{
-anchors = (
-{
-name = _top;
-pos = (456,1182);
-}
-);
-layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
-shapes = (
-{
-closed = 1;
-nodes = (
-(111,1286,o),
-(148,1236,o),
-(226,1236,cs),
-(303,1236,o),
-(340,1286,o),
-(340,1344,cs),
-(340,1408,o),
-(303,1457,o),
-(226,1458,cs),
-(148,1457,o),
-(111,1408,o),
-(110,1344,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(579,1283,o),
-(620,1233,o),
-(696,1234,cs),
-(771,1233,o),
-(812,1283,o),
-(812,1344,cs),
-(812,1405,o),
-(771,1455,o),
-(696,1454,cs),
-(620,1455,o),
-(579,1405,o),
-(578,1344,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(643,1667,o),
-(605,1629,o),
-(562,1630,cs),
-(477,1629,o),
-(428,1705,o),
-(340,1704,cs),
-(241,1705,o),
-(172,1615,o),
-(172,1518,c),
-(262,1496,l),
-(262,1545,o),
-(297,1583,o),
-(340,1582,cs),
-(428,1583,o),
-(454,1510,o),
-(562,1510,cs),
-(660,1510,o),
-(727,1594,o),
-(728,1690,c),
-(642,1716,l)
-);
-}
-);
-width = 920;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (512,1182);
-}
-);
-layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
-shapes = (
-{
-closed = 1;
-nodes = (
-(93,1248,o),
-(169,1187,o),
-(270,1186,cs),
-(372,1187,o),
-(448,1248,o),
-(448,1332,cs),
-(448,1411,o),
-(372,1475,o),
-(270,1474,cs),
-(166,1475,o),
-(93,1411,o),
-(94,1332,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(585,1251,o),
-(657,1190,o),
-(762,1190,cs),
-(864,1190,o),
-(940,1251,o),
-(940,1332,cs),
-(940,1414,o),
-(864,1475,o),
-(762,1474,cs),
-(657,1475,o),
-(585,1414,o),
-(584,1332,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(684,1743,o),
-(655,1708,o),
-(626,1708,cs),
-(541,1708,o),
-(457,1766,o),
-(370,1766,cs),
-(271,1766,o),
-(201,1679,o),
-(200,1588,c),
-(354,1544,l),
-(355,1585,o),
-(378,1626,o),
-(414,1626,cs),
-(500,1626,o),
-(561,1568,o),
-(670,1568,cs),
-(765,1568,o),
-(841,1652,o),
-(840,1748,c),
-(684,1790,l)
-);
-}
-);
-width = 1030;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (372,1182);
-}
-);
-layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
-shapes = (
-{
-closed = 1;
-nodes = (
-(116,1342,o),
-(137,1321,o),
-(162,1320,cs),
-(188,1321,o),
-(209,1342,o),
-(210,1368,cs),
-(209,1393,o),
-(188,1414,o),
-(162,1414,cs),
-(137,1414,o),
-(116,1393,o),
-(116,1368,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(527,1342,o),
-(548,1321,o),
-(574,1320,cs),
-(599,1321,o),
-(620,1342,o),
-(620,1368,cs),
-(620,1393,o),
-(599,1414,o),
-(574,1414,cs),
-(548,1414,o),
-(527,1393,o),
-(526,1368,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(572,1571,o),
-(541,1524,o),
-(482,1522,cs),
-(404,1522,o),
-(375,1642,o),
-(270,1642,cs),
-(185,1642,o),
-(135,1579,o),
-(126,1488,c),
-(168,1482,l),
-(177,1548,o),
-(208,1596,o),
-(268,1596,cs),
-(349,1596,o),
-(386,1476,o),
-(484,1476,cs),
-(564,1477,o),
-(615,1540,o),
-(624,1630,c),
-(582,1636,l)
-);
-}
-);
-width = 740;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (424,1182);
-}
-);
-layerId = m007;
-shapes = (
-{
-closed = 1;
-nodes = (
-(79,1286,o),
-(116,1236,o),
-(194,1236,cs),
-(271,1236,o),
-(308,1286,o),
-(308,1344,cs),
-(308,1408,o),
-(271,1457,o),
-(194,1458,cs),
-(116,1457,o),
-(79,1408,o),
-(78,1344,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(547,1283,o),
-(588,1233,o),
-(664,1234,cs),
-(739,1233,o),
-(780,1283,o),
-(780,1344,cs),
-(780,1405,o),
-(739,1455,o),
-(664,1454,cs),
-(588,1455,o),
-(547,1405,o),
-(546,1344,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(611,1667,o),
-(573,1629,o),
-(530,1630,cs),
-(445,1629,o),
-(396,1705,o),
-(308,1704,cs),
-(209,1705,o),
-(140,1615,o),
-(140,1518,c),
-(230,1496,l),
-(230,1545,o),
-(265,1583,o),
-(308,1582,cs),
-(396,1583,o),
-(422,1510,o),
-(530,1510,cs),
-(628,1510,o),
-(695,1594,o),
-(696,1690,c),
-(610,1716,l)
-);
-}
-);
-width = 856;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (496,1182);
-}
-);
-layerId = m009;
-shapes = (
-{
-closed = 1;
-nodes = (
-(77,1248,o),
-(153,1187,o),
-(254,1186,cs),
-(356,1187,o),
-(432,1248,o),
-(432,1332,cs),
-(432,1411,o),
-(356,1475,o),
-(254,1474,cs),
-(150,1475,o),
-(77,1411,o),
-(78,1332,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(569,1251,o),
-(641,1190,o),
-(746,1190,cs),
-(848,1190,o),
-(924,1251,o),
-(924,1332,cs),
-(924,1414,o),
-(848,1475,o),
-(746,1474,cs),
-(641,1475,o),
-(569,1414,o),
-(568,1332,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(668,1743,o),
-(639,1708,o),
-(610,1708,cs),
-(525,1708,o),
-(441,1766,o),
-(354,1766,cs),
-(255,1766,o),
-(185,1679,o),
-(184,1588,c),
-(338,1544,l),
-(339,1585,o),
-(362,1626,o),
-(398,1626,cs),
-(484,1626,o),
-(545,1568,o),
-(654,1568,cs),
-(749,1568,o),
-(825,1652,o),
-(824,1748,c),
-(668,1790,l)
-);
-}
-);
-width = 998;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (308,1182);
-}
-);
-layerId = m011;
-shapes = (
-{
-closed = 1;
-nodes = (
-(52,1342,o),
-(73,1321,o),
-(98,1320,cs),
-(124,1321,o),
-(145,1342,o),
-(146,1368,cs),
-(145,1393,o),
-(124,1414,o),
-(98,1414,cs),
-(73,1414,o),
-(52,1393,o),
-(52,1368,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(463,1342,o),
-(484,1321,o),
-(510,1320,cs),
-(535,1321,o),
-(556,1342,o),
-(556,1368,cs),
-(556,1393,o),
-(535,1414,o),
-(510,1414,cs),
-(484,1414,o),
-(463,1393,o),
-(462,1368,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(508,1571,o),
-(477,1524,o),
-(418,1522,cs),
-(340,1522,o),
-(311,1642,o),
-(206,1642,cs),
-(121,1642,o),
-(71,1579,o),
-(62,1488,c),
-(104,1482,l),
-(113,1548,o),
-(144,1596,o),
-(204,1596,cs),
-(285,1596,o),
-(322,1476,o),
-(420,1476,cs),
-(500,1477,o),
-(551,1540,o),
-(560,1630,c),
-(518,1636,l)
-);
-}
-);
-width = 612;
-}
-);
-tags = (
-"TODO-opsz"
-);
-unicode = 8129;
-userData = {
-interface.gridadjust.original = "{'width': 1269, 'leftMargin': 155, 'rightMargin': 151}";
-"interface.width-adjustments" = (
--16
-);
-};
-}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_2.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_2.glyph
index 6ed667423..b948e45f2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_2.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_2.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (242,-78);
+pos = (242,0);
 ref = uni1FEF;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (260,-64);
+pos = (260,0);
 ref = uni1FEF;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (296,-86);
+pos = (296,0);
 ref = uni1FEF;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (242,-140);
+pos = (242,0);
 ref = uni1FEF;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (260,-126);
+pos = (260,0);
 ref = uni1FEF;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (296,-148);
+pos = (296,0);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_4.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_4.glyph
index cdb0550cc..f49e88ab6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_4.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_4.glyph
@@ -14,7 +14,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (326,-186);
+pos = (326,0);
 ref = uni1FFD;
 }
 );
@@ -31,7 +31,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (340,-186);
+pos = (340,0);
 ref = uni1FFD;
 }
 );
@@ -47,7 +47,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (340,-186);
+pos = (340,0);
 ref = uni1FFD;
 }
 );
@@ -64,7 +64,7 @@ pos = (18,0);
 ref = uni1FBE;
 },
 {
-pos = (326,-248);
+pos = (326,0);
 ref = uni1FFD;
 }
 );
@@ -81,7 +81,7 @@ pos = (34,0);
 ref = uni1FBE;
 },
 {
-pos = (340,-248);
+pos = (340,0);
 ref = uni1FFD;
 }
 );
@@ -97,7 +97,7 @@ ref = eta;
 ref = uni1FBE;
 },
 {
-pos = (340,-248);
+pos = (340,0);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_D_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_D_.glyph
index ad0ce2280..ef4caa85f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_D_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_D_.glyph
@@ -6,7 +6,7 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (460,1182);
+pos = (460,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -27,12 +27,12 @@ closed = 1;
 nodes = (
 (226,1496,l),
 (226,1420,ls),
-(227,1324,o),
+(226,1324,o),
 (198,1257,o),
 (146,1196,c),
 (224,1134,l),
 (340,1199,o),
-(407,1297,o),
+(408,1297,o),
 (408,1414,cs),
 (408,1496,l)
 );
@@ -44,7 +44,7 @@ width = 920;
 anchors = (
 {
 name = _top;
-pos = (538,1182);
+pos = (538,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -82,7 +82,7 @@ width = 1050;
 anchors = (
 {
 name = _top;
-pos = (366,1182);
+pos = (366,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -103,7 +103,7 @@ closed = 1;
 nodes = (
 (290,1496,l),
 (290,1464,ls),
-(289,1338,o),
+(290,1338,o),
 (266,1269,o),
 (172,1158,c),
 (206,1142,l),
@@ -120,7 +120,7 @@ width = 806;
 anchors = (
 {
 name = _top;
-pos = (428,1182);
+pos = (428,1056);
 }
 );
 layerId = m007;
@@ -141,12 +141,12 @@ closed = 1;
 nodes = (
 (194,1496,l),
 (194,1420,ls),
-(195,1324,o),
+(194,1324,o),
 (166,1257,o),
 (114,1196,c),
 (192,1134,l),
 (308,1199,o),
-(375,1297,o),
+(376,1297,o),
 (376,1414,cs),
 (376,1496,l)
 );
@@ -158,7 +158,7 @@ width = 856;
 anchors = (
 {
 name = _top;
-pos = (522,1182);
+pos = (522,1056);
 }
 );
 layerId = m009;
@@ -196,7 +196,7 @@ width = 1018;
 anchors = (
 {
 name = _top;
-pos = (302,1182);
+pos = (302,1056);
 }
 );
 layerId = m011;
@@ -217,7 +217,7 @@ closed = 1;
 nodes = (
 (226,1496,l),
 (226,1464,ls),
-(225,1338,o),
+(226,1338,o),
 (202,1269,o),
 (108,1158,c),
 (142,1142,l),
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_E_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_E_.glyph
index a9ce0408c..968bce36a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_E_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_E_.glyph
@@ -6,7 +6,7 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (384,1176);
+pos = (384,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -27,7 +27,7 @@ closed = 1;
 nodes = (
 (242,1490,l),
 (242,1414,ls),
-(241,1318,o),
+(242,1318,o),
 (212,1251,o),
 (160,1190,c),
 (238,1128,l),
@@ -44,7 +44,7 @@ width = 920;
 anchors = (
 {
 name = _top;
-pos = (466,1176);
+pos = (466,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -65,12 +65,12 @@ closed = 1;
 nodes = (
 (288,1490,l),
 (288,1390,ls),
-(287,1338,o),
+(288,1338,o),
 (281,1271,o),
 (210,1240,c),
 (300,1128,l),
 (388,1164,o),
-(464,1257,o),
+(466,1257,o),
 (466,1384,cs),
 (466,1490,l)
 );
@@ -82,7 +82,7 @@ width = 1056;
 anchors = (
 {
 name = _top;
-pos = (240,1176);
+pos = (240,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -103,12 +103,12 @@ closed = 1;
 nodes = (
 (238,1496,l),
 (238,1464,ls),
-(239,1338,o),
+(238,1338,o),
 (215,1269,o),
 (120,1158,c),
 (154,1142,l),
 (257,1247,o),
-(285,1326,o),
+(286,1326,o),
 (286,1458,cs),
 (286,1496,l)
 );
@@ -120,7 +120,7 @@ width = 674;
 anchors = (
 {
 name = _top;
-pos = (352,1176);
+pos = (352,1056);
 }
 );
 layerId = m007;
@@ -141,7 +141,7 @@ closed = 1;
 nodes = (
 (210,1490,l),
 (210,1414,ls),
-(209,1318,o),
+(210,1318,o),
 (180,1251,o),
 (128,1190,c),
 (206,1128,l),
@@ -158,7 +158,7 @@ width = 856;
 anchors = (
 {
 name = _top;
-pos = (450,1176);
+pos = (450,1056);
 }
 );
 layerId = m009;
@@ -179,12 +179,12 @@ closed = 1;
 nodes = (
 (272,1490,l),
 (272,1390,ls),
-(271,1338,o),
+(272,1338,o),
 (265,1271,o),
 (194,1240,c),
 (284,1128,l),
 (372,1164,o),
-(448,1257,o),
+(450,1257,o),
 (450,1384,cs),
 (450,1490,l)
 );
@@ -196,7 +196,7 @@ width = 1024;
 anchors = (
 {
 name = _top;
-pos = (176,1176);
+pos = (176,1056);
 }
 );
 layerId = m011;
@@ -217,12 +217,12 @@ closed = 1;
 nodes = (
 (174,1496,l),
 (174,1464,ls),
-(175,1338,o),
+(174,1338,o),
 (151,1269,o),
 (56,1158,c),
 (90,1142,l),
 (193,1247,o),
-(221,1326,o),
+(222,1326,o),
 (222,1458,cs),
 (222,1496,l)
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_F_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_F_.glyph
index a1fd9850c..a06efa041 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_F_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_C_F_.glyph
@@ -6,7 +6,7 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (350,1182);
+pos = (350,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -41,12 +41,12 @@ closed = 1;
 nodes = (
 (312,1434,l),
 (312,1362,ls),
-(311,1295,o),
+(312,1295,o),
 (294,1239,o),
 (254,1184,c),
 (340,1134,l),
 (422,1193,o),
-(463,1289,o),
+(462,1289,o),
 (462,1364,cs),
 (462,1434,l)
 );
@@ -58,7 +58,7 @@ width = 734;
 anchors = (
 {
 name = _top;
-pos = (364,1182);
+pos = (364,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -110,7 +110,7 @@ width = 832;
 anchors = (
 {
 name = _top;
-pos = (328,1182);
+pos = (328,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -145,12 +145,12 @@ closed = 1;
 nodes = (
 (296,1438,l),
 (296,1406,ls),
-(297,1331,o),
+(296,1331,o),
 (288,1262,o),
 (222,1158,c),
 (256,1142,l),
 (330,1239,o),
-(343,1319,o),
+(344,1319,o),
 (344,1400,cs),
 (344,1438,l)
 );
@@ -162,7 +162,7 @@ width = 658;
 anchors = (
 {
 name = _top;
-pos = (318,1182);
+pos = (318,1056);
 }
 );
 layerId = m007;
@@ -197,12 +197,12 @@ closed = 1;
 nodes = (
 (280,1434,l),
 (280,1362,ls),
-(279,1295,o),
+(280,1295,o),
 (262,1239,o),
 (222,1184,c),
 (308,1134,l),
 (390,1193,o),
-(431,1289,o),
+(430,1289,o),
 (430,1364,cs),
 (430,1434,l)
 );
@@ -214,7 +214,7 @@ width = 670;
 anchors = (
 {
 name = _top;
-pos = (348,1182);
+pos = (348,1056);
 }
 );
 layerId = m009;
@@ -266,7 +266,7 @@ width = 800;
 anchors = (
 {
 name = _top;
-pos = (264,1182);
+pos = (264,1056);
 }
 );
 layerId = m011;
@@ -301,12 +301,12 @@ closed = 1;
 nodes = (
 (232,1438,l),
 (232,1406,ls),
-(233,1331,o),
+(232,1331,o),
 (224,1262,o),
 (158,1158,c),
 (192,1142,l),
 (266,1239,o),
-(279,1319,o),
+(280,1319,o),
 (280,1400,cs),
 (280,1438,l)
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_1.glyph
index 98ce30769..3940abb08 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_1.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-364,0);
+pos = (-252,0);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-331,0);
+pos = (-82,0);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-360,0);
+pos = (-178,0);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-364,0);
+pos = (-212,0);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-331,0);
+pos = (-66,0);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-376,0);
+pos = (-226,0);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_2.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_2.glyph
index fb3c114a0..afc1674d7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_2.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_2.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-220,-64);
+pos = (-326,0);
 ref = uni1FED;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-190,-64);
+pos = (-276,0);
 ref = uni1FED;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-80,-64);
+pos = (-326,0);
 ref = uni1FED;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-220,-126);
+pos = (-310,-49);
 ref = uni1FED;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-190,-126);
+pos = (-292,0);
 ref = uni1FED;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-80,-126);
+pos = (-342,0);
 ref = uni1FED;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_7.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_7.glyph
index e7aedefe3..e728d7849 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_7.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_7.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-220,-64);
-ref = uni1FC1;
+pos = (-212,0);
+ref = dialytikaperispomeni;
 }
 );
 width = 544;
@@ -23,8 +23,8 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-178,-64);
-ref = uni1FC1;
+pos = (-146,0);
+ref = dialytikaperispomeni;
 }
 );
 width = 734;
@@ -37,7 +37,7 @@ ref = iota;
 },
 {
 pos = (-150,-64);
-ref = uni1FC1;
+ref = dialytikaperispomeni;
 }
 );
 width = 442;
@@ -49,8 +49,8 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-220,-126);
-ref = uni1FC1;
+pos = (-276,0);
+ref = dialytikaperispomeni;
 }
 );
 width = 480;
@@ -62,8 +62,8 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-178,-126);
-ref = uni1FC1;
+pos = (-178,0);
+ref = dialytikaperispomeni;
 }
 );
 width = 702;
@@ -76,7 +76,7 @@ ref = iota;
 },
 {
 pos = (-150,-126);
-ref = uni1FC1;
+ref = dialytikaperispomeni;
 }
 );
 width = 314;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.1.glyph
index 8403ed1c8..e5292dbc9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.1.glyph
@@ -10,7 +10,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-147,372);
+pos = (-35,372);
 ref = macron;
 }
 );
@@ -24,7 +24,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-146,372);
+pos = (103,372);
 ref = macron;
 }
 );
@@ -38,7 +38,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-222,372);
+pos = (-40,372);
 ref = macron;
 }
 );
@@ -52,7 +52,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-147,434);
+pos = (5,434);
 ref = macron;
 }
 );
@@ -66,7 +66,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-148,434);
+pos = (117,434);
 ref = macron;
 }
 );
@@ -80,7 +80,7 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-242,434);
+pos = (-92,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.glyph
index cc2523587..54cfd9558 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-330,372);
+pos = (-218,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-365,372);
+pos = (-116,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-326,372);
+pos = (-144,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-330,434);
+pos = (-178,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-361,434);
+pos = (-96,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = I;
 },
 {
-pos = (-342,434);
+pos = (-192,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_D_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_D_.glyph
index 2e42d96ab..819a3e4da 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_D_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_D_.glyph
@@ -6,7 +6,7 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (498,1176);
+pos = (498,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -30,7 +30,7 @@ nodes = (
 (358,1128,c),
 (436,1190,l),
 (381,1251,o),
-(355,1318,o),
+(354,1318,o),
 (354,1414,cs),
 (354,1490,l),
 (174,1490,l),
@@ -44,7 +44,7 @@ width = 920;
 anchors = (
 {
 name = _top;
-pos = (440,1178);
+pos = (440,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -68,7 +68,7 @@ nodes = (
 (250,1128,c),
 (340,1240,l),
 (266,1271,o),
-(260,1338,o),
+(262,1338,o),
 (262,1390,cs),
 (262,1490,l),
 (84,1490,l),
@@ -82,7 +82,7 @@ width = 776;
 anchors = (
 {
 name = _top;
-pos = (352,1176);
+pos = (352,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -120,7 +120,7 @@ width = 702;
 anchors = (
 {
 name = _top;
-pos = (466,1176);
+pos = (466,1056);
 }
 );
 layerId = m007;
@@ -144,7 +144,7 @@ nodes = (
 (326,1128,c),
 (404,1190,l),
 (349,1251,o),
-(323,1318,o),
+(322,1318,o),
 (322,1414,cs),
 (322,1490,l),
 (142,1490,l),
@@ -158,7 +158,7 @@ width = 856;
 anchors = (
 {
 name = _top;
-pos = (424,1178);
+pos = (424,1056);
 }
 );
 layerId = m009;
@@ -182,7 +182,7 @@ nodes = (
 (234,1128,c),
 (324,1240,l),
 (250,1271,o),
-(244,1338,o),
+(246,1338,o),
 (246,1390,cs),
 (246,1490,l),
 (68,1490,l),
@@ -196,7 +196,7 @@ width = 744;
 anchors = (
 {
 name = _top;
-pos = (288,1176);
+pos = (288,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_E_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_E_.glyph
index 1c65249dc..823e195ad 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_E_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_E_.glyph
@@ -6,7 +6,7 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (428,1176);
+pos = (428,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -27,7 +27,7 @@ closed = 1;
 nodes = (
 (410,1190,l),
 (358,1251,o),
-(329,1318,o),
+(328,1318,o),
 (328,1414,cs),
 (328,1490,l),
 (148,1490,l),
@@ -44,7 +44,7 @@ width = 920;
 anchors = (
 {
 name = _top;
-pos = (460,1178);
+pos = (460,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -65,7 +65,7 @@ closed = 1;
 nodes = (
 (448,1240,l),
 (385,1268,o),
-(373,1324,o),
+(372,1324,o),
 (372,1390,cs),
 (372,1490,l),
 (198,1490,l),
@@ -82,7 +82,7 @@ width = 1048;
 anchors = (
 {
 name = _top;
-pos = (316,1176);
+pos = (316,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -103,7 +103,7 @@ closed = 1;
 nodes = (
 (280,1158,l),
 (186,1269,o),
-(163,1338,o),
+(162,1338,o),
 (162,1464,cs),
 (162,1496,l),
 (116,1496,l),
@@ -120,7 +120,7 @@ width = 668;
 anchors = (
 {
 name = _top;
-pos = (396,1176);
+pos = (396,1056);
 }
 );
 layerId = m007;
@@ -141,7 +141,7 @@ closed = 1;
 nodes = (
 (378,1190,l),
 (326,1251,o),
-(297,1318,o),
+(296,1318,o),
 (296,1414,cs),
 (296,1490,l),
 (116,1490,l),
@@ -158,7 +158,7 @@ width = 856;
 anchors = (
 {
 name = _top;
-pos = (444,1178);
+pos = (444,1056);
 }
 );
 layerId = m009;
@@ -179,7 +179,7 @@ closed = 1;
 nodes = (
 (432,1240,l),
 (369,1268,o),
-(357,1324,o),
+(356,1324,o),
 (356,1390,cs),
 (356,1490,l),
 (182,1490,l),
@@ -196,7 +196,7 @@ width = 1016;
 anchors = (
 {
 name = _top;
-pos = (252,1176);
+pos = (252,1056);
 }
 );
 layerId = m011;
@@ -217,7 +217,7 @@ closed = 1;
 nodes = (
 (216,1158,l),
 (122,1269,o),
-(99,1338,o),
+(98,1338,o),
 (98,1464,cs),
 (98,1496,l),
 (52,1496,l),
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_F_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_F_.glyph
index 319904521..50e357d5b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_F_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_F_.glyph
@@ -6,7 +6,7 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (376,1182);
+pos = (376,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -58,7 +58,7 @@ width = 734;
 anchors = (
 {
 name = _top;
-pos = (440,1182);
+pos = (440,1118);
 }
 );
 guides = (
@@ -77,7 +77,7 @@ nodes = (
 (514,1134,c),
 (596,1224,l),
 (527,1245,o),
-(521,1306,o),
+(520,1306,o),
 (520,1352,cs),
 (520,1432,l),
 (350,1432,l),
@@ -116,7 +116,7 @@ width = 832;
 anchors = (
 {
 name = _top;
-pos = (338,1182);
+pos = (338,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -129,7 +129,7 @@ nodes = (
 (392,1142,c),
 (426,1158,l),
 (375,1247,o),
-(351,1316,o),
+(350,1316,o),
 (350,1406,cs),
 (350,1438,l),
 (304,1438,l),
@@ -168,7 +168,7 @@ width = 658;
 anchors = (
 {
 name = _top;
-pos = (344,1182);
+pos = (344,1056);
 }
 );
 layerId = m007;
@@ -220,7 +220,7 @@ width = 670;
 anchors = (
 {
 name = _top;
-pos = (424,1182);
+pos = (424,1056);
 }
 );
 guides = (
@@ -239,7 +239,7 @@ nodes = (
 (498,1134,c),
 (580,1224,l),
 (511,1245,o),
-(505,1306,o),
+(504,1306,o),
 (504,1352,cs),
 (504,1432,l),
 (334,1432,l),
@@ -278,7 +278,7 @@ width = 800;
 anchors = (
 {
 name = _top;
-pos = (274,1182);
+pos = (274,1056);
 }
 );
 layerId = m011;
@@ -291,7 +291,7 @@ nodes = (
 (328,1142,c),
 (362,1158,l),
 (311,1247,o),
-(287,1316,o),
+(286,1316,o),
 (286,1406,cs),
 (286,1438,l),
 (240,1438,l),
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_0.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_0.glyph
index 0ddd79b0a..343d16000 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_0.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_0.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (190,0);
+pos = (206,0);
 ref = breve;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (108,0);
+pos = (176,0);
 ref = breve;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -40,7 +40,7 @@ pos = (226,0);
 ref = breve;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (144,0);
+pos = (160,0);
 ref = breve;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (92,0);
+pos = (161,0);
 ref = breve;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (162,0);
+pos = (172,0);
 ref = breve;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_1.glyph
index f0cd009c5..5c9f77703 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_1.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-26,0);
+pos = (102,0);
 ref = macron;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-77,0);
+pos = (240,0);
 ref = macron;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-4,0);
+pos = (178,0);
 ref = macron;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-24,0);
+pos = (144,0);
 ref = macron;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-77,0);
+pos = (257,0);
 ref = macron;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-20,0);
+pos = (140,0);
 ref = macron;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_2.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_2.glyph
index e4bcf12dc..2d349887b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_2.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_2.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (118,-64);
+pos = (28,0);
 ref = uni1FED;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (64,-64);
+pos = (46,0);
 ref = uni1FED;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (276,-64);
+pos = (30,0);
 ref = uni1FED;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (120,-126);
+pos = (46,-49);
 ref = uni1FED;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (64,-126);
+pos = (31,0);
 ref = uni1FED;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (276,-126);
+pos = (24,0);
 ref = uni1FED;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_3.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_3.glyph
index 468653bf9..cc241f30d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_3.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_3.glyph
@@ -8,11 +8,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (138,-64);
+pos = (154,-64);
 ref = uni1FEE;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -21,11 +21,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (58,-64);
+pos = (126,-64);
 ref = uni1FEE;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -38,7 +38,7 @@ pos = (274,-64);
 ref = uni1FEE;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -47,11 +47,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (140,-126);
+pos = (156,-126);
 ref = uni1FEE;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -60,11 +60,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (58,-126);
+pos = (127,-126);
 ref = uni1FEE;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -73,11 +73,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (274,-126);
+pos = (284,-126);
 ref = uni1FEE;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_4.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_4.glyph
index 4921ea91a..ec811ad69 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_4.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_4.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (362,-64);
+pos = (362,0);
 ref = uni1FBD;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (472,-64);
+pos = (472,0);
 ref = uni1FBD;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (282,-64);
+pos = (282,0);
 ref = uni1FBD;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (362,-126);
+pos = (362,0);
 ref = uni1FBD;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (472,-126);
+pos = (472,0);
 ref = uni1FBD;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (282,-126);
+pos = (282,0);
 ref = uni1FBD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_5.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_5.glyph
index 463ae7590..8a9703a58 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_5.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_5.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (326,-58);
+pos = (326,0);
 ref = uni1FFE;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (258,-58);
+pos = (258,0);
 ref = uni1FFE;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (354,-58);
+pos = (354,0);
 ref = uni1FFE;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (326,-120);
+pos = (326,0);
 ref = uni1FFE;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (258,-120);
+pos = (258,0);
 ref = uni1FFE;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = rho;
 },
 {
-pos = (354,-120);
+pos = (354,0);
 ref = uni1FFE;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_6.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_6.glyph
index f408293ee..eaf2a5f0f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_6.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_6.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (62,0);
+pos = (78,0);
 ref = uni1FC0;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (76,0);
+pos = (144,0);
 ref = uni1FC0;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -40,7 +40,7 @@ pos = (74,0);
 ref = uni1FC0;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (64,0);
+pos = (80,0);
 ref = uni1FC0;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (60,0);
+pos = (129,0);
 ref = uni1FC0;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (66,0);
+pos = (76,0);
 ref = uni1FC0;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_7.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_7.glyph
index 72a97bd5b..fb4d7b233 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_7.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_7.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (118,-64);
-ref = uni1FC1;
+pos = (142,0);
+ref = dialytikaperispomeni;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (76,-64);
-ref = uni1FC1;
+pos = (176,0);
+ref = dialytikaperispomeni;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (206,-64);
-ref = uni1FC1;
+pos = (162,0);
+ref = dialytikaperispomeni;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (120,-126);
-ref = uni1FC1;
+pos = (80,0);
+ref = dialytikaperispomeni;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (76,-126);
-ref = uni1FC1;
+pos = (145,0);
+ref = dialytikaperispomeni;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (206,-126);
-ref = uni1FC1;
+pos = (172,0);
+ref = dialytikaperispomeni;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_9.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_9.glyph
index 59f307cc7..1f5788568 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_9.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_9.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (80,372);
+pos = (192,372);
 ref = macron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (129,372);
+pos = (378,372);
 ref = macron;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (42,372);
+pos = (224,372);
 ref = macron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (80,434);
+pos = (232,434);
 ref = macron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (99,434);
+pos = (364,434);
 ref = macron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = Y;
 },
 {
-pos = (44,434);
+pos = (194,434);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_D_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_D_.glyph
index 7b7665577..4af2059b1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_D_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_D_.glyph
@@ -3,334 +3,70 @@ color = (204,240,242,1);
 glyphname = uni1FED;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (456,1182);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(536,1402,l),
-(408,1630,l),
-(224,1630,l),
-(408,1402,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(303,1236,o),
-(340,1286,o),
-(340,1344,cs),
-(340,1408,o),
-(303,1457,o),
-(226,1458,cs),
-(148,1457,o),
-(111,1408,o),
-(110,1344,cs),
-(111,1286,o),
-(148,1236,o),
-(226,1236,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(771,1233,o),
-(812,1283,o),
-(812,1344,cs),
-(812,1405,o),
-(771,1455,o),
-(696,1454,cs),
-(620,1455,o),
-(579,1405,o),
-(578,1344,cs),
-(579,1283,o),
-(620,1233,o),
-(696,1234,cs)
-);
+pos = (1106,0);
+ref = dieresistonos;
+scale = (-1,1);
 }
 );
-width = 920;
+width = 1106;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (524,1182);
-}
-);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(622,1502,l),
-(544,1666,l),
-(302,1666,l),
-(436,1502,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(372,1187,o),
-(448,1248,o),
-(448,1332,cs),
-(448,1411,o),
-(372,1475,o),
-(270,1474,cs),
-(166,1475,o),
-(93,1411,o),
-(94,1332,cs),
-(93,1248,o),
-(169,1187,o),
-(270,1186,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(864,1190,o),
-(940,1251,o),
-(940,1332,cs),
-(940,1414,o),
-(864,1475,o),
-(762,1474,cs),
-(657,1475,o),
-(585,1414,o),
-(584,1332,cs),
-(585,1251,o),
-(657,1190,o),
-(762,1190,cs)
-);
+pos = (1234,0);
+ref = dieresistonos;
+scale = (-1,1);
 }
 );
-width = 1030;
+width = 1234;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (302,1182);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(334,1396,l),
-(204,1594,l),
-(146,1594,l),
-(286,1396,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(188,1321,o),
-(209,1342,o),
-(210,1368,cs),
-(209,1393,o),
-(188,1414,o),
-(162,1414,cs),
-(137,1414,o),
-(116,1393,o),
-(116,1368,cs),
-(116,1342,o),
-(137,1321,o),
-(162,1320,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(468,1321,o),
-(489,1342,o),
-(488,1368,cs),
-(489,1393,o),
-(468,1414,o),
-(442,1414,cs),
-(417,1414,o),
-(396,1393,o),
-(396,1368,cs),
-(396,1342,o),
-(417,1321,o),
-(442,1320,cs)
-);
+pos = (1028,0);
+ref = dieresistonos;
+scale = (-1,1);
 }
 );
-width = 606;
+width = 1028;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (424,1182);
-}
-);
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(504,1402,l),
-(376,1630,l),
-(192,1630,l),
-(376,1402,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(271,1236,o),
-(308,1286,o),
-(308,1344,cs),
-(308,1408,o),
-(271,1457,o),
-(194,1458,cs),
-(116,1457,o),
-(79,1408,o),
-(78,1344,cs),
-(79,1286,o),
-(116,1236,o),
-(194,1236,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(739,1233,o),
-(780,1283,o),
-(780,1344,cs),
-(780,1405,o),
-(739,1455,o),
-(664,1454,cs),
-(588,1455,o),
-(547,1405,o),
-(546,1344,cs),
-(547,1283,o),
-(588,1233,o),
-(664,1234,cs)
-);
+pos = (1042,0);
+ref = dieresistonos;
+scale = (-1,1);
 }
 );
-width = 856;
+width = 1042;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (508,1182);
-}
-);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(606,1502,l),
-(528,1666,l),
-(286,1666,l),
-(420,1502,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(356,1187,o),
-(432,1248,o),
-(432,1332,cs),
-(432,1411,o),
-(356,1475,o),
-(254,1474,cs),
-(150,1475,o),
-(77,1411,o),
-(78,1332,cs),
-(77,1248,o),
-(153,1187,o),
-(254,1186,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(848,1190,o),
-(924,1251,o),
-(924,1332,cs),
-(924,1414,o),
-(848,1475,o),
-(746,1474,cs),
-(641,1475,o),
-(569,1414,o),
-(568,1332,cs),
-(569,1251,o),
-(641,1190,o),
-(746,1190,cs)
-);
+pos = (1202,0);
+ref = dieresistonos;
+scale = (-1,1);
 }
 );
-width = 998;
+width = 1202;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (238,1182);
-}
-);
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(270,1396,l),
-(140,1594,l),
-(82,1594,l),
-(222,1396,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(124,1321,o),
-(145,1342,o),
-(146,1368,cs),
-(145,1393,o),
-(124,1414,o),
-(98,1414,cs),
-(73,1414,o),
-(52,1393,o),
-(52,1368,cs),
-(52,1342,o),
-(73,1321,o),
-(98,1320,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(404,1321,o),
-(425,1342,o),
-(424,1368,cs),
-(425,1393,o),
-(404,1414,o),
-(378,1414,cs),
-(353,1414,o),
-(332,1393,o),
-(332,1368,cs),
-(332,1342,o),
-(353,1321,o),
-(378,1320,cs)
-);
+pos = (900,0);
+ref = dieresistonos;
+scale = (-1,1);
 }
 );
-width = 478;
+width = 900;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_F_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_F_.glyph
index 30a42ae71..5d91b39c3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_F_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_E_F_.glyph
@@ -6,7 +6,7 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (358,1196);
+pos = (358,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -29,7 +29,7 @@ width = 546;
 anchors = (
 {
 name = _top;
-pos = (404,1182);
+pos = (404,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -52,7 +52,7 @@ width = 648;
 anchors = (
 {
 name = _top;
-pos = (286,1204);
+pos = (286,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -75,7 +75,7 @@ width = 416;
 anchors = (
 {
 name = _top;
-pos = (326,1196);
+pos = (326,1056);
 }
 );
 layerId = m007;
@@ -98,7 +98,7 @@ width = 482;
 anchors = (
 {
 name = _top;
-pos = (388,1182);
+pos = (388,1056);
 }
 );
 layerId = m009;
@@ -121,7 +121,7 @@ width = 616;
 anchors = (
 {
 name = _top;
-pos = (222,1204);
+pos = (222,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_2.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_2.glyph
index 9e9f333a9..626291e08 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_2.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_2.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (454,-78);
+pos = (454,0);
 ref = uni1FEF;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (485,-64);
+pos = (485,0);
 ref = uni1FEF;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (503,-86);
+pos = (503,0);
 ref = uni1FEF;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (454,-140);
+pos = (454,0);
 ref = uni1FEF;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (482,-126);
+pos = (482,0);
 ref = uni1FEF;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (503,-148);
+pos = (503,0);
 ref = uni1FEF;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_4.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_4.glyph
index db556e7aa..0d1430bae 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_4.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_4.glyph
@@ -14,7 +14,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (538,-186);
+pos = (538,0);
 ref = uni1FFD;
 }
 );
@@ -31,7 +31,7 @@ pos = (621,0);
 ref = uni1FBE;
 },
 {
-pos = (565,-186);
+pos = (565,0);
 ref = uni1FFD;
 }
 );
@@ -48,7 +48,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (547,-186);
+pos = (547,0);
 ref = uni1FFD;
 }
 );
@@ -65,7 +65,7 @@ pos = (586,0);
 ref = uni1FBE;
 },
 {
-pos = (538,-248);
+pos = (538,0);
 ref = uni1FFD;
 }
 );
@@ -82,7 +82,7 @@ pos = (618,0);
 ref = uni1FBE;
 },
 {
-pos = (562,-248);
+pos = (562,0);
 ref = uni1FFD;
 }
 );
@@ -99,7 +99,7 @@ pos = (579,0);
 ref = uni1FBE;
 },
 {
-pos = (547,-248);
+pos = (547,0);
 ref = uni1FFD;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_D_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_D_.glyph
index 97a897187..0eb599b2f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_D_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_D_.glyph
@@ -6,7 +6,7 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (274,1304);
+pos = (274,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -29,7 +29,7 @@ width = 546;
 anchors = (
 {
 name = _top;
-pos = (324,1304);
+pos = (324,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -52,7 +52,7 @@ width = 648;
 anchors = (
 {
 name = _top;
-pos = (242,1304);
+pos = (242,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -75,7 +75,7 @@ width = 486;
 anchors = (
 {
 name = _top;
-pos = (242,1304);
+pos = (242,1056);
 }
 );
 layerId = m007;
@@ -98,7 +98,7 @@ width = 482;
 anchors = (
 {
 name = _top;
-pos = (308,1304);
+pos = (308,1056);
 }
 );
 layerId = m009;
@@ -121,7 +121,7 @@ width = 616;
 anchors = (
 {
 name = _top;
-pos = (178,1304);
+pos = (178,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_E_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_E_.glyph
index 086165174..21fc03028 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_E_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_F_E_.glyph
@@ -6,7 +6,7 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (274,1176);
+pos = (274,1118);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -19,7 +19,7 @@ nodes = (
 (326,1128,c),
 (404,1190,l),
 (349,1251,o),
-(323,1318,o),
+(322,1318,o),
 (322,1414,cs),
 (322,1490,l),
 (142,1490,l),
@@ -33,7 +33,7 @@ width = 546;
 anchors = (
 {
 name = _top;
-pos = (382,1176);
+pos = (382,1118);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -46,7 +46,7 @@ nodes = (
 (364,1128,c),
 (454,1240,l),
 (388,1271,o),
-(380,1338,o),
+(378,1338,o),
 (378,1390,cs),
 (378,1490,l),
 (204,1490,l),
@@ -60,7 +60,7 @@ width = 658;
 anchors = (
 {
 name = _top;
-pos = (210,1176);
+pos = (210,1118);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -87,7 +87,7 @@ width = 480;
 anchors = (
 {
 name = _top;
-pos = (242,1176);
+pos = (242,1056);
 }
 );
 layerId = m007;
@@ -100,7 +100,7 @@ nodes = (
 (294,1128,c),
 (372,1190,l),
 (317,1251,o),
-(291,1318,o),
+(290,1318,o),
 (290,1414,cs),
 (290,1490,l),
 (110,1490,l),
@@ -114,7 +114,7 @@ width = 482;
 anchors = (
 {
 name = _top;
-pos = (366,1176);
+pos = (366,1056);
 }
 );
 layerId = m009;
@@ -127,7 +127,7 @@ nodes = (
 (348,1128,c),
 (438,1240,l),
 (372,1271,o),
-(364,1338,o),
+(362,1338,o),
 (362,1390,cs),
 (362,1490,l),
 (188,1490,l),
@@ -141,7 +141,7 @@ width = 626;
 anchors = (
 {
 name = _top;
-pos = (146,1176);
+pos = (146,1056);
 }
 );
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/upsilon.glyph b/src/Inter-Roman.glyphspackage/glyphs/upsilon.glyph
index ec4bb8a4d..ff10fc6ee 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/upsilon.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/upsilon.glyph
@@ -7,79 +7,85 @@ layers = (
 anchors = (
 {
 name = top;
-pos = (574,1118);
+pos = (590,1118);
 }
 );
+background = {
+shapes = (
+{
+ref = u;
+}
+);
+};
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 closed = 1;
 nodes = (
-(158,434,l),
-(157,119,o),
-(323,-20,o),
-(562,-20,cs),
-(899,-20,o),
-(1041,262,o),
-(1042,568,c),
-(1041,762,o),
-(986,995,o),
-(926,1118,c),
-(744,1118,l),
-(812,951,o),
-(870,733,o),
-(872,568,c),
-(873,326,o),
-(742,137,o),
-(556,136,cs),
-(439,137,o),
-(329,212,o),
-(328,430,c),
+(855,-14,o),
+(1022,146,o),
+(1022,400,cs),
+(1022,1118,l),
+(852,1118,l),
+(852,400,ls),
+(852,237,o),
+(751,142,o),
+(590,142,cs),
+(429,142,o),
+(328,237,o),
+(328,400,cs),
 (328,1118,l),
-(158,1118,l)
+(158,1118,l),
+(158,400,ls),
+(158,146,o),
+(325,-14,o),
+(590,-14,cs)
 );
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 anchors = (
 {
 name = top;
-pos = (588,1118);
+pos = (656,1118);
 }
 );
+background = {
+shapes = (
+{
+ref = u;
+}
+);
+};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 closed = 1;
 nodes = (
-(102,404,l),
-(101,111,o),
-(284,-20,o),
-(568,-20,cs),
-(951,-20,o),
-(1108,221,o),
-(1108,568,c),
-(1108,791,o),
-(1055,995,o),
-(992,1118,c),
-(638,1118,l),
-(689,951,o),
-(721,753,o),
-(728,568,c),
-(727,439,o),
-(668,279,o),
-(556,280,cs),
-(517,279,o),
-(488,305,o),
-(488,402,c),
-(488,1118,l),
-(102,1118,l)
-);
-}
-);
-width = 1210;
+(996,-14,o),
+(1210,169,o),
+(1210,460,cs),
+(1210,1118,l),
+(808,1118,l),
+(808,488,ls),
+(808,380,o),
+(749,312,o),
+(656,312,cs),
+(563,312,o),
+(504,380,o),
+(504,488,cs),
+(504,1118,l),
+(102,1118,l),
+(102,460,ls),
+(102,169,o),
+(315,-14,o),
+(655,-14,cs)
+);
+}
+);
+width = 1312;
 },
 {
 anchors = (
@@ -88,89 +94,181 @@ name = top;
 pos = (578,1118);
 }
 );
+background = {
+shapes = (
+{
+ref = u;
+}
+);
+};
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 closed = 1;
 nodes = (
-(198,422,ls),
-(197,137,o),
-(346,-20,o),
-(564,-20,cs),
-(837,-20,o),
-(1009,228,o),
-(1008,558,cs),
-(1008,737,o),
-(956,989,o),
-(892,1118,c),
-(840,1118,l),
-(911,967,o),
-(961,739,o),
-(962,562,cs),
-(962,252,o),
-(809,25,o),
-(562,26,cs),
-(372,27,o),
-(247,160,o),
-(246,418,cs),
+(801,-14,o),
+(958,143,o),
+(958,366,cs),
+(958,1118,l),
+(912,1118,l),
+(912,366,ls),
+(912,169,o),
+(775,32,o),
+(578,32,cs),
+(381,32,o),
+(244,169,o),
+(244,366,cs),
 (244,1118,l),
-(200,1118,l)
+(198,1118,l),
+(198,366,ls),
+(198,143,o),
+(355,-14,o),
+(578,-14,cs)
 );
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 anchors = (
 {
 name = top;
-pos = (544,1056);
+pos = (560,1056);
+}
+);
+background = {
+shapes = (
+{
+ref = u;
 }
 );
+};
 layerId = m007;
 shapes = (
 {
 closed = 1;
 nodes = (
-(128,434,l),
-(127,119,o),
-(293,-20,o),
-(532,-20,cs),
-(869,-20,o),
-(1011,262,o),
-(1012,568,c),
-(1011,762,o),
-(956,995,o),
-(896,1118,c),
-(714,1118,l),
-(782,951,o),
-(840,733,o),
-(842,568,c),
-(843,326,o),
-(712,137,o),
-(526,136,cs),
-(409,137,o),
-(299,212,o),
-(298,430,c),
-(298,1118,l),
-(128,1118,l)
-);
-}
-);
-width = 1140;
+(825,-20,o),
+(992,142,o),
+(992,400,cs),
+(992,1056,l),
+(822,1056,l),
+(822,408,ls),
+(822,234,o),
+(728,136,o),
+(560,136,cs),
+(392,136,o),
+(298,234,o),
+(298,408,cs),
+(298,1056,l),
+(128,1056,l),
+(128,400,ls),
+(128,142,o),
+(295,-20,o),
+(560,-20,cs)
+);
+}
+);
+width = 1120;
 },
 {
 anchors = (
 {
 name = top;
-pos = (572,1056);
+pos = (641,1056);
+}
+);
+background = {
+shapes = (
+{
+ref = u;
 }
 );
+};
 layerId = m009;
 shapes = (
 {
 closed = 1;
 nodes = (
+(982,-24,o),
+(1196,157,o),
+(1196,446,cs),
+(1196,1056,l),
+(796,1056,l),
+(796,472,ls),
+(796,365,o),
+(736,298,o),
+(641,298,cs),
+(546,298,o),
+(486,365,o),
+(486,472,cs),
+(486,1056,l),
+(86,1056,l),
+(86,446,ls),
+(86,157,o),
+(300,-24,o),
+(641,-24,cs)
+);
+}
+);
+width = 1282;
+},
+{
+anchors = (
+{
+name = top;
+pos = (524,1056);
+}
+);
+background = {
+shapes = (
+{
+ref = u;
+}
+);
+};
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(753,-16,o),
+(914,139,o),
+(914,368,cs),
+(914,1056,l),
+(868,1056,l),
+(868,368,ls),
+(868,165,o),
+(727,30,o),
+(524,30,cs),
+(321,30,o),
+(180,165,o),
+(180,368,cs),
+(180,1056,l),
+(134,1056,l),
+(134,368,ls),
+(134,139,o),
+(295,-16,o),
+(524,-16,cs)
+);
+}
+);
+width = 1048;
+},
+{
+anchors = (
+{
+name = top;
+pos = (572,1056);
+}
+);
+associatedMasterId = m009;
+layerId = "CCF10B8A-1011-4E12-84D1-716F7B475CE2";
+name = "Apr 14, 23, 12:06";
+shapes = (
+{
+closed = 1;
+nodes = (
 (86,404,l),
 (85,111,o),
 (268,-20,o),
@@ -197,49 +295,11 @@ nodes = (
 }
 );
 width = 1178;
-},
-{
-anchors = (
-{
-name = top;
-pos = (514,1056);
-}
-);
-layerId = m011;
-shapes = (
-{
-closed = 1;
-nodes = (
-(134,422,ls),
-(133,137,o),
-(282,-20,o),
-(500,-20,cs),
-(773,-20,o),
-(945,228,o),
-(944,558,cs),
-(944,737,o),
-(892,989,o),
-(828,1118,c),
-(776,1118,l),
-(847,967,o),
-(897,739,o),
-(898,562,cs),
-(898,252,o),
-(745,25,o),
-(498,26,cs),
-(308,27,o),
-(183,160,o),
-(182,418,cs),
-(180,1118,l),
-(136,1118,l)
-);
-}
-);
-width = 1078;
 }
 );
 metricLeft = u;
-metricRight = u;
+metricRight = "=|u";
+note = "https://en.wikipedia.org/wiki/Upsilon";
 tags = (
 "TODO-opsz-thin"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/upsilondieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/upsilondieresis.glyph
index f6cf8cb22..e364f7b09 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/upsilondieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/upsilondieresis.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-27,0);
+pos = (-11,0);
 ref = dieresis;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-77,0);
+pos = (-9,0);
 ref = dieresis;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -40,7 +40,7 @@ pos = (-4,0);
 ref = dieresis;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-25,0);
+pos = (-9,0);
 ref = dieresis;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-77,0);
+pos = (-8,0);
 ref = dieresis;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-20,0);
+pos = (-10,0);
 ref = dieresis;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/upsilondieresistonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/upsilondieresistonos.glyph
index 9e91d5238..32f93508c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/upsilondieresistonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/upsilondieresistonos.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (18,-174);
+pos = (46,0);
 ref = dieresistonos;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-28,-174);
+pos = (32,0);
 ref = dieresistonos;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (58,-174);
+pos = (98,0);
 ref = dieresistonos;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (20,-236);
+pos = (32,-49);
 ref = dieresistonos;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (-28,-236);
+pos = (49,0);
 ref = dieresistonos;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (58,-236);
+pos = (124,0);
 ref = dieresistonos;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/upsilontonos.glyph b/src/Inter-Roman.glyphspackage/glyphs/upsilontonos.glyph
index 8e8a60291..86fec9468 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/upsilontonos.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/upsilontonos.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (352,-186);
+pos = (368,0);
 ref = tonostop;
 }
 );
-width = 1200;
+width = 1180;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -23,11 +23,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (216,-164);
+pos = (284,0);
 ref = tonostop;
 }
 );
-width = 1210;
+width = 1312;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -36,11 +36,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (448,-196);
+pos = (444,0);
 ref = tonostop;
 }
 );
-width = 1206;
+width = 1156;
 },
 {
 layerId = m007;
@@ -49,11 +49,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (354,-248);
+pos = (370,0);
 ref = tonostop;
 }
 );
-width = 1140;
+width = 1120;
 },
 {
 layerId = m009;
@@ -62,11 +62,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (216,-226);
+pos = (285,0);
 ref = tonostop;
 }
 );
-width = 1178;
+width = 1282;
 },
 {
 layerId = m011;
@@ -75,11 +75,11 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (448,-258);
+pos = (453,0);
 ref = tonostop;
 }
 );
-width = 1078;
+width = 1048;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/utildeacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/utildeacute.glyph
index 51a28b1c1..28f2bf0bd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/utildeacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/utildeacute.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (90,0);
+pos = (89,0);
 ref = tildeacute.lc;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/utildebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/utildebelow.glyph
index da927a4a9..4a50a6f17 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/utildebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/utildebelow.glyph
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1163,0);
+pos = (1165,0);
 ref = tildesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/vdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/vdotbelow.glyph
index 63fa5160d..57e0b56cf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/vdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/vdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = v;
 },
 {
-pos = (1176,0);
+pos = (1170,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = v;
 },
 {
-pos = (1156,0);
+pos = (1287,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = v;
 },
 {
-pos = (1092,0);
+pos = (1119,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = v;
 },
 {
-pos = (1170,0);
+pos = (1101,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = v;
 },
 {
-pos = (1148,0);
+pos = (1243,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = v;
 },
 {
-pos = (1110,0);
+pos = (1023,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/wacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/wacute.glyph
index 3985d109e..e505a0bb7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/wacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/wacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (480,0);
+pos = (588,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (506,0);
+pos = (592,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (528,0);
+pos = (596,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (411,0);
+pos = (598,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (454,0);
+pos = (646,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (460,0);
+pos = (614,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/wcircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/wcircumflex.glyph
index 3f568a14e..a648841f6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/wcircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/wcircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (368,0);
+pos = (416,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (256,0);
+pos = (384,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (330,0);
+pos = (362,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (236,0);
+pos = (432,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (376,0);
+pos = (392,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/wdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/wdotbelow.glyph
index 55c156e5f..750d2b6ed 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/wdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/wdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (1438,0);
+pos = (1432,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (1424,0);
+pos = (1555,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (1366,0);
+pos = (1393,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (1400,0);
+pos = (1331,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (1416,0);
+pos = (1511,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (1366,0);
+pos = (1279,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/wgrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/wgrave.glyph
index 835ee1e09..ac6a3b1ae 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/wgrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/wgrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (294,0);
+pos = (422,0);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (292,0);
+pos = (378,0);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (314,0);
+pos = (443,0);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (202,0);
+pos = (432,0);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (192,0);
+pos = (384,0);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = w;
 },
 {
-pos = (250,0);
+pos = (418,0);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/yacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/yacute.glyph
index 20e93b93e..719936bb0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/yacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/yacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (218,0);
+pos = (326,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (226,0);
+pos = (312,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (256,0);
+pos = (324,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (181,0);
+pos = (368,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (182,0);
+pos = (374,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (204,0);
+pos = (358,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ycircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/ycircumflex.glyph
index 62a02ef13..d5a77373b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ycircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ycircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (106,0);
+pos = (154,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-24,0);
+pos = (104,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (100,0);
+pos = (132,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-36,0);
+pos = (160,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (120,0);
+pos = (136,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ydotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/ydotbelow.glyph
index 8331e8892..0d1563dc1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ydotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ydotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (1452,-50);
+pos = (1446,-50);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (1546,0);
+pos = (1677,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (1296,-86);
+pos = (1323,-86);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (1447,-50);
+pos = (1378,-50);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (1538,0);
+pos = (1633,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (1236,-86);
+pos = (1149,-86);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ygrave.glyph b/src/Inter-Roman.glyphspackage/glyphs/ygrave.glyph
index 795fd66b5..4cad65680 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ygrave.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ygrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (32,0);
+pos = (160,0);
 ref = grave;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (12,0);
+pos = (98,0);
 ref = grave;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (42,0);
+pos = (171,0);
 ref = grave;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-28,0);
+pos = (202,0);
 ref = grave;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-80,0);
+pos = (112,0);
 ref = grave;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = y;
 },
 {
-pos = (-6,0);
+pos = (162,0);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/yhookabove.glyph b/src/Inter-Roman.glyphspackage/glyphs/yhookabove.glyph
index 2bf114c26..aedc569e8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/yhookabove.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/yhookabove.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (1157,0);
-ref = hookabovecmb;
+pos = (305,0);
+ref = hookabove;
 }
 );
 width = 1140;
@@ -23,8 +23,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (1280,0);
-ref = hookabovecmb;
+pos = (302,0);
+ref = hookabove;
 }
 );
 width = 1240;
@@ -36,8 +36,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (1058,0);
-ref = hookabovecmb;
+pos = (316,0);
+ref = hookabove;
 }
 );
 width = 1070;
@@ -49,8 +49,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (1095,0);
-ref = hookabovecmb;
+pos = (267,0);
+ref = hookabove;
 }
 );
 width = 1064;
@@ -62,8 +62,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (1246,0);
-ref = hookabovecmb;
+pos = (269,0);
+ref = hookabove;
 }
 );
 width = 1192;
@@ -75,8 +75,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (1015,0);
-ref = hookabovecmb;
+pos = (270,0);
+ref = hookabove;
 }
 );
 width = 976;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/zacute.glyph
index 64f30ddbd..cd5f8ef7e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (200,0);
+pos = (308,0);
 ref = acute;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (216,0);
+pos = (302,0);
 ref = acute;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (240,0);
+pos = (308,0);
 ref = acute;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (137,0);
+pos = (324,0);
 ref = acute;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (162,0);
+pos = (354,0);
 ref = acute;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (175,0);
+pos = (329,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/zcaron.glyph
index 53b4ce040..0c1b6db98 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zcaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (86,0);
+pos = (136,0);
 ref = caron;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (-40,0);
+pos = (94,0);
 ref = caron;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (54,0);
+pos = (88,0);
 ref = caron;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (-56,0);
+pos = (140,0);
 ref = caron;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (91,0);
+pos = (107,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zcircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/zcircumflex.glyph
index 13578f10c..44ac9f562 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zcircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zcircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (88,0);
+pos = (136,0);
 ref = circumflex;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (-34,0);
+pos = (94,0);
 ref = circumflex;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (56,0);
+pos = (88,0);
 ref = circumflex;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (-56,0);
+pos = (140,0);
 ref = circumflex;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (91,0);
+pos = (107,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/zdotbelow.glyph
index 010a3784c..59e71fc2f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (1152,0);
+pos = (1146,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (1146,0);
+pos = (1277,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (1062,0);
+pos = (1089,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (1127,0);
+pos = (1058,0);
 ref = dotbelow;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (1126,0);
+pos = (1221,0);
 ref = dotbelow;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (1079,0);
+pos = (992,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zeta.glyph b/src/Inter-Roman.glyphspackage/glyphs/zeta.glyph
index 97176396d..666964a17 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zeta.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zeta.glyph
@@ -1,5 +1,6 @@
 {
 glyphname = zeta;
+kernLeft = seven;
 layers = (
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
@@ -160,6 +161,13 @@ nodes = (
 width = 1016;
 },
 {
+background = {
+shapes = (
+{
+ref = seven;
+}
+);
+};
 layerId = m007;
 shapes = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zlinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/zlinebelow.glyph
index da1eb5028..7b6ea956a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zlinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zlinebelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (1144,0);
-ref = macronsubnosp;
+pos = (58,0);
+ref = macronsub;
 }
 );
 width = 1126;
@@ -23,8 +23,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (1276,0);
-ref = macronsubnosp;
+pos = (194,0);
+ref = macronsub;
 }
 );
 width = 1208;
@@ -36,8 +36,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (1079,0);
-ref = macronsubnosp;
+pos = (104,0);
+ref = macronsub;
 }
 );
 width = 1072;
@@ -49,8 +49,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (1049,0);
-ref = macronsubnosp;
+pos = (73,0);
+ref = macronsub;
 }
 );
 width = 980;
@@ -62,8 +62,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (1219,0);
-ref = macronsubnosp;
+pos = (190,0);
+ref = macronsub;
 }
 );
 width = 1148;
@@ -75,8 +75,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (986,0);
-ref = macronsubnosp;
+pos = (73,0);
+ref = macronsub;
 }
 );
 width = 914;