convert marks to put anchors in *comb glyphs (and adjust comb glyph width to friendly-to-edit values since postprocessing zeroes their advance width anyways)

930 files changed, 10010 insertions, 11159 deletions

diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_.glyph
index 4bc08bc59..b73082a2f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = A;
 kernLeft = A;
 kernRight = A;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_E_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_E_acute.glyph
index 65c44665b..89639b434 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_E_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_E_acute.glyph
@@ -5,78 +5,84 @@ kernRight = E;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = AE;
 },
 {
-pos = (1173,558);
-ref = acute;
+pos = (1293,558);
+ref = acutecomb;
 }
 );
 width = 2026;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = AE;
 },
 {
-pos = (1142,558);
-ref = acute;
+pos = (1272,558);
+ref = acutecomb;
 }
 );
 width = 2164;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = AE;
 },
 {
-pos = (1137,558);
-ref = acute;
+pos = (1277,558);
+ref = acutecomb;
 }
 );
 width = 1964;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = AE;
 },
 {
-pos = (1226,620);
-ref = acute;
+pos = (1266,620);
+ref = acutecomb;
 }
 );
 width = 1954;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = AE;
 },
 {
-pos = (1199,620);
-ref = acute;
+pos = (1223,620);
+ref = acutecomb;
 }
 );
 width = 2133;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = AE;
 },
 {
-pos = (1164,620);
-ref = acute;
+pos = (1224,620);
+ref = acutecomb;
 }
 );
 width = 1836;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_E_macron.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_E_macron.glyph
index f4a664954..50c3857eb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_E_macron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_E_macron.glyph
@@ -5,78 +5,84 @@ kernRight = E;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = AE;
 },
 {
 pos = (930,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 2026;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = AE;
 },
 {
 pos = (1029,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 2164;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = AE;
 },
 {
 pos = (949,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1964;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = AE;
 },
 {
-pos = (975,620);
-ref = macron;
+pos = (974,620);
+ref = macroncomb;
 }
 );
 width = 1954;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = AE;
 },
 {
 pos = (1032,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 2133;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = AE;
 },
 {
 pos = (910,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1836;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_acute.glyph
index 14255a085..fec4da717 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_acute.glyph
@@ -5,78 +5,84 @@ kernRight = A;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
-pos = (541,558);
-ref = acute;
+pos = (661,558);
+ref = acutecomb;
 }
 );
 width = 1386;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
-pos = (604,558);
-ref = acute;
+pos = (734,558);
+ref = acutecomb;
 }
 );
 width = 1630;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
-pos = (513,558);
-ref = acute;
+pos = (653,558);
+ref = acutecomb;
 }
 );
 width = 1262;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
-pos = (606,620);
-ref = acute;
+pos = (646,620);
+ref = acutecomb;
 }
 );
 width = 1338;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
-pos = (653,620);
-ref = acute;
+pos = (677,620);
+ref = acutecomb;
 }
 );
 width = 1536;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
-pos = (540,620);
-ref = acute;
+pos = (600,620);
+ref = acutecomb;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_breve.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_breve.glyph
index f3eec978e..651cdc8c8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_breve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_breve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (295,372);
-ref = breve;
+pos = (402,558);
+ref = brevecomb;
 }
 );
 width = 1386;
@@ -23,8 +23,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (365,372);
-ref = breve;
+pos = (428,558);
+ref = brevecomb;
 }
 );
 width = 1630;
@@ -36,8 +36,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (279,372);
-ref = breve;
+pos = (374,558);
+ref = brevecomb;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (308,414);
-ref = breve;
+pos = (371,620);
+ref = brevecomb;
 }
 );
 width = 1338;
@@ -62,8 +62,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (340,414);
-ref = breve;
+pos = (390,620);
+ref = brevecomb;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (226,414);
-ref = breve;
+pos = (318,620);
+ref = brevecomb;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_brevecyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_brevecyrillic.glyph
index 5f978916f..e5c85b0c8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_brevecyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_brevecyrillic.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (295,372);
-ref = breve;
+pos = (402,558);
+ref = brevecomb;
 }
 );
 width = 1386;
@@ -23,8 +23,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (365,372);
-ref = breve;
+pos = (428,558);
+ref = brevecomb;
 }
 );
 width = 1630;
@@ -36,8 +36,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (279,372);
-ref = breve;
+pos = (374,558);
+ref = brevecomb;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (308,414);
-ref = breve;
+pos = (371,620);
+ref = brevecomb;
 }
 );
 width = 1338;
@@ -62,8 +62,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (340,414);
-ref = breve;
+pos = (390,620);
+ref = brevecomb;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (226,414);
-ref = breve;
+pos = (318,620);
+ref = brevecomb;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_brevedotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_brevedotbelow.glyph
index bad79c95c..554f75531 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_brevedotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_brevedotbelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (295,372);
-ref = breve;
+pos = (402,558);
+ref = brevecomb;
 },
 {
 pos = (1296,0);
@@ -27,8 +27,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (365,372);
-ref = breve;
+pos = (428,558);
+ref = brevecomb;
 },
 {
 pos = (1352,0);
@@ -44,8 +44,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (279,372);
-ref = breve;
+pos = (374,558);
+ref = brevecomb;
 },
 {
 pos = (1190,0);
@@ -61,8 +61,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (308,414);
-ref = breve;
+pos = (371,620);
+ref = brevecomb;
 },
 {
 pos = (1309,0);
@@ -78,8 +78,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (340,414);
-ref = breve;
+pos = (390,620);
+ref = brevecomb;
 },
 {
 pos = (1327,0);
@@ -95,8 +95,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (226,414);
-ref = breve;
+pos = (318,620);
+ref = brevecomb;
 },
 {
 pos = (1197,0);
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_brevehookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_brevehookabove.glyph
index b70c16fef..deaffc39c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_brevehookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_brevehookabove.glyph
@@ -11,7 +11,7 @@ ref = A;
 },
 {
 pos = (462,558);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1386;
@@ -24,7 +24,7 @@ ref = A;
 },
 {
 pos = (451,558);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1630;
@@ -37,7 +37,7 @@ ref = A;
 },
 {
 pos = (518,558);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1262;
@@ -50,7 +50,7 @@ ref = A;
 },
 {
 pos = (382,620);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1338;
@@ -63,7 +63,7 @@ ref = A;
 },
 {
 pos = (399,620);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1536;
@@ -76,7 +76,7 @@ ref = A;
 },
 {
 pos = (457,620);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_caron.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_caron.glyph
index eb33e7427..06f2cb001 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_caron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_caron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (288,372);
-ref = caron;
+pos = (369,558);
+ref = caroncomb;
 }
 );
 width = 1386;
@@ -23,8 +23,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (231,372);
-ref = caron;
+pos = (396,558);
+ref = caroncomb;
 }
 );
 width = 1630;
@@ -36,8 +36,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (267,388);
-ref = caron;
+pos = (294,558);
+ref = caroncomb;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (302,414);
-ref = caron;
+pos = (371,620);
+ref = caroncomb;
 }
 );
 width = 1338;
@@ -62,8 +62,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (207,414);
-ref = caron;
+pos = (438,620);
+ref = caroncomb;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (274,414);
-ref = caron;
+pos = (319,620);
+ref = caroncomb;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_circumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_circumflex.glyph
index 5a2fbdca5..57562639f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_circumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_circumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (290,372);
-ref = circumflex;
+pos = (369,558);
+ref = circumflexcomb;
 }
 );
 width = 1386;
@@ -23,8 +23,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (230,372);
-ref = circumflex;
+pos = (396,558);
+ref = circumflexcomb;
 }
 );
 width = 1630;
@@ -36,8 +36,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (263,372);
-ref = circumflex;
+pos = (293,558);
+ref = circumflexcomb;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (304,414);
-ref = circumflex;
+pos = (370,620);
+ref = circumflexcomb;
 }
 );
 width = 1338;
@@ -62,8 +62,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (206,414);
-ref = circumflex;
+pos = (439,620);
+ref = circumflexcomb;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (277,414);
-ref = circumflex;
+pos = (318,620);
+ref = circumflexcomb;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_circumflexdotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_circumflexdotbelow.glyph
index 880cba55d..80eaf9d26 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_circumflexdotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_circumflexdotbelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (290,372);
-ref = circumflex;
+pos = (369,558);
+ref = circumflexcomb;
 },
 {
 pos = (1296,0);
@@ -27,8 +27,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (230,372);
-ref = circumflex;
+pos = (396,558);
+ref = circumflexcomb;
 },
 {
 pos = (1352,0);
@@ -44,8 +44,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (263,372);
-ref = circumflex;
+pos = (293,558);
+ref = circumflexcomb;
 },
 {
 pos = (1190,0);
@@ -61,8 +61,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (304,414);
-ref = circumflex;
+pos = (370,620);
+ref = circumflexcomb;
 },
 {
 pos = (1309,0);
@@ -78,8 +78,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (206,414);
-ref = circumflex;
+pos = (439,620);
+ref = circumflexcomb;
 },
 {
 pos = (1327,0);
@@ -95,8 +95,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (277,414);
-ref = circumflex;
+pos = (318,620);
+ref = circumflexcomb;
 },
 {
 pos = (1197,0);
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_dieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_dieresis.glyph
index 94bac2d7f..221f51973 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_dieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_dieresis.glyph
@@ -11,7 +11,7 @@ ref = A;
 },
 {
 pos = (184,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1386;
@@ -30,7 +30,7 @@ ref = A;
 },
 {
 pos = (242,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1630;
@@ -43,7 +43,7 @@ ref = A;
 },
 {
 pos = (143,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1262;
@@ -56,7 +56,7 @@ ref = A;
 },
 {
 pos = (201,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1338;
@@ -75,7 +75,7 @@ ref = A;
 },
 {
 pos = (221,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1536;
@@ -88,7 +88,7 @@ ref = A;
 },
 {
 pos = (136,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_grave.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_grave.glyph
index 19021aa24..01c27b0b1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_grave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_grave.glyph
@@ -11,7 +11,7 @@ ref = A;
 },
 {
 pos = (376,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1386;
@@ -24,7 +24,7 @@ ref = A;
 },
 {
 pos = (390,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1630;
@@ -37,7 +37,7 @@ ref = A;
 },
 {
 pos = (361,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1262;
@@ -50,7 +50,7 @@ ref = A;
 },
 {
 pos = (441,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1338;
@@ -63,7 +63,7 @@ ref = A;
 },
 {
 pos = (390,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (345,620);
-ref = grave;
+pos = (349,620);
+ref = gravecomb;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_hookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_hookabove.glyph
index 2852ac58e..5f98aee5f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_hookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_hookabove.glyph
@@ -11,7 +11,7 @@ ref = A;
 },
 {
 pos = (521,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1386;
@@ -24,7 +24,7 @@ ref = A;
 },
 {
 pos = (594,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1630;
@@ -37,7 +37,7 @@ ref = A;
 },
 {
 pos = (505,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1262;
@@ -50,7 +50,7 @@ ref = A;
 },
 {
 pos = (506,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1338;
@@ -63,7 +63,7 @@ ref = A;
 },
 {
 pos = (547,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (452,620);
-ref = hookabove;
+pos = (446,620);
+ref = hookabovecomb;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_invertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_invertedbreve.glyph
index 6c23315de..17f47a93a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_invertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_invertedbreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1382,558);
-ref = breveinvnosp;
+pos = (369,558);
+ref = breveinvcomb;
 }
 );
 width = 1386;
@@ -23,8 +23,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1570,558);
-ref = breveinvnosp;
+pos = (396,558);
+ref = breveinvcomb;
 }
 );
 width = 1630;
@@ -36,8 +36,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1308,558);
-ref = breveinvnosp;
+pos = (363,558);
+ref = breveinvcomb;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1333,620);
-ref = breveinvnosp;
+pos = (370,620);
+ref = breveinvcomb;
 }
 );
 width = 1338;
@@ -62,8 +62,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1521,620);
-ref = breveinvnosp;
+pos = (439,620);
+ref = breveinvcomb;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (1199,620);
-ref = breveinvnosp;
+pos = (318,620);
+ref = breveinvcomb;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_macron.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_macron.glyph
index 5c2cfcac0..c92ff40bb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_macron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_macron.glyph
@@ -5,78 +5,84 @@ kernRight = A;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
 pos = (298,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1386;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
 pos = (491,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1630;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
 pos = (325,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1262;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
-pos = (355,620);
-ref = macron;
+pos = (354,620);
+ref = macroncomb;
 }
 );
 width = 1338;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
 pos = (486,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1536;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
 pos = (286,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_ring.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_ring.glyph
index bc47ac02d..7566c027d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_ring.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_ring.glyph
@@ -11,7 +11,7 @@ ref = A;
 },
 {
 pos = (366,0);
-ref = ring.uc;
+ref = ringcomb.uc;
 }
 );
 width = 1386;
@@ -24,7 +24,7 @@ ref = A;
 },
 {
 pos = (376,0);
-ref = ring.uc;
+ref = ringcomb.uc;
 }
 );
 width = 1630;
@@ -37,7 +37,7 @@ ref = A;
 },
 {
 pos = (388,0);
-ref = ring.uc;
+ref = ringcomb.uc;
 }
 );
 width = 1262;
@@ -50,7 +50,7 @@ ref = A;
 },
 {
 pos = (378,0);
-ref = ring.uc;
+ref = ringcomb.uc;
 }
 );
 width = 1338;
@@ -63,7 +63,7 @@ ref = A;
 },
 {
 pos = (350,0);
-ref = ring.uc;
+ref = ringcomb.uc;
 }
 );
 width = 1536;
@@ -76,7 +76,7 @@ ref = A;
 },
 {
 pos = (392,0);
-ref = ring.uc;
+ref = ringcomb.uc;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_ringogonek.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_ringogonek.glyph
index 95ca16cda..0af1d7d08 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_ringogonek.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_ringogonek.glyph
@@ -11,7 +11,7 @@ ref = Aring;
 },
 {
 pos = (922,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1262;
@@ -24,7 +24,7 @@ ref = Aring;
 },
 {
 pos = (897,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1386;
@@ -37,7 +37,7 @@ ref = Aring;
 },
 {
 pos = (1053,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1630;
@@ -50,7 +50,7 @@ ref = Aring;
 },
 {
 pos = (914,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1338;
@@ -63,7 +63,7 @@ ref = Aring;
 },
 {
 pos = (970,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = Aring;
 },
 {
-pos = (862,0);
-ref = ogonek;
+pos = (857,0);
+ref = ogonekcomb;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/A_tilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/A_tilde.glyph
index 2a1882127..13476845f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/A_tilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/A_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (243,372);
-ref = tilde;
+pos = (273,558);
+ref = tildecomb;
 }
 );
 width = 1386;
@@ -23,8 +23,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (365,372);
-ref = tilde;
+pos = (395,558);
+ref = tildecomb;
 }
 );
 width = 1630;
@@ -36,8 +36,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (184,372);
-ref = tilde;
+pos = (222,558);
+ref = tildecomb;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (257,414);
-ref = tilde;
+pos = (290,620);
+ref = tildecomb;
 }
 );
 width = 1338;
@@ -62,8 +62,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (324,414);
-ref = tilde;
+pos = (358,620);
+ref = tildecomb;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (193,414);
-ref = tilde;
+pos = (223,620);
+ref = tildecomb;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/B_.glyph b/src/Inter-Italic.glyphspackage/glyphs/B_.glyph
index 334bbffee..a10a6dda6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/B_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/B_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = B;
 kernLeft = B;
 kernRight = B;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/B_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/B_dotaccent.glyph
index 5b4b0dca2..ae86c4a30 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/B_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/B_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = B;
 },
 {
-pos = (454,372);
-ref = dotaccent;
+pos = (485,558);
+ref = dotaccentcomb;
 }
 );
 width = 1332;
@@ -25,8 +25,8 @@ shapes = (
 ref = B;
 },
 {
-pos = (392,372);
-ref = dotaccent;
+pos = (423,558);
+ref = dotaccentcomb;
 }
 );
 width = 1368;
@@ -39,8 +39,8 @@ shapes = (
 ref = B;
 },
 {
-pos = (494,372);
-ref = dotaccent;
+pos = (525,558);
+ref = dotaccentcomb;
 }
 );
 width = 1311;
@@ -53,8 +53,8 @@ shapes = (
 ref = B;
 },
 {
-pos = (462,414);
-ref = dotaccent;
+pos = (496,620);
+ref = dotaccentcomb;
 }
 );
 width = 1269;
@@ -67,8 +67,8 @@ shapes = (
 ref = B;
 },
 {
-pos = (398,414);
-ref = dotaccent;
+pos = (432,620);
+ref = dotaccentcomb;
 }
 );
 width = 1329;
@@ -81,8 +81,8 @@ shapes = (
 ref = B;
 },
 {
-pos = (502,414);
-ref = dotaccent;
+pos = (530,620);
+ref = dotaccentcomb;
 }
 );
 width = 1178;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/B_linebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/B_linebelow.glyph
index b727eda8a..67a7aedea 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/B_linebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/B_linebelow.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = B;
 },
 {
-pos = (198,0);
+pos = (199,0);
 ref = macronsub;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = B;
 },
 {
-pos = (265,0);
+pos = (264,0);
 ref = macronsub;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/C_.glyph b/src/Inter-Italic.glyphspackage/glyphs/C_.glyph
index 0bb679dfa..fdbc76ecc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/C_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/C_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = C;
 kernLeft = C;
 kernRight = C;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/C_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/C_acute.glyph
index 9b8f05284..526d0b524 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/C_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/C_acute.glyph
@@ -5,78 +5,84 @@ kernRight = C;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = C;
 },
 {
-pos = (629,558);
-ref = acute;
+pos = (749,558);
+ref = acutecomb;
 }
 );
 width = 1491;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = C;
 },
 {
-pos = (598,558);
-ref = acute;
+pos = (728,558);
+ref = acutecomb;
 }
 );
 width = 1575;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = C;
 },
 {
-pos = (647,558);
-ref = acute;
+pos = (787,558);
+ref = acutecomb;
 }
 );
 width = 1481;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = C;
 },
 {
-pos = (696,620);
-ref = acute;
+pos = (736,620);
+ref = acutecomb;
 }
 );
 width = 1480;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = C;
 },
 {
-pos = (643,620);
-ref = acute;
+pos = (667,620);
+ref = acutecomb;
 }
 );
 width = 1509;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = C;
 },
 {
-pos = (670,620);
-ref = acute;
+pos = (730,620);
+ref = acutecomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/C_caron.glyph b/src/Inter-Italic.glyphspackage/glyphs/C_caron.glyph
index e86156e15..f5d8110f0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/C_caron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/C_caron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (376,372);
-ref = caron;
+pos = (457,558);
+ref = caroncomb;
 }
 );
 width = 1491;
@@ -23,8 +23,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (225,372);
-ref = caron;
+pos = (390,558);
+ref = caroncomb;
 }
 );
 width = 1575;
@@ -36,8 +36,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (401,388);
-ref = caron;
+pos = (428,558);
+ref = caroncomb;
 }
 );
 width = 1481;
@@ -49,8 +49,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (392,414);
-ref = caron;
+pos = (461,620);
+ref = caroncomb;
 }
 );
 width = 1480;
@@ -62,8 +62,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (197,414);
-ref = caron;
+pos = (428,620);
+ref = caroncomb;
 }
 );
 width = 1509;
@@ -75,8 +75,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (404,414);
-ref = caron;
+pos = (449,620);
+ref = caroncomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/C_cedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/C_cedilla.glyph
index 50cead71c..6674fffae 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/C_cedilla.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/C_cedilla.glyph
@@ -11,7 +11,7 @@ ref = C;
 },
 {
 pos = (500,-12);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1491;
@@ -24,7 +24,7 @@ ref = C;
 },
 {
 pos = (345,6);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1575;
@@ -37,7 +37,7 @@ ref = C;
 },
 {
 pos = (552,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1481;
@@ -50,7 +50,7 @@ ref = C;
 },
 {
 pos = (517,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1480;
@@ -63,7 +63,7 @@ ref = C;
 },
 {
 pos = (316,6);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1509;
@@ -76,7 +76,7 @@ ref = C;
 },
 {
 pos = (552,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/C_cedillaacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/C_cedillaacute.glyph
index 0323fa2f7..0e80b5cf5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/C_cedillaacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/C_cedillaacute.glyph
@@ -5,102 +5,108 @@ kernRight = C;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = C;
 },
 {
 pos = (500,-12);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (629,558);
-ref = acute;
+pos = (749,558);
+ref = acutecomb;
 }
 );
 width = 1491;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = C;
 },
 {
 pos = (345,6);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (598,558);
-ref = acute;
+pos = (728,558);
+ref = acutecomb;
 }
 );
 width = 1575;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = C;
 },
 {
 pos = (552,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (647,558);
-ref = acute;
+pos = (787,558);
+ref = acutecomb;
 }
 );
 width = 1481;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = C;
 },
 {
 pos = (517,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (696,620);
-ref = acute;
+pos = (736,620);
+ref = acutecomb;
 }
 );
 width = 1480;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = C;
 },
 {
 pos = (316,6);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (643,620);
-ref = acute;
+pos = (667,620);
+ref = acutecomb;
 }
 );
 width = 1509;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = C;
 },
 {
 pos = (552,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (670,620);
-ref = acute;
+pos = (730,620);
+ref = acutecomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/C_circumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/C_circumflex.glyph
index 537fb0388..c7f6ccac1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/C_circumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/C_circumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (378,372);
-ref = circumflex;
+pos = (457,558);
+ref = circumflexcomb;
 }
 );
 width = 1491;
@@ -23,8 +23,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (224,372);
-ref = circumflex;
+pos = (390,558);
+ref = circumflexcomb;
 }
 );
 width = 1575;
@@ -36,8 +36,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (397,372);
-ref = circumflex;
+pos = (427,558);
+ref = circumflexcomb;
 }
 );
 width = 1481;
@@ -49,8 +49,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (394,414);
-ref = circumflex;
+pos = (460,620);
+ref = circumflexcomb;
 }
 );
 width = 1480;
@@ -62,8 +62,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (196,414);
-ref = circumflex;
+pos = (429,620);
+ref = circumflexcomb;
 }
 );
 width = 1509;
@@ -75,8 +75,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (407,414);
-ref = circumflex;
+pos = (448,620);
+ref = circumflexcomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/C_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/C_dotaccent.glyph
index 8dedc9385..dbe73d6ec 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/C_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/C_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (598,372);
-ref = dotaccent;
+pos = (629,558);
+ref = dotaccentcomb;
 }
 );
 width = 1491;
@@ -25,8 +25,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (536,372);
-ref = dotaccent;
+pos = (567,558);
+ref = dotaccentcomb;
 }
 );
 width = 1575;
@@ -39,8 +39,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (642,372);
-ref = dotaccent;
+pos = (673,558);
+ref = dotaccentcomb;
 }
 );
 width = 1481;
@@ -53,8 +53,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (614,414);
-ref = dotaccent;
+pos = (648,620);
+ref = dotaccentcomb;
 }
 );
 width = 1480;
@@ -67,8 +67,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (506,414);
-ref = dotaccent;
+pos = (540,620);
+ref = dotaccentcomb;
 }
 );
 width = 1509;
@@ -81,8 +81,8 @@ shapes = (
 ref = C;
 },
 {
-pos = (650,414);
-ref = dotaccent;
+pos = (678,620);
+ref = dotaccentcomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/C_hedieresiscyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/C_hedieresiscyrillic.glyph
index 6a50b7f3f..d7504a600 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/C_hedieresiscyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/C_hedieresiscyrillic.glyph
@@ -10,7 +10,7 @@ ref = "Che-cy";
 },
 {
 pos = (214,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1448;
@@ -24,7 +24,7 @@ ref = "Che-cy";
 },
 {
 pos = (158,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1468;
@@ -38,7 +38,7 @@ ref = "Che-cy";
 },
 {
 pos = (225,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1438;
@@ -52,7 +52,7 @@ ref = "Che-cy";
 },
 {
 pos = (225,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1384;
@@ -66,7 +66,7 @@ ref = "Che-cy";
 },
 {
 pos = (169,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1436;
@@ -80,7 +80,7 @@ ref = "Che-cy";
 },
 {
 pos = (213,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1309;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_.glyph
index 9b9c3e5f6..a7b023956 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = D;
 kernLeft = B;
 kernRight = D;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_caron.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_caron.glyph
index 7fb811155..b587fe16c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_caron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_caron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (180,186);
-ref = caron;
+pos = (261,372);
+ref = caroncomb;
 }
 );
 width = 1472;
@@ -23,8 +23,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (-21,186);
-ref = caron;
+pos = (144,372);
+ref = caroncomb;
 }
 );
 width = 1499;
@@ -36,8 +36,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (235,202);
-ref = caron;
+pos = (262,372);
+ref = caroncomb;
 }
 );
 width = 1461;
@@ -49,8 +49,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (188,228);
-ref = caron;
+pos = (257,434);
+ref = caroncomb;
 }
 );
 width = 1413;
@@ -62,8 +62,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (-5,228);
-ref = caron;
+pos = (226,434);
+ref = caroncomb;
 }
 );
 width = 1456;
@@ -75,8 +75,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (238,228);
-ref = caron;
+pos = (283,434);
+ref = caroncomb;
 }
 );
 width = 1333;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_circumflexbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_circumflexbelow.glyph
index ae9703c49..5422776f4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_circumflexbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_circumflexbelow.glyph
@@ -11,7 +11,7 @@ ref = D;
 },
 {
 pos = (1203,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1472;
@@ -24,7 +24,7 @@ ref = D;
 },
 {
 pos = (1347,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1499;
@@ -37,7 +37,7 @@ ref = D;
 },
 {
 pos = (1101,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1461;
@@ -50,7 +50,7 @@ ref = D;
 },
 {
 pos = (1204,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1413;
@@ -63,7 +63,7 @@ ref = D;
 },
 {
 pos = (1357,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1456;
@@ -76,7 +76,7 @@ ref = D;
 },
 {
 pos = (1094,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1333;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_dotaccent.glyph
index 44e64a4b4..623e25419 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (402,186);
-ref = dotaccent;
+pos = (433,372);
+ref = dotaccentcomb;
 }
 );
 width = 1472;
@@ -25,8 +25,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (290,186);
-ref = dotaccent;
+pos = (321,372);
+ref = dotaccentcomb;
 }
 );
 width = 1499;
@@ -39,8 +39,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (476,186);
-ref = dotaccent;
+pos = (507,372);
+ref = dotaccentcomb;
 }
 );
 width = 1461;
@@ -53,8 +53,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (410,228);
-ref = dotaccent;
+pos = (444,434);
+ref = dotaccentcomb;
 }
 );
 width = 1413;
@@ -67,8 +67,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (304,228);
-ref = dotaccent;
+pos = (338,434);
+ref = dotaccentcomb;
 }
 );
 width = 1456;
@@ -81,8 +81,8 @@ shapes = (
 ref = D;
 },
 {
-pos = (484,228);
-ref = dotaccent;
+pos = (512,434);
+ref = dotaccentcomb;
 }
 );
 width = 1333;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_linebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_linebelow.glyph
index 091bd68db..4e5d13006 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_linebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_linebelow.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (174,0);
+pos = (175,0);
 ref = macronsub;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = D;
 },
 {
-pos = (283,0);
+pos = (282,0);
 ref = macronsub;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_.glyph
index 675d1c131..0afbddab3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = E;
 kernLeft = B;
 kernRight = E;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_acute.glyph
index 7d5d7b394..a05ab997f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_acute.glyph
@@ -5,78 +5,84 @@ kernRight = E;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = E;
 },
 {
-pos = (477,558);
-ref = acute;
+pos = (597,558);
+ref = acutecomb;
 }
 );
 width = 1224;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = E;
 },
 {
-pos = (429,558);
-ref = acute;
+pos = (559,558);
+ref = acutecomb;
 }
 );
 width = 1275;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = E;
 },
 {
-pos = (513,558);
-ref = acute;
+pos = (653,558);
+ref = acutecomb;
 }
 );
 width = 1196;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = E;
 },
 {
-pos = (534,620);
-ref = acute;
+pos = (574,620);
+ref = acutecomb;
 }
 );
 width = 1160;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = E;
 },
 {
-pos = (515,620);
-ref = acute;
+pos = (539,620);
+ref = acutecomb;
 }
 );
 width = 1260;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = E;
 },
 {
-pos = (536,620);
-ref = acute;
+pos = (596,620);
+ref = acutecomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_breve.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_breve.glyph
index 3594a0883..114ef195a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_breve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_breve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (231,372);
-ref = breve;
+pos = (338,558);
+ref = brevecomb;
 }
 );
 width = 1224;
@@ -23,8 +23,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (190,372);
-ref = breve;
+pos = (253,558);
+ref = brevecomb;
 }
 );
 width = 1275;
@@ -36,8 +36,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (279,372);
-ref = breve;
+pos = (374,558);
+ref = brevecomb;
 }
 );
 width = 1196;
@@ -49,8 +49,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (236,414);
-ref = breve;
+pos = (299,620);
+ref = brevecomb;
 }
 );
 width = 1160;
@@ -62,8 +62,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (202,414);
-ref = breve;
+pos = (252,620);
+ref = brevecomb;
 }
 );
 width = 1260;
@@ -75,8 +75,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (222,414);
-ref = breve;
+pos = (314,620);
+ref = brevecomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_caron.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_caron.glyph
index 8ad3b328d..e0a5bbecc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_caron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_caron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (224,372);
-ref = caron;
+pos = (305,558);
+ref = caroncomb;
 }
 );
 width = 1224;
@@ -23,8 +23,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (56,372);
-ref = caron;
+pos = (221,558);
+ref = caroncomb;
 }
 );
 width = 1275;
@@ -36,8 +36,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (267,388);
-ref = caron;
+pos = (294,558);
+ref = caroncomb;
 }
 );
 width = 1196;
@@ -49,8 +49,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (230,414);
-ref = caron;
+pos = (299,620);
+ref = caroncomb;
 }
 );
 width = 1160;
@@ -62,8 +62,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (69,414);
-ref = caron;
+pos = (300,620);
+ref = caroncomb;
 }
 );
 width = 1260;
@@ -75,8 +75,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (270,414);
-ref = caron;
+pos = (315,620);
+ref = caroncomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_cedillabreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_cedillabreve.glyph
index ffc91897e..12a5637d4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_cedillabreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_cedillabreve.glyph
@@ -11,11 +11,11 @@ ref = E;
 },
 {
 pos = (338,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (231,372);
-ref = breve;
+pos = (338,558);
+ref = brevecomb;
 }
 );
 width = 1224;
@@ -28,11 +28,11 @@ ref = E;
 },
 {
 pos = (183,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (190,372);
-ref = breve;
+pos = (253,558);
+ref = brevecomb;
 }
 );
 width = 1275;
@@ -45,11 +45,11 @@ ref = E;
 },
 {
 pos = (388,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (279,372);
-ref = breve;
+pos = (374,558);
+ref = brevecomb;
 }
 );
 width = 1196;
@@ -62,11 +62,11 @@ ref = E;
 },
 {
 pos = (343,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (236,414);
-ref = breve;
+pos = (299,620);
+ref = brevecomb;
 }
 );
 width = 1160;
@@ -79,11 +79,11 @@ ref = E;
 },
 {
 pos = (197,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (202,414);
-ref = breve;
+pos = (252,620);
+ref = brevecomb;
 }
 );
 width = 1260;
@@ -96,11 +96,11 @@ ref = E;
 },
 {
 pos = (387,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (222,414);
-ref = breve;
+pos = (314,620);
+ref = brevecomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_circumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_circumflex.glyph
index 33b9d0706..33ee1f752 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_circumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_circumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (226,372);
-ref = circumflex;
+pos = (305,558);
+ref = circumflexcomb;
 }
 );
 width = 1224;
@@ -23,8 +23,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (55,372);
-ref = circumflex;
+pos = (221,558);
+ref = circumflexcomb;
 }
 );
 width = 1275;
@@ -36,8 +36,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (263,372);
-ref = circumflex;
+pos = (293,558);
+ref = circumflexcomb;
 }
 );
 width = 1196;
@@ -49,8 +49,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (232,414);
-ref = circumflex;
+pos = (298,620);
+ref = circumflexcomb;
 }
 );
 width = 1160;
@@ -62,8 +62,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (68,414);
-ref = circumflex;
+pos = (301,620);
+ref = circumflexcomb;
 }
 );
 width = 1260;
@@ -75,8 +75,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (273,414);
-ref = circumflex;
+pos = (314,620);
+ref = circumflexcomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_circumflexbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_circumflexbelow.glyph
index 95e1482a0..9c42e80f6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_circumflexbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_circumflexbelow.glyph
@@ -11,7 +11,7 @@ ref = E;
 },
 {
 pos = (1194,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1224;
@@ -24,7 +24,7 @@ ref = E;
 },
 {
 pos = (1311,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1275;
@@ -37,7 +37,7 @@ ref = E;
 },
 {
 pos = (1110,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1196;
@@ -50,7 +50,7 @@ ref = E;
 },
 {
 pos = (1196,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1160;
@@ -63,7 +63,7 @@ ref = E;
 },
 {
 pos = (1321,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1260;
@@ -76,7 +76,7 @@ ref = E;
 },
 {
 pos = (1104,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_circumflexdotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_circumflexdotbelow.glyph
index 60f3f280b..48660fbb0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_circumflexdotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_circumflexdotbelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (226,372);
-ref = circumflex;
+pos = (305,558);
+ref = circumflexcomb;
 },
 {
 pos = (1216,0);
@@ -27,8 +27,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (55,372);
-ref = circumflex;
+pos = (221,558);
+ref = circumflexcomb;
 },
 {
 pos = (1175,0);
@@ -44,8 +44,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (263,372);
-ref = circumflex;
+pos = (293,558);
+ref = circumflexcomb;
 },
 {
 pos = (1158,0);
@@ -61,8 +61,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (232,414);
-ref = circumflex;
+pos = (298,620);
+ref = circumflexcomb;
 },
 {
 pos = (1223,0);
@@ -78,8 +78,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (68,414);
-ref = circumflex;
+pos = (301,620);
+ref = circumflexcomb;
 },
 {
 pos = (1189,0);
@@ -95,8 +95,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (273,414);
-ref = circumflex;
+pos = (314,620);
+ref = circumflexcomb;
 },
 {
 pos = (1159,0);
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_dieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_dieresis.glyph
index 91db43b44..fbfb9023c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_dieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_dieresis.glyph
@@ -11,7 +11,7 @@ ref = E;
 },
 {
 pos = (120,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1224;
@@ -24,7 +24,7 @@ ref = E;
 },
 {
 pos = (67,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1275;
@@ -37,7 +37,7 @@ ref = E;
 },
 {
 pos = (143,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1196;
@@ -50,7 +50,7 @@ ref = E;
 },
 {
 pos = (129,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1160;
@@ -63,7 +63,7 @@ ref = E;
 },
 {
 pos = (83,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1260;
@@ -76,7 +76,7 @@ ref = E;
 },
 {
 pos = (132,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_dotaccent.glyph
index 27361f8bb..96532658a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (446,372);
-ref = dotaccent;
+pos = (477,558);
+ref = dotaccentcomb;
 }
 );
 width = 1224;
@@ -25,8 +25,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (367,372);
-ref = dotaccent;
+pos = (398,558);
+ref = dotaccentcomb;
 }
 );
 width = 1275;
@@ -39,8 +39,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (508,372);
-ref = dotaccent;
+pos = (539,558);
+ref = dotaccentcomb;
 }
 );
 width = 1196;
@@ -53,8 +53,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (452,414);
-ref = dotaccent;
+pos = (486,620);
+ref = dotaccentcomb;
 }
 );
 width = 1160;
@@ -67,8 +67,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (378,414);
-ref = dotaccent;
+pos = (412,620);
+ref = dotaccentcomb;
 }
 );
 width = 1260;
@@ -81,8 +81,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (516,414);
-ref = dotaccent;
+pos = (544,620);
+ref = dotaccentcomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_grave.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_grave.glyph
index 5e157f088..a35f85539 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_grave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_grave.glyph
@@ -11,7 +11,7 @@ ref = E;
 },
 {
 pos = (312,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1224;
@@ -24,7 +24,7 @@ ref = E;
 },
 {
 pos = (215,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1275;
@@ -37,7 +37,7 @@ ref = E;
 },
 {
 pos = (361,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1196;
@@ -50,7 +50,7 @@ ref = E;
 },
 {
 pos = (369,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1160;
@@ -63,7 +63,7 @@ ref = E;
 },
 {
 pos = (252,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1260;
@@ -75,8 +75,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (341,620);
-ref = grave;
+pos = (345,620);
+ref = gravecomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_hookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_hookabove.glyph
index 839448a19..05d4f7363 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_hookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_hookabove.glyph
@@ -11,7 +11,7 @@ ref = E;
 },
 {
 pos = (457,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1224;
@@ -24,7 +24,7 @@ ref = E;
 },
 {
 pos = (419,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1275;
@@ -37,7 +37,7 @@ ref = E;
 },
 {
 pos = (505,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1196;
@@ -50,7 +50,7 @@ ref = E;
 },
 {
 pos = (434,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1160;
@@ -63,7 +63,7 @@ ref = E;
 },
 {
 pos = (409,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1260;
@@ -75,8 +75,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (448,620);
-ref = hookabove;
+pos = (442,620);
+ref = hookabovecomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_invertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_invertedbreve.glyph
index d0f46c3f4..e2e1c6899 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_invertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_invertedbreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (1318,558);
-ref = breveinvnosp;
+pos = (305,558);
+ref = breveinvcomb;
 }
 );
 width = 1224;
@@ -23,8 +23,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (1395,558);
-ref = breveinvnosp;
+pos = (221,558);
+ref = breveinvcomb;
 }
 );
 width = 1275;
@@ -36,8 +36,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (1308,558);
-ref = breveinvnosp;
+pos = (363,558);
+ref = breveinvcomb;
 }
 );
 width = 1196;
@@ -49,8 +49,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (1261,620);
-ref = breveinvnosp;
+pos = (298,620);
+ref = breveinvcomb;
 }
 );
 width = 1160;
@@ -62,8 +62,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (1383,620);
-ref = breveinvnosp;
+pos = (301,620);
+ref = breveinvcomb;
 }
 );
 width = 1260;
@@ -75,8 +75,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (1195,620);
-ref = breveinvnosp;
+pos = (314,620);
+ref = breveinvcomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_macron.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_macron.glyph
index 16a70c793..24c3e86ce 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_macron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_macron.glyph
@@ -5,78 +5,84 @@ kernRight = E;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = E;
 },
 {
 pos = (234,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1224;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = E;
 },
 {
 pos = (316,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1275;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = E;
 },
 {
 pos = (325,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1196;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = E;
 },
 {
-pos = (283,620);
-ref = macron;
+pos = (282,620);
+ref = macroncomb;
 }
 );
 width = 1160;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = E;
 },
 {
 pos = (348,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1260;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = E;
 },
 {
 pos = (282,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_ogonek.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_ogonek.glyph
index 4412a722c..153bce505 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_ogonek.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_ogonek.glyph
@@ -11,7 +11,7 @@ ref = E;
 },
 {
 pos = (655,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1224;
@@ -24,7 +24,7 @@ ref = E;
 },
 {
 pos = (638,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1275;
@@ -37,7 +37,7 @@ ref = E;
 },
 {
 pos = (774,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1196;
@@ -50,7 +50,7 @@ ref = E;
 },
 {
 pos = (654,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1160;
@@ -63,7 +63,7 @@ ref = E;
 },
 {
 pos = (592,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1260;
@@ -75,8 +75,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (708,0);
-ref = ogonek;
+pos = (703,0);
+ref = ogonekcomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_sdescendercyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_sdescendercyrillic.glyph
index cf6530ed4..40e66e870 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_sdescendercyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_sdescendercyrillic.glyph
@@ -11,7 +11,7 @@ ref = C;
 },
 {
 pos = (500,-12);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1491;
@@ -24,7 +24,7 @@ ref = C;
 },
 {
 pos = (345,6);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1575;
@@ -37,7 +37,7 @@ ref = C;
 },
 {
 pos = (552,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1481;
@@ -50,7 +50,7 @@ ref = C;
 },
 {
 pos = (517,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1480;
@@ -63,7 +63,7 @@ ref = C;
 },
 {
 pos = (316,6);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1509;
@@ -76,7 +76,7 @@ ref = C;
 },
 {
 pos = (552,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_tilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_tilde.glyph
index c479bc569..5a06dcc27 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_tilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (179,372);
-ref = tilde;
+pos = (209,558);
+ref = tildecomb;
 }
 );
 width = 1224;
@@ -23,8 +23,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (190,372);
-ref = tilde;
+pos = (220,558);
+ref = tildecomb;
 }
 );
 width = 1275;
@@ -36,8 +36,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (184,372);
-ref = tilde;
+pos = (222,558);
+ref = tildecomb;
 }
 );
 width = 1196;
@@ -49,8 +49,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (185,414);
-ref = tilde;
+pos = (218,620);
+ref = tildecomb;
 }
 );
 width = 1160;
@@ -62,8 +62,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (186,414);
-ref = tilde;
+pos = (220,620);
+ref = tildecomb;
 }
 );
 width = 1260;
@@ -75,8 +75,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (189,414);
-ref = tilde;
+pos = (219,620);
+ref = tildecomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_tildebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_tildebelow.glyph
index adf0e4146..7ecf9e9ff 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_tildebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_tildebelow.glyph
@@ -11,7 +11,7 @@ ref = E;
 },
 {
 pos = (1236,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1224;
@@ -24,7 +24,7 @@ ref = E;
 },
 {
 pos = (1357,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1275;
@@ -37,7 +37,7 @@ ref = E;
 },
 {
 pos = (1085,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1196;
@@ -50,7 +50,7 @@ ref = E;
 },
 {
 pos = (1238,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1160;
@@ -63,7 +63,7 @@ ref = E;
 },
 {
 pos = (1351,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1260;
@@ -76,7 +76,7 @@ ref = E;
 },
 {
 pos = (1077,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/E_zhcaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/E_zhcaron.glyph
index 96e1ba189..7b73e94e6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/E_zhcaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/E_zhcaron.glyph
@@ -8,8 +8,8 @@ shapes = (
 ref = Ezh;
 },
 {
-pos = (292,372);
-ref = caron;
+pos = (373,558);
+ref = caroncomb;
 }
 );
 width = 1395;
@@ -21,8 +21,8 @@ shapes = (
 ref = Ezh;
 },
 {
-pos = (125,372);
-ref = caron;
+pos = (290,558);
+ref = caroncomb;
 }
 );
 width = 1414;
@@ -34,8 +34,8 @@ shapes = (
 ref = Ezh;
 },
 {
-pos = (348,388);
-ref = caron;
+pos = (375,558);
+ref = caroncomb;
 }
 );
 width = 1424;
@@ -47,8 +47,8 @@ shapes = (
 ref = Ezh;
 },
 {
-pos = (299,414);
-ref = caron;
+pos = (368,620);
+ref = caroncomb;
 }
 );
 width = 1331;
@@ -60,8 +60,8 @@ shapes = (
 ref = Ezh;
 },
 {
-pos = (132,414);
-ref = caron;
+pos = (363,620);
+ref = caroncomb;
 }
 );
 width = 1382;
@@ -73,8 +73,8 @@ shapes = (
 ref = Ezh;
 },
 {
-pos = (348,414);
-ref = caron;
+pos = (393,620);
+ref = caroncomb;
 }
 );
 width = 1288;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/F_.glyph
index 052fb41fb..9e4f00eac 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/F_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = F;
 kernLeft = B;
 kernRight = F;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/F_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/F_dotaccent.glyph
index f4fcfd997..5c2ac3282 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/F_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/F_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = F;
 },
 {
-pos = (463,372);
-ref = dotaccent;
+pos = (494,558);
+ref = dotaccentcomb;
 }
 );
 width = 1202;
@@ -25,8 +25,8 @@ shapes = (
 ref = F;
 },
 {
-pos = (349,372);
-ref = dotaccent;
+pos = (380,558);
+ref = dotaccentcomb;
 }
 );
 width = 1196;
@@ -39,8 +39,8 @@ shapes = (
 ref = F;
 },
 {
-pos = (507,372);
-ref = dotaccent;
+pos = (538,558);
+ref = dotaccentcomb;
 }
 );
 width = 1196;
@@ -53,8 +53,8 @@ shapes = (
 ref = F;
 },
 {
-pos = (470,414);
-ref = dotaccent;
+pos = (504,620);
+ref = dotaccentcomb;
 }
 );
 width = 1139;
@@ -67,8 +67,8 @@ shapes = (
 ref = F;
 },
 {
-pos = (354,414);
-ref = dotaccent;
+pos = (388,620);
+ref = dotaccentcomb;
 }
 );
 width = 1193;
@@ -81,8 +81,8 @@ shapes = (
 ref = F;
 },
 {
-pos = (515,414);
-ref = dotaccent;
+pos = (543,620);
+ref = dotaccentcomb;
 }
 );
 width = 1068;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/G_.glyph b/src/Inter-Italic.glyphspackage/glyphs/G_.glyph
index 70db472ac..334c0e1a5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/G_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/G_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = G;
 kernLeft = C;
 kernRight = G;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/G_acute.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/G_acute.1.glyph
index a04933886..2e65bc0a3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/G_acute.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/G_acute.1.glyph
@@ -4,81 +4,93 @@ glyphname = Gacute.1;
 layers = (
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = G.1;
 },
 {
-pos = (636,558);
-ref = acute;
+pos = (776,558);
+ref = acutecomb;
 }
 );
-width = 1512;
+width = 1513;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = G.1;
 },
 {
-pos = (483,372);
-ref = acute;
+pos = (742,558);
+ref = acutecomb;
 }
 );
-width = 1536;
+width = 1523;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = G.1;
 },
 {
-pos = (477,372);
-ref = acute;
+pos = (724,558);
+ref = acutecomb;
 }
 );
-width = 1594;
+width = 1582;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = G.1;
 },
 {
-pos = (681,620);
-ref = acute;
+pos = (721,620);
+ref = acutecomb;
 }
 );
-width = 1472;
+width = 1497;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = G.1;
 },
 {
-pos = (642,620);
-ref = acute;
+pos = (666,620);
+ref = acutecomb;
 }
 );
-width = 1562;
+width = 1517;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = G.1;
 },
 {
-pos = (659,620);
-ref = acute;
+pos = (719,620);
+ref = acutecomb;
 }
 );
-width = 1384;
+width = 1385;
 }
 );
 unicode = 57354;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/G_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/G_acute.glyph
index a345d7a37..b84ac57dd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/G_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/G_acute.glyph
@@ -5,78 +5,84 @@ kernRight = G;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = G;
 },
 {
-pos = (622,558);
-ref = acute;
+pos = (742,558);
+ref = acutecomb;
 }
 );
 width = 1523;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = G;
 },
 {
-pos = (594,558);
-ref = acute;
+pos = (724,558);
+ref = acutecomb;
 }
 );
 width = 1582;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = G;
 },
 {
-pos = (636,558);
-ref = acute;
+pos = (776,558);
+ref = acutecomb;
 }
 );
 width = 1513;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = G;
 },
 {
-pos = (697,620);
-ref = acute;
+pos = (737,620);
+ref = acutecomb;
 }
 );
 width = 1497;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = G;
 },
 {
-pos = (642,620);
-ref = acute;
+pos = (666,620);
+ref = acutecomb;
 }
 );
 width = 1517;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = G;
 },
 {
-pos = (659,620);
-ref = acute;
+pos = (719,620);
+ref = acutecomb;
 }
 );
 width = 1385;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/G_breve.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/G_breve.1.glyph
index 59ba83970..11beace57 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/G_breve.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/G_breve.1.glyph
@@ -9,8 +9,8 @@ shapes = (
 ref = G.1;
 },
 {
-pos = (402,372);
-ref = breve;
+pos = (497,558);
+ref = brevecomb;
 }
 );
 width = 1512;
@@ -23,7 +23,7 @@ ref = G.1;
 },
 {
 pos = (376,372);
-ref = breve;
+ref = brevecomb;
 }
 );
 width = 1536;
@@ -36,7 +36,7 @@ ref = G.1;
 },
 {
 pos = (355,372);
-ref = breve;
+ref = brevecomb;
 }
 );
 width = 1594;
@@ -48,8 +48,8 @@ shapes = (
 ref = G.1;
 },
 {
-pos = (383,414);
-ref = breve;
+pos = (446,620);
+ref = brevecomb;
 }
 );
 width = 1472;
@@ -62,7 +62,7 @@ ref = G.1;
 },
 {
 pos = (329,414);
-ref = breve;
+ref = brevecomb;
 }
 );
 width = 1562;
@@ -75,7 +75,7 @@ ref = G.1;
 },
 {
 pos = (345,414);
-ref = breve;
+ref = brevecomb;
 }
 );
 width = 1384;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/G_breve.glyph b/src/Inter-Italic.glyphspackage/glyphs/G_breve.glyph
index 745023aef..20e9eafaf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/G_breve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/G_breve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (376,372);
-ref = breve;
+pos = (483,558);
+ref = brevecomb;
 }
 );
 width = 1523;
@@ -23,8 +23,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (355,372);
-ref = breve;
+pos = (418,558);
+ref = brevecomb;
 }
 );
 width = 1582;
@@ -36,8 +36,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (402,372);
-ref = breve;
+pos = (497,558);
+ref = brevecomb;
 }
 );
 width = 1513;
@@ -49,8 +49,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (399,414);
-ref = breve;
+pos = (462,620);
+ref = brevecomb;
 }
 );
 width = 1497;
@@ -62,8 +62,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (329,414);
-ref = breve;
+pos = (379,620);
+ref = brevecomb;
 }
 );
 width = 1517;
@@ -75,8 +75,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (345,414);
-ref = breve;
+pos = (437,620);
+ref = brevecomb;
 }
 );
 width = 1385;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/G_caron.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/G_caron.1.glyph
index 86190a06d..c7cc01a1c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/G_caron.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/G_caron.1.glyph
@@ -9,8 +9,8 @@ shapes = (
 ref = G.1;
 },
 {
-pos = (390,388);
-ref = caron;
+pos = (417,558);
+ref = caroncomb;
 }
 );
 width = 1512;
@@ -23,7 +23,7 @@ ref = G.1;
 },
 {
 pos = (369,372);
-ref = caron;
+ref = caroncomb;
 }
 );
 width = 1536;
@@ -36,7 +36,7 @@ ref = G.1;
 },
 {
 pos = (221,372);
-ref = caron;
+ref = caroncomb;
 }
 );
 width = 1594;
@@ -48,8 +48,8 @@ shapes = (
 ref = G.1;
 },
 {
-pos = (377,414);
-ref = caron;
+pos = (446,620);
+ref = caroncomb;
 }
 );
 width = 1472;
@@ -62,7 +62,7 @@ ref = G.1;
 },
 {
 pos = (196,414);
-ref = caron;
+ref = caroncomb;
 }
 );
 width = 1562;
@@ -75,7 +75,7 @@ ref = G.1;
 },
 {
 pos = (393,414);
-ref = caron;
+ref = caroncomb;
 }
 );
 width = 1384;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/G_caron.glyph b/src/Inter-Italic.glyphspackage/glyphs/G_caron.glyph
index d93e3fd6a..05ddffbdc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/G_caron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/G_caron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (369,372);
-ref = caron;
+pos = (450,558);
+ref = caroncomb;
 }
 );
 width = 1523;
@@ -23,8 +23,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (221,372);
-ref = caron;
+pos = (386,558);
+ref = caroncomb;
 }
 );
 width = 1582;
@@ -36,8 +36,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (390,388);
-ref = caron;
+pos = (417,558);
+ref = caroncomb;
 }
 );
 width = 1513;
@@ -49,8 +49,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (393,414);
-ref = caron;
+pos = (462,620);
+ref = caroncomb;
 }
 );
 width = 1497;
@@ -62,8 +62,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (196,414);
-ref = caron;
+pos = (427,620);
+ref = caroncomb;
 }
 );
 width = 1517;
@@ -75,8 +75,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (393,414);
-ref = caron;
+pos = (438,620);
+ref = caroncomb;
 }
 );
 width = 1385;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/G_circumflex.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/G_circumflex.1.glyph
index 9aeb0ad0e..04b3185ae 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/G_circumflex.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/G_circumflex.1.glyph
@@ -9,8 +9,8 @@ shapes = (
 ref = G.1;
 },
 {
-pos = (386,372);
-ref = circumflex;
+pos = (416,558);
+ref = circumflexcomb;
 }
 );
 width = 1512;
@@ -23,7 +23,7 @@ ref = G.1;
 },
 {
 pos = (371,372);
-ref = circumflex;
+ref = circumflexcomb;
 }
 );
 width = 1536;
@@ -36,7 +36,7 @@ ref = G.1;
 },
 {
 pos = (220,372);
-ref = circumflex;
+ref = circumflexcomb;
 }
 );
 width = 1594;
@@ -48,8 +48,8 @@ shapes = (
 ref = G.1;
 },
 {
-pos = (379,414);
-ref = circumflex;
+pos = (445,620);
+ref = circumflexcomb;
 }
 );
 width = 1472;
@@ -62,7 +62,7 @@ ref = G.1;
 },
 {
 pos = (195,414);
-ref = circumflex;
+ref = circumflexcomb;
 }
 );
 width = 1562;
@@ -75,7 +75,7 @@ ref = G.1;
 },
 {
 pos = (396,414);
-ref = circumflex;
+ref = circumflexcomb;
 }
 );
 width = 1384;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/G_circumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/G_circumflex.glyph
index d83bb3cc3..75370cac2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/G_circumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/G_circumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (371,372);
-ref = circumflex;
+pos = (450,558);
+ref = circumflexcomb;
 }
 );
 width = 1523;
@@ -23,8 +23,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (220,372);
-ref = circumflex;
+pos = (386,558);
+ref = circumflexcomb;
 }
 );
 width = 1582;
@@ -36,8 +36,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (386,372);
-ref = circumflex;
+pos = (416,558);
+ref = circumflexcomb;
 }
 );
 width = 1513;
@@ -49,8 +49,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (395,414);
-ref = circumflex;
+pos = (461,620);
+ref = circumflexcomb;
 }
 );
 width = 1497;
@@ -62,8 +62,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (195,414);
-ref = circumflex;
+pos = (428,620);
+ref = circumflexcomb;
 }
 );
 width = 1517;
@@ -75,8 +75,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (396,414);
-ref = circumflex;
+pos = (437,620);
+ref = circumflexcomb;
 }
 );
 width = 1385;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/G_dotaccent.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/G_dotaccent.1.glyph
index 9898ba086..64a5247bf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/G_dotaccent.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/G_dotaccent.1.glyph
@@ -11,8 +11,8 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (631,372);
-ref = dotaccent;
+pos = (662,558);
+ref = dotaccentcomb;
 }
 );
 width = 1513;
@@ -26,8 +26,8 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (591,372);
-ref = dotaccent;
+pos = (622,558);
+ref = dotaccentcomb;
 }
 );
 width = 1523;
@@ -41,8 +41,8 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (532,372);
-ref = dotaccent;
+pos = (563,558);
+ref = dotaccentcomb;
 }
 );
 width = 1582;
@@ -56,8 +56,8 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (599,414);
-ref = dotaccent;
+pos = (633,620);
+ref = dotaccentcomb;
 }
 );
 width = 1497;
@@ -71,8 +71,8 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (505,414);
-ref = dotaccent;
+pos = (539,620);
+ref = dotaccentcomb;
 }
 );
 width = 1517;
@@ -86,8 +86,8 @@ alignment = 1;
 ref = G.1;
 },
 {
-pos = (639,414);
-ref = dotaccent;
+pos = (667,620);
+ref = dotaccentcomb;
 }
 );
 width = 1385;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/G_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/G_dotaccent.glyph
index bc42ab178..74079f87d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/G_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/G_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (591,372);
-ref = dotaccent;
+pos = (622,558);
+ref = dotaccentcomb;
 }
 );
 width = 1523;
@@ -25,8 +25,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (532,372);
-ref = dotaccent;
+pos = (563,558);
+ref = dotaccentcomb;
 }
 );
 width = 1582;
@@ -39,8 +39,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (631,372);
-ref = dotaccent;
+pos = (662,558);
+ref = dotaccentcomb;
 }
 );
 width = 1513;
@@ -53,8 +53,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (615,414);
-ref = dotaccent;
+pos = (649,620);
+ref = dotaccentcomb;
 }
 );
 width = 1497;
@@ -67,8 +67,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (505,414);
-ref = dotaccent;
+pos = (539,620);
+ref = dotaccentcomb;
 }
 );
 width = 1517;
@@ -81,8 +81,8 @@ shapes = (
 ref = G;
 },
 {
-pos = (639,414);
-ref = dotaccent;
+pos = (667,620);
+ref = dotaccentcomb;
 }
 );
 width = 1385;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/G_macron.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/G_macron.1.glyph
index be49fbd0f..ff7c49f03 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/G_macron.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/G_macron.1.glyph
@@ -4,81 +4,93 @@ glyphname = Gmacron.1;
 layers = (
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = G.1;
 },
 {
 pos = (448,558);
-ref = macron;
+ref = macroncomb;
 }
 );
-width = 1512;
+width = 1513;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = G.1;
 },
 {
-pos = (377,372);
-ref = macron;
+pos = (379,558);
+ref = macroncomb;
 }
 );
-width = 1536;
+width = 1523;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = G.1;
 },
 {
-pos = (208,372);
-ref = macron;
+pos = (481,558);
+ref = macroncomb;
 }
 );
-width = 1594;
+width = 1582;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = G.1;
 },
 {
-pos = (430,620);
-ref = macron;
+pos = (429,620);
+ref = macroncomb;
 }
 );
-width = 1472;
+width = 1497;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = G.1;
 },
 {
 pos = (475,620);
-ref = macron;
+ref = macroncomb;
 }
 );
-width = 1562;
+width = 1517;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = G.1;
 },
 {
 pos = (405,620);
-ref = macron;
+ref = macroncomb;
 }
 );
-width = 1384;
+width = 1385;
 }
 );
 unicode = 57355;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/G_macron.glyph b/src/Inter-Italic.glyphspackage/glyphs/G_macron.glyph
index e886e5004..df63fe5d0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/G_macron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/G_macron.glyph
@@ -5,78 +5,84 @@ kernRight = G;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = G;
 },
 {
 pos = (379,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1523;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = G;
 },
 {
 pos = (481,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1582;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = G;
 },
 {
 pos = (448,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1513;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = G;
 },
 {
-pos = (446,620);
-ref = macron;
+pos = (445,620);
+ref = macroncomb;
 }
 );
 width = 1497;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = G;
 },
 {
 pos = (475,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1517;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = G;
 },
 {
 pos = (405,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1385;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/H_.glyph b/src/Inter-Italic.glyphspackage/glyphs/H_.glyph
index 45871795c..7cb3048ca 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/H_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/H_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = H;
 kernLeft = B;
 kernRight = H;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/H_brevebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/H_brevebelow.glyph
index 6ad8a0b5a..76109b62c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/H_brevebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/H_brevebelow.glyph
@@ -18,7 +18,7 @@ ref = H;
 },
 {
 pos = (1343,0);
-ref = brevesubnosp;
+ref = brevesubcomb;
 }
 );
 width = 1514;
@@ -31,7 +31,7 @@ ref = H;
 },
 {
 pos = (1473,2);
-ref = brevesubnosp;
+ref = brevesubcomb;
 }
 );
 width = 1536;
@@ -44,7 +44,7 @@ ref = H;
 },
 {
 pos = (1271,-2);
-ref = brevesubnosp;
+ref = brevesubcomb;
 }
 );
 width = 1506;
@@ -64,7 +64,7 @@ ref = H;
 },
 {
 pos = (1349,0);
-ref = brevesubnosp;
+ref = brevesubcomb;
 }
 );
 width = 1451;
@@ -77,7 +77,7 @@ ref = H;
 },
 {
 pos = (1471,2);
-ref = brevesubnosp;
+ref = brevesubcomb;
 }
 );
 width = 1489;
@@ -90,7 +90,7 @@ ref = H;
 },
 {
 pos = (1271,-2);
-ref = brevesubnosp;
+ref = brevesubcomb;
 }
 );
 width = 1378;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/H_cedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/H_cedilla.glyph
index b91a4be3f..f303165b8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/H_cedilla.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/H_cedilla.glyph
@@ -12,7 +12,7 @@ ref = H;
 {
 anchor = cedilla;
 pos = (15,-2);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1514;
@@ -26,7 +26,7 @@ ref = H;
 {
 anchor = cedilla;
 pos = (-169,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1536;
@@ -40,7 +40,7 @@ ref = H;
 {
 anchor = cedilla;
 pos = (40,-6);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1506;
@@ -54,7 +54,7 @@ ref = H;
 {
 anchor = cedilla;
 pos = (21,-2);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1451;
@@ -68,7 +68,7 @@ ref = H;
 {
 anchor = cedilla;
 pos = (-147,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1489;
@@ -82,7 +82,7 @@ ref = H;
 {
 anchor = cedilla;
 pos = (40,-6);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1378;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/H_circumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/H_circumflex.glyph
index a1ebbee88..0935c7353 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/H_circumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/H_circumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (352,372);
-ref = circumflex;
+pos = (431,558);
+ref = circumflexcomb;
 }
 );
 width = 1514;
@@ -23,8 +23,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (182,372);
-ref = circumflex;
+pos = (348,558);
+ref = circumflexcomb;
 }
 );
 width = 1536;
@@ -36,8 +36,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (383,372);
-ref = circumflex;
+pos = (413,558);
+ref = circumflexcomb;
 }
 );
 width = 1506;
@@ -49,8 +49,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (371,416);
-ref = circumflex;
+pos = (437,622);
+ref = circumflexcomb;
 }
 );
 width = 1451;
@@ -62,8 +62,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (183,414);
-ref = circumflex;
+pos = (416,620);
+ref = circumflexcomb;
 }
 );
 width = 1489;
@@ -75,8 +75,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (393,414);
-ref = circumflex;
+pos = (434,620);
+ref = circumflexcomb;
 }
 );
 width = 1378;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/H_dieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/H_dieresis.glyph
index b1fea1451..8d26a894d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/H_dieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/H_dieresis.glyph
@@ -11,7 +11,7 @@ ref = H;
 },
 {
 pos = (246,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1514;
@@ -24,7 +24,7 @@ ref = H;
 },
 {
 pos = (194,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1536;
@@ -37,7 +37,7 @@ ref = H;
 },
 {
 pos = (263,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1506;
@@ -50,7 +50,7 @@ ref = H;
 },
 {
 pos = (268,622);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1451;
@@ -63,7 +63,7 @@ ref = H;
 },
 {
 pos = (198,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1489;
@@ -76,7 +76,7 @@ ref = H;
 },
 {
 pos = (252,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1378;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/H_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/H_dotaccent.glyph
index e69c4c6c4..785318b34 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/H_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/H_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (572,372);
-ref = dotaccent;
+pos = (603,558);
+ref = dotaccentcomb;
 }
 );
 width = 1514;
@@ -25,8 +25,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (494,372);
-ref = dotaccent;
+pos = (525,558);
+ref = dotaccentcomb;
 }
 );
 width = 1536;
@@ -39,8 +39,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (628,372);
-ref = dotaccent;
+pos = (659,558);
+ref = dotaccentcomb;
 }
 );
 width = 1506;
@@ -53,8 +53,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (591,416);
-ref = dotaccent;
+pos = (625,622);
+ref = dotaccentcomb;
 }
 );
 width = 1451;
@@ -67,8 +67,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (493,414);
-ref = dotaccent;
+pos = (527,620);
+ref = dotaccentcomb;
 }
 );
 width = 1489;
@@ -81,8 +81,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (636,414);
-ref = dotaccent;
+pos = (664,620);
+ref = dotaccentcomb;
 }
 );
 width = 1378;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_.glyph
index 7c37d9e70..bc3ce86bb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = I;
 kernLeft = B;
 kernRight = H;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_acute.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_acute.1.glyph
index 0fb25d964..df0d8cbe2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_acute.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_acute.1.glyph
@@ -4,81 +4,93 @@ glyphname = Iacute.1;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
-pos = (301,558);
-ref = acute;
+pos = (421,558);
+ref = acutecomb;
 }
 );
-width = 908;
+width = 907;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
-pos = (311,558);
-ref = acute;
+pos = (441,558);
+ref = acutecomb;
 }
 );
-width = 1032;
+width = 1037;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
-pos = (242,558);
-ref = acute;
+pos = (382,558);
+ref = acutecomb;
 }
 );
-width = 716;
+width = 723;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
-pos = (360,620);
-ref = acute;
+pos = (400,620);
+ref = acutecomb;
 }
 );
-width = 844;
+width = 842;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
-pos = (391,620);
-ref = acute;
+pos = (415,620);
+ref = acutecomb;
 }
 );
-width = 1000;
+width = 1002;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
-pos = (253,620);
-ref = acute;
+pos = (313,620);
+ref = acutecomb;
 }
 );
-width = 588;
+width = 584;
 }
 );
 unicode = 57362;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_acute.glyph
index 221157087..0866a2e03 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_acute.glyph
@@ -5,78 +5,84 @@ kernRight = H;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
-pos = (117,558);
-ref = acute;
+pos = (237,558);
+ref = acutecomb;
 }
 );
 width = 541;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
-pos = (91,558);
-ref = acute;
+pos = (221,558);
+ref = acutecomb;
 }
 );
 width = 598;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
-pos = (137,558);
-ref = acute;
+pos = (277,558);
+ref = acutecomb;
 }
 );
 width = 512;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
-pos = (176,620);
-ref = acute;
+pos = (216,620);
+ref = acutecomb;
 }
 );
 width = 476;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
-pos = (173,620);
-ref = acute;
+pos = (197,620);
+ref = acutecomb;
 }
 );
 width = 576;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
-pos = (158,620);
-ref = acute;
+pos = (218,620);
+ref = acutecomb;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_breve.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_breve.1.glyph
index 7db863fd4..cc240d13d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_breve.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_breve.1.glyph
@@ -9,8 +9,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (55,372);
-ref = breve;
+pos = (162,558);
+ref = brevecomb;
 }
 );
 width = 908;
@@ -22,8 +22,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (72,372);
-ref = breve;
+pos = (135,558);
+ref = brevecomb;
 }
 );
 width = 1032;
@@ -35,8 +35,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (8,372);
-ref = breve;
+pos = (103,558);
+ref = brevecomb;
 }
 );
 width = 716;
@@ -48,8 +48,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (62,414);
-ref = breve;
+pos = (125,620);
+ref = brevecomb;
 }
 );
 width = 844;
@@ -62,7 +62,7 @@ ref = I.1;
 },
 {
 pos = (78,414);
-ref = breve;
+ref = brevecomb;
 }
 );
 width = 1000;
@@ -75,7 +75,7 @@ ref = I.1;
 },
 {
 pos = (-61,414);
-ref = breve;
+ref = brevecomb;
 }
 );
 width = 588;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_breve.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_breve.glyph
index 7b7b688b0..589f76e8d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_breve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_breve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-129,372);
-ref = breve;
+pos = (-22,558);
+ref = brevecomb;
 }
 );
 width = 541;
@@ -23,8 +23,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-148,372);
-ref = breve;
+pos = (-85,558);
+ref = brevecomb;
 }
 );
 width = 598;
@@ -36,8 +36,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-97,372);
-ref = breve;
+pos = (-2,558);
+ref = brevecomb;
 }
 );
 width = 512;
@@ -49,8 +49,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-122,414);
-ref = breve;
+pos = (-59,620);
+ref = brevecomb;
 }
 );
 width = 476;
@@ -62,8 +62,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-140,414);
-ref = breve;
+pos = (-90,620);
+ref = brevecomb;
 }
 );
 width = 576;
@@ -75,8 +75,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-156,414);
-ref = breve;
+pos = (-64,620);
+ref = brevecomb;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_caron.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_caron.1.glyph
index 6f6ec616d..d1fe108f1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_caron.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_caron.1.glyph
@@ -9,8 +9,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (48,372);
-ref = caron;
+pos = (129,558);
+ref = caroncomb;
 }
 );
 width = 908;
@@ -22,8 +22,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-62,372);
-ref = caron;
+pos = (103,558);
+ref = caroncomb;
 }
 );
 width = 1032;
@@ -35,8 +35,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-4,388);
-ref = caron;
+pos = (23,558);
+ref = caroncomb;
 }
 );
 width = 716;
@@ -48,8 +48,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (56,414);
-ref = caron;
+pos = (125,620);
+ref = caroncomb;
 }
 );
 width = 844;
@@ -61,8 +61,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-55,414);
-ref = caron;
+pos = (176,620);
+ref = caroncomb;
 }
 );
 width = 1000;
@@ -75,7 +75,7 @@ ref = I.1;
 },
 {
 pos = (-13,414);
-ref = caron;
+ref = caroncomb;
 }
 );
 width = 588;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_caron.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_caron.glyph
index 60e6726ed..87ee824e7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_caron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_caron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-136,372);
-ref = caron;
+pos = (-55,558);
+ref = caroncomb;
 }
 );
 width = 541;
@@ -23,8 +23,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-282,372);
-ref = caron;
+pos = (-117,558);
+ref = caroncomb;
 }
 );
 width = 598;
@@ -36,8 +36,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-109,388);
-ref = caron;
+pos = (-82,558);
+ref = caroncomb;
 }
 );
 width = 512;
@@ -49,8 +49,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-128,414);
-ref = caron;
+pos = (-59,620);
+ref = caroncomb;
 }
 );
 width = 476;
@@ -62,8 +62,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-273,414);
-ref = caron;
+pos = (-42,620);
+ref = caroncomb;
 }
 );
 width = 576;
@@ -75,8 +75,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-108,414);
-ref = caron;
+pos = (-63,620);
+ref = caroncomb;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_circumflex.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_circumflex.1.glyph
index adfba5a49..d34f45ad7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_circumflex.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_circumflex.1.glyph
@@ -9,8 +9,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (50,372);
-ref = circumflex;
+pos = (129,558);
+ref = circumflexcomb;
 }
 );
 width = 908;
@@ -22,8 +22,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-63,372);
-ref = circumflex;
+pos = (103,558);
+ref = circumflexcomb;
 }
 );
 width = 1032;
@@ -35,8 +35,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-8,372);
-ref = circumflex;
+pos = (22,558);
+ref = circumflexcomb;
 }
 );
 width = 716;
@@ -48,8 +48,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (58,414);
-ref = circumflex;
+pos = (124,620);
+ref = circumflexcomb;
 }
 );
 width = 844;
@@ -61,8 +61,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-56,414);
-ref = circumflex;
+pos = (177,620);
+ref = circumflexcomb;
 }
 );
 width = 1000;
@@ -75,7 +75,7 @@ ref = I.1;
 },
 {
 pos = (-10,414);
-ref = circumflex;
+ref = circumflexcomb;
 }
 );
 width = 588;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_circumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_circumflex.glyph
index 28e4ce30a..66b5ce920 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_circumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_circumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-134,372);
-ref = circumflex;
+pos = (-55,558);
+ref = circumflexcomb;
 }
 );
 width = 541;
@@ -23,8 +23,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-283,372);
-ref = circumflex;
+pos = (-117,558);
+ref = circumflexcomb;
 }
 );
 width = 598;
@@ -36,8 +36,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-113,372);
-ref = circumflex;
+pos = (-83,558);
+ref = circumflexcomb;
 }
 );
 width = 512;
@@ -49,8 +49,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-126,414);
-ref = circumflex;
+pos = (-60,620);
+ref = circumflexcomb;
 }
 );
 width = 476;
@@ -62,8 +62,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-274,414);
-ref = circumflex;
+pos = (-41,620);
+ref = circumflexcomb;
 }
 );
 width = 576;
@@ -75,8 +75,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-105,414);
-ref = circumflex;
+pos = (-64,620);
+ref = circumflexcomb;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_dieresis.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_dieresis.1.glyph
index 8181a8946..42fc3f505 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_dieresis.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_dieresis.1.glyph
@@ -11,7 +11,7 @@ ref = I.1;
 },
 {
 pos = (-56,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 907;
@@ -25,7 +25,7 @@ ref = I.1;
 },
 {
 pos = (-51,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1037;
@@ -39,7 +39,7 @@ ref = I.1;
 },
 {
 pos = (-128,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 723;
@@ -53,7 +53,7 @@ ref = I.1;
 },
 {
 pos = (-45,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 842;
@@ -67,7 +67,7 @@ ref = I.1;
 },
 {
 pos = (-41,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1002;
@@ -81,7 +81,7 @@ ref = I.1;
 },
 {
 pos = (-151,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 584;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_dieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_dieresis.glyph
index 02fe90c8d..0a0c9da7e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_dieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_dieresis.glyph
@@ -11,7 +11,7 @@ ref = I;
 },
 {
 pos = (-240,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 541;
@@ -24,7 +24,7 @@ ref = I;
 },
 {
 pos = (-271,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 598;
@@ -37,7 +37,7 @@ ref = I;
 },
 {
 pos = (-233,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 512;
@@ -50,7 +50,7 @@ ref = I;
 },
 {
 pos = (-229,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 476;
@@ -63,7 +63,7 @@ ref = I;
 },
 {
 pos = (-259,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 576;
@@ -76,7 +76,7 @@ ref = I;
 },
 {
 pos = (-246,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_dieresiscyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_dieresiscyrillic.glyph
index 480b6982d..bdbbba8a8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_dieresiscyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_dieresiscyrillic.glyph
@@ -12,7 +12,7 @@ ref = "Ii-cy";
 },
 {
 pos = (264,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1544;
@@ -26,7 +26,7 @@ ref = "Ii-cy";
 },
 {
 pos = (164,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1480;
@@ -40,7 +40,7 @@ ref = "Ii-cy";
 },
 {
 pos = (299,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1580;
@@ -54,7 +54,7 @@ ref = "Ii-cy";
 },
 {
 pos = (264,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1473;
@@ -68,7 +68,7 @@ ref = "Ii-cy";
 },
 {
 pos = (208,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1513;
@@ -82,7 +82,7 @@ ref = "Ii-cy";
 },
 {
 pos = (288,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1452;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_dotaccent.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_dotaccent.1.glyph
index c48646c39..76a33765c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_dotaccent.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_dotaccent.1.glyph
@@ -11,8 +11,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (270,372);
-ref = dotaccent;
+pos = (301,558);
+ref = dotaccentcomb;
 }
 );
 width = 907;
@@ -26,8 +26,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (249,372);
-ref = dotaccent;
+pos = (280,558);
+ref = dotaccentcomb;
 }
 );
 width = 1037;
@@ -41,8 +41,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (237,372);
-ref = dotaccent;
+pos = (268,558);
+ref = dotaccentcomb;
 }
 );
 width = 723;
@@ -56,8 +56,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (278,414);
-ref = dotaccent;
+pos = (312,620);
+ref = dotaccentcomb;
 }
 );
 width = 842;
@@ -71,8 +71,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (254,414);
-ref = dotaccent;
+pos = (288,620);
+ref = dotaccentcomb;
 }
 );
 width = 1002;
@@ -86,8 +86,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (233,414);
-ref = dotaccent;
+pos = (261,620);
+ref = dotaccentcomb;
 }
 );
 width = 584;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_dotaccent.glyph
index 95bfc196f..50a46affc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (86,372);
-ref = dotaccent;
+pos = (117,558);
+ref = dotaccentcomb;
 }
 );
 width = 541;
@@ -25,8 +25,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (29,372);
-ref = dotaccent;
+pos = (60,558);
+ref = dotaccentcomb;
 }
 );
 width = 598;
@@ -39,8 +39,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (132,372);
-ref = dotaccent;
+pos = (163,558);
+ref = dotaccentcomb;
 }
 );
 width = 512;
@@ -53,8 +53,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (94,414);
-ref = dotaccent;
+pos = (128,620);
+ref = dotaccentcomb;
 }
 );
 width = 476;
@@ -67,8 +67,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (36,414);
-ref = dotaccent;
+pos = (70,620);
+ref = dotaccentcomb;
 }
 );
 width = 576;
@@ -81,8 +81,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (138,414);
-ref = dotaccent;
+pos = (166,620);
+ref = dotaccentcomb;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_ebrevecyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_ebrevecyrillic.glyph
index 1fadfcf45..ab5cbabbc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_ebrevecyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_ebrevecyrillic.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (231,372);
-ref = breve;
+pos = (338,558);
+ref = brevecomb;
 }
 );
 width = 1224;
@@ -23,8 +23,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (190,372);
-ref = breve;
+pos = (253,558);
+ref = brevecomb;
 }
 );
 width = 1275;
@@ -36,8 +36,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (279,372);
-ref = breve;
+pos = (374,558);
+ref = brevecomb;
 }
 );
 width = 1196;
@@ -49,8 +49,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (236,414);
-ref = breve;
+pos = (299,620);
+ref = brevecomb;
 }
 );
 width = 1160;
@@ -62,8 +62,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (202,414);
-ref = breve;
+pos = (252,620);
+ref = brevecomb;
 }
 );
 width = 1260;
@@ -75,8 +75,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (222,414);
-ref = breve;
+pos = (314,620);
+ref = brevecomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_grave.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_grave.1.glyph
index 6048fb46a..d0d6ca20a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_grave.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_grave.1.glyph
@@ -10,7 +10,7 @@ ref = I.1;
 },
 {
 pos = (136,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 908;
@@ -23,7 +23,7 @@ ref = I.1;
 },
 {
 pos = (97,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1032;
@@ -35,8 +35,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-70,372);
-ref = grave;
+pos = (90,558);
+ref = gravecomb;
 }
 );
 width = 716;
@@ -49,7 +49,7 @@ ref = I.1;
 },
 {
 pos = (195,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 844;
@@ -62,7 +62,7 @@ ref = I.1;
 },
 {
 pos = (128,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1000;
@@ -74,8 +74,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (58,620);
-ref = grave;
+pos = (62,620);
+ref = gravecomb;
 }
 );
 width = 588;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_grave.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_grave.glyph
index c03a0f219..7b193611b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_grave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_grave.glyph
@@ -11,7 +11,7 @@ ref = I;
 },
 {
 pos = (-48,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 541;
@@ -24,7 +24,7 @@ ref = I;
 },
 {
 pos = (-123,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 598;
@@ -37,7 +37,7 @@ ref = I;
 },
 {
 pos = (-15,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 512;
@@ -50,7 +50,7 @@ ref = I;
 },
 {
 pos = (11,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 476;
@@ -63,7 +63,7 @@ ref = I;
 },
 {
 pos = (-90,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 576;
@@ -75,8 +75,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-37,620);
-ref = grave;
+pos = (-33,620);
+ref = gravecomb;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_hookabove.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_hookabove.1.glyph
index a6957f238..58e580700 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_hookabove.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_hookabove.1.glyph
@@ -10,7 +10,7 @@ ref = I.1;
 },
 {
 pos = (281,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 908;
@@ -23,7 +23,7 @@ ref = I.1;
 },
 {
 pos = (301,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1032;
@@ -36,7 +36,7 @@ ref = I.1;
 },
 {
 pos = (234,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 716;
@@ -49,7 +49,7 @@ ref = I.1;
 },
 {
 pos = (260,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 844;
@@ -62,7 +62,7 @@ ref = I.1;
 },
 {
 pos = (285,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1000;
@@ -74,8 +74,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (165,620);
-ref = hookabove;
+pos = (159,620);
+ref = hookabovecomb;
 }
 );
 width = 588;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_hookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_hookabove.glyph
index eea16b95e..48a9340ad 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_hookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_hookabove.glyph
@@ -11,7 +11,7 @@ ref = I;
 },
 {
 pos = (97,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 541;
@@ -24,7 +24,7 @@ ref = I;
 },
 {
 pos = (81,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 598;
@@ -37,7 +37,7 @@ ref = I;
 },
 {
 pos = (129,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 512;
@@ -50,7 +50,7 @@ ref = I;
 },
 {
 pos = (76,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 476;
@@ -63,7 +63,7 @@ ref = I;
 },
 {
 pos = (67,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 576;
@@ -75,8 +75,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (70,620);
-ref = hookabove;
+pos = (64,620);
+ref = hookabovecomb;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_invertedbreve.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_invertedbreve.1.glyph
index 84fed0b03..b9bef36ff 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_invertedbreve.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_invertedbreve.1.glyph
@@ -9,8 +9,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (1142,558);
-ref = breveinvnosp;
+pos = (129,558);
+ref = breveinvcomb;
 }
 );
 width = 908;
@@ -22,8 +22,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (1277,558);
-ref = breveinvnosp;
+pos = (103,558);
+ref = breveinvcomb;
 }
 );
 width = 1032;
@@ -35,8 +35,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (1037,558);
-ref = breveinvnosp;
+pos = (92,558);
+ref = breveinvcomb;
 }
 );
 width = 716;
@@ -48,8 +48,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (1087,620);
-ref = breveinvnosp;
+pos = (124,620);
+ref = breveinvcomb;
 }
 );
 width = 844;
@@ -61,8 +61,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (1259,620);
-ref = breveinvnosp;
+pos = (177,620);
+ref = breveinvcomb;
 }
 );
 width = 1000;
@@ -74,8 +74,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (912,620);
-ref = breveinvnosp;
+pos = (31,620);
+ref = breveinvcomb;
 }
 );
 width = 588;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_invertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_invertedbreve.glyph
index 4c08f6e5c..d8e49a5c3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_invertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_invertedbreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (958,558);
-ref = breveinvnosp;
+pos = (-55,558);
+ref = breveinvcomb;
 }
 );
 width = 541;
@@ -23,8 +23,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (1057,558);
-ref = breveinvnosp;
+pos = (-117,558);
+ref = breveinvcomb;
 }
 );
 width = 598;
@@ -36,8 +36,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (932,558);
-ref = breveinvnosp;
+pos = (-13,558);
+ref = breveinvcomb;
 }
 );
 width = 512;
@@ -49,8 +49,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (903,620);
-ref = breveinvnosp;
+pos = (-60,620);
+ref = breveinvcomb;
 }
 );
 width = 476;
@@ -62,8 +62,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (1041,620);
-ref = breveinvnosp;
+pos = (-41,620);
+ref = breveinvcomb;
 }
 );
 width = 576;
@@ -75,8 +75,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (817,620);
-ref = breveinvnosp;
+pos = (-64,620);
+ref = breveinvcomb;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_macron.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_macron.1.glyph
index 9fb0eb9c2..c8dca4dd3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_macron.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_macron.1.glyph
@@ -4,81 +4,93 @@ glyphname = Imacron.1;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
 pos = (58,558);
-ref = macron;
+ref = macroncomb;
 }
 );
-width = 908;
+width = 907;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
 pos = (198,558);
-ref = macron;
+ref = macroncomb;
 }
 );
-width = 1032;
+width = 1037;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
 pos = (54,558);
-ref = macron;
+ref = macroncomb;
 }
 );
-width = 716;
+width = 723;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
-pos = (109,620);
-ref = macron;
+pos = (108,620);
+ref = macroncomb;
 }
 );
-width = 844;
+width = 842;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
 pos = (224,620);
-ref = macron;
+ref = macroncomb;
 }
 );
-width = 1000;
+width = 1002;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
 pos = (-1,620);
-ref = macron;
+ref = macroncomb;
 }
 );
-width = 588;
+width = 584;
 }
 );
 unicode = 57365;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_macron.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_macron.glyph
index 6c6baeea7..0e4364e99 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_macron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_macron.glyph
@@ -5,78 +5,84 @@ kernRight = Idieresis;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
 pos = (-126,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 541;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
 pos = (-22,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 598;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
 pos = (-51,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 512;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
-pos = (-75,620);
-ref = macron;
+pos = (-76,620);
+ref = macroncomb;
 }
 );
 width = 476;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
 pos = (6,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 576;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
 pos = (-96,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_macroncyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_macroncyrillic.glyph
index 0bc995bb3..05ecc25a5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_macroncyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_macroncyrillic.glyph
@@ -12,7 +12,7 @@ ref = "Ii-cy";
 },
 {
 pos = (378,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1544;
@@ -26,7 +26,7 @@ ref = "Ii-cy";
 },
 {
 pos = (413,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1480;
@@ -40,7 +40,7 @@ ref = "Ii-cy";
 },
 {
 pos = (481,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1580;
@@ -53,8 +53,8 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (418,620);
-ref = macron;
+pos = (417,620);
+ref = macroncomb;
 }
 );
 width = 1473;
@@ -68,7 +68,7 @@ ref = "Ii-cy";
 },
 {
 pos = (473,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1513;
@@ -82,7 +82,7 @@ ref = "Ii-cy";
 },
 {
 pos = (438,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1452;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_ogonek.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_ogonek.1.glyph
index 63d6c9505..db9f6d86a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_ogonek.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_ogonek.1.glyph
@@ -12,7 +12,7 @@ ref = I.1;
 },
 {
 pos = (373,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 907;
@@ -27,7 +27,7 @@ ref = I.1;
 },
 {
 pos = (449,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1037;
@@ -42,7 +42,7 @@ ref = I.1;
 },
 {
 pos = (321,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 723;
@@ -57,7 +57,7 @@ ref = I.1;
 },
 {
 pos = (372,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 842;
@@ -72,7 +72,7 @@ ref = I.1;
 },
 {
 pos = (396,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1002;
@@ -86,8 +86,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (249,0);
-ref = ogonek;
+pos = (244,0);
+ref = ogonekcomb;
 }
 );
 width = 584;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_ogonek.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_ogonek.glyph
index dc9d846fa..f6d2eb6f7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_ogonek.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_ogonek.glyph
@@ -11,7 +11,7 @@ ref = I;
 },
 {
 pos = (-75,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 541;
@@ -24,7 +24,7 @@ ref = I;
 },
 {
 pos = (-28,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 598;
@@ -37,7 +37,7 @@ ref = I;
 },
 {
 pos = (6,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 512;
@@ -50,7 +50,7 @@ ref = I;
 },
 {
 pos = (-76,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 476;
@@ -63,7 +63,7 @@ ref = I;
 },
 {
 pos = (-70,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 576;
@@ -75,8 +75,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-60,0);
-ref = ogonek;
+pos = (-65,0);
+ref = ogonekcomb;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_tilde.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_tilde.1.glyph
index 61731a1fa..cc5f81cf4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_tilde.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_tilde.1.glyph
@@ -10,8 +10,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (3,372);
-ref = tilde;
+pos = (33,558);
+ref = tildecomb;
 }
 );
 width = 907;
@@ -24,8 +24,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (72,372);
-ref = tilde;
+pos = (102,558);
+ref = tildecomb;
 }
 );
 width = 1037;
@@ -38,8 +38,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-87,372);
-ref = tilde;
+pos = (-49,558);
+ref = tildecomb;
 }
 );
 width = 723;
@@ -52,8 +52,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (11,414);
-ref = tilde;
+pos = (44,620);
+ref = tildecomb;
 }
 );
 width = 842;
@@ -66,8 +66,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (62,414);
-ref = tilde;
+pos = (96,620);
+ref = tildecomb;
 }
 );
 width = 1002;
@@ -80,8 +80,8 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-94,414);
-ref = tilde;
+pos = (-64,620);
+ref = tildecomb;
 }
 );
 width = 584;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_tilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_tilde.glyph
index 6f71a77fc..9f7c3ec4c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_tilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-181,372);
-ref = tilde;
+pos = (-151,558);
+ref = tildecomb;
 }
 );
 width = 541;
@@ -23,8 +23,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-148,372);
-ref = tilde;
+pos = (-118,558);
+ref = tildecomb;
 }
 );
 width = 598;
@@ -36,8 +36,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-192,372);
-ref = tilde;
+pos = (-154,558);
+ref = tildecomb;
 }
 );
 width = 512;
@@ -49,8 +49,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-173,414);
-ref = tilde;
+pos = (-140,620);
+ref = tildecomb;
 }
 );
 width = 476;
@@ -62,8 +62,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-156,414);
-ref = tilde;
+pos = (-122,620);
+ref = tildecomb;
 }
 );
 width = 576;
@@ -75,8 +75,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-189,414);
-ref = tilde;
+pos = (-159,620);
+ref = tildecomb;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_tildebelow.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_tildebelow.1.glyph
index 58bcd0fa7..98a4eefaf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_tildebelow.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_tildebelow.1.glyph
@@ -10,7 +10,7 @@ ref = I.1;
 },
 {
 pos = (1080,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 908;
@@ -23,7 +23,7 @@ ref = I.1;
 },
 {
 pos = (1239,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1032;
@@ -36,7 +36,7 @@ ref = I.1;
 },
 {
 pos = (846,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 716;
@@ -49,7 +49,7 @@ ref = I.1;
 },
 {
 pos = (1078,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 844;
@@ -62,7 +62,7 @@ ref = I.1;
 },
 {
 pos = (1227,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1000;
@@ -75,7 +75,7 @@ ref = I.1;
 },
 {
 pos = (828,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 588;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/I_tildebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/I_tildebelow.glyph
index e79100ca8..eeea416ac 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/I_tildebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/I_tildebelow.glyph
@@ -11,7 +11,7 @@ ref = I;
 },
 {
 pos = (896,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 541;
@@ -24,7 +24,7 @@ ref = I;
 },
 {
 pos = (1019,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 598;
@@ -37,7 +37,7 @@ ref = I;
 },
 {
 pos = (741,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 512;
@@ -50,7 +50,7 @@ ref = I;
 },
 {
 pos = (894,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 476;
@@ -63,7 +63,7 @@ ref = I;
 },
 {
 pos = (1009,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 576;
@@ -76,7 +76,7 @@ ref = I;
 },
 {
 pos = (733,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/J_.glyph b/src/Inter-Italic.glyphspackage/glyphs/J_.glyph
index e78de4a6a..2e08827eb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/J_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/J_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = J;
 kernLeft = J;
 kernRight = J;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/J_circumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/J_circumflex.glyph
index 42f2cfa15..9ffb10f2e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/J_circumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/J_circumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = J;
 },
 {
-pos = (437,372);
-ref = circumflex;
+pos = (516,558);
+ref = circumflexcomb;
 }
 );
 width = 1110;
@@ -23,8 +23,8 @@ shapes = (
 ref = J;
 },
 {
-pos = (323,372);
-ref = circumflex;
+pos = (489,558);
+ref = circumflexcomb;
 }
 );
 width = 1204;
@@ -36,8 +36,8 @@ shapes = (
 ref = J;
 },
 {
-pos = (438,372);
-ref = circumflex;
+pos = (468,558);
+ref = circumflexcomb;
 }
 );
 width = 1064;
@@ -49,8 +49,8 @@ shapes = (
 ref = J;
 },
 {
-pos = (444,414);
-ref = circumflex;
+pos = (510,620);
+ref = circumflexcomb;
 }
 );
 width = 1046;
@@ -62,8 +62,8 @@ shapes = (
 ref = J;
 },
 {
-pos = (320,414);
-ref = circumflex;
+pos = (553,620);
+ref = circumflexcomb;
 }
 );
 width = 1170;
@@ -75,8 +75,8 @@ shapes = (
 ref = J;
 },
 {
-pos = (453,414);
-ref = circumflex;
+pos = (494,620);
+ref = circumflexcomb;
 }
 );
 width = 941;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/K_.glyph b/src/Inter-Italic.glyphspackage/glyphs/K_.glyph
index f9371e633..ba142acb7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/K_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/K_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = K;
 kernLeft = B;
 kernRight = K;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/K_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/K_acute.glyph
index d6d4c3304..9421a99ae 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/K_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/K_acute.glyph
@@ -5,78 +5,84 @@ kernRight = K;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = K;
 },
 {
-pos = (519,558);
-ref = acute;
+pos = (639,558);
+ref = acutecomb;
 }
 );
 width = 1336;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = K;
 },
 {
-pos = (515,558);
-ref = acute;
+pos = (645,558);
+ref = acutecomb;
 }
 );
 width = 1465;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = K;
 },
 {
-pos = (519,558);
-ref = acute;
+pos = (659,558);
+ref = acutecomb;
 }
 );
 width = 1262;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = K;
 },
 {
-pos = (580,620);
-ref = acute;
+pos = (620,620);
+ref = acutecomb;
 }
 );
 width = 1272;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = K;
 },
 {
-pos = (605,620);
-ref = acute;
+pos = (629,620);
+ref = acutecomb;
 }
 );
 width = 1478;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = K;
 },
 {
-pos = (539,620);
-ref = acute;
+pos = (599,620);
+ref = acutecomb;
 }
 );
 width = 1142;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/K_caron.glyph b/src/Inter-Italic.glyphspackage/glyphs/K_caron.glyph
index 661532217..be326c8ef 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/K_caron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/K_caron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = K;
 },
 {
-pos = (266,372);
-ref = caron;
+pos = (347,558);
+ref = caroncomb;
 }
 );
 width = 1336;
@@ -23,8 +23,8 @@ shapes = (
 ref = K;
 },
 {
-pos = (142,372);
-ref = caron;
+pos = (307,558);
+ref = caroncomb;
 }
 );
 width = 1465;
@@ -36,8 +36,8 @@ shapes = (
 ref = K;
 },
 {
-pos = (273,388);
-ref = caron;
+pos = (300,558);
+ref = caroncomb;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = K;
 },
 {
-pos = (276,414);
-ref = caron;
+pos = (345,620);
+ref = caroncomb;
 }
 );
 width = 1272;
@@ -62,8 +62,8 @@ shapes = (
 ref = K;
 },
 {
-pos = (159,414);
-ref = caron;
+pos = (390,620);
+ref = caroncomb;
 }
 );
 width = 1478;
@@ -75,8 +75,8 @@ shapes = (
 ref = K;
 },
 {
-pos = (273,414);
-ref = caron;
+pos = (318,620);
+ref = caroncomb;
 }
 );
 width = 1142;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/K_linebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/K_linebelow.glyph
index 2b58d9af4..e16f4ed9d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/K_linebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/K_linebelow.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (222,0);
+pos = (223,0);
 ref = macronsub;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = K;
 },
 {
-pos = (335,2);
+pos = (334,2);
 ref = macronsub;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/L_.glyph b/src/Inter-Italic.glyphspackage/glyphs/L_.glyph
index d6144c160..8d5dafcfb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/L_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/L_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = L;
 kernLeft = B;
 kernRight = L;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/L_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/L_acute.glyph
index 68694e6bd..7bc4701e3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/L_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/L_acute.glyph
@@ -5,78 +5,84 @@ kernRight = L;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = L;
 },
 {
-pos = (123,558);
-ref = acute;
+pos = (243,558);
+ref = acutecomb;
 }
 );
 width = 1152;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = L;
 },
 {
-pos = (85,558);
-ref = acute;
+pos = (215,558);
+ref = acutecomb;
 }
 );
 width = 1171;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = L;
 },
 {
-pos = (137,558);
-ref = acute;
+pos = (277,558);
+ref = acutecomb;
 }
 );
 width = 1152;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = L;
 },
 {
-pos = (176,620);
-ref = acute;
+pos = (216,620);
+ref = acutecomb;
 }
 );
 width = 1088;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = L;
 },
 {
-pos = (163,620);
-ref = acute;
+pos = (187,620);
+ref = acutecomb;
 }
 );
 width = 1138;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = L;
 },
 {
-pos = (158,620);
-ref = acute;
+pos = (218,620);
+ref = acutecomb;
 }
 );
 width = 1018;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/L_circumflexbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/L_circumflexbelow.glyph
index 655974525..f0d1d6450 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/L_circumflexbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/L_circumflexbelow.glyph
@@ -11,7 +11,7 @@ ref = L;
 },
 {
 pos = (1206,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1152;
@@ -24,7 +24,7 @@ ref = L;
 },
 {
 pos = (1227,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1171;
@@ -37,7 +37,7 @@ ref = L;
 },
 {
 pos = (1140,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1152;
@@ -50,7 +50,7 @@ ref = L;
 },
 {
 pos = (1198,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1088;
@@ -63,7 +63,7 @@ ref = L;
 },
 {
 pos = (1275,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1138;
@@ -76,7 +76,7 @@ ref = L;
 },
 {
 pos = (1132,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1018;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/L_dot.glyph b/src/Inter-Italic.glyphspackage/glyphs/L_dot.glyph
index 091ca4e0a..c30994e4d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/L_dot.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/L_dot.glyph
@@ -11,7 +11,7 @@ ref = L;
 {
 alignment = -1;
 pos = (376,-568);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 1152;
@@ -27,7 +27,7 @@ ref = L;
 {
 alignment = -1;
 pos = (382,-480);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 1210;
@@ -43,7 +43,7 @@ ref = L;
 {
 alignment = -1;
 pos = (372,-620);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 1118;
@@ -58,7 +58,7 @@ ref = L;
 {
 alignment = -1;
 pos = (376,-568);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 1088;
@@ -74,7 +74,7 @@ ref = L;
 {
 alignment = -1;
 pos = (382,-480);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 1178;
@@ -90,7 +90,7 @@ ref = L;
 {
 alignment = -1;
 pos = (372,-620);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 990;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/L_dotbelowmacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/L_dotbelowmacron.glyph
index 40d7cb0d7..594005a9f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/L_dotbelowmacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/L_dotbelowmacron.glyph
@@ -5,6 +5,7 @@ kernRight = L;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = L;
@@ -15,13 +16,14 @@ ref = dotbelow;
 },
 {
 pos = (-120,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1152;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = L;
@@ -32,13 +34,14 @@ ref = dotbelow;
 },
 {
 pos = (-28,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1171;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = L;
@@ -49,13 +52,14 @@ ref = dotbelow;
 },
 {
 pos = (-51,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1152;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = L;
@@ -65,14 +69,15 @@ pos = (1225,0);
 ref = dotbelow;
 },
 {
-pos = (-75,620);
-ref = macron;
+pos = (-76,620);
+ref = macroncomb;
 }
 );
 width = 1088;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = L;
@@ -83,13 +88,14 @@ ref = dotbelow;
 },
 {
 pos = (-4,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1138;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = L;
@@ -100,7 +106,7 @@ ref = dotbelow;
 },
 {
 pos = (-96,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1018;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/L_linebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/L_linebelow.glyph
index 9c9e54533..fe438b9a8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/L_linebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/L_linebelow.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (168,0);
+pos = (169,0);
 ref = macronsub;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = L;
 },
 {
-pos = (201,0);
+pos = (200,0);
 ref = macronsub;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/M_.glyph b/src/Inter-Italic.glyphspackage/glyphs/M_.glyph
index 1c32e024a..53d3a8d1c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/M_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/M_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = M;
 kernLeft = B;
 kernRight = H;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/M_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/M_acute.glyph
index a13e6bea8..31a91eefd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/M_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/M_acute.glyph
@@ -5,78 +5,84 @@ kernRight = H;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = M;
 },
 {
-pos = (757,558);
-ref = acute;
+pos = (877,558);
+ref = acutecomb;
 }
 );
 width = 1829;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = M;
 },
 {
-pos = (742,558);
-ref = acute;
+pos = (872,558);
+ref = acutecomb;
 }
 );
 width = 1908;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = M;
 },
 {
-pos = (763,558);
-ref = acute;
+pos = (903,558);
+ref = acutecomb;
 }
 );
 width = 1768;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = M;
 },
 {
-pos = (813,620);
-ref = acute;
+pos = (853,620);
+ref = acutecomb;
 }
 );
 width = 1749;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = M;
 },
 {
-pos = (824,620);
-ref = acute;
+pos = (848,620);
+ref = acutecomb;
 }
 );
 width = 1885;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = M;
 },
 {
-pos = (786,620);
-ref = acute;
+pos = (846,620);
+ref = acutecomb;
 }
 );
 width = 1640;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/M_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/M_dotaccent.glyph
index 7d9ed72aa..986908d10 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/M_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/M_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = M;
 },
 {
-pos = (726,372);
-ref = dotaccent;
+pos = (757,558);
+ref = dotaccentcomb;
 }
 );
 width = 1829;
@@ -25,8 +25,8 @@ shapes = (
 ref = M;
 },
 {
-pos = (680,372);
-ref = dotaccent;
+pos = (711,558);
+ref = dotaccentcomb;
 }
 );
 width = 1908;
@@ -39,8 +39,8 @@ shapes = (
 ref = M;
 },
 {
-pos = (758,372);
-ref = dotaccent;
+pos = (789,558);
+ref = dotaccentcomb;
 }
 );
 width = 1768;
@@ -53,8 +53,8 @@ shapes = (
 ref = M;
 },
 {
-pos = (731,414);
-ref = dotaccent;
+pos = (765,620);
+ref = dotaccentcomb;
 }
 );
 width = 1749;
@@ -67,8 +67,8 @@ shapes = (
 ref = M;
 },
 {
-pos = (687,414);
-ref = dotaccent;
+pos = (721,620);
+ref = dotaccentcomb;
 }
 );
 width = 1885;
@@ -81,8 +81,8 @@ shapes = (
 ref = M;
 },
 {
-pos = (766,414);
-ref = dotaccent;
+pos = (794,620);
+ref = dotaccentcomb;
 }
 );
 width = 1640;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/N_.glyph b/src/Inter-Italic.glyphspackage/glyphs/N_.glyph
index 04e806a03..0910b7a57 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/N_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/N_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = N;
 kernLeft = B;
 kernRight = H;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/N_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/N_acute.glyph
index ee86f736c..fe1b3aa1e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/N_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/N_acute.glyph
@@ -5,78 +5,84 @@ kernRight = H;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = N;
 },
 {
-pos = (617,558);
-ref = acute;
+pos = (737,558);
+ref = acutecomb;
 }
 );
 width = 1544;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = N;
 },
 {
-pos = (530,558);
-ref = acute;
+pos = (660,558);
+ref = acutecomb;
 }
 );
 width = 1480;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = N;
 },
 {
-pos = (669,558);
-ref = acute;
+pos = (809,558);
+ref = acutecomb;
 }
 );
 width = 1580;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = N;
 },
 {
-pos = (681,620);
-ref = acute;
+pos = (721,620);
+ref = acutecomb;
 }
 );
 width = 1473;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = N;
 },
 {
-pos = (644,620);
-ref = acute;
+pos = (668,620);
+ref = acutecomb;
 }
 );
 width = 1513;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = N;
 },
 {
-pos = (692,620);
-ref = acute;
+pos = (752,620);
+ref = acutecomb;
 }
 );
 width = 1452;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/N_caron.glyph b/src/Inter-Italic.glyphspackage/glyphs/N_caron.glyph
index aa3ab79a6..e95f7ffb9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/N_caron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/N_caron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (364,372);
-ref = caron;
+pos = (445,558);
+ref = caroncomb;
 }
 );
 width = 1544;
@@ -23,8 +23,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (157,372);
-ref = caron;
+pos = (322,558);
+ref = caroncomb;
 }
 );
 width = 1480;
@@ -36,8 +36,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (423,388);
-ref = caron;
+pos = (450,558);
+ref = caroncomb;
 }
 );
 width = 1580;
@@ -49,8 +49,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (377,414);
-ref = caron;
+pos = (446,620);
+ref = caroncomb;
 }
 );
 width = 1473;
@@ -62,8 +62,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (198,414);
-ref = caron;
+pos = (429,620);
+ref = caroncomb;
 }
 );
 width = 1513;
@@ -75,8 +75,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (426,414);
-ref = caron;
+pos = (471,620);
+ref = caroncomb;
 }
 );
 width = 1452;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/N_circumflexbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/N_circumflexbelow.glyph
index 5241e29fa..004c5ae99 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/N_circumflexbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/N_circumflexbelow.glyph
@@ -11,7 +11,7 @@ ref = N;
 },
 {
 pos = (1351,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1544;
@@ -24,7 +24,7 @@ ref = N;
 },
 {
 pos = (1415,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1480;
@@ -37,7 +37,7 @@ ref = N;
 },
 {
 pos = (1301,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1580;
@@ -50,7 +50,7 @@ ref = N;
 },
 {
 pos = (1356,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1473;
@@ -63,7 +63,7 @@ ref = N;
 },
 {
 pos = (1449,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1513;
@@ -76,7 +76,7 @@ ref = N;
 },
 {
 pos = (1294,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1452;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/N_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/N_dotaccent.glyph
index aa0ef3415..b9765a010 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/N_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/N_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (586,372);
-ref = dotaccent;
+pos = (617,558);
+ref = dotaccentcomb;
 }
 );
 width = 1544;
@@ -25,8 +25,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (468,372);
-ref = dotaccent;
+pos = (499,558);
+ref = dotaccentcomb;
 }
 );
 width = 1480;
@@ -39,8 +39,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (664,372);
-ref = dotaccent;
+pos = (695,558);
+ref = dotaccentcomb;
 }
 );
 width = 1580;
@@ -53,8 +53,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (599,414);
-ref = dotaccent;
+pos = (633,620);
+ref = dotaccentcomb;
 }
 );
 width = 1473;
@@ -67,8 +67,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (507,414);
-ref = dotaccent;
+pos = (541,620);
+ref = dotaccentcomb;
 }
 );
 width = 1513;
@@ -81,8 +81,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (672,414);
-ref = dotaccent;
+pos = (700,620);
+ref = dotaccentcomb;
 }
 );
 width = 1452;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/N_linebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/N_linebelow.glyph
index 62a1c1bb5..30996e033 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/N_linebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/N_linebelow.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (326,0);
+pos = (327,0);
 ref = macronsub;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = N;
 },
 {
-pos = (375,0);
+pos = (374,0);
 ref = macronsub;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/N_tilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/N_tilde.glyph
index f308a76b0..0aba3396e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/N_tilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/N_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (319,372);
-ref = tilde;
+pos = (349,558);
+ref = tildecomb;
 }
 );
 width = 1544;
@@ -23,8 +23,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (291,372);
-ref = tilde;
+pos = (321,558);
+ref = tildecomb;
 }
 );
 width = 1480;
@@ -36,8 +36,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (340,372);
-ref = tilde;
+pos = (378,558);
+ref = tildecomb;
 }
 );
 width = 1580;
@@ -49,8 +49,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (332,414);
-ref = tilde;
+pos = (365,620);
+ref = tildecomb;
 }
 );
 width = 1473;
@@ -62,8 +62,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (315,414);
-ref = tilde;
+pos = (349,620);
+ref = tildecomb;
 }
 );
 width = 1513;
@@ -75,8 +75,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (345,414);
-ref = tilde;
+pos = (375,620);
+ref = tildecomb;
 }
 );
 width = 1452;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_.glyph
index cb7f92ef1..e250a5459 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = O;
 kernLeft = C;
 kernRight = D;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_acute.glyph
index c2c2e9eda..44d34b6fe 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_acute.glyph
@@ -5,78 +5,84 @@ kernRight = D;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
-pos = (629,558);
-ref = acute;
+pos = (749,558);
+ref = acutecomb;
 }
 );
 width = 1560;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
-pos = (603,558);
-ref = acute;
+pos = (733,558);
+ref = acutecomb;
 }
 );
 width = 1628;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
-pos = (646,558);
-ref = acute;
+pos = (786,558);
+ref = acutecomb;
 }
 );
 width = 1530;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
-pos = (706,620);
-ref = acute;
+pos = (746,620);
+ref = acutecomb;
 }
 );
 width = 1534;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
-pos = (650,620);
-ref = acute;
+pos = (674,620);
+ref = acutecomb;
 }
 );
 width = 1528;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
-pos = (669,620);
-ref = acute;
+pos = (729,620);
+ref = acutecomb;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_barreddieresiscyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_barreddieresiscyrillic.glyph
index a9dacaab5..c6d40f06c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_barreddieresiscyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_barreddieresiscyrillic.glyph
@@ -11,7 +11,7 @@ ref = afii10147;
 },
 {
 pos = (272,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1560;
@@ -24,7 +24,7 @@ ref = afii10147;
 },
 {
 pos = (241,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1628;
@@ -37,7 +37,7 @@ ref = afii10147;
 },
 {
 pos = (276,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1530;
@@ -50,7 +50,7 @@ ref = afii10147;
 },
 {
 pos = (301,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1534;
@@ -63,7 +63,7 @@ ref = afii10147;
 },
 {
 pos = (218,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1528;
@@ -76,7 +76,7 @@ ref = afii10147;
 },
 {
 pos = (265,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_breve.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_breve.glyph
index 18950e34d..45ea708e9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_breve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_breve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (383,372);
-ref = breve;
+pos = (490,558);
+ref = brevecomb;
 }
 );
 width = 1560;
@@ -23,8 +23,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (364,372);
-ref = breve;
+pos = (427,558);
+ref = brevecomb;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (412,372);
-ref = breve;
+pos = (507,558);
+ref = brevecomb;
 }
 );
 width = 1530;
@@ -49,8 +49,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (408,414);
-ref = breve;
+pos = (471,620);
+ref = brevecomb;
 }
 );
 width = 1534;
@@ -62,8 +62,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (337,414);
-ref = breve;
+pos = (387,620);
+ref = brevecomb;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (355,414);
-ref = breve;
+pos = (447,620);
+ref = brevecomb;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_caron.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_caron.glyph
index a83011b33..bed5cd455 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_caron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_caron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (376,372);
-ref = caron;
+pos = (457,558);
+ref = caroncomb;
 }
 );
 width = 1560;
@@ -23,8 +23,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (230,372);
-ref = caron;
+pos = (395,558);
+ref = caroncomb;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (400,388);
-ref = caron;
+pos = (427,558);
+ref = caroncomb;
 }
 );
 width = 1530;
@@ -49,8 +49,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (402,414);
-ref = caron;
+pos = (471,620);
+ref = caroncomb;
 }
 );
 width = 1534;
@@ -62,8 +62,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (204,414);
-ref = caron;
+pos = (435,620);
+ref = caroncomb;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (403,414);
-ref = caron;
+pos = (448,620);
+ref = caroncomb;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_circumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_circumflex.glyph
index 7bf1994b3..1fa0c2624 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_circumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_circumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (378,372);
-ref = circumflex;
+pos = (457,558);
+ref = circumflexcomb;
 }
 );
 width = 1560;
@@ -23,8 +23,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (229,372);
-ref = circumflex;
+pos = (395,558);
+ref = circumflexcomb;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (396,372);
-ref = circumflex;
+pos = (426,558);
+ref = circumflexcomb;
 }
 );
 width = 1530;
@@ -49,8 +49,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (404,414);
-ref = circumflex;
+pos = (470,620);
+ref = circumflexcomb;
 }
 );
 width = 1534;
@@ -62,8 +62,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (203,414);
-ref = circumflex;
+pos = (436,620);
+ref = circumflexcomb;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (406,414);
-ref = circumflex;
+pos = (447,620);
+ref = circumflexcomb;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_circumflexdotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_circumflexdotbelow.glyph
index d6789d4d3..fea653302 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_circumflexdotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_circumflexdotbelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (378,372);
-ref = circumflex;
+pos = (457,558);
+ref = circumflexcomb;
 },
 {
 pos = (1385,0);
@@ -27,8 +27,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (229,372);
-ref = circumflex;
+pos = (395,558);
+ref = circumflexcomb;
 },
 {
 pos = (1352,0);
@@ -44,8 +44,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (396,372);
-ref = circumflex;
+pos = (426,558);
+ref = circumflexcomb;
 },
 {
 pos = (1326,0);
@@ -61,8 +61,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (404,414);
-ref = circumflex;
+pos = (470,620);
+ref = circumflexcomb;
 },
 {
 pos = (1408,0);
@@ -78,8 +78,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (203,414);
-ref = circumflex;
+pos = (436,620);
+ref = circumflexcomb;
 },
 {
 pos = (1323,0);
@@ -95,8 +95,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (406,414);
-ref = circumflex;
+pos = (447,620);
+ref = circumflexcomb;
 },
 {
 pos = (1326,0);
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_dieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_dieresis.glyph
index 836bb3fc5..74bdd6199 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_dieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_dieresis.glyph
@@ -16,7 +16,7 @@ ref = O;
 },
 {
 pos = (272,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1560;
@@ -29,7 +29,7 @@ ref = O;
 },
 {
 pos = (241,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1628;
@@ -42,7 +42,7 @@ ref = O;
 },
 {
 pos = (276,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1530;
@@ -60,7 +60,7 @@ ref = O;
 },
 {
 pos = (301,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1534;
@@ -73,7 +73,7 @@ ref = O;
 },
 {
 pos = (218,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1528;
@@ -86,7 +86,7 @@ ref = O;
 },
 {
 pos = (265,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_grave.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_grave.glyph
index 0f5330501..b4909a7c4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_grave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_grave.glyph
@@ -11,7 +11,7 @@ ref = O;
 },
 {
 pos = (464,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1560;
@@ -24,7 +24,7 @@ ref = O;
 },
 {
 pos = (389,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1628;
@@ -37,7 +37,7 @@ ref = O;
 },
 {
 pos = (494,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1530;
@@ -50,7 +50,7 @@ ref = O;
 },
 {
 pos = (541,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1534;
@@ -63,7 +63,7 @@ ref = O;
 },
 {
 pos = (387,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (474,620);
-ref = grave;
+pos = (478,620);
+ref = gravecomb;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_hookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_hookabove.glyph
index 920f21d92..cd4c3b36d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_hookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_hookabove.glyph
@@ -11,7 +11,7 @@ ref = O;
 },
 {
 pos = (609,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1560;
@@ -24,7 +24,7 @@ ref = O;
 },
 {
 pos = (593,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1628;
@@ -37,7 +37,7 @@ ref = O;
 },
 {
 pos = (638,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1530;
@@ -50,7 +50,7 @@ ref = O;
 },
 {
 pos = (606,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1534;
@@ -63,7 +63,7 @@ ref = O;
 },
 {
 pos = (544,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (581,620);
-ref = hookabove;
+pos = (575,620);
+ref = hookabovecomb;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_hornacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_hornacute.glyph
index 40b75ec18..91eb35204 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_hornacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_hornacute.glyph
@@ -5,78 +5,84 @@ kernRight = D;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = Ohorn;
 },
 {
-pos = (629,558);
-ref = acute;
+pos = (749,558);
+ref = acutecomb;
 }
 );
 width = 1560;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = Ohorn;
 },
 {
-pos = (603,558);
-ref = acute;
+pos = (733,558);
+ref = acutecomb;
 }
 );
 width = 1628;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = Ohorn;
 },
 {
-pos = (646,558);
-ref = acute;
+pos = (786,558);
+ref = acutecomb;
 }
 );
 width = 1530;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = Ohorn;
 },
 {
-pos = (706,620);
-ref = acute;
+pos = (746,620);
+ref = acutecomb;
 }
 );
 width = 1534;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = Ohorn;
 },
 {
-pos = (650,620);
-ref = acute;
+pos = (674,620);
+ref = acutecomb;
 }
 );
 width = 1528;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = Ohorn;
 },
 {
-pos = (669,620);
-ref = acute;
+pos = (729,620);
+ref = acutecomb;
 }
 );
 width = 1401;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_horngrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_horngrave.glyph
index a1a46abde..c5c344835 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_horngrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_horngrave.glyph
@@ -11,7 +11,7 @@ ref = Ohorn;
 },
 {
 pos = (464,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1560;
@@ -24,7 +24,7 @@ ref = Ohorn;
 },
 {
 pos = (389,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1628;
@@ -37,7 +37,7 @@ ref = Ohorn;
 },
 {
 pos = (494,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1530;
@@ -50,7 +50,7 @@ ref = Ohorn;
 },
 {
 pos = (541,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1534;
@@ -63,7 +63,7 @@ ref = Ohorn;
 },
 {
 pos = (387,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (474,620);
-ref = grave;
+pos = (478,620);
+ref = gravecomb;
 }
 );
 width = 1401;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_hornhookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_hornhookabove.glyph
index 81007c097..942d4a6af 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_hornhookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_hornhookabove.glyph
@@ -11,7 +11,7 @@ ref = Ohorn;
 },
 {
 pos = (609,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1560;
@@ -24,7 +24,7 @@ ref = Ohorn;
 },
 {
 pos = (593,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1628;
@@ -37,7 +37,7 @@ ref = Ohorn;
 },
 {
 pos = (638,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1530;
@@ -50,7 +50,7 @@ ref = Ohorn;
 },
 {
 pos = (606,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1534;
@@ -63,7 +63,7 @@ ref = Ohorn;
 },
 {
 pos = (544,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (581,620);
-ref = hookabove;
+pos = (575,620);
+ref = hookabovecomb;
 }
 );
 width = 1401;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_horntilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_horntilde.glyph
index d7efcdbcf..fc13e1b64 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_horntilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_horntilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (331,372);
-ref = tilde;
+pos = (361,558);
+ref = tildecomb;
 }
 );
 width = 1560;
@@ -23,8 +23,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (364,372);
-ref = tilde;
+pos = (394,558);
+ref = tildecomb;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (317,372);
-ref = tilde;
+pos = (355,558);
+ref = tildecomb;
 }
 );
 width = 1530;
@@ -49,8 +49,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (357,414);
-ref = tilde;
+pos = (390,620);
+ref = tildecomb;
 }
 );
 width = 1534;
@@ -62,8 +62,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (321,414);
-ref = tilde;
+pos = (355,620);
+ref = tildecomb;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = Ohorn;
 },
 {
-pos = (322,414);
-ref = tilde;
+pos = (352,620);
+ref = tildecomb;
 }
 );
 width = 1401;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_invertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_invertedbreve.glyph
index 24fd15512..e202b342d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_invertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_invertedbreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1470,558);
-ref = breveinvnosp;
+pos = (457,558);
+ref = breveinvcomb;
 }
 );
 width = 1560;
@@ -23,8 +23,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1569,558);
-ref = breveinvnosp;
+pos = (395,558);
+ref = breveinvcomb;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1441,558);
-ref = breveinvnosp;
+pos = (496,558);
+ref = breveinvcomb;
 }
 );
 width = 1530;
@@ -49,8 +49,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1433,620);
-ref = breveinvnosp;
+pos = (470,620);
+ref = breveinvcomb;
 }
 );
 width = 1534;
@@ -62,8 +62,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1518,620);
-ref = breveinvnosp;
+pos = (436,620);
+ref = breveinvcomb;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1328,620);
-ref = breveinvnosp;
+pos = (447,620);
+ref = breveinvcomb;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_macron.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_macron.glyph
index 1e80c22c3..7cd6dd5d4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_macron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_macron.glyph
@@ -5,78 +5,84 @@ kernRight = D;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
 pos = (386,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1560;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
 pos = (490,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1628;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
 pos = (458,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1530;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
-pos = (455,620);
-ref = macron;
+pos = (454,620);
+ref = macroncomb;
 }
 );
 width = 1534;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
 pos = (483,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1528;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = O;
 },
 {
 pos = (415,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_ogonekmacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_ogonekmacron.glyph
index 40147ae16..22638021e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_ogonekmacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_ogonekmacron.glyph
@@ -5,78 +5,84 @@ kernRight = D;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = Oogonek;
 },
 {
 pos = (386,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1560;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = Oogonek;
 },
 {
 pos = (490,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1628;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = Oogonek;
 },
 {
 pos = (458,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1530;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = Oogonek;
 },
 {
-pos = (455,620);
-ref = macron;
+pos = (454,620);
+ref = macroncomb;
 }
 );
 width = 1534;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = Oogonek;
 },
 {
 pos = (483,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1528;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = Oogonek;
 },
 {
 pos = (415,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_slashacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_slashacute.glyph
index d99c32173..200502ea1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_slashacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_slashacute.glyph
@@ -5,78 +5,84 @@ kernRight = D;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = Oslash;
 },
 {
-pos = (629,558);
-ref = acute;
+pos = (749,558);
+ref = acutecomb;
 }
 );
 width = 1560;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = Oslash;
 },
 {
-pos = (603,558);
-ref = acute;
+pos = (733,558);
+ref = acutecomb;
 }
 );
 width = 1628;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = Oslash;
 },
 {
-pos = (645,552);
-ref = acute;
+pos = (785,552);
+ref = acutecomb;
 }
 );
 width = 1530;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = Oslash;
 },
 {
-pos = (706,620);
-ref = acute;
+pos = (746,620);
+ref = acutecomb;
 }
 );
 width = 1534;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = Oslash;
 },
 {
-pos = (650,620);
-ref = acute;
+pos = (674,620);
+ref = acutecomb;
 }
 );
 width = 1528;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = Oslash;
 },
 {
-pos = (669,620);
-ref = acute;
+pos = (729,620);
+ref = acutecomb;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_tilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_tilde.glyph
index 0e1036d60..484e8c528 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_tilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (331,372);
-ref = tilde;
+pos = (361,558);
+ref = tildecomb;
 }
 );
 width = 1560;
@@ -23,8 +23,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (364,372);
-ref = tilde;
+pos = (394,558);
+ref = tildecomb;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (317,372);
-ref = tilde;
+pos = (355,558);
+ref = tildecomb;
 }
 );
 width = 1530;
@@ -49,8 +49,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (357,414);
-ref = tilde;
+pos = (390,620);
+ref = tildecomb;
 }
 );
 width = 1534;
@@ -62,8 +62,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (321,414);
-ref = tilde;
+pos = (355,620);
+ref = tildecomb;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (322,414);
-ref = tilde;
+pos = (352,620);
+ref = tildecomb;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_tildedieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_tildedieresis.glyph
index dac39f202..00750d26a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_tildedieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_tildedieresis.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1438,414);
-ref = tildedieresiscomb.cn;
+pos = (362,558);
+ref = tildedieresiscomb.uc;
 }
 );
 width = 1560;
@@ -23,8 +23,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1575,398);
-ref = tildedieresiscomb.cn;
+pos = (406,558);
+ref = tildedieresiscomb.uc;
 }
 );
 width = 1628;
@@ -36,8 +36,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1361,422);
-ref = tildedieresiscomb.cn;
+pos = (355,558);
+ref = tildedieresiscomb.uc;
 }
 );
 width = 1530;
@@ -49,8 +49,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1462,414);
-ref = tildedieresiscomb.cn;
+pos = (390,620);
+ref = tildedieresiscomb.uc;
 }
 );
 width = 1534;
@@ -62,8 +62,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1547,398);
-ref = tildedieresiscomb.cn;
+pos = (380,620);
+ref = tildedieresiscomb.uc;
 }
 );
 width = 1528;
@@ -75,8 +75,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1361,422);
-ref = tildedieresiscomb.cn;
+pos = (351,620);
+ref = tildedieresiscomb.uc;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/P_.glyph b/src/Inter-Italic.glyphspackage/glyphs/P_.glyph
index ff8e834fe..0620d9980 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/P_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/P_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = P;
 kernLeft = B;
 kernRight = P;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/P_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/P_acute.glyph
index 035ddebe4..6b587148c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/P_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/P_acute.glyph
@@ -5,78 +5,84 @@ kernRight = P;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = P;
 },
 {
-pos = (497,558);
-ref = acute;
+pos = (617,558);
+ref = acutecomb;
 }
 );
 width = 1298;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = P;
 },
 {
-pos = (449,558);
-ref = acute;
+pos = (579,558);
+ref = acutecomb;
 }
 );
 width = 1345;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = P;
 },
 {
-pos = (519,558);
-ref = acute;
+pos = (659,558);
+ref = acutecomb;
 }
 );
 width = 1242;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = P;
 },
 {
-pos = (554,620);
-ref = acute;
+pos = (594,620);
+ref = acutecomb;
 }
 );
 width = 1236;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = P;
 },
 {
-pos = (535,620);
-ref = acute;
+pos = (559,620);
+ref = acutecomb;
 }
 );
 width = 1308;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = P;
 },
 {
-pos = (540,620);
-ref = acute;
+pos = (600,620);
+ref = acutecomb;
 }
 );
 width = 1108;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/P_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/P_dotaccent.glyph
index 45a6093cf..d0feb6595 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/P_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/P_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = P;
 },
 {
-pos = (466,372);
-ref = dotaccent;
+pos = (497,558);
+ref = dotaccentcomb;
 }
 );
 width = 1298;
@@ -25,8 +25,8 @@ shapes = (
 ref = P;
 },
 {
-pos = (387,372);
-ref = dotaccent;
+pos = (418,558);
+ref = dotaccentcomb;
 }
 );
 width = 1345;
@@ -39,8 +39,8 @@ shapes = (
 ref = P;
 },
 {
-pos = (514,372);
-ref = dotaccent;
+pos = (545,558);
+ref = dotaccentcomb;
 }
 );
 width = 1242;
@@ -53,8 +53,8 @@ shapes = (
 ref = P;
 },
 {
-pos = (472,414);
-ref = dotaccent;
+pos = (506,620);
+ref = dotaccentcomb;
 }
 );
 width = 1236;
@@ -67,8 +67,8 @@ shapes = (
 ref = P;
 },
 {
-pos = (398,414);
-ref = dotaccent;
+pos = (432,620);
+ref = dotaccentcomb;
 }
 );
 width = 1308;
@@ -81,8 +81,8 @@ shapes = (
 ref = P;
 },
 {
-pos = (520,414);
-ref = dotaccent;
+pos = (548,620);
+ref = dotaccentcomb;
 }
 );
 width = 1108;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Q_.glyph b/src/Inter-Italic.glyphspackage/glyphs/Q_.glyph
index fff50754c..dc07ca869 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Q_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Q_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = Q;
 kernLeft = C;
 kernRight = D;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/R_.glyph b/src/Inter-Italic.glyphspackage/glyphs/R_.glyph
index 65e9cf178..763e0b323 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/R_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/R_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = R;
 kernLeft = B;
 kernRight = R;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/R_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/R_acute.glyph
index 684ae04d4..d5e1f94d1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/R_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/R_acute.glyph
@@ -5,78 +5,84 @@ kernRight = R;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = R;
 },
 {
-pos = (493,558);
-ref = acute;
+pos = (613,558);
+ref = acutecomb;
 }
 );
 width = 1310;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = R;
 },
 {
-pos = (462,558);
-ref = acute;
+pos = (592,558);
+ref = acutecomb;
 }
 );
 width = 1368;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = R;
 },
 {
-pos = (505,558);
-ref = acute;
+pos = (645,558);
+ref = acutecomb;
 }
 );
 width = 1260;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = R;
 },
 {
-pos = (553,620);
-ref = acute;
+pos = (593,620);
+ref = acutecomb;
 }
 );
 width = 1246;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = R;
 },
 {
-pos = (552,620);
-ref = acute;
+pos = (576,620);
+ref = acutecomb;
 }
 );
 width = 1344;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = R;
 },
 {
-pos = (528,620);
-ref = acute;
+pos = (588,620);
+ref = acutecomb;
 }
 );
 width = 1132;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/R_caron.glyph b/src/Inter-Italic.glyphspackage/glyphs/R_caron.glyph
index 9366d5686..636dc5a12 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/R_caron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/R_caron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (240,372);
-ref = caron;
+pos = (321,558);
+ref = caroncomb;
 }
 );
 width = 1310;
@@ -23,8 +23,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (89,372);
-ref = caron;
+pos = (254,558);
+ref = caroncomb;
 }
 );
 width = 1368;
@@ -36,8 +36,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (259,388);
-ref = caron;
+pos = (286,558);
+ref = caroncomb;
 }
 );
 width = 1260;
@@ -49,8 +49,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (249,414);
-ref = caron;
+pos = (318,620);
+ref = caroncomb;
 }
 );
 width = 1246;
@@ -62,8 +62,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (106,414);
-ref = caron;
+pos = (337,620);
+ref = caroncomb;
 }
 );
 width = 1344;
@@ -75,8 +75,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (262,414);
-ref = caron;
+pos = (307,620);
+ref = caroncomb;
 }
 );
 width = 1132;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/R_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/R_dotaccent.glyph
index 63e86d9e2..baccff823 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/R_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/R_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (462,372);
-ref = dotaccent;
+pos = (493,558);
+ref = dotaccentcomb;
 }
 );
 width = 1310;
@@ -25,8 +25,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (400,372);
-ref = dotaccent;
+pos = (431,558);
+ref = dotaccentcomb;
 }
 );
 width = 1368;
@@ -39,8 +39,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (500,372);
-ref = dotaccent;
+pos = (531,558);
+ref = dotaccentcomb;
 }
 );
 width = 1260;
@@ -53,8 +53,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (471,414);
-ref = dotaccent;
+pos = (505,620);
+ref = dotaccentcomb;
 }
 );
 width = 1246;
@@ -67,8 +67,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (415,414);
-ref = dotaccent;
+pos = (449,620);
+ref = dotaccentcomb;
 }
 );
 width = 1344;
@@ -81,8 +81,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (508,414);
-ref = dotaccent;
+pos = (536,620);
+ref = dotaccentcomb;
 }
 );
 width = 1132;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/R_dotbelowmacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/R_dotbelowmacron.glyph
index 1d9a9d9f5..04d0b0b9a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/R_dotbelowmacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/R_dotbelowmacron.glyph
@@ -5,6 +5,7 @@ kernRight = R;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = R;
@@ -15,13 +16,14 @@ ref = dotbelow;
 },
 {
 pos = (250,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1310;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = R;
@@ -32,13 +34,14 @@ ref = dotbelow;
 },
 {
 pos = (349,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1368;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = R;
@@ -49,13 +52,14 @@ ref = dotbelow;
 },
 {
 pos = (317,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1260;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = R;
@@ -65,14 +69,15 @@ pos = (1281,0);
 ref = dotbelow;
 },
 {
-pos = (302,620);
-ref = macron;
+pos = (301,620);
+ref = macroncomb;
 }
 );
 width = 1246;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = R;
@@ -83,13 +88,14 @@ ref = dotbelow;
 },
 {
 pos = (385,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1344;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = R;
@@ -100,7 +106,7 @@ ref = dotbelow;
 },
 {
 pos = (274,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1132;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/R_invertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/R_invertedbreve.glyph
index 77111601d..7aa52f6f2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/R_invertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/R_invertedbreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (1334,558);
-ref = breveinvnosp;
+pos = (321,558);
+ref = breveinvcomb;
 }
 );
 width = 1310;
@@ -23,8 +23,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (1428,558);
-ref = breveinvnosp;
+pos = (254,558);
+ref = breveinvcomb;
 }
 );
 width = 1368;
@@ -36,8 +36,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (1300,558);
-ref = breveinvnosp;
+pos = (355,558);
+ref = breveinvcomb;
 }
 );
 width = 1260;
@@ -49,8 +49,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (1280,620);
-ref = breveinvnosp;
+pos = (317,620);
+ref = breveinvcomb;
 }
 );
 width = 1246;
@@ -62,8 +62,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (1420,620);
-ref = breveinvnosp;
+pos = (338,620);
+ref = breveinvcomb;
 }
 );
 width = 1344;
@@ -75,8 +75,8 @@ shapes = (
 ref = R;
 },
 {
-pos = (1187,620);
-ref = breveinvnosp;
+pos = (306,620);
+ref = breveinvcomb;
 }
 );
 width = 1132;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/R_linebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/R_linebelow.glyph
index 3ce4d1079..146540cb5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/R_linebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/R_linebelow.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (224,0);
+pos = (225,0);
 ref = macronsub;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = R;
 },
 {
-pos = (307,0);
+pos = (306,0);
 ref = macronsub;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/R_x.glyph b/src/Inter-Italic.glyphspackage/glyphs/R_x.glyph
index 753061372..38931e361 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/R_x.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/R_x.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = Rx;
 kernLeft = B;
 kernRight = R;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/S_.glyph b/src/Inter-Italic.glyphspackage/glyphs/S_.glyph
index 7927045e4..c5801b1d2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/S_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/S_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = S;
 kernLeft = S;
 kernRight = S;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/S_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/S_acute.glyph
index 8af55adfe..296d9ea4e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/S_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/S_acute.glyph
@@ -5,78 +5,84 @@ kernRight = S;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = S;
 },
 {
-pos = (501,558);
-ref = acute;
+pos = (621,558);
+ref = acutecomb;
 }
 );
 width = 1306;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = S;
 },
 {
-pos = (474,558);
-ref = acute;
+pos = (604,558);
+ref = acutecomb;
 }
 );
 width = 1364;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = S;
 },
 {
-pos = (509,558);
-ref = acute;
+pos = (649,558);
+ref = acutecomb;
 }
 );
 width = 1254;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = S;
 },
 {
-pos = (562,620);
-ref = acute;
+pos = (602,620);
+ref = acutecomb;
 }
 );
 width = 1258;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = S;
 },
 {
-pos = (586,620);
-ref = acute;
+pos = (610,620);
+ref = acutecomb;
 }
 );
 width = 1403;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = S;
 },
 {
-pos = (536,620);
-ref = acute;
+pos = (596,620);
+ref = acutecomb;
 }
 );
 width = 1127;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/S_caron.glyph b/src/Inter-Italic.glyphspackage/glyphs/S_caron.glyph
index efb9564c5..bb6c7394e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/S_caron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/S_caron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (248,372);
-ref = caron;
+pos = (329,558);
+ref = caroncomb;
 }
 );
 width = 1306;
@@ -23,8 +23,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (101,372);
-ref = caron;
+pos = (266,558);
+ref = caroncomb;
 }
 );
 width = 1364;
@@ -36,8 +36,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (263,388);
-ref = caron;
+pos = (290,558);
+ref = caroncomb;
 }
 );
 width = 1254;
@@ -49,8 +49,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (258,414);
-ref = caron;
+pos = (327,620);
+ref = caroncomb;
 }
 );
 width = 1258;
@@ -62,8 +62,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (140,414);
-ref = caron;
+pos = (371,620);
+ref = caroncomb;
 }
 );
 width = 1403;
@@ -75,8 +75,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (270,414);
-ref = caron;
+pos = (315,620);
+ref = caroncomb;
 }
 );
 width = 1127;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/S_cedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/S_cedilla.glyph
index bbefb7ae4..875234185 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/S_cedilla.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/S_cedilla.glyph
@@ -12,7 +12,7 @@ ref = S;
 {
 anchor = cedilla;
 pos = (378,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1306;
@@ -26,7 +26,7 @@ ref = S;
 {
 anchor = cedilla;
 pos = (230,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1364;
@@ -40,7 +40,7 @@ ref = S;
 {
 anchor = cedilla;
 pos = (414,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1254;
@@ -54,7 +54,7 @@ ref = S;
 {
 anchor = cedilla;
 pos = (392,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1258;
@@ -68,7 +68,7 @@ ref = S;
 {
 anchor = cedilla;
 pos = (266,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1403;
@@ -82,7 +82,7 @@ ref = S;
 {
 anchor = cedilla;
 pos = (419,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1127;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/S_chwadieresiscyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/S_chwadieresiscyrillic.glyph
index df8fe0059..1fd76dd30 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/S_chwadieresiscyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/S_chwadieresiscyrillic.glyph
@@ -11,7 +11,7 @@ ref = Schwacyrillic;
 },
 {
 pos = (200,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1411;
@@ -24,7 +24,7 @@ ref = Schwacyrillic;
 },
 {
 pos = (164,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1471;
@@ -37,7 +37,7 @@ ref = Schwacyrillic;
 },
 {
 pos = (197,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1371;
@@ -50,7 +50,7 @@ ref = Schwacyrillic;
 },
 {
 pos = (207,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1348;
@@ -63,7 +63,7 @@ ref = Schwacyrillic;
 },
 {
 pos = (173,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1436;
@@ -76,7 +76,7 @@ ref = Schwacyrillic;
 },
 {
 pos = (198,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1254;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/S_circumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/S_circumflex.glyph
index 062174c76..9fbb747a1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/S_circumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/S_circumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (250,372);
-ref = circumflex;
+pos = (329,558);
+ref = circumflexcomb;
 }
 );
 width = 1306;
@@ -23,8 +23,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (100,372);
-ref = circumflex;
+pos = (266,558);
+ref = circumflexcomb;
 }
 );
 width = 1364;
@@ -36,8 +36,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (259,372);
-ref = circumflex;
+pos = (289,558);
+ref = circumflexcomb;
 }
 );
 width = 1254;
@@ -49,8 +49,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (260,414);
-ref = circumflex;
+pos = (326,620);
+ref = circumflexcomb;
 }
 );
 width = 1258;
@@ -62,8 +62,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (139,414);
-ref = circumflex;
+pos = (372,620);
+ref = circumflexcomb;
 }
 );
 width = 1403;
@@ -75,8 +75,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (273,414);
-ref = circumflex;
+pos = (314,620);
+ref = circumflexcomb;
 }
 );
 width = 1127;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/S_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/S_dotaccent.glyph
index 23983a03a..05ba5e574 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/S_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/S_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (470,372);
-ref = dotaccent;
+pos = (501,558);
+ref = dotaccentcomb;
 }
 );
 width = 1306;
@@ -25,8 +25,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (412,372);
-ref = dotaccent;
+pos = (443,558);
+ref = dotaccentcomb;
 }
 );
 width = 1364;
@@ -39,8 +39,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (504,372);
-ref = dotaccent;
+pos = (535,558);
+ref = dotaccentcomb;
 }
 );
 width = 1254;
@@ -53,8 +53,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (480,414);
-ref = dotaccent;
+pos = (514,620);
+ref = dotaccentcomb;
 }
 );
 width = 1258;
@@ -67,8 +67,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (449,414);
-ref = dotaccent;
+pos = (483,620);
+ref = dotaccentcomb;
 }
 );
 width = 1403;
@@ -81,8 +81,8 @@ shapes = (
 ref = S;
 },
 {
-pos = (516,414);
-ref = dotaccent;
+pos = (544,620);
+ref = dotaccentcomb;
 }
 );
 width = 1127;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/S_dotbelowdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/S_dotbelowdotaccent.glyph
index 5c9b461e3..2d92dc499 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/S_dotbelowdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/S_dotbelowdotaccent.glyph
@@ -15,8 +15,8 @@ pos = (1254,-26);
 ref = dotbelow;
 },
 {
-pos = (470,372);
-ref = dotaccent;
+pos = (501,558);
+ref = dotaccentcomb;
 }
 );
 width = 1306;
@@ -33,8 +33,8 @@ pos = (1226,0);
 ref = dotbelow;
 },
 {
-pos = (412,372);
-ref = dotaccent;
+pos = (443,558);
+ref = dotaccentcomb;
 }
 );
 width = 1364;
@@ -51,8 +51,8 @@ pos = (1184,-24);
 ref = dotbelow;
 },
 {
-pos = (504,372);
-ref = dotaccent;
+pos = (535,558);
+ref = dotaccentcomb;
 }
 );
 width = 1254;
@@ -69,8 +69,8 @@ pos = (1270,-24);
 ref = dotbelow;
 },
 {
-pos = (480,414);
-ref = dotaccent;
+pos = (514,620);
+ref = dotaccentcomb;
 }
 );
 width = 1258;
@@ -87,8 +87,8 @@ pos = (1263,0);
 ref = dotbelow;
 },
 {
-pos = (449,414);
-ref = dotaccent;
+pos = (483,620);
+ref = dotaccentcomb;
 }
 );
 width = 1403;
@@ -105,8 +105,8 @@ pos = (1189,-24);
 ref = dotbelow;
 },
 {
-pos = (516,414);
-ref = dotaccent;
+pos = (544,620);
+ref = dotaccentcomb;
 }
 );
 width = 1127;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/T_.glyph b/src/Inter-Italic.glyphspackage/glyphs/T_.glyph
index f553fb6a2..5a8956671 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/T_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/T_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = T;
 kernLeft = T;
 kernRight = T;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/T_caron.glyph b/src/Inter-Italic.glyphspackage/glyphs/T_caron.glyph
index e119ad850..a1ead412f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/T_caron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/T_caron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (253,372);
-ref = caron;
+pos = (334,558);
+ref = caroncomb;
 }
 );
 width = 1315;
@@ -23,8 +23,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (118,372);
-ref = caron;
+pos = (283,558);
+ref = caroncomb;
 }
 );
 width = 1406;
@@ -36,8 +36,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (264,388);
-ref = caron;
+pos = (291,558);
+ref = caroncomb;
 }
 );
 width = 1263;
@@ -49,8 +49,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (261,414);
-ref = caron;
+pos = (330,620);
+ref = caroncomb;
 }
 );
 width = 1251;
@@ -62,8 +62,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (137,414);
-ref = caron;
+pos = (368,620);
+ref = caroncomb;
 }
 );
 width = 1393;
@@ -75,8 +75,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (263,414);
-ref = caron;
+pos = (308,620);
+ref = caroncomb;
 }
 );
 width = 1127;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/T_circumflexbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/T_circumflexbelow.glyph
index 36f9e5333..2980614f8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/T_circumflexbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/T_circumflexbelow.glyph
@@ -11,7 +11,7 @@ ref = T;
 },
 {
 pos = (1240,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1315;
@@ -24,7 +24,7 @@ ref = T;
 },
 {
 pos = (1376,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1406;
@@ -37,7 +37,7 @@ ref = T;
 },
 {
 pos = (1142,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1263;
@@ -50,7 +50,7 @@ ref = T;
 },
 {
 pos = (1240,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1251;
@@ -63,7 +63,7 @@ ref = T;
 },
 {
 pos = (1386,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1393;
@@ -76,7 +76,7 @@ ref = T;
 },
 {
 pos = (1131,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1127;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/T_commaaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/T_commaaccent.glyph
index 34d2a660b..b6824e1bf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/T_commaaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/T_commaaccent.glyph
@@ -12,7 +12,7 @@ ref = T;
 {
 anchor = cedilla;
 pos = (402,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1315;
@@ -26,7 +26,7 @@ ref = T;
 {
 anchor = cedilla;
 pos = (239,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1406;
@@ -40,7 +40,7 @@ ref = T;
 {
 anchor = cedilla;
 pos = (415,-6);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1263;
@@ -54,7 +54,7 @@ ref = T;
 {
 anchor = cedilla;
 pos = (407,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1251;
@@ -68,7 +68,7 @@ ref = T;
 {
 anchor = cedilla;
 pos = (254,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1393;
@@ -82,7 +82,7 @@ ref = T;
 {
 anchor = cedilla;
 pos = (411,-6);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1127;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/T_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/T_dotaccent.glyph
index ee00a496d..682f229a8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/T_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/T_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (475,372);
-ref = dotaccent;
+pos = (506,558);
+ref = dotaccentcomb;
 }
 );
 width = 1315;
@@ -25,8 +25,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (429,372);
-ref = dotaccent;
+pos = (460,558);
+ref = dotaccentcomb;
 }
 );
 width = 1406;
@@ -39,8 +39,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (505,372);
-ref = dotaccent;
+pos = (536,558);
+ref = dotaccentcomb;
 }
 );
 width = 1263;
@@ -53,8 +53,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (483,414);
-ref = dotaccent;
+pos = (517,620);
+ref = dotaccentcomb;
 }
 );
 width = 1251;
@@ -67,8 +67,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (446,414);
-ref = dotaccent;
+pos = (480,620);
+ref = dotaccentcomb;
 }
 );
 width = 1393;
@@ -81,8 +81,8 @@ shapes = (
 ref = T;
 },
 {
-pos = (509,414);
-ref = dotaccent;
+pos = (537,620);
+ref = dotaccentcomb;
 }
 );
 width = 1127;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/T_hook.base.glyph b/src/Inter-Italic.glyphspackage/glyphs/T_hook.base.glyph
index 19318daa4..7da680dca 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/T_hook.base.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/T_hook.base.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = Thook.base;
 kernRight = T;
 layers = (
diff --git a/src/Inter-Italic.glyphspackage/glyphs/T_linebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/T_linebelow.glyph
index 5b27f6f93..09d7ff866 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/T_linebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/T_linebelow.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (210,0);
+pos = (211,0);
 ref = macronsub;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = T;
 },
 {
-pos = (312,0);
+pos = (311,0);
 ref = macronsub;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_.glyph
index 388ffd277..268b153d9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = U;
 kernLeft = U;
 kernRight = J;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_acute.glyph
index 1e6bcaea4..0db848706 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_acute.glyph
@@ -5,78 +5,84 @@ kernRight = J;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
-pos = (607,558);
-ref = acute;
+pos = (727,558);
+ref = acutecomb;
 }
 );
 width = 1518;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
-pos = (526,558);
-ref = acute;
+pos = (656,558);
+ref = acutecomb;
 }
 );
 width = 1478;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
-pos = (648,558);
-ref = acute;
+pos = (788,558);
+ref = acutecomb;
 }
 );
 width = 1537;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
-pos = (658,620);
-ref = acute;
+pos = (698,620);
+ref = acutecomb;
 }
 );
 width = 1438;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
-pos = (607,620);
-ref = acute;
+pos = (631,620);
+ref = acutecomb;
 }
 );
 width = 1444;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
-pos = (649,620);
-ref = acute;
+pos = (709,620);
+ref = acutecomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_breve.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_breve.glyph
index 8a7f12bbe..6719de506 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_breve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_breve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (361,372);
-ref = breve;
+pos = (468,558);
+ref = brevecomb;
 }
 );
 width = 1518;
@@ -23,8 +23,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (287,372);
-ref = breve;
+pos = (350,558);
+ref = brevecomb;
 }
 );
 width = 1478;
@@ -36,8 +36,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (414,372);
-ref = breve;
+pos = (509,558);
+ref = brevecomb;
 }
 );
 width = 1537;
@@ -49,8 +49,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (360,414);
-ref = breve;
+pos = (423,620);
+ref = brevecomb;
 }
 );
 width = 1438;
@@ -62,8 +62,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (294,414);
-ref = breve;
+pos = (344,620);
+ref = brevecomb;
 }
 );
 width = 1444;
@@ -75,8 +75,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (335,414);
-ref = breve;
+pos = (427,620);
+ref = brevecomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_caron.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_caron.glyph
index 677d782f0..e7c2bf103 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_caron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_caron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (354,372);
-ref = caron;
+pos = (435,558);
+ref = caroncomb;
 }
 );
 width = 1518;
@@ -23,8 +23,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (153,372);
-ref = caron;
+pos = (318,558);
+ref = caroncomb;
 }
 );
 width = 1478;
@@ -36,8 +36,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (402,388);
-ref = caron;
+pos = (429,558);
+ref = caroncomb;
 }
 );
 width = 1537;
@@ -49,8 +49,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (354,414);
-ref = caron;
+pos = (423,620);
+ref = caroncomb;
 }
 );
 width = 1438;
@@ -62,8 +62,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (161,414);
-ref = caron;
+pos = (392,620);
+ref = caroncomb;
 }
 );
 width = 1444;
@@ -75,8 +75,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (383,414);
-ref = caron;
+pos = (428,620);
+ref = caroncomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_circumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_circumflex.glyph
index b957bec4a..0af5a6987 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_circumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_circumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (356,372);
-ref = circumflex;
+pos = (435,558);
+ref = circumflexcomb;
 }
 );
 width = 1518;
@@ -23,8 +23,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (152,372);
-ref = circumflex;
+pos = (318,558);
+ref = circumflexcomb;
 }
 );
 width = 1478;
@@ -36,8 +36,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (398,372);
-ref = circumflex;
+pos = (428,558);
+ref = circumflexcomb;
 }
 );
 width = 1537;
@@ -49,8 +49,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (356,414);
-ref = circumflex;
+pos = (422,620);
+ref = circumflexcomb;
 }
 );
 width = 1438;
@@ -62,8 +62,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (160,414);
-ref = circumflex;
+pos = (393,620);
+ref = circumflexcomb;
 }
 );
 width = 1444;
@@ -75,8 +75,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (386,414);
-ref = circumflex;
+pos = (427,620);
+ref = circumflexcomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_circumflexbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_circumflexbelow.glyph
index 1c746e660..dc50b446e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_circumflexbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_circumflexbelow.glyph
@@ -11,7 +11,7 @@ ref = U;
 },
 {
 pos = (1341,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1518;
@@ -24,7 +24,7 @@ ref = U;
 },
 {
 pos = (1411,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1478;
@@ -37,7 +37,7 @@ ref = U;
 },
 {
 pos = (1280,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1537;
@@ -50,7 +50,7 @@ ref = U;
 },
 {
 pos = (1333,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1438;
@@ -63,7 +63,7 @@ ref = U;
 },
 {
 pos = (1412,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1444;
@@ -76,7 +76,7 @@ ref = U;
 },
 {
 pos = (1250,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_dieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_dieresis.glyph
index f454cacd5..82e8b425c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_dieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_dieresis.glyph
@@ -11,7 +11,7 @@ ref = U;
 },
 {
 pos = (250,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1518;
@@ -24,7 +24,7 @@ ref = U;
 },
 {
 pos = (164,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1478;
@@ -37,7 +37,7 @@ ref = U;
 },
 {
 pos = (278,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1537;
@@ -50,7 +50,7 @@ ref = U;
 },
 {
 pos = (253,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1438;
@@ -63,7 +63,7 @@ ref = U;
 },
 {
 pos = (175,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1444;
@@ -76,7 +76,7 @@ ref = U;
 },
 {
 pos = (245,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_dieresisbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_dieresisbelow.glyph
index db6578cc3..40f8ea370 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_dieresisbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_dieresisbelow.glyph
@@ -11,7 +11,7 @@ ref = U;
 },
 {
 pos = (1453,0);
-ref = dotdblsubnosp;
+ref = dotdblsubcomb;
 }
 );
 width = 1518;
@@ -31,7 +31,7 @@ ref = U;
 },
 {
 pos = (1507,0);
-ref = dotdblsubnosp;
+ref = dotdblsubcomb;
 }
 );
 width = 1478;
@@ -44,7 +44,7 @@ ref = U;
 },
 {
 pos = (1377,0);
-ref = dotdblsubnosp;
+ref = dotdblsubcomb;
 }
 );
 width = 1537;
@@ -57,7 +57,7 @@ ref = U;
 },
 {
 pos = (1445,0);
-ref = dotdblsubnosp;
+ref = dotdblsubcomb;
 }
 );
 width = 1438;
@@ -77,7 +77,7 @@ ref = U;
 },
 {
 pos = (1507,0);
-ref = dotdblsubnosp;
+ref = dotdblsubcomb;
 }
 );
 width = 1444;
@@ -90,7 +90,7 @@ ref = U;
 },
 {
 pos = (1285,0);
-ref = dotdblsubnosp;
+ref = dotdblsubcomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_dieresiscyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_dieresiscyrillic.glyph
index d0d1c6084..c012e42d7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_dieresiscyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_dieresiscyrillic.glyph
@@ -9,7 +9,7 @@ ref = afii10037;
 },
 {
 pos = (126,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1276;
@@ -22,7 +22,7 @@ ref = afii10037;
 },
 {
 pos = (144,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1442;
@@ -35,7 +35,7 @@ ref = afii10037;
 },
 {
 pos = (101,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1170;
@@ -48,7 +48,7 @@ ref = afii10037;
 },
 {
 pos = (135,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1212;
@@ -61,7 +61,7 @@ ref = afii10037;
 },
 {
 pos = (155,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1410;
@@ -74,7 +74,7 @@ ref = afii10037;
 },
 {
 pos = (98,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1046;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_grave.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_grave.glyph
index 5e5cae018..cf12f51d0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_grave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_grave.glyph
@@ -11,7 +11,7 @@ ref = U;
 },
 {
 pos = (442,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1518;
@@ -24,7 +24,7 @@ ref = U;
 },
 {
 pos = (312,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1478;
@@ -37,7 +37,7 @@ ref = U;
 },
 {
 pos = (496,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1537;
@@ -50,7 +50,7 @@ ref = U;
 },
 {
 pos = (493,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1438;
@@ -63,7 +63,7 @@ ref = U;
 },
 {
 pos = (344,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1444;
@@ -75,8 +75,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (454,620);
-ref = grave;
+pos = (458,620);
+ref = gravecomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_hookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_hookabove.glyph
index 712443949..fb73ca78b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_hookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_hookabove.glyph
@@ -11,7 +11,7 @@ ref = U;
 },
 {
 pos = (587,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1518;
@@ -24,7 +24,7 @@ ref = U;
 },
 {
 pos = (516,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1478;
@@ -37,7 +37,7 @@ ref = U;
 },
 {
 pos = (640,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1537;
@@ -50,7 +50,7 @@ ref = U;
 },
 {
 pos = (558,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1438;
@@ -63,7 +63,7 @@ ref = U;
 },
 {
 pos = (501,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1444;
@@ -75,8 +75,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (561,620);
-ref = hookabove;
+pos = (555,620);
+ref = hookabovecomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_hornacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_hornacute.glyph
index 3cf35565e..03131f696 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_hornacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_hornacute.glyph
@@ -5,78 +5,84 @@ kernRight = U;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = Uhorn;
 },
 {
-pos = (607,558);
-ref = acute;
+pos = (727,558);
+ref = acutecomb;
 }
 );
 width = 1518;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = Uhorn;
 },
 {
-pos = (526,558);
-ref = acute;
+pos = (656,558);
+ref = acutecomb;
 }
 );
 width = 1478;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = Uhorn;
 },
 {
-pos = (648,558);
-ref = acute;
+pos = (788,558);
+ref = acutecomb;
 }
 );
 width = 1535;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = Uhorn;
 },
 {
-pos = (658,620);
-ref = acute;
+pos = (698,620);
+ref = acutecomb;
 }
 );
 width = 1440;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = Uhorn;
 },
 {
-pos = (607,620);
-ref = acute;
+pos = (631,620);
+ref = acutecomb;
 }
 );
 width = 1443;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = Uhorn;
 },
 {
-pos = (649,620);
-ref = acute;
+pos = (709,620);
+ref = acutecomb;
 }
 );
 width = 1351;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_horngrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_horngrave.glyph
index ad6317580..db6b56065 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_horngrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_horngrave.glyph
@@ -11,7 +11,7 @@ ref = Uhorn;
 },
 {
 pos = (442,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1518;
@@ -24,7 +24,7 @@ ref = Uhorn;
 },
 {
 pos = (312,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1478;
@@ -37,7 +37,7 @@ ref = Uhorn;
 },
 {
 pos = (496,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1535;
@@ -50,7 +50,7 @@ ref = Uhorn;
 },
 {
 pos = (493,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1440;
@@ -63,7 +63,7 @@ ref = Uhorn;
 },
 {
 pos = (344,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1443;
@@ -75,8 +75,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (454,620);
-ref = grave;
+pos = (458,620);
+ref = gravecomb;
 }
 );
 width = 1351;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_hornhookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_hornhookabove.glyph
index 6c301b569..b73330051 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_hornhookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_hornhookabove.glyph
@@ -11,7 +11,7 @@ ref = Uhorn;
 },
 {
 pos = (587,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1518;
@@ -24,7 +24,7 @@ ref = Uhorn;
 },
 {
 pos = (516,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1478;
@@ -37,7 +37,7 @@ ref = Uhorn;
 },
 {
 pos = (640,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1535;
@@ -50,7 +50,7 @@ ref = Uhorn;
 },
 {
 pos = (558,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1440;
@@ -63,7 +63,7 @@ ref = Uhorn;
 },
 {
 pos = (501,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1443;
@@ -75,8 +75,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (561,620);
-ref = hookabove;
+pos = (555,620);
+ref = hookabovecomb;
 }
 );
 width = 1351;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_horntilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_horntilde.glyph
index c177edfee..5197ddd4f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_horntilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_horntilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (309,372);
-ref = tilde;
+pos = (339,558);
+ref = tildecomb;
 }
 );
 width = 1518;
@@ -23,8 +23,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (287,372);
-ref = tilde;
+pos = (317,558);
+ref = tildecomb;
 }
 );
 width = 1478;
@@ -36,8 +36,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (319,372);
-ref = tilde;
+pos = (357,558);
+ref = tildecomb;
 }
 );
 width = 1535;
@@ -49,8 +49,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (309,414);
-ref = tilde;
+pos = (342,620);
+ref = tildecomb;
 }
 );
 width = 1440;
@@ -62,8 +62,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (278,414);
-ref = tilde;
+pos = (312,620);
+ref = tildecomb;
 }
 );
 width = 1443;
@@ -75,8 +75,8 @@ shapes = (
 ref = Uhorn;
 },
 {
-pos = (302,414);
-ref = tilde;
+pos = (332,620);
+ref = tildecomb;
 }
 );
 width = 1351;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_invertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_invertedbreve.glyph
index 18bc2257e..56779d906 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_invertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_invertedbreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1448,558);
-ref = breveinvnosp;
+pos = (435,558);
+ref = breveinvcomb;
 }
 );
 width = 1518;
@@ -23,8 +23,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1492,558);
-ref = breveinvnosp;
+pos = (318,558);
+ref = breveinvcomb;
 }
 );
 width = 1478;
@@ -36,8 +36,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1443,558);
-ref = breveinvnosp;
+pos = (498,558);
+ref = breveinvcomb;
 }
 );
 width = 1537;
@@ -49,8 +49,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1385,620);
-ref = breveinvnosp;
+pos = (422,620);
+ref = breveinvcomb;
 }
 );
 width = 1438;
@@ -62,8 +62,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1475,620);
-ref = breveinvnosp;
+pos = (393,620);
+ref = breveinvcomb;
 }
 );
 width = 1444;
@@ -75,8 +75,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (1308,620);
-ref = breveinvnosp;
+pos = (427,620);
+ref = breveinvcomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_macron.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_macron.glyph
index 180e8989d..0a8678545 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_macron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_macron.glyph
@@ -5,78 +5,84 @@ kernRight = J;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
 pos = (364,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1518;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
 pos = (413,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1478;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
 pos = (460,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1537;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
-pos = (407,620);
-ref = macron;
+pos = (406,620);
+ref = macroncomb;
 }
 );
 width = 1438;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
 pos = (440,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1444;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = U;
 },
 {
 pos = (395,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_macroncyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_macroncyrillic.glyph
index 667b05110..390fc6ac4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_macroncyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_macroncyrillic.glyph
@@ -3,78 +3,84 @@ glyphname = Umacroncyrillic;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = afii10037;
 },
 {
 pos = (240,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1276;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = afii10037;
 },
 {
 pos = (393,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1442;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = afii10037;
 },
 {
 pos = (283,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1170;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = afii10037;
 },
 {
-pos = (289,620);
-ref = macron;
+pos = (288,620);
+ref = macroncomb;
 }
 );
 width = 1212;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = afii10037;
 },
 {
 pos = (420,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1410;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = afii10037;
 },
 {
 pos = (248,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1046;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_psilondieresishooksymbolgreek.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_psilondieresishooksymbolgreek.glyph
index cb7a8a70d..f5a4e24c1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_psilondieresishooksymbolgreek.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_psilondieresishooksymbolgreek.glyph
@@ -9,7 +9,7 @@ ref = Upsilonhooksymbol;
 },
 {
 pos = (168,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1356;
@@ -22,7 +22,7 @@ ref = Upsilonhooksymbol;
 },
 {
 pos = (182,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1510;
@@ -35,7 +35,7 @@ ref = Upsilonhooksymbol;
 },
 {
 pos = (143,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1264;
@@ -48,7 +48,7 @@ ref = Upsilonhooksymbol;
 },
 {
 pos = (179,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1292;
@@ -61,7 +61,7 @@ ref = Upsilonhooksymbol;
 },
 {
 pos = (191,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1478;
@@ -74,7 +74,7 @@ ref = Upsilonhooksymbol;
 },
 {
 pos = (136,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1136;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_ring.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_ring.glyph
index 768a77e16..09e31bbec 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_ring.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_ring.glyph
@@ -11,7 +11,7 @@ ref = U;
 },
 {
 pos = (432,0);
-ref = ring.uc;
+ref = ringcomb.uc;
 }
 );
 width = 1518;
@@ -24,7 +24,7 @@ ref = U;
 },
 {
 pos = (298,0);
-ref = ring.uc;
+ref = ringcomb.uc;
 }
 );
 width = 1478;
@@ -37,7 +37,7 @@ ref = U;
 },
 {
 pos = (523,0);
-ref = ring.uc;
+ref = ringcomb.uc;
 }
 );
 width = 1537;
@@ -50,7 +50,7 @@ ref = U;
 },
 {
 pos = (430,0);
-ref = ring.uc;
+ref = ringcomb.uc;
 }
 );
 width = 1438;
@@ -63,7 +63,7 @@ ref = U;
 },
 {
 pos = (304,0);
-ref = ring.uc;
+ref = ringcomb.uc;
 }
 );
 width = 1444;
@@ -76,7 +76,7 @@ ref = U;
 },
 {
 pos = (501,0);
-ref = ring.uc;
+ref = ringcomb.uc;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_tilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_tilde.glyph
index 121610708..e78808787 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_tilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (309,372);
-ref = tilde;
+pos = (339,558);
+ref = tildecomb;
 }
 );
 width = 1518;
@@ -23,8 +23,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (287,372);
-ref = tilde;
+pos = (317,558);
+ref = tildecomb;
 }
 );
 width = 1478;
@@ -36,8 +36,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (319,372);
-ref = tilde;
+pos = (357,558);
+ref = tildecomb;
 }
 );
 width = 1537;
@@ -49,8 +49,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (309,414);
-ref = tilde;
+pos = (342,620);
+ref = tildecomb;
 }
 );
 width = 1438;
@@ -62,8 +62,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (278,414);
-ref = tilde;
+pos = (312,620);
+ref = tildecomb;
 }
 );
 width = 1444;
@@ -75,8 +75,8 @@ shapes = (
 ref = U;
 },
 {
-pos = (302,414);
-ref = tilde;
+pos = (332,620);
+ref = tildecomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_tildebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_tildebelow.glyph
index 34d826d7f..d2826f3d5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_tildebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_tildebelow.glyph
@@ -11,7 +11,7 @@ ref = U;
 },
 {
 pos = (1383,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1518;
@@ -24,7 +24,7 @@ ref = U;
 },
 {
 pos = (1457,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1478;
@@ -37,7 +37,7 @@ ref = U;
 },
 {
 pos = (1255,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1537;
@@ -50,7 +50,7 @@ ref = U;
 },
 {
 pos = (1375,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1438;
@@ -63,7 +63,7 @@ ref = U;
 },
 {
 pos = (1442,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1444;
@@ -76,7 +76,7 @@ ref = U;
 },
 {
 pos = (1223,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1353;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/V_.glyph b/src/Inter-Italic.glyphspackage/glyphs/V_.glyph
index 736ef704f..0612b530e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/V_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/V_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = V;
 kernLeft = V;
 kernRight = V;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/V_tilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/V_tilde.glyph
index 1223a8c1a..bedd2f07b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/V_tilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/V_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (244,372);
-ref = tilde;
+pos = (274,558);
+ref = tildecomb;
 }
 );
 width = 1386;
@@ -23,8 +23,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (366,372);
-ref = tilde;
+pos = (396,558);
+ref = tildecomb;
 }
 );
 width = 1630;
@@ -36,8 +36,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (179,372);
-ref = tilde;
+pos = (217,558);
+ref = tildecomb;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (258,414);
-ref = tilde;
+pos = (291,620);
+ref = tildecomb;
 }
 );
 width = 1338;
@@ -62,8 +62,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (324,414);
-ref = tilde;
+pos = (358,620);
+ref = tildecomb;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = V;
 },
 {
-pos = (193,414);
-ref = tilde;
+pos = (223,620);
+ref = tildecomb;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/W_.glyph b/src/Inter-Italic.glyphspackage/glyphs/W_.glyph
index f8af6cb51..d13e5a4b9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/W_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/W_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = W;
 kernLeft = W;
 kernRight = W;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/W_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/W_acute.glyph
index eb3e9a042..66595c8d8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/W_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/W_acute.glyph
@@ -5,78 +5,84 @@ kernRight = W;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = W;
 },
 {
-pos = (822,558);
-ref = acute;
+pos = (942,558);
+ref = acutecomb;
 }
 );
 width = 1946;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = W;
 },
 {
-pos = (905,558);
-ref = acute;
+pos = (1035,558);
+ref = acutecomb;
 }
 );
 width = 2232;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = W;
 },
 {
-pos = (788,558);
-ref = acute;
+pos = (928,558);
+ref = acutecomb;
 }
 );
 width = 1824;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = W;
 },
 {
-pos = (883,620);
-ref = acute;
+pos = (923,620);
+ref = acutecomb;
 }
 );
 width = 1890;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = W;
 },
 {
-pos = (971,620);
-ref = acute;
+pos = (995,620);
+ref = acutecomb;
 }
 );
 width = 2172;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = W;
 },
 {
-pos = (818,620);
-ref = acute;
+pos = (878,620);
+ref = acutecomb;
 }
 );
 width = 1690;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/W_circumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/W_circumflex.glyph
index 2cfa17b81..195ffabe6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/W_circumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/W_circumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = W;
 },
 {
-pos = (571,372);
-ref = circumflex;
+pos = (650,558);
+ref = circumflexcomb;
 }
 );
 width = 1946;
@@ -23,8 +23,8 @@ shapes = (
 ref = W;
 },
 {
-pos = (531,372);
-ref = circumflex;
+pos = (697,558);
+ref = circumflexcomb;
 }
 );
 width = 2232;
@@ -36,8 +36,8 @@ shapes = (
 ref = W;
 },
 {
-pos = (538,372);
-ref = circumflex;
+pos = (568,558);
+ref = circumflexcomb;
 }
 );
 width = 1824;
@@ -49,8 +49,8 @@ shapes = (
 ref = W;
 },
 {
-pos = (581,414);
-ref = circumflex;
+pos = (647,620);
+ref = circumflexcomb;
 }
 );
 width = 1890;
@@ -62,8 +62,8 @@ shapes = (
 ref = W;
 },
 {
-pos = (524,414);
-ref = circumflex;
+pos = (757,620);
+ref = circumflexcomb;
 }
 );
 width = 2172;
@@ -75,8 +75,8 @@ shapes = (
 ref = W;
 },
 {
-pos = (555,414);
-ref = circumflex;
+pos = (596,620);
+ref = circumflexcomb;
 }
 );
 width = 1690;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/W_dieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/W_dieresis.glyph
index 1487eb06f..287498487 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/W_dieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/W_dieresis.glyph
@@ -11,7 +11,7 @@ ref = W;
 },
 {
 pos = (465,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1946;
@@ -24,7 +24,7 @@ ref = W;
 },
 {
 pos = (543,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 2232;
@@ -37,7 +37,7 @@ ref = W;
 },
 {
 pos = (418,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1824;
@@ -50,7 +50,7 @@ ref = W;
 },
 {
 pos = (478,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1890;
@@ -63,7 +63,7 @@ ref = W;
 },
 {
 pos = (539,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 2172;
@@ -76,7 +76,7 @@ ref = W;
 },
 {
 pos = (414,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1690;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/W_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/W_dotaccent.glyph
index e3bdda604..60452231f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/W_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/W_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = W;
 },
 {
-pos = (791,372);
-ref = dotaccent;
+pos = (822,558);
+ref = dotaccentcomb;
 }
 );
 width = 1946;
@@ -25,8 +25,8 @@ shapes = (
 ref = W;
 },
 {
-pos = (843,372);
-ref = dotaccent;
+pos = (874,558);
+ref = dotaccentcomb;
 }
 );
 width = 2232;
@@ -39,8 +39,8 @@ shapes = (
 ref = W;
 },
 {
-pos = (783,372);
-ref = dotaccent;
+pos = (814,558);
+ref = dotaccentcomb;
 }
 );
 width = 1824;
@@ -53,8 +53,8 @@ shapes = (
 ref = W;
 },
 {
-pos = (801,414);
-ref = dotaccent;
+pos = (835,620);
+ref = dotaccentcomb;
 }
 );
 width = 1890;
@@ -67,8 +67,8 @@ shapes = (
 ref = W;
 },
 {
-pos = (834,414);
-ref = dotaccent;
+pos = (868,620);
+ref = dotaccentcomb;
 }
 );
 width = 2172;
@@ -81,8 +81,8 @@ shapes = (
 ref = W;
 },
 {
-pos = (798,414);
-ref = dotaccent;
+pos = (826,620);
+ref = dotaccentcomb;
 }
 );
 width = 1690;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/W_grave.glyph b/src/Inter-Italic.glyphspackage/glyphs/W_grave.glyph
index d7c57a2dc..1cf4796a1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/W_grave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/W_grave.glyph
@@ -11,7 +11,7 @@ ref = W;
 },
 {
 pos = (657,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1946;
@@ -24,7 +24,7 @@ ref = W;
 },
 {
 pos = (691,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 2232;
@@ -37,7 +37,7 @@ ref = W;
 },
 {
 pos = (636,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1824;
@@ -50,7 +50,7 @@ ref = W;
 },
 {
 pos = (718,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1890;
@@ -63,7 +63,7 @@ ref = W;
 },
 {
 pos = (708,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 2172;
@@ -75,8 +75,8 @@ shapes = (
 ref = W;
 },
 {
-pos = (623,620);
-ref = grave;
+pos = (627,620);
+ref = gravecomb;
 }
 );
 width = 1690;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/X_.glyph b/src/Inter-Italic.glyphspackage/glyphs/X_.glyph
index fa0ab1bf3..bbc9e1fae 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/X_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/X_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = X;
 kernLeft = X;
 kernRight = X;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/X_dieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/X_dieresis.glyph
index 81ad5e39d..81d2e335b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/X_dieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/X_dieresis.glyph
@@ -12,7 +12,7 @@ ref = X;
 },
 {
 pos = (148,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1316;
@@ -26,7 +26,7 @@ ref = X;
 },
 {
 pos = (206,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1564;
@@ -40,7 +40,7 @@ ref = X;
 },
 {
 pos = (109,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1198;
@@ -54,7 +54,7 @@ ref = X;
 },
 {
 pos = (160,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1253;
@@ -68,7 +68,7 @@ ref = X;
 },
 {
 pos = (216,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1524;
@@ -82,7 +82,7 @@ ref = X;
 },
 {
 pos = (98,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1070;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/X_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/X_dotaccent.glyph
index 405b6aa82..4ec37466b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/X_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/X_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = X;
 },
 {
-pos = (474,372);
-ref = dotaccent;
+pos = (505,558);
+ref = dotaccentcomb;
 }
 );
 width = 1316;
@@ -25,8 +25,8 @@ shapes = (
 ref = X;
 },
 {
-pos = (506,372);
-ref = dotaccent;
+pos = (537,558);
+ref = dotaccentcomb;
 }
 );
 width = 1564;
@@ -39,8 +39,8 @@ shapes = (
 ref = X;
 },
 {
-pos = (474,372);
-ref = dotaccent;
+pos = (505,558);
+ref = dotaccentcomb;
 }
 );
 width = 1198;
@@ -53,8 +53,8 @@ shapes = (
 ref = X;
 },
 {
-pos = (483,414);
-ref = dotaccent;
+pos = (517,620);
+ref = dotaccentcomb;
 }
 );
 width = 1253;
@@ -67,8 +67,8 @@ shapes = (
 ref = X;
 },
 {
-pos = (511,414);
-ref = dotaccent;
+pos = (545,620);
+ref = dotaccentcomb;
 }
 );
 width = 1524;
@@ -81,8 +81,8 @@ shapes = (
 ref = X;
 },
 {
-pos = (482,414);
-ref = dotaccent;
+pos = (510,620);
+ref = dotaccentcomb;
 }
 );
 width = 1070;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Y_.glyph b/src/Inter-Italic.glyphspackage/glyphs/Y_.glyph
index 58d370ec9..fb3673756 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Y_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Y_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = Y;
 kernLeft = Y;
 kernRight = Y;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Y_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/Y_acute.glyph
index bd39a3926..b7e546502 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Y_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Y_acute.glyph
@@ -5,78 +5,84 @@ kernRight = Y;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
-pos = (529,558);
-ref = acute;
+pos = (649,558);
+ref = acutecomb;
 }
 );
 width = 1362;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
-pos = (572,558);
-ref = acute;
+pos = (702,558);
+ref = acutecomb;
 }
 );
 width = 1566;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
-pos = (509,558);
-ref = acute;
+pos = (649,558);
+ref = acutecomb;
 }
 );
 width = 1256;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
-pos = (586,620);
-ref = acute;
+pos = (626,620);
+ref = acutecomb;
 }
 );
 width = 1298;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
-pos = (651,620);
-ref = acute;
+pos = (675,620);
+ref = acutecomb;
 }
 );
 width = 1534;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
-pos = (536,620);
-ref = acute;
+pos = (596,620);
+ref = acutecomb;
 }
 );
 width = 1128;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Y_circumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/Y_circumflex.glyph
index a979bcfae..43e868cf6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Y_circumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Y_circumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (278,372);
-ref = circumflex;
+pos = (357,558);
+ref = circumflexcomb;
 }
 );
 width = 1362;
@@ -23,8 +23,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (198,372);
-ref = circumflex;
+pos = (364,558);
+ref = circumflexcomb;
 }
 );
 width = 1566;
@@ -36,8 +36,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (259,372);
-ref = circumflex;
+pos = (289,558);
+ref = circumflexcomb;
 }
 );
 width = 1256;
@@ -49,8 +49,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (284,414);
-ref = circumflex;
+pos = (350,620);
+ref = circumflexcomb;
 }
 );
 width = 1298;
@@ -62,8 +62,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (204,414);
-ref = circumflex;
+pos = (437,620);
+ref = circumflexcomb;
 }
 );
 width = 1534;
@@ -75,8 +75,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (273,414);
-ref = circumflex;
+pos = (314,620);
+ref = circumflexcomb;
 }
 );
 width = 1128;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Y_dieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/Y_dieresis.glyph
index 0d15b9a18..f511fcab6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Y_dieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Y_dieresis.glyph
@@ -11,7 +11,7 @@ ref = Y;
 },
 {
 pos = (172,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1362;
@@ -24,7 +24,7 @@ ref = Y;
 },
 {
 pos = (210,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1566;
@@ -37,7 +37,7 @@ ref = Y;
 },
 {
 pos = (139,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1256;
@@ -50,7 +50,7 @@ ref = Y;
 },
 {
 pos = (181,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1298;
@@ -63,7 +63,7 @@ ref = Y;
 },
 {
 pos = (219,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1534;
@@ -76,7 +76,7 @@ ref = Y;
 },
 {
 pos = (132,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1128;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Y_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/Y_dotaccent.glyph
index 3062ac1b9..b9b4148aa 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Y_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Y_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (498,372);
-ref = dotaccent;
+pos = (529,558);
+ref = dotaccentcomb;
 }
 );
 width = 1362;
@@ -25,8 +25,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (510,372);
-ref = dotaccent;
+pos = (541,558);
+ref = dotaccentcomb;
 }
 );
 width = 1566;
@@ -39,8 +39,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (504,372);
-ref = dotaccent;
+pos = (535,558);
+ref = dotaccentcomb;
 }
 );
 width = 1256;
@@ -53,8 +53,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (504,414);
-ref = dotaccent;
+pos = (538,620);
+ref = dotaccentcomb;
 }
 );
 width = 1298;
@@ -67,8 +67,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (514,414);
-ref = dotaccent;
+pos = (548,620);
+ref = dotaccentcomb;
 }
 );
 width = 1534;
@@ -81,8 +81,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (516,414);
-ref = dotaccent;
+pos = (544,620);
+ref = dotaccentcomb;
 }
 );
 width = 1128;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Y_erudieresiscyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/Y_erudieresiscyrillic.glyph
index 7fa0c913b..e0cae0c4a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Y_erudieresiscyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Y_erudieresiscyrillic.glyph
@@ -10,7 +10,7 @@ ref = afii10045;
 },
 {
 pos = (360,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1742;
@@ -24,7 +24,7 @@ ref = afii10045;
 },
 {
 pos = (352,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1854;
@@ -38,7 +38,7 @@ ref = afii10045;
 },
 {
 pos = (322,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1625;
@@ -52,7 +52,7 @@ ref = afii10045;
 },
 {
 pos = (358,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1650;
@@ -66,7 +66,7 @@ ref = afii10045;
 },
 {
 pos = (359,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1813;
@@ -80,7 +80,7 @@ ref = afii10045;
 },
 {
 pos = (279,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1434;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Y_grave.glyph b/src/Inter-Italic.glyphspackage/glyphs/Y_grave.glyph
index 7ce4cfeb5..14328405a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Y_grave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Y_grave.glyph
@@ -11,7 +11,7 @@ ref = Y;
 },
 {
 pos = (364,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1362;
@@ -24,7 +24,7 @@ ref = Y;
 },
 {
 pos = (358,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1566;
@@ -37,7 +37,7 @@ ref = Y;
 },
 {
 pos = (357,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1256;
@@ -50,7 +50,7 @@ ref = Y;
 },
 {
 pos = (421,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1298;
@@ -63,7 +63,7 @@ ref = Y;
 },
 {
 pos = (388,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1534;
@@ -75,8 +75,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (341,620);
-ref = grave;
+pos = (345,620);
+ref = gravecomb;
 }
 );
 width = 1128;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Y_hookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/Y_hookabove.glyph
index f668256ea..328f4bae2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Y_hookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Y_hookabove.glyph
@@ -11,7 +11,7 @@ ref = Y;
 },
 {
 pos = (509,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1362;
@@ -24,7 +24,7 @@ ref = Y;
 },
 {
 pos = (562,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1566;
@@ -37,7 +37,7 @@ ref = Y;
 },
 {
 pos = (501,558);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1256;
@@ -50,7 +50,7 @@ ref = Y;
 },
 {
 pos = (486,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1298;
@@ -63,7 +63,7 @@ ref = Y;
 },
 {
 pos = (545,620);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1534;
@@ -75,8 +75,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (448,620);
-ref = hookabove;
+pos = (442,620);
+ref = hookabovecomb;
 }
 );
 width = 1128;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Y_i-cy.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/Y_i-cy.1.glyph
index d06454bf9..75f89435c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Y_i-cy.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Y_i-cy.1.glyph
@@ -12,7 +12,7 @@ ref = I.1;
 },
 {
 pos = (-56,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 907;
@@ -27,7 +27,7 @@ ref = I.1;
 },
 {
 pos = (-51,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1037;
@@ -42,7 +42,7 @@ ref = I.1;
 },
 {
 pos = (-128,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 723;
@@ -57,7 +57,7 @@ ref = I.1;
 },
 {
 pos = (-45,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 842;
@@ -72,7 +72,7 @@ ref = I.1;
 },
 {
 pos = (-41,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1002;
@@ -87,7 +87,7 @@ ref = I.1;
 },
 {
 pos = (-151,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 584;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Y_i-cy.glyph b/src/Inter-Italic.glyphspackage/glyphs/Y_i-cy.glyph
index ad208ae40..c5a95eac5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Y_i-cy.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Y_i-cy.glyph
@@ -11,7 +11,7 @@ ref = I;
 },
 {
 pos = (-240,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 541;
@@ -24,7 +24,7 @@ ref = I;
 },
 {
 pos = (-271,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 598;
@@ -37,7 +37,7 @@ ref = I;
 },
 {
 pos = (-233,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 512;
@@ -50,7 +50,7 @@ ref = I;
 },
 {
 pos = (-229,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 476;
@@ -63,7 +63,7 @@ ref = I;
 },
 {
 pos = (-259,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 576;
@@ -76,7 +76,7 @@ ref = I;
 },
 {
 pos = (-246,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Y_ogonek.glyph b/src/Inter-Italic.glyphspackage/glyphs/Y_ogonek.glyph
index 50e2b176d..afa2aafa3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Y_ogonek.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Y_ogonek.glyph
@@ -11,7 +11,7 @@ ref = Y;
 },
 {
 pos = (378,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1256;
@@ -24,7 +24,7 @@ ref = Y;
 },
 {
 pos = (335,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1362;
@@ -37,7 +37,7 @@ ref = Y;
 },
 {
 pos = (453,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1566;
@@ -50,7 +50,7 @@ ref = Y;
 },
 {
 pos = (334,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1298;
@@ -63,7 +63,7 @@ ref = Y;
 },
 {
 pos = (402,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1534;
@@ -75,8 +75,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (318,0);
-ref = ogonek;
+pos = (313,0);
+ref = ogonekcomb;
 }
 );
 width = 1128;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Y_tilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/Y_tilde.glyph
index feb1153bc..95c58812e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Y_tilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Y_tilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (231,372);
-ref = tilde;
+pos = (261,558);
+ref = tildecomb;
 }
 );
 width = 1362;
@@ -23,8 +23,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (333,372);
-ref = tilde;
+pos = (363,558);
+ref = tildecomb;
 }
 );
 width = 1566;
@@ -36,8 +36,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (180,372);
-ref = tilde;
+pos = (218,558);
+ref = tildecomb;
 }
 );
 width = 1256;
@@ -49,8 +49,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (237,414);
-ref = tilde;
+pos = (270,620);
+ref = tildecomb;
 }
 );
 width = 1298;
@@ -62,8 +62,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (322,414);
-ref = tilde;
+pos = (356,620);
+ref = tildecomb;
 }
 );
 width = 1534;
@@ -75,8 +75,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (189,414);
-ref = tilde;
+pos = (219,620);
+ref = tildecomb;
 }
 );
 width = 1128;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Z_.glyph b/src/Inter-Italic.glyphspackage/glyphs/Z_.glyph
index 7cd3385d4..01c10d034 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Z_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Z_.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = Z;
 kernLeft = Z;
 kernRight = Z;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Z_acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/Z_acute.glyph
index 15d726567..5406f160c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Z_acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Z_acute.glyph
@@ -5,78 +5,84 @@ kernRight = Z;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = Z;
 },
 {
-pos = (488,558);
-ref = acute;
+pos = (608,558);
+ref = acutecomb;
 }
 );
 width = 1281;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = Z;
 },
 {
-pos = (505,558);
-ref = acute;
+pos = (635,558);
+ref = acutecomb;
 }
 );
 width = 1423;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = Z;
 },
 {
-pos = (499,558);
-ref = acute;
+pos = (639,558);
+ref = acutecomb;
 }
 );
 width = 1240;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = Z;
 },
 {
-pos = (547,620);
-ref = acute;
+pos = (587,620);
+ref = acutecomb;
 }
 );
 width = 1216;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = Z;
 },
 {
-pos = (586,620);
-ref = acute;
+pos = (610,620);
+ref = acutecomb;
 }
 );
 width = 1391;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = Z;
 },
 {
-pos = (522,620);
-ref = acute;
+pos = (582,620);
+ref = acutecomb;
 }
 );
 width = 1112;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Z_caron.glyph b/src/Inter-Italic.glyphspackage/glyphs/Z_caron.glyph
index f8d6b1dfd..9ee48bfff 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Z_caron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Z_caron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (235,372);
-ref = caron;
+pos = (316,558);
+ref = caroncomb;
 }
 );
 width = 1281;
@@ -23,8 +23,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (132,372);
-ref = caron;
+pos = (297,558);
+ref = caroncomb;
 }
 );
 width = 1423;
@@ -36,8 +36,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (253,388);
-ref = caron;
+pos = (280,558);
+ref = caroncomb;
 }
 );
 width = 1240;
@@ -49,8 +49,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (243,414);
-ref = caron;
+pos = (312,620);
+ref = caroncomb;
 }
 );
 width = 1216;
@@ -62,8 +62,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (140,414);
-ref = caron;
+pos = (371,620);
+ref = caroncomb;
 }
 );
 width = 1391;
@@ -75,8 +75,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (256,414);
-ref = caron;
+pos = (301,620);
+ref = caroncomb;
 }
 );
 width = 1112;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Z_circumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/Z_circumflex.glyph
index 423c60c1c..41932fe6e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Z_circumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Z_circumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (237,372);
-ref = circumflex;
+pos = (316,558);
+ref = circumflexcomb;
 }
 );
 width = 1281;
@@ -23,8 +23,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (131,372);
-ref = circumflex;
+pos = (297,558);
+ref = circumflexcomb;
 }
 );
 width = 1423;
@@ -36,8 +36,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (249,372);
-ref = circumflex;
+pos = (279,558);
+ref = circumflexcomb;
 }
 );
 width = 1240;
@@ -49,8 +49,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (245,414);
-ref = circumflex;
+pos = (311,620);
+ref = circumflexcomb;
 }
 );
 width = 1216;
@@ -62,8 +62,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (139,414);
-ref = circumflex;
+pos = (372,620);
+ref = circumflexcomb;
 }
 );
 width = 1391;
@@ -75,8 +75,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (259,414);
-ref = circumflex;
+pos = (300,620);
+ref = circumflexcomb;
 }
 );
 width = 1112;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Z_dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/Z_dotaccent.glyph
index 6dd42f77f..c943475f6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Z_dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Z_dotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (457,372);
-ref = dotaccent;
+pos = (488,558);
+ref = dotaccentcomb;
 }
 );
 width = 1281;
@@ -25,8 +25,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (443,372);
-ref = dotaccent;
+pos = (474,558);
+ref = dotaccentcomb;
 }
 );
 width = 1423;
@@ -39,8 +39,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (494,372);
-ref = dotaccent;
+pos = (525,558);
+ref = dotaccentcomb;
 }
 );
 width = 1240;
@@ -53,8 +53,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (465,414);
-ref = dotaccent;
+pos = (499,620);
+ref = dotaccentcomb;
 }
 );
 width = 1216;
@@ -67,8 +67,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (449,414);
-ref = dotaccent;
+pos = (483,620);
+ref = dotaccentcomb;
 }
 );
 width = 1391;
@@ -81,8 +81,8 @@ shapes = (
 ref = Z;
 },
 {
-pos = (502,414);
-ref = dotaccent;
+pos = (530,620);
+ref = dotaccentcomb;
 }
 );
 width = 1112;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Z_edescendercyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/Z_edescendercyrillic.glyph
index ee2687441..c8cfe54d4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Z_edescendercyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Z_edescendercyrillic.glyph
@@ -10,7 +10,7 @@ ref = afii10025;
 },
 {
 pos = (398,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1304;
@@ -23,7 +23,7 @@ ref = afii10025;
 },
 {
 pos = (256,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1383;
@@ -36,7 +36,7 @@ ref = afii10025;
 },
 {
 pos = (442,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1256;
@@ -49,7 +49,7 @@ ref = afii10025;
 },
 {
 pos = (430,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1233;
@@ -62,7 +62,7 @@ ref = afii10025;
 },
 {
 pos = (272,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1344;
@@ -75,7 +75,7 @@ ref = afii10025;
 },
 {
 pos = (506,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1128;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Z_edieresiscyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/Z_edieresiscyrillic.glyph
index 8548e8ddf..4d8fa5f9f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Z_edieresiscyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Z_edieresiscyrillic.glyph
@@ -9,7 +9,7 @@ ref = afii10025;
 },
 {
 pos = (152,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1304;
@@ -22,7 +22,7 @@ ref = afii10025;
 },
 {
 pos = (118,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1383;
@@ -35,7 +35,7 @@ ref = afii10025;
 },
 {
 pos = (143,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1256;
@@ -48,7 +48,7 @@ ref = afii10025;
 },
 {
 pos = (189,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1233;
@@ -61,7 +61,7 @@ ref = afii10025;
 },
 {
 pos = (139,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1344;
@@ -74,7 +74,7 @@ ref = afii10025;
 },
 {
 pos = (196,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1128;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Z_hebrevecyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/Z_hebrevecyrillic.glyph
index 2eb36b763..c5d751a91 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Z_hebrevecyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Z_hebrevecyrillic.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (573,372);
-ref = breve;
+pos = (680,558);
+ref = brevecomb;
 }
 );
 width = 1944;
@@ -25,8 +25,8 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (753,372);
-ref = breve;
+pos = (816,558);
+ref = brevecomb;
 }
 );
 width = 2410;
@@ -39,8 +39,8 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (545,372);
-ref = breve;
+pos = (640,558);
+ref = brevecomb;
 }
 );
 width = 1804;
@@ -53,8 +53,8 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (581,414);
-ref = breve;
+pos = (644,620);
+ref = brevecomb;
 }
 );
 width = 1877;
@@ -67,8 +67,8 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (721,414);
-ref = breve;
+pos = (771,620);
+ref = brevecomb;
 }
 );
 width = 2298;
@@ -81,8 +81,8 @@ shapes = (
 ref = afii10024;
 },
 {
-pos = (488,414);
-ref = breve;
+pos = (580,620);
+ref = brevecomb;
 }
 );
 width = 1675;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Z_hedieresiscyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/Z_hedieresiscyrillic.glyph
index d9581b962..831b6966d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Z_hedieresiscyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Z_hedieresiscyrillic.glyph
@@ -12,7 +12,7 @@ ref = afii10024;
 },
 {
 pos = (462,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1944;
@@ -26,7 +26,7 @@ ref = afii10024;
 },
 {
 pos = (630,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 2410;
@@ -40,7 +40,7 @@ ref = afii10024;
 },
 {
 pos = (409,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1804;
@@ -54,7 +54,7 @@ ref = afii10024;
 },
 {
 pos = (474,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1877;
@@ -68,7 +68,7 @@ ref = afii10024;
 },
 {
 pos = (602,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 2298;
@@ -82,7 +82,7 @@ ref = afii10024;
 },
 {
 pos = (398,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1675;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Z_linebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/Z_linebelow.glyph
index a0a44a4b2..db1506e67 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Z_linebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Z_linebelow.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (186,0);
+pos = (187,0);
 ref = macronsub;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = Z;
 },
 {
-pos = (313,0);
+pos = (312,0);
 ref = macronsub;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.cyrtail.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.cyrtail.glyph
index 8dac0663d..14468c6fc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/_part.cyrtail.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/_part.cyrtail.glyph
@@ -1,5 +1,4 @@
 {
-color = 4;
 glyphname = _part.cyrtail;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.cyrtic.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.cyrtic.glyph
index c078465b5..7e54d6371 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/_part.cyrtic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/_part.cyrtic.glyph
@@ -1,5 +1,4 @@
 {
-color = 4;
 glyphname = _part.cyrtic;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.cyrtic_center.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.cyrtic_center.glyph
index 21c8c330b..acefd2ac7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/_part.cyrtic_center.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/_part.cyrtic_center.glyph
@@ -1,5 +1,4 @@
 {
-color = 4;
 glyphname = _part.cyrtic_center;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.t_base.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.t_base.glyph
index 670a51308..aa1dc14ef 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/_part.t_base.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/_part.t_base.glyph
@@ -1,5 +1,4 @@
 {
-color = 5;
 glyphname = _part.t_base;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.tcurl_base.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.tcurl_base.glyph
index dcf9323b4..9a7cb7b0d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/_part.tcurl_base.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/_part.tcurl_base.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = _part.tcurl_base;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/_tildecross.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/_tildecross.cn.glyph
index c88878c42..528223efd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/_tildecross.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/_tildecross.cn.glyph
@@ -13,7 +13,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-278,-628);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 670;
@@ -30,7 +30,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-258,-628);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 714;
@@ -47,7 +47,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-280,-628);
-ref = tilde;
+ref = tildecomb;
 scale = (1.25,1);
 }
 );
@@ -65,7 +65,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-258,-628);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 650;
@@ -82,7 +82,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-276,-628);
-ref = tilde;
+ref = tildecomb;
 scale = (1.25,1);
 }
 );
@@ -100,7 +100,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-278,-628);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 542;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/a.glyph b/src/Inter-Italic.glyphspackage/glyphs/a.glyph
index cedeabee7..92e3a7b90 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/a.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/a.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = a;
 kernLeft = a;
 kernRight = a;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/aacute.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/aacute.1.glyph
index de2374a5c..aab21a941 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/aacute.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/aacute.1.glyph
@@ -6,84 +6,90 @@ kernRight = u;
 layers = (
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
 ref = a.1;
 },
 {
-pos = (401,186);
-ref = acute;
+pos = (541,186);
+ref = acutecomb;
 }
 );
 width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
 ref = a.1;
 },
 {
-pos = (413,186);
-ref = acute;
+pos = (533,186);
+ref = acutecomb;
 }
 );
 width = 1249;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
 ref = a.1;
 },
 {
-pos = (398,186);
-ref = acute;
+pos = (528,186);
+ref = acutecomb;
 }
 );
 width = 1323;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
 ref = a.1;
 },
 {
-pos = (438,206);
-ref = acute;
+pos = (478,206);
+ref = acutecomb;
 }
 );
 width = 1161;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
 ref = a.1;
 },
 {
-pos = (470,206);
-ref = acute;
+pos = (494,206);
+ref = acutecomb;
 }
 );
 width = 1274;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
 ref = a.1;
 },
 {
-pos = (434,206);
-ref = acute;
+pos = (494,206);
+ref = acutecomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/aacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/aacute.glyph
index eddcc543b..9449989c0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/aacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/aacute.glyph
@@ -5,78 +5,84 @@ kernRight = a;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
-pos = (413,186);
-ref = acute;
+pos = (533,186);
+ref = acutecomb;
 }
 );
 width = 1249;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
-pos = (398,186);
-ref = acute;
+pos = (528,186);
+ref = acutecomb;
 }
 );
 width = 1323;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
-pos = (401,186);
-ref = acute;
+pos = (541,186);
+ref = acutecomb;
 }
 );
 width = 1191;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
-pos = (438,206);
-ref = acute;
+pos = (478,206);
+ref = acutecomb;
 }
 );
 width = 1161;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
-pos = (470,206);
-ref = acute;
+pos = (494,206);
+ref = acutecomb;
 }
 );
 width = 1274;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
-pos = (434,206);
-ref = acute;
+pos = (494,206);
+ref = acutecomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/abreve.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/abreve.1.glyph
index 1370d71e4..467ea3446 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/abreve.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/abreve.1.glyph
@@ -12,8 +12,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (167,0);
-ref = breve;
+pos = (262,186);
+ref = brevecomb;
 }
 );
 width = 1191;
@@ -26,8 +26,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (167,0);
-ref = breve;
+pos = (274,186);
+ref = brevecomb;
 }
 );
 width = 1249;
@@ -40,8 +40,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (159,0);
-ref = breve;
+pos = (222,186);
+ref = brevecomb;
 }
 );
 width = 1323;
@@ -54,8 +54,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (140,0);
-ref = breve;
+pos = (203,206);
+ref = brevecomb;
 }
 );
 width = 1161;
@@ -68,8 +68,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (157,0);
-ref = breve;
+pos = (207,206);
+ref = brevecomb;
 }
 );
 width = 1274;
@@ -82,8 +82,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (120,0);
-ref = breve;
+pos = (212,206);
+ref = brevecomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/abreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/abreve.glyph
index dadffd52d..bf0d117e9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/abreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/abreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (167,0);
-ref = breve;
+pos = (274,186);
+ref = brevecomb;
 }
 );
 width = 1249;
@@ -23,8 +23,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (159,0);
-ref = breve;
+pos = (222,186);
+ref = brevecomb;
 }
 );
 width = 1323;
@@ -36,8 +36,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (167,0);
-ref = breve;
+pos = (262,186);
+ref = brevecomb;
 }
 );
 width = 1191;
@@ -49,8 +49,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (140,0);
-ref = breve;
+pos = (203,206);
+ref = brevecomb;
 }
 );
 width = 1161;
@@ -62,8 +62,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (157,0);
-ref = breve;
+pos = (207,206);
+ref = brevecomb;
 }
 );
 width = 1274;
@@ -75,8 +75,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (120,0);
-ref = breve;
+pos = (212,206);
+ref = brevecomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/abrevecyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/abrevecyrillic.glyph
index 83ec4d5f1..da11c2b53 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/abrevecyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/abrevecyrillic.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (167,0);
-ref = breve;
+pos = (274,186);
+ref = brevecomb;
 }
 );
 width = 1249;
@@ -23,8 +23,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (159,0);
-ref = breve;
+pos = (222,186);
+ref = brevecomb;
 }
 );
 width = 1323;
@@ -36,8 +36,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (167,0);
-ref = breve;
+pos = (262,186);
+ref = brevecomb;
 }
 );
 width = 1191;
@@ -49,8 +49,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (140,0);
-ref = breve;
+pos = (203,206);
+ref = brevecomb;
 }
 );
 width = 1161;
@@ -62,8 +62,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (157,0);
-ref = breve;
+pos = (207,206);
+ref = brevecomb;
 }
 );
 width = 1274;
@@ -75,8 +75,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (120,0);
-ref = breve;
+pos = (212,206);
+ref = brevecomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/abrevedotbelow.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/abrevedotbelow.1.glyph
index 8665ad8fe..5d192c830 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/abrevedotbelow.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/abrevedotbelow.1.glyph
@@ -12,8 +12,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (167,0);
-ref = breve;
+pos = (262,186);
+ref = brevecomb;
 },
 {
 pos = (1160,0);
@@ -30,8 +30,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (167,0);
-ref = breve;
+pos = (274,186);
+ref = brevecomb;
 },
 {
 pos = (1220,0);
@@ -48,8 +48,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (159,0);
-ref = breve;
+pos = (222,186);
+ref = brevecomb;
 },
 {
 pos = (1194,0);
@@ -66,8 +66,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (140,0);
-ref = breve;
+pos = (203,206);
+ref = brevecomb;
 },
 {
 pos = (1201,0);
@@ -84,8 +84,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (157,0);
-ref = breve;
+pos = (207,206);
+ref = brevecomb;
 },
 {
 pos = (1198,0);
@@ -102,8 +102,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (120,0);
-ref = breve;
+pos = (212,206);
+ref = brevecomb;
 },
 {
 pos = (1159,0);
diff --git a/src/Inter-Italic.glyphspackage/glyphs/abrevedotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/abrevedotbelow.glyph
index e2ed7ea61..4215b2790 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/abrevedotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/abrevedotbelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (167,0);
-ref = breve;
+pos = (274,186);
+ref = brevecomb;
 },
 {
 pos = (1220,0);
@@ -27,8 +27,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (159,0);
-ref = breve;
+pos = (222,186);
+ref = brevecomb;
 },
 {
 pos = (1194,0);
@@ -44,8 +44,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (167,0);
-ref = breve;
+pos = (262,186);
+ref = brevecomb;
 },
 {
 pos = (1160,0);
@@ -61,8 +61,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (140,0);
-ref = breve;
+pos = (203,206);
+ref = brevecomb;
 },
 {
 pos = (1201,0);
@@ -78,8 +78,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (157,0);
-ref = breve;
+pos = (207,206);
+ref = brevecomb;
 },
 {
 pos = (1198,0);
@@ -95,8 +95,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (120,0);
-ref = breve;
+pos = (212,206);
+ref = brevecomb;
 },
 {
 pos = (1159,0);
diff --git a/src/Inter-Italic.glyphspackage/glyphs/abrevehookabove.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/abrevehookabove.1.glyph
index 845fa9c8d..5260e93ac 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/abrevehookabove.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/abrevehookabove.1.glyph
@@ -14,7 +14,7 @@ ref = a.1;
 {
 alignment = 1;
 pos = (406,186);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1191;
@@ -29,7 +29,7 @@ ref = a.1;
 {
 alignment = 1;
 pos = (334,186);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1249;
@@ -44,7 +44,7 @@ ref = a.1;
 {
 alignment = 1;
 pos = (245,186);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1323;
@@ -59,7 +59,7 @@ ref = a.1;
 {
 alignment = 1;
 pos = (214,206);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1161;
@@ -74,7 +74,7 @@ ref = a.1;
 {
 alignment = 1;
 pos = (216,206);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1274;
@@ -89,7 +89,7 @@ ref = a.1;
 {
 alignment = 1;
 pos = (351,206);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/abrevehookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/abrevehookabove.glyph
index e678c0ba7..187943784 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/abrevehookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/abrevehookabove.glyph
@@ -12,7 +12,7 @@ ref = a;
 {
 alignment = 1;
 pos = (334,186);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1249;
@@ -26,7 +26,7 @@ ref = a;
 {
 alignment = 1;
 pos = (245,186);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1323;
@@ -40,7 +40,7 @@ ref = a;
 {
 alignment = 1;
 pos = (406,186);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1191;
@@ -54,7 +54,7 @@ ref = a;
 {
 alignment = 1;
 pos = (214,206);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1161;
@@ -68,7 +68,7 @@ ref = a;
 {
 alignment = 1;
 pos = (216,206);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1274;
@@ -82,7 +82,7 @@ ref = a;
 {
 alignment = 1;
 pos = (351,206);
-ref = brevehookcomb.cn;
+ref = brevecomb_hookabovecomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acaron.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/acaron.1.glyph
index ee8d1c2ae..d41f3f654 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acaron.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acaron.1.glyph
@@ -12,8 +12,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (155,16);
-ref = caron;
+pos = (182,186);
+ref = caroncomb;
 }
 );
 width = 1191;
@@ -26,8 +26,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (160,0);
-ref = caron;
+pos = (241,186);
+ref = caroncomb;
 }
 );
 width = 1249;
@@ -40,8 +40,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (25,0);
-ref = caron;
+pos = (190,186);
+ref = caroncomb;
 }
 );
 width = 1323;
@@ -54,8 +54,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (134,0);
-ref = caron;
+pos = (203,206);
+ref = caroncomb;
 }
 );
 width = 1161;
@@ -68,8 +68,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (24,0);
-ref = caron;
+pos = (255,206);
+ref = caroncomb;
 }
 );
 width = 1274;
@@ -82,8 +82,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (168,0);
-ref = caron;
+pos = (213,206);
+ref = caroncomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/acaron.glyph
index 4d934c15a..ca6faabd2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acaron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (160,0);
-ref = caron;
+pos = (241,186);
+ref = caroncomb;
 }
 );
 width = 1249;
@@ -23,8 +23,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (25,0);
-ref = caron;
+pos = (190,186);
+ref = caroncomb;
 }
 );
 width = 1323;
@@ -36,8 +36,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (155,16);
-ref = caron;
+pos = (182,186);
+ref = caroncomb;
 }
 );
 width = 1191;
@@ -49,8 +49,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (134,0);
-ref = caron;
+pos = (203,206);
+ref = caroncomb;
 }
 );
 width = 1161;
@@ -62,8 +62,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (24,0);
-ref = caron;
+pos = (255,206);
+ref = caroncomb;
 }
 );
 width = 1274;
@@ -75,8 +75,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (168,0);
-ref = caron;
+pos = (213,206);
+ref = caroncomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/accountof.glyph b/src/Inter-Italic.glyphspackage/glyphs/accountof.glyph
index fd2ca1333..3118ee4e0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/accountof.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/accountof.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = accountof;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acircumflex.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/acircumflex.1.glyph
index fbd0a0507..67c6d9cea 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acircumflex.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acircumflex.1.glyph
@@ -12,8 +12,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (151,0);
-ref = circumflex;
+pos = (181,186);
+ref = circumflexcomb;
 }
 );
 width = 1191;
@@ -26,8 +26,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (162,0);
-ref = circumflex;
+pos = (241,186);
+ref = circumflexcomb;
 }
 );
 width = 1249;
@@ -40,8 +40,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (24,0);
-ref = circumflex;
+pos = (190,186);
+ref = circumflexcomb;
 }
 );
 width = 1323;
@@ -54,8 +54,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (136,0);
-ref = circumflex;
+pos = (202,206);
+ref = circumflexcomb;
 }
 );
 width = 1161;
@@ -68,8 +68,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (23,0);
-ref = circumflex;
+pos = (256,206);
+ref = circumflexcomb;
 }
 );
 width = 1274;
@@ -82,8 +82,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (171,0);
-ref = circumflex;
+pos = (212,206);
+ref = circumflexcomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acircumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/acircumflex.glyph
index 23595b6ef..c89757e41 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acircumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acircumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (162,0);
-ref = circumflex;
+pos = (241,186);
+ref = circumflexcomb;
 }
 );
 width = 1249;
@@ -23,8 +23,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (24,0);
-ref = circumflex;
+pos = (190,186);
+ref = circumflexcomb;
 }
 );
 width = 1323;
@@ -36,8 +36,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (151,0);
-ref = circumflex;
+pos = (181,186);
+ref = circumflexcomb;
 }
 );
 width = 1191;
@@ -49,8 +49,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (136,0);
-ref = circumflex;
+pos = (202,206);
+ref = circumflexcomb;
 }
 );
 width = 1161;
@@ -62,8 +62,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (23,0);
-ref = circumflex;
+pos = (256,206);
+ref = circumflexcomb;
 }
 );
 width = 1274;
@@ -75,8 +75,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (171,0);
-ref = circumflex;
+pos = (212,206);
+ref = circumflexcomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acircumflexdotbelow.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/acircumflexdotbelow.1.glyph
index 5f1c2a4b6..65cceef5a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acircumflexdotbelow.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acircumflexdotbelow.1.glyph
@@ -12,8 +12,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (151,0);
-ref = circumflex;
+pos = (181,186);
+ref = circumflexcomb;
 },
 {
 pos = (1160,0);
@@ -30,8 +30,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (162,0);
-ref = circumflex;
+pos = (241,186);
+ref = circumflexcomb;
 },
 {
 pos = (1220,0);
@@ -48,8 +48,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (24,0);
-ref = circumflex;
+pos = (190,186);
+ref = circumflexcomb;
 },
 {
 pos = (1194,0);
@@ -66,8 +66,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (136,0);
-ref = circumflex;
+pos = (202,206);
+ref = circumflexcomb;
 },
 {
 pos = (1201,0);
@@ -84,8 +84,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (23,0);
-ref = circumflex;
+pos = (256,206);
+ref = circumflexcomb;
 },
 {
 pos = (1198,0);
@@ -102,8 +102,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (171,0);
-ref = circumflex;
+pos = (212,206);
+ref = circumflexcomb;
 },
 {
 pos = (1159,0);
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acircumflexdotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/acircumflexdotbelow.glyph
index a2098e1fe..733de7b24 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acircumflexdotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acircumflexdotbelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (162,0);
-ref = circumflex;
+pos = (241,186);
+ref = circumflexcomb;
 },
 {
 pos = (1220,0);
@@ -27,8 +27,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (24,0);
-ref = circumflex;
+pos = (190,186);
+ref = circumflexcomb;
 },
 {
 pos = (1194,0);
@@ -44,8 +44,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (151,0);
-ref = circumflex;
+pos = (181,186);
+ref = circumflexcomb;
 },
 {
 pos = (1160,0);
@@ -61,8 +61,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (136,0);
-ref = circumflex;
+pos = (202,206);
+ref = circumflexcomb;
 },
 {
 pos = (1201,0);
@@ -78,8 +78,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (23,0);
-ref = circumflex;
+pos = (256,206);
+ref = circumflexcomb;
 },
 {
 pos = (1198,0);
@@ -95,8 +95,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (171,0);
-ref = circumflex;
+pos = (212,206);
+ref = circumflexcomb;
 },
 {
 pos = (1159,0);
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acute.glyph b/src/Inter-Italic.glyphspackage/glyphs/acute.glyph
index 366d55e6f..d1253c5a2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acute.glyph
@@ -1,61 +1,48 @@
 {
-color = (204,240,242,1);
 glyphname = acute;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (337,1118);
-},
+background = {
+shapes = (
 {
-name = top;
-pos = (410,1557);
+closed = 1;
+nodes = (
+(310,1264,l),
+(502,1557,l),
+(308,1557,l),
+(168,1264,l)
+);
 }
 );
+};
 guides = (
 {
-pos = (1,1283);
+pos = (0,1264);
 },
 {
-pos = (1,1557);
+pos = (0,1557);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(422,1283,l),
-(660,1557,l),
-(466,1557,l),
-(280,1283,l)
-);
+pos = (128,0);
+ref = acutecomb;
 }
 );
-width = 655;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (396,1118);
+width = 654;
 },
 {
-name = top;
-pos = (473,1582);
-}
-);
 background = {
 shapes = (
 {
 closed = 1;
 nodes = (
-(375,1283,l),
-(567,1557,l),
-(373,1557,l),
-(233,1283,l)
+(434,1256,l),
+(652,1582,l),
+(308,1582,l),
+(170,1256,l)
 );
 }
 );
@@ -72,118 +59,73 @@ layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(549,1256,l),
-(821,1582,l),
-(477,1582,l),
-(285,1256,l)
-);
+pos = (130,0);
+ref = acutecomb;
 }
 );
 width = 822;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (305,1118);
-},
-{
-name = top;
-pos = (382,1557);
-}
-);
 background = {
 shapes = (
 {
 closed = 1;
 nodes = (
-(279,1283,l),
-(471,1557,l),
-(277,1557,l),
-(137,1283,l)
+(226,1283,l),
+(393,1557,l),
+(333,1557,l),
+(180,1283,l)
 );
 }
 );
 };
 guides = (
 {
-pos = (1,1283);
+pos = (0,1283);
 },
 {
-pos = (1,1557);
+pos = (0,1557);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(346,1283,l),
-(559,1557,l),
-(499,1557,l),
-(300,1283,l)
-);
+pos = (140,0);
+ref = acutecomb;
 }
 );
-width = 574;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (252,1056);
+width = 573;
 },
 {
-name = top;
-pos = (328,1515);
-}
-);
 guides = (
 {
-pos = (1,1241);
+pos = (0,1192);
 },
 {
-pos = (1,1515);
+pos = (0,1490);
 }
 );
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(340,1241,l),
-(578,1515,l),
-(384,1515,l),
-(198,1241,l)
-);
+pos = (49,0);
+ref = acutecomb;
 }
 );
-width = 495;
+width = 494;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (305,1056);
-},
-{
-name = top;
-pos = (380,1507);
-}
-);
 background = {
 shapes = (
 {
 closed = 1;
 nodes = (
-(313,1241,l),
-(505,1515,l),
-(311,1515,l),
-(171,1241,l)
+(328,1181,l),
+(634,1507,l),
+(266,1507,l),
+(64,1181,l)
 );
 }
 );
@@ -200,50 +142,40 @@ layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(436,1181,l),
-(795,1507,l),
-(427,1507,l),
-(172,1181,l)
-);
+pos = (24,0);
+ref = acutecomb;
 }
 );
-width = 697;
+width = 698;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (218,1056);
-},
+background = {
+shapes = (
 {
-name = top;
-pos = (294,1515);
+closed = 1;
+nodes = (
+(151,1192,l),
+(283,1490,l),
+(225,1490,l),
+(106,1192,l)
+);
 }
 );
+};
 guides = (
 {
-pos = (1,1241);
-},
-{
-pos = (1,1515);
+pos = (0,1192);
 }
 );
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(269,1241,l),
-(516,1515,l),
-(458,1515,l),
-(218,1241,l)
-);
+pos = (66,0);
+ref = acutecomb;
 }
 );
-width = 453;
+width = 452;
 }
 );
 unicode = 180;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acute_compact.glyph b/src/Inter-Italic.glyphspackage/glyphs/acute_compact.glyph
index 3f0aebdb0..f8b974bd8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acute_compact.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acute_compact.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = acute_compact;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acutecomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/acutecomb.glyph
index 4a125bdf0..129ebca2b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acutecomb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acutecomb.glyph
@@ -1,73 +1,158 @@
 {
-color = (250,227,227,1);
 glyphname = acutecomb;
 layers = (
 {
+anchors = (
+{
+name = _top;
+pos = (217,1118);
+},
+{
+name = top;
+pos = (290,1557);
+}
+);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (-768,0);
-ref = acute;
+closed = 1;
+nodes = (
+(302,1283,l),
+(540,1557,l),
+(346,1557,l),
+(160,1283,l)
+);
 }
 );
-width = 0;
+width = 415;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (266,1118);
 },
 {
+name = top;
+pos = (343,1582);
+}
+);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (-928,0);
-ref = acute;
+closed = 1;
+nodes = (
+(419,1256,l),
+(691,1582,l),
+(347,1582,l),
+(155,1256,l)
+);
 }
 );
-width = 14;
+width = 562;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (165,1118);
+},
+{
+name = top;
+pos = (242,1557);
+}
+);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (-672,0);
-ref = acute;
+closed = 1;
+nodes = (
+(206,1283,l),
+(419,1557,l),
+(359,1557,l),
+(160,1283,l)
+);
 }
 );
-width = 0;
+width = 294;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (212,1056);
+},
+{
+name = top;
+pos = (288,1515);
+}
+);
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (-768,0);
-ref = acute;
+closed = 1;
+nodes = (
+(300,1241,l),
+(538,1515,l),
+(344,1515,l),
+(158,1241,l)
+);
 }
 );
-width = 0;
+width = 415;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (281,1056);
 },
 {
+name = top;
+pos = (356,1507);
+}
+);
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (-928,0);
-ref = acute;
+closed = 1;
+nodes = (
+(412,1181,l),
+(771,1507,l),
+(403,1507,l),
+(148,1181,l)
+);
 }
 );
-width = 0;
+width = 649;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (158,1056);
+},
+{
+name = top;
+pos = (234,1515);
+}
+);
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (-672,0);
-ref = acute;
+closed = 1;
+nodes = (
+(209,1241,l),
+(456,1515,l),
+(398,1515,l),
+(158,1241,l)
+);
 }
 );
-width = 0;
+width = 333;
 }
 );
+metricLeft = "=40";
+metricRight = "=40";
 unicode = 769;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acutedblnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/acutedblcomb.glyph
index 03b6450df..f44d9777e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acutedblnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acutedblcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = acutedblnosp;
+glyphname = acutedblcomb;
 layers = (
 {
 anchors = (
@@ -210,5 +209,4 @@ width = 0;
 }
 );
 note = "match dblgravecmb";
-unicode = 779;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acutelowmod.glyph b/src/Inter-Italic.glyphspackage/glyphs/acutelowmod.glyph
index ce5af27ea..b471950d2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acutelowmod.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acutelowmod.glyph
@@ -3,69 +3,75 @@ glyphname = acutelowmod;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (20,-1600);
-ref = acute;
+pos = (-117,-1600);
+ref = acutecomb;
 }
 );
-width = 734;
+width = 735;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (46,-1600);
-ref = acute;
+pos = (-114,-1600);
+ref = acutecomb;
 }
 );
-width = 834;
+width = 835;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (6,-1600);
-ref = acute;
+pos = (-105,-1600);
+ref = acutecomb;
 }
 );
-width = 672;
+width = 673;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (20,-1600);
-ref = acute;
+pos = (-196,-1600);
+ref = acutecomb;
 }
 );
 width = 670;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (46,-1600);
-ref = acute;
+pos = (-221,-1600);
+ref = acutecomb;
 }
 );
-width = 802;
+width = 801;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (6,-1600);
-ref = acute;
+pos = (-179,-1600);
+ref = acutecomb;
 }
 );
-width = 544;
+width = 619;
 }
 );
 unicode = 719;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acuterightnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/acuterightcomb.glyph
index ef7921317..b81e23e70 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acuterightnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acuterightcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = acuterightnosp;
+glyphname = acuterightcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -69,5 +68,4 @@ ref = acute;
 width = 0;
 }
 );
-unicode = 833;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/macronsubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/acutesubcomb.glyph
index 8f66ffd92..be3e0d30f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/macronsubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acutesubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = macronsubnosp;
+glyphname = acutesubcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -8,11 +7,11 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-1090,0);
-ref = macronsub;
+pos = (-1076,-1630);
+ref = acutecomb;
 }
 );
-width = 0;
+width = 1;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -20,11 +19,11 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-1081,0);
-ref = macronsub;
+pos = (-1223,-1606);
+ref = acutecomb;
 }
 );
-width = 0;
+width = 33;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -32,11 +31,11 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-990,0);
-ref = macronsub;
+pos = (-972,-1644);
+ref = acutecomb;
 }
 );
-width = 0;
+width = 1;
 },
 {
 layerId = m008;
@@ -44,8 +43,8 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-980,0);
-ref = macronsub;
+pos = (-1155,-1630);
+ref = acutecomb;
 }
 );
 width = 0;
@@ -56,8 +55,8 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-1033,0);
-ref = macronsub;
+pos = (-1330,-1606);
+ref = acutecomb;
 }
 );
 width = 0;
@@ -68,12 +67,11 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-925,0);
-ref = macronsub;
+pos = (-1046,-1644);
+ref = acutecomb;
 }
 );
-width = 0;
+width = 76;
 }
 );
-unicode = 817;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acutesubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/acutesubnosp.glyph
deleted file mode 100644
index 3838ec587..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/acutesubnosp.glyph
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-color = (250,227,227,1);
-glyphname = acutesubnosp;
-layers = (
-{
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-alignment = -1;
-pos = (-934,-1630);
-ref = acute;
-}
-);
-width = 0;
-},
-{
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-alignment = -1;
-pos = (-1062,-1606);
-ref = acute;
-}
-);
-width = 2;
-},
-{
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-alignment = -1;
-pos = (-858,-1644);
-ref = acute;
-}
-);
-width = 0;
-},
-{
-layerId = m008;
-shapes = (
-{
-alignment = -1;
-pos = (-934,-1630);
-ref = acute;
-}
-);
-width = 0;
-},
-{
-layerId = m010;
-shapes = (
-{
-alignment = -1;
-pos = (-1062,-1606);
-ref = acute;
-}
-);
-width = 0;
-},
-{
-layerId = m012;
-shapes = (
-{
-alignment = -1;
-pos = (-858,-1644);
-ref = acute;
-}
-);
-width = 0;
-}
-);
-unicode = 791;
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/addresssubject.glyph b/src/Inter-Italic.glyphspackage/glyphs/addresssubject.glyph
index e6538f083..47fdfc192 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/addresssubject.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/addresssubject.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = addresssubject;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/adieresis.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/adieresis.1.glyph
index 3c019d1ee..a4db6fb31 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/adieresis.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/adieresis.1.glyph
@@ -13,7 +13,7 @@ ref = a.1;
 },
 {
 pos = (31,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1191;
@@ -27,7 +27,7 @@ ref = a.1;
 },
 {
 pos = (56,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1249;
@@ -41,7 +41,7 @@ ref = a.1;
 },
 {
 pos = (36,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1323;
@@ -55,7 +55,7 @@ ref = a.1;
 },
 {
 pos = (33,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1161;
@@ -69,7 +69,7 @@ ref = a.1;
 },
 {
 pos = (38,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1274;
@@ -83,7 +83,7 @@ ref = a.1;
 },
 {
 pos = (30,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/adieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/adieresis.glyph
index a3a43e5c3..0a5e061e6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/adieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/adieresis.glyph
@@ -5,78 +5,166 @@ kernRight = a;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
 pos = (56,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1249;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
 pos = (36,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1323;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
 pos = (31,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1191;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
 pos = (33,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1161;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
 pos = (38,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1274;
 },
 {
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(577,86,o),
+(702,-16,o),
+(899,-16,cs),
+(1113,-16,o),
+(1262,93,o),
+(1315,275,c),
+(1317,275,l),
+(1317,1,l),
+(1350,1,l),
+(1350,701,ls),
+(1350,938,o),
+(1216,1072,o),
+(994,1072,cs),
+(779,1072,o),
+(631,950,o),
+(613,726,c),
+(646,726,l),
+(662,933,o),
+(796,1042,o),
+(994,1042,cs),
+(1197,1042,o),
+(1315,926,o),
+(1315,701,cs),
+(1315,633,o),
+(1252,610,o),
+(1164,595,cs),
+(881,549,ls),
+(689,522,o),
+(577,427,o),
+(577,260,c),
+(577,260,l),
+(577,260,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(725,14,o),
+(611,106,o),
+(611,262,cs),
+(611,412,o),
+(715,493,o),
+(888,522,cs),
+(1169,565,ls),
+(1228,575,o),
+(1290,594,o),
+(1315,632,c),
+(1315,461,ls),
+(1315,167,o),
+(1142,14,o),
+(899,14,c),
+(899,14,l),
+(899,14,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(1218,1495,l),
+(1183,1495,l),
+(1183,1314,l),
+(1218,1314,l),
+(1218,1314,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(810,1495,l),
+(775,1495,l),
+(775,1314,l),
+(810,1314,l),
+(810,1314,l)
+);
+}
+);
+};
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
 pos = (30,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/adieresismacron.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/adieresismacron.1.glyph
index d5476170a..cfcfafa81 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/adieresismacron.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/adieresismacron.1.glyph
@@ -13,7 +13,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1145,-46);
+pos = (-79,186);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1220,-18);
+pos = (-43,186);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -43,7 +43,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1339,-32);
+pos = (37,186);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1181,-60);
+pos = (5,206);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1329,-74);
+pos = (39,206);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -88,7 +88,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1151,-88);
+pos = (-64,206);
 ref = dieresismacroncomb.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/adieresismacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/adieresismacron.glyph
index 824a79aa6..e5d78f8c6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/adieresismacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/adieresismacron.glyph
@@ -11,7 +11,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1220,-18);
+pos = (-43,186);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -25,7 +25,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1339,-32);
+pos = (37,186);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -39,7 +39,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1145,-46);
+pos = (-79,186);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -53,7 +53,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1181,-60);
+pos = (5,206);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -67,7 +67,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1329,-74);
+pos = (39,206);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -81,7 +81,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1151,-88);
+pos = (-64,206);
 ref = dieresismacroncomb.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/adotmacron.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/adotmacron.1.glyph
index a4f14789b..3903e745f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/adotmacron.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/adotmacron.1.glyph
@@ -13,7 +13,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1235,0);
+pos = (301,186);
 ref = dotmacron.lc;
 }
 );
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1216,0);
+pos = (264,186);
 ref = dotmacron.lc;
 }
 );
@@ -43,7 +43,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1375,0);
+pos = (335,186);
 ref = dotmacron.lc;
 }
 );
@@ -58,7 +58,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1190,0);
+pos = (312,206);
 ref = dotmacron.lc;
 }
 );
@@ -73,7 +73,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1373,0);
+pos = (344,206);
 ref = dotmacron.lc;
 }
 );
@@ -88,7 +88,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1251,0);
+pos = (331,206);
 ref = dotmacron.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/adotmacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/adotmacron.glyph
index 54849a1ca..af0fb76eb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/adotmacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/adotmacron.glyph
@@ -11,7 +11,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1216,0);
+pos = (264,186);
 ref = dotmacron.lc;
 }
 );
@@ -25,7 +25,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1375,0);
+pos = (335,186);
 ref = dotmacron.lc;
 }
 );
@@ -39,7 +39,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1235,0);
+pos = (301,186);
 ref = dotmacron.lc;
 }
 );
@@ -53,7 +53,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1190,0);
+pos = (312,206);
 ref = dotmacron.lc;
 }
 );
@@ -67,7 +67,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1373,0);
+pos = (344,206);
 ref = dotmacron.lc;
 }
 );
@@ -81,7 +81,7 @@ ref = a;
 },
 {
 alignment = 1;
-pos = (1251,0);
+pos = (331,206);
 ref = dotmacron.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/aeacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/aeacute.glyph
index 894bc3a90..58b8573bb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/aeacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/aeacute.glyph
@@ -5,78 +5,84 @@ kernRight = e;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = ae;
 },
 {
-pos = (679,186);
-ref = acute;
+pos = (799,186);
+ref = acutecomb;
 }
 );
 width = 1853;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = ae;
 },
 {
-pos = (776,186);
-ref = acute;
+pos = (906,186);
+ref = acutecomb;
 }
 );
 width = 1917;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = ae;
 },
 {
-pos = (719,186);
-ref = acute;
+pos = (859,186);
+ref = acutecomb;
 }
 );
 width = 1850;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = ae;
 },
 {
-pos = (727,206);
-ref = acute;
+pos = (767,206);
+ref = acutecomb;
 }
 );
 width = 1764;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = ae;
 },
 {
-pos = (851,206);
-ref = acute;
+pos = (875,206);
+ref = acutecomb;
 }
 );
 width = 1871;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = ae;
 },
 {
-pos = (739,206);
-ref = acute;
+pos = (799,206);
+ref = acutecomb;
 }
 );
 width = 1727;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/aemacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/aemacron.glyph
index 715291c61..ccba33f78 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/aemacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/aemacron.glyph
@@ -5,78 +5,84 @@ kernRight = e;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = ae;
 },
 {
 pos = (436,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1853;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = ae;
 },
 {
 pos = (663,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1917;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = ae;
 },
 {
 pos = (531,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1850;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = ae;
 },
 {
-pos = (476,206);
-ref = macron;
+pos = (475,206);
+ref = macroncomb;
 }
 );
 width = 1764;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = ae;
 },
 {
 pos = (684,206);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1871;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = ae;
 },
 {
 pos = (485,206);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1727;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/afii10023.glyph b/src/Inter-Italic.glyphspackage/glyphs/afii10023.glyph
index fc22d4d17..7cfd772a5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/afii10023.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/afii10023.glyph
@@ -11,7 +11,7 @@ ref = E;
 },
 {
 pos = (120,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1224;
@@ -24,7 +24,7 @@ ref = E;
 },
 {
 pos = (67,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1275;
@@ -37,7 +37,7 @@ ref = E;
 },
 {
 pos = (143,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1196;
@@ -50,7 +50,7 @@ ref = E;
 },
 {
 pos = (129,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1160;
@@ -63,7 +63,7 @@ ref = E;
 },
 {
 pos = (83,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1260;
@@ -76,7 +76,7 @@ ref = E;
 },
 {
 pos = (132,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/afii10027.glyph b/src/Inter-Italic.glyphspackage/glyphs/afii10027.glyph
index fe04b831c..372425982 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/afii10027.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/afii10027.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (375,372);
-ref = breve;
+pos = (482,558);
+ref = brevecomb;
 }
 );
 width = 1544;
@@ -25,8 +25,8 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (287,372);
-ref = breve;
+pos = (350,558);
+ref = brevecomb;
 }
 );
 width = 1480;
@@ -39,8 +39,8 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (435,372);
-ref = breve;
+pos = (530,558);
+ref = brevecomb;
 }
 );
 width = 1580;
@@ -53,8 +53,8 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (371,414);
-ref = breve;
+pos = (434,620);
+ref = brevecomb;
 }
 );
 width = 1473;
@@ -67,8 +67,8 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (327,414);
-ref = breve;
+pos = (377,620);
+ref = brevecomb;
 }
 );
 width = 1513;
@@ -81,8 +81,8 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (378,414);
-ref = breve;
+pos = (470,620);
+ref = brevecomb;
 }
 );
 width = 1452;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/afii10052.glyph b/src/Inter-Italic.glyphspackage/glyphs/afii10052.glyph
index 29682a665..5ab66482a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/afii10052.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/afii10052.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (479,558);
-ref = acute;
+pos = (599,558);
+ref = acutecomb;
 }
 );
 width = 1178;
@@ -25,8 +25,8 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (426,558);
-ref = acute;
+pos = (556,558);
+ref = acutecomb;
 }
 );
 width = 1200;
@@ -39,8 +39,8 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (511,558);
-ref = acute;
+pos = (651,558);
+ref = acutecomb;
 }
 );
 width = 1172;
@@ -53,8 +53,8 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (539,620);
-ref = acute;
+pos = (579,620);
+ref = acutecomb;
 }
 );
 width = 1115;
@@ -67,8 +67,8 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (508,620);
-ref = acute;
+pos = (532,620);
+ref = acutecomb;
 }
 );
 width = 1169;
@@ -81,8 +81,8 @@ shapes = (
 ref = "Ge-cy";
 },
 {
-pos = (534,620);
-ref = acute;
+pos = (594,620);
+ref = acutecomb;
 }
 );
 width = 1040;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/afii10061.glyph b/src/Inter-Italic.glyphspackage/glyphs/afii10061.glyph
index 27fa776a8..9d18b3af6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/afii10061.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/afii10061.glyph
@@ -5,78 +5,84 @@ kernRight = K;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = K;
 },
 {
-pos = (519,558);
-ref = acute;
+pos = (639,558);
+ref = acutecomb;
 }
 );
 width = 1336;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = K;
 },
 {
-pos = (515,558);
-ref = acute;
+pos = (645,558);
+ref = acutecomb;
 }
 );
 width = 1465;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = K;
 },
 {
-pos = (519,558);
-ref = acute;
+pos = (659,558);
+ref = acutecomb;
 }
 );
 width = 1262;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = K;
 },
 {
-pos = (580,620);
-ref = acute;
+pos = (620,620);
+ref = acutecomb;
 }
 );
 width = 1272;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = K;
 },
 {
-pos = (605,620);
-ref = acute;
+pos = (629,620);
+ref = acutecomb;
 }
 );
 width = 1478;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = K;
 },
 {
-pos = (539,620);
-ref = acute;
+pos = (599,620);
+ref = acutecomb;
 }
 );
 width = 1142;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/afii10062.glyph b/src/Inter-Italic.glyphspackage/glyphs/afii10062.glyph
index a38f6b64c..51b92e4e7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/afii10062.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/afii10062.glyph
@@ -8,8 +8,8 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (237,372);
-ref = breve;
+pos = (344,558);
+ref = brevecomb;
 }
 );
 width = 1276;
@@ -21,8 +21,8 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (267,372);
-ref = breve;
+pos = (330,558);
+ref = brevecomb;
 }
 );
 width = 1442;
@@ -34,8 +34,8 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (237,372);
-ref = breve;
+pos = (332,558);
+ref = brevecomb;
 }
 );
 width = 1170;
@@ -47,8 +47,8 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (242,414);
-ref = breve;
+pos = (305,620);
+ref = brevecomb;
 }
 );
 width = 1212;
@@ -60,8 +60,8 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (274,414);
-ref = breve;
+pos = (324,620);
+ref = brevecomb;
 }
 );
 width = 1410;
@@ -73,8 +73,8 @@ shapes = (
 ref = afii10037;
 },
 {
-pos = (188,414);
-ref = breve;
+pos = (280,620);
+ref = brevecomb;
 }
 );
 width = 1046;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/agrave.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/agrave.1.glyph
index d349f2486..1a774e7e3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/agrave.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/agrave.1.glyph
@@ -13,7 +13,7 @@ ref = a.1;
 },
 {
 pos = (249,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1191;
@@ -27,7 +27,7 @@ ref = a.1;
 },
 {
 pos = (248,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1249;
@@ -41,7 +41,7 @@ ref = a.1;
 },
 {
 pos = (184,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1323;
@@ -55,7 +55,7 @@ ref = a.1;
 },
 {
 pos = (273,206);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1161;
@@ -69,7 +69,7 @@ ref = a.1;
 },
 {
 pos = (207,206);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1274;
@@ -82,8 +82,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (239,206);
-ref = grave;
+pos = (243,206);
+ref = gravecomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/agrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/agrave.glyph
index 877fde30c..7d297c475 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/agrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/agrave.glyph
@@ -11,7 +11,7 @@ ref = a;
 },
 {
 pos = (248,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1249;
@@ -24,7 +24,7 @@ ref = a;
 },
 {
 pos = (184,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1323;
@@ -37,7 +37,7 @@ ref = a;
 },
 {
 pos = (249,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1191;
@@ -50,7 +50,7 @@ ref = a;
 },
 {
 pos = (273,206);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1161;
@@ -63,7 +63,7 @@ ref = a;
 },
 {
 pos = (207,206);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1274;
@@ -75,8 +75,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (239,206);
-ref = grave;
+pos = (243,206);
+ref = gravecomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ahookabove.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/ahookabove.1.glyph
index 2b361226d..2c0739875 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ahookabove.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ahookabove.1.glyph
@@ -13,7 +13,7 @@ ref = a.1;
 },
 {
 pos = (393,186);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1191;
@@ -27,7 +27,7 @@ ref = a.1;
 },
 {
 pos = (393,186);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1249;
@@ -41,7 +41,7 @@ ref = a.1;
 },
 {
 pos = (388,186);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1323;
@@ -55,7 +55,7 @@ ref = a.1;
 },
 {
 pos = (338,206);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1161;
@@ -69,7 +69,7 @@ ref = a.1;
 },
 {
 pos = (364,206);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1274;
@@ -82,8 +82,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (346,206);
-ref = hookabove;
+pos = (340,206);
+ref = hookabovecomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ahookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/ahookabove.glyph
index ee5efbc2c..92c6ccfdc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ahookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ahookabove.glyph
@@ -11,7 +11,7 @@ ref = a;
 },
 {
 pos = (393,186);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1249;
@@ -24,7 +24,7 @@ ref = a;
 },
 {
 pos = (388,186);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1323;
@@ -37,7 +37,7 @@ ref = a;
 },
 {
 pos = (393,186);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1191;
@@ -50,7 +50,7 @@ ref = a;
 },
 {
 pos = (338,206);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1161;
@@ -63,7 +63,7 @@ ref = a;
 },
 {
 pos = (364,206);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1274;
@@ -75,8 +75,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (346,206);
-ref = hookabove;
+pos = (340,206);
+ref = hookabovecomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.1.glyph
index 3b6c284c1..3985e4118 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.1.glyph
@@ -12,8 +12,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1196,186);
-ref = breveinvnosp;
+pos = (251,186);
+ref = breveinvcomb;
 }
 );
 width = 1191;
@@ -26,8 +26,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1254,186);
-ref = breveinvnosp;
+pos = (241,186);
+ref = breveinvcomb;
 }
 );
 width = 1249;
@@ -40,8 +40,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1364,186);
-ref = breveinvnosp;
+pos = (190,186);
+ref = breveinvcomb;
 }
 );
 width = 1323;
@@ -54,8 +54,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1165,206);
-ref = breveinvnosp;
+pos = (202,206);
+ref = breveinvcomb;
 }
 );
 width = 1161;
@@ -68,8 +68,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1338,206);
-ref = breveinvnosp;
+pos = (256,206);
+ref = breveinvcomb;
 }
 );
 width = 1274;
@@ -82,8 +82,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1093,206);
-ref = breveinvnosp;
+pos = (212,206);
+ref = breveinvcomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.glyph
index 7ecb308c8..d17c436e3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (1254,186);
-ref = breveinvnosp;
+pos = (241,186);
+ref = breveinvcomb;
 }
 );
 width = 1249;
@@ -23,8 +23,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (1364,186);
-ref = breveinvnosp;
+pos = (190,186);
+ref = breveinvcomb;
 }
 );
 width = 1323;
@@ -36,8 +36,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (1196,186);
-ref = breveinvnosp;
+pos = (251,186);
+ref = breveinvcomb;
 }
 );
 width = 1191;
@@ -49,8 +49,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (1165,206);
-ref = breveinvnosp;
+pos = (202,206);
+ref = breveinvcomb;
 }
 );
 width = 1161;
@@ -62,8 +62,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (1338,206);
-ref = breveinvnosp;
+pos = (256,206);
+ref = breveinvcomb;
 }
 );
 width = 1274;
@@ -75,8 +75,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (1093,206);
-ref = breveinvnosp;
+pos = (212,206);
+ref = breveinvcomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/amacron.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/amacron.1.glyph
index 50c8014e7..f465adf8d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/amacron.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/amacron.1.glyph
@@ -6,6 +6,7 @@ kernRight = u;
 layers = (
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
@@ -13,13 +14,14 @@ ref = a.1;
 },
 {
 pos = (213,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
@@ -27,13 +29,14 @@ ref = a.1;
 },
 {
 pos = (170,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1249;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
@@ -41,27 +44,29 @@ ref = a.1;
 },
 {
 pos = (285,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1323;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
 ref = a.1;
 },
 {
-pos = (187,206);
-ref = macron;
+pos = (186,206);
+ref = macroncomb;
 }
 );
 width = 1161;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
@@ -69,13 +74,14 @@ ref = a.1;
 },
 {
 pos = (303,206);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1274;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
@@ -83,7 +89,7 @@ ref = a.1;
 },
 {
 pos = (180,206);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/amacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/amacron.glyph
index 48b4612b0..134434c1d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/amacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/amacron.glyph
@@ -5,78 +5,84 @@ kernRight = a;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
 pos = (170,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1249;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
 pos = (285,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1323;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
 pos = (213,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1191;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
-pos = (187,206);
-ref = macron;
+pos = (186,206);
+ref = macroncomb;
 }
 );
 width = 1161;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
 pos = (303,206);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1274;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
 pos = (180,206);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/anglesupnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/anglesupcomb.glyph
index 697e82355..0252620df 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/anglesupnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/anglesupcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = anglesupnosp;
+glyphname = anglesupcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -147,5 +146,4 @@ nodes = (
 width = 0;
 }
 );
-unicode = 794;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/archdblsubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/archdblsubcomb.glyph
index 4dfd43b15..c8d00ef63 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/archdblsubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/archdblsubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = archdblsubnosp;
+glyphname = archdblsubcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -267,5 +266,4 @@ nodes = (
 width = 0;
 }
 );
-unicode = 811;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.1.glyph
index a4fad6336..9003f4ccf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.1.glyph
@@ -6,6 +6,7 @@ kernRight = u;
 layers = (
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
@@ -13,13 +14,14 @@ ref = a.1;
 },
 {
 pos = (458,186);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
@@ -27,13 +29,14 @@ ref = a.1;
 },
 {
 pos = (511,186);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 1249;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
@@ -41,27 +44,29 @@ ref = a.1;
 },
 {
 pos = (546,186);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 1323;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
 ref = a.1;
 },
 {
-pos = (453,206);
-ref = ringhalfright;
+pos = (454,206);
+ref = righthalfringabovecomb;
 }
 );
 width = 1161;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
@@ -69,13 +74,14 @@ ref = a.1;
 },
 {
 pos = (538,206);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 1274;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
@@ -83,7 +89,7 @@ ref = a.1;
 },
 {
 pos = (409,206);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.glyph b/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.glyph
index 4a68f5f01..282827da8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.glyph
@@ -5,78 +5,84 @@ kernRight = a;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
 pos = (511,186);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 1249;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
 pos = (546,186);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 1323;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
 pos = (458,186);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 1191;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
-pos = (453,206);
-ref = ringhalfright;
+pos = (454,206);
+ref = righthalfringabovecomb;
 }
 );
 width = 1161;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
 pos = (538,206);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 1274;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = a;
 },
 {
 pos = (409,206);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/aring.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/aring.1.glyph
index c9656b7d7..8eb32e027 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/aring.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/aring.1.glyph
@@ -12,8 +12,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (336,0);
-ref = ring;
+pos = (373,186);
+ref = ringcomb;
 }
 );
 width = 1191;
@@ -26,8 +26,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (308,0);
-ref = ring;
+pos = (353,186);
+ref = ringcomb;
 }
 );
 width = 1249;
@@ -40,8 +40,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (230,0);
-ref = ring;
+pos = (270,186);
+ref = ringcomb;
 }
 );
 width = 1323;
@@ -54,8 +54,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (280,-42);
-ref = ring;
+pos = (314,206);
+ref = ringcomb;
 }
 );
 width = 1161;
@@ -68,8 +68,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (227,-42);
-ref = ring;
+pos = (255,206);
+ref = ringcomb;
 }
 );
 width = 1274;
@@ -82,8 +82,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (346,-42);
-ref = ring;
+pos = (276,206);
+ref = ringcomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/aring.glyph b/src/Inter-Italic.glyphspackage/glyphs/aring.glyph
index 668ff74fe..e7fe244dd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/aring.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/aring.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (308,0);
-ref = ring;
+pos = (353,186);
+ref = ringcomb;
 }
 );
 width = 1249;
@@ -23,8 +23,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (230,0);
-ref = ring;
+pos = (270,186);
+ref = ringcomb;
 }
 );
 width = 1323;
@@ -36,8 +36,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (336,0);
-ref = ring;
+pos = (373,186);
+ref = ringcomb;
 }
 );
 width = 1191;
@@ -49,8 +49,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (280,-42);
-ref = ring;
+pos = (314,206);
+ref = ringcomb;
 }
 );
 width = 1161;
@@ -62,8 +62,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (227,-42);
-ref = ring;
+pos = (255,206);
+ref = ringcomb;
 }
 );
 width = 1274;
@@ -75,8 +75,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (346,-42);
-ref = ring;
+pos = (276,206);
+ref = ringcomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/aringogonek.glyph b/src/Inter-Italic.glyphspackage/glyphs/aringogonek.glyph
index 50a98f7d2..cadfa4448 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/aringogonek.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/aringogonek.glyph
@@ -11,7 +11,7 @@ ref = aring;
 },
 {
 pos = (720,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1191;
@@ -24,7 +24,7 @@ ref = aring;
 },
 {
 pos = (655,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1249;
@@ -37,7 +37,7 @@ ref = aring;
 },
 {
 pos = (691,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1323;
@@ -50,7 +50,7 @@ ref = aring;
 },
 {
 pos = (628,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1161;
@@ -63,7 +63,7 @@ ref = aring;
 },
 {
 pos = (621,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1274;
@@ -75,8 +75,8 @@ shapes = (
 ref = aring;
 },
 {
-pos = (714,0);
-ref = ogonek;
+pos = (709,0);
+ref = ogonekcomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/arrowheaddownmod.glyph b/src/Inter-Italic.glyphspackage/glyphs/arrowheaddownmod.glyph
index 6df3840cc..fe5e70754 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/arrowheaddownmod.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/arrowheaddownmod.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = arrowheaddownmod;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/arrowheadleftmod.glyph b/src/Inter-Italic.glyphspackage/glyphs/arrowheadleftmod.glyph
index 2cd020e59..cb9cdfc67 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/arrowheadleftmod.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/arrowheadleftmod.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = arrowheadleftmod;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/arrowheadrightabovecomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/arrowheadrightabovecomb.glyph
index d2cb8bf98..a310a0630 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/arrowheadrightabovecomb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/arrowheadrightabovecomb.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = arrowheadrightabovecomb;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/arrowheadrightmod.glyph b/src/Inter-Italic.glyphspackage/glyphs/arrowheadrightmod.glyph
index 46c3d0f40..e7ed4585e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/arrowheadrightmod.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/arrowheadrightmod.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = arrowheadrightmod;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/arrowheadupmod.glyph b/src/Inter-Italic.glyphspackage/glyphs/arrowheadupmod.glyph
index a0656f52c..7915f554d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/arrowheadupmod.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/arrowheadupmod.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = arrowheadupmod;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/atilde.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/atilde.1.glyph
index c03f949cf..8236357e0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/atilde.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/atilde.1.glyph
@@ -12,8 +12,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (72,0);
-ref = tilde;
+pos = (110,186);
+ref = tildecomb;
 }
 );
 width = 1191;
@@ -26,8 +26,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (115,0);
-ref = tilde;
+pos = (145,186);
+ref = tildecomb;
 }
 );
 width = 1249;
@@ -40,8 +40,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (159,0);
-ref = tilde;
+pos = (189,186);
+ref = tildecomb;
 }
 );
 width = 1323;
@@ -54,8 +54,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (89,0);
-ref = tilde;
+pos = (122,206);
+ref = tildecomb;
 }
 );
 width = 1161;
@@ -68,8 +68,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (141,0);
-ref = tilde;
+pos = (175,206);
+ref = tildecomb;
 }
 );
 width = 1274;
@@ -82,8 +82,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (87,0);
-ref = tilde;
+pos = (117,206);
+ref = tildecomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/atilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/atilde.glyph
index 8f100386d..d738ab2b2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/atilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/atilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (115,0);
-ref = tilde;
+pos = (145,186);
+ref = tildecomb;
 }
 );
 width = 1249;
@@ -23,8 +23,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (159,0);
-ref = tilde;
+pos = (189,186);
+ref = tildecomb;
 }
 );
 width = 1323;
@@ -36,8 +36,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (72,0);
-ref = tilde;
+pos = (110,186);
+ref = tildecomb;
 }
 );
 width = 1191;
@@ -49,8 +49,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (89,0);
-ref = tilde;
+pos = (122,206);
+ref = tildecomb;
 }
 );
 width = 1161;
@@ -62,8 +62,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (141,0);
-ref = tilde;
+pos = (175,206);
+ref = tildecomb;
 }
 );
 width = 1274;
@@ -75,8 +75,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (87,0);
-ref = tilde;
+pos = (117,206);
+ref = tildecomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/b.glyph b/src/Inter-Italic.glyphspackage/glyphs/b.glyph
index f419cc482..04036e8dc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/b.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/b.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = b;
 kernLeft = B;
 kernRight = o;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/barmidlongnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/barmidlongcomb.glyph
index 61caae1b9..0155564a9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/barmidlongnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/barmidlongcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = barmidlongnosp;
+glyphname = barmidlongcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -93,5 +92,4 @@ nodes = (
 width = 0;
 }
 );
-unicode = 822;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/barmidshortnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/barmidshortcomb.glyph
index bb2123be9..60f7b66d0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/barmidshortnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/barmidshortcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = barmidshortnosp;
+glyphname = barmidshortcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -75,5 +74,4 @@ ref = crossbar;
 width = 0;
 }
 );
-unicode = 821;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/bdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/bdotaccent.glyph
index e578ac27c..40e78cd5a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/bdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/bdotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = b;
 },
 {
-pos = (412,0);
-ref = dotaccent;
+pos = (443,186);
+ref = dotaccentcomb;
 }
 );
 width = 1248;
@@ -25,8 +25,8 @@ shapes = (
 ref = b;
 },
 {
-pos = (503,0);
-ref = dotaccent;
+pos = (534,186);
+ref = dotaccentcomb;
 }
 );
 width = 1323;
@@ -39,8 +39,8 @@ shapes = (
 ref = b;
 },
 {
-pos = (442,0);
-ref = dotaccent;
+pos = (473,186);
+ref = dotaccentcomb;
 }
 );
 width = 1190;
@@ -53,8 +53,8 @@ shapes = (
 ref = b;
 },
 {
-pos = (434,0);
-ref = dotaccent;
+pos = (468,206);
+ref = dotaccentcomb;
 }
 );
 width = 1160;
@@ -67,8 +67,8 @@ shapes = (
 ref = b;
 },
 {
-pos = (508,42);
-ref = dotaccent;
+pos = (542,248);
+ref = dotaccentcomb;
 }
 );
 width = 1282;
@@ -81,8 +81,8 @@ shapes = (
 ref = b;
 },
 {
-pos = (472,0);
-ref = dotaccent;
+pos = (500,206);
+ref = dotaccentcomb;
 }
 );
 width = 1118;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/blinebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/blinebelow.glyph
index b69ff31f8..b3f09d8cc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/blinebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/blinebelow.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (210,0);
+pos = (211,0);
 ref = macronsub;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = b;
 },
 {
-pos = (239,0);
+pos = (238,0);
 ref = macronsub;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/breve.glyph b/src/Inter-Italic.glyphspackage/glyphs/breve.glyph
index ac1238316..35870980e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/breve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/breve.glyph
@@ -1,223 +1,72 @@
 {
-color = (204,240,242,1);
 glyphname = breve;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (583,1304);
-},
-{
-name = top;
-pos = (637,1626);
-}
-);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(748,1218,o),
-(888,1328,o),
-(915,1490,c),
-(755,1490,l),
-(741,1403,o),
-(674,1343,o),
-(590,1343,cs),
-(506,1343,o),
-(459,1403,o),
-(473,1490,c),
-(313,1490,l),
-(286,1328,o),
-(390,1218,o),
-(569,1218,cs)
-);
+alignment = 1;
+ref = brevecomb;
 }
 );
-width = 920;
+width = 768;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (635,1304);
-},
-{
-name = top;
-pos = (697,1676);
-}
-);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(857,1204,o),
-(1040,1335,o),
-(1072,1528,c),
-(818,1528,l),
-(805,1448,o),
-(742,1400,o),
-(651,1400,cs),
-(558,1400,o),
-(511,1448,o),
-(524,1528,c),
-(272,1528,l),
-(240,1335,o),
-(381,1204,o),
-(619,1204,cs)
-);
+alignment = 1;
+ref = brevecomb;
 }
 );
-width = 1032;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (539,1304);
+width = 960;
 },
 {
-name = top;
-pos = (601,1676);
-}
-);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(642,1325,o),
-(717,1391,o),
-(733,1491,c),
-(687,1491,l),
-(675,1416,o),
-(623,1369,o),
-(550,1369,cs),
-(477,1369,o),
-(441,1416,o),
-(453,1491,c),
-(407,1491,l),
-(391,1391,o),
-(444,1325,o),
-(543,1325,cs)
-);
+alignment = 1;
+ref = brevecomb;
 }
 );
-width = 850;
+width = 704;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (550,1262);
-},
-{
-name = top;
-pos = (610,1626);
-}
-);
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(714,1176,o),
-(854,1286,o),
-(881,1448,c),
-(721,1448,l),
-(707,1361,o),
-(640,1301,o),
-(556,1301,cs),
-(472,1301,o),
-(425,1361,o),
-(439,1448,c),
-(279,1448,l),
-(252,1286,o),
-(356,1176,o),
-(535,1176,cs)
-);
+alignment = 1;
+ref = brevecomb;
 }
 );
-width = 856;
+width = 800;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (618,1262);
-},
-{
-name = top;
-pos = (686,1676);
-}
-);
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(824,1151,o),
-(1024,1301,o),
-(1056,1493,c),
-(802,1493,l),
-(789,1413,o),
-(714,1350,o),
-(632,1350,cs),
-(549,1350,o),
-(495,1413,o),
-(508,1493,c),
-(256,1493,l),
-(224,1301,o),
-(374,1151,o),
-(599,1151,cs)
-);
+alignment = 1;
+ref = brevecomb;
 }
 );
-width = 1000;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (532,1262);
+width = 960;
 },
 {
-name = top;
-pos = (601,1676);
-}
-);
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(635,1283,o),
-(710,1349,o),
-(726,1449,c),
-(680,1449,l),
-(668,1374,o),
-(616,1327,o),
-(543,1327,cs),
-(470,1327,o),
-(434,1374,o),
-(446,1449,c),
-(400,1449,l),
-(384,1349,o),
-(437,1283,o),
-(536,1283,cs)
-);
+alignment = 1;
+ref = brevecomb;
 }
 );
-width = 722;
+width = 704;
 }
 );
 unicode = 728;
-userData = {
-interface.gridadjust.original = "{'width': 1206, 'leftMargin': 176, 'rightMargin': 201}";
-"interface.width-adjustments" = (
--16
-);
-};
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/breveacutecomb.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/breveacutecomb.cn.glyph
index 178ba6d98..7328445fe 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/breveacutecomb.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/breveacutecomb.cn.glyph
@@ -26,7 +26,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-65,-28);
-ref = breve;
+ref = brevecomb;
 },
 {
 alignment = -1;
@@ -61,7 +61,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-28,-27);
-ref = breve;
+ref = brevecomb;
 },
 {
 alignment = -1;
@@ -100,7 +100,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-167,-28);
-ref = breve;
+ref = brevecomb;
 },
 {
 alignment = -1;
@@ -138,7 +138,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-20,-50);
-ref = breve;
+ref = brevecomb;
 },
 {
 alignment = -1;
@@ -173,7 +173,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-8,0);
-ref = breve;
+ref = brevecomb;
 },
 {
 alignment = -1;
@@ -219,7 +219,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-164,-42);
-ref = breve;
+ref = brevecomb;
 },
 {
 alignment = -1;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/brevecomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/brevecomb.glyph
new file mode 100644
index 000000000..f31fd2470
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/brevecomb.glyph
@@ -0,0 +1,324 @@
+{
+glyphname = brevecomb;
+layers = (
+{
+anchors = (
+{
+name = _top;
+pos = (476,1118);
+},
+{
+name = top;
+pos = (549,1557);
+}
+);
+background = {
+shapes = (
+{
+pos = (-82,0);
+ref = caroncomb;
+}
+);
+};
+guides = (
+{
+pos = (0,1557);
+},
+{
+pos = (0,1283);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(662,1277,o),
+(808,1400,o),
+(834,1557,c),
+(706,1557,l),
+(691,1465,o),
+(615,1401,o),
+(523,1401,cs),
+(431,1401,o),
+(377,1465,o),
+(392,1557,c),
+(264,1557,l),
+(238,1400,o),
+(342,1277,o),
+(502,1277,cs)
+);
+}
+);
+width = 768;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (572,1118);
+},
+{
+name = top;
+pos = (649,1582);
+}
+);
+background = {
+shapes = (
+{
+pos = (-166,0);
+ref = caroncomb;
+}
+);
+};
+guides = (
+{
+pos = (0,1256);
+},
+{
+pos = (0,1582);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(816,1240,o),
+(1009,1387,o),
+(1040,1574,c),
+(826,1574,l),
+(813,1496,o),
+(725,1435,o),
+(625,1435,cs),
+(524,1435,o),
+(455,1496,o),
+(468,1574,c),
+(256,1574,l),
+(225,1387,o),
+(368,1240,o),
+(592,1240,cs)
+);
+}
+);
+width = 960;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (444,1118);
+},
+{
+name = top;
+pos = (513,1532);
+}
+);
+background = {
+shapes = (
+{
+pos = (-80,0);
+ref = caroncomb;
+}
+);
+};
+guides = (
+{
+pos = (0,1557);
+},
+{
+pos = (0,1283);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(616,1270,o),
+(751,1387,o),
+(775,1532,c),
+(729,1532,l),
+(709,1411,o),
+(596,1314,o),
+(477,1314,cs),
+(358,1314,o),
+(277,1411,o),
+(297,1532,c),
+(251,1532,l),
+(227,1387,o),
+(322,1270,o),
+(469,1270,cs)
+);
+}
+);
+width = 704;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (487,1056);
+},
+{
+name = top;
+pos = (559,1490);
+}
+);
+background = {
+shapes = (
+{
+pos = (-34,0);
+ref = caroncomb;
+}
+);
+};
+guides = (
+{
+pos = (0,1192);
+},
+{
+pos = (0,1490);
+}
+);
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(672,1210,o),
+(818,1333,o),
+(844,1490,c),
+(716,1490,l),
+(700,1398,o),
+(625,1334,o),
+(533,1334,cs),
+(441,1334,o),
+(386,1398,o),
+(402,1490,c),
+(274,1490,l),
+(248,1333,o),
+(352,1210,o),
+(512,1210,cs)
+);
+}
+);
+width = 800;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (568,1056);
+},
+{
+name = top;
+pos = (643,1507);
+}
+);
+background = {
+shapes = (
+{
+pos = (-143,0);
+ref = caroncomb;
+}
+);
+};
+guides = (
+{
+pos = (1,1181);
+},
+{
+pos = (1,1507);
+}
+);
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(810,1165,o),
+(1002,1312,o),
+(1033,1499,c),
+(811,1499,l),
+(797,1415,o),
+(717,1356,o),
+(617,1356,cs),
+(516,1356,o),
+(455,1415,o),
+(469,1499,c),
+(249,1499,l),
+(218,1312,o),
+(362,1165,o),
+(586,1165,cs)
+);
+}
+);
+width = 960;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (440,1056);
+},
+{
+name = top;
+pos = (512,1492);
+}
+);
+background = {
+shapes = (
+{
+pos = (-15,0);
+ref = caroncomb;
+}
+);
+};
+guides = (
+{
+pos = (1,1515);
+},
+{
+pos = (1,1241);
+}
+);
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(616,1230,o),
+(750,1347,o),
+(774,1492,c),
+(728,1492,l),
+(708,1371,o),
+(595,1276,o),
+(476,1276,cs),
+(357,1276,o),
+(276,1371,o),
+(296,1492,c),
+(250,1492,l),
+(226,1347,o),
+(322,1230,o),
+(469,1230,cs)
+);
+}
+);
+width = 704;
+}
+);
+unicode = 774;
+userData = {
+interface.gridadjust.original = "{'width': 1206, 'leftMargin': 176, 'rightMargin': 201}";
+"interface.width-adjustments" = (
+-16
+);
+};
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/brevehookcomb.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/brevecomb_hookabovecomb.glyph
index 0375390ae..e395eb92e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/brevehookcomb.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/brevecomb_hookabovecomb.glyph
@@ -1,5 +1,5 @@
 {
-glyphname = brevehookcomb.cn;
+glyphname = brevecomb_hookabovecomb;
 layers = (
 {
 anchors = (
@@ -22,7 +22,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-65,-28);
-ref = breve;
+ref = brevecomb;
 },
 {
 alignment = -1;
@@ -53,7 +53,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-28,-27);
-ref = breve;
+ref = brevecomb;
 },
 {
 alignment = -1;
@@ -88,7 +88,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-149,-28);
-ref = breve;
+ref = brevecomb;
 },
 {
 alignment = -1;
@@ -122,7 +122,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-20,-50);
-ref = breve;
+ref = brevecomb;
 },
 {
 alignment = -1;
@@ -153,7 +153,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-8,0);
-ref = breve;
+ref = brevecomb;
 },
 {
 alignment = -1;
@@ -182,7 +182,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-145,-42);
-ref = breve;
+ref = brevecomb;
 },
 {
 alignment = -1;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/breveinv.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/breveinv.cn.glyph
deleted file mode 100644
index a06435723..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/breveinv.cn.glyph
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-case = lower;
-color = (250,227,227,1);
-glyphname = breveinv.cn;
-layers = (
-{
-anchors = (
-{
-name = _top;
-pos = (502,1118);
-},
-{
-name = top;
-pos = (574,1550);
-}
-);
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(368,1258,l),
-(385,1357,o),
-(461,1426,o),
-(553,1426,cs),
-(645,1426,o),
-(699,1357,o),
-(682,1258,c),
-(834,1258,l),
-(862,1426,o),
-(748,1558,o),
-(575,1558,cs),
-(402,1558,o),
-(244,1426,o),
-(216,1258,c)
-);
-}
-);
-width = 818;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (592,1118);
-},
-{
-name = top;
-pos = (669,1582);
-}
-);
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(467,1256,l),
-(480,1332,o),
-(554,1391,o),
-(637,1391,cs),
-(719,1391,o),
-(774,1332,o),
-(761,1256,c),
-(1015,1256,l),
-(1046,1443,o),
-(894,1590,o),
-(670,1590,cs),
-(446,1590,o),
-(246,1443,o),
-(215,1256,c)
-);
-}
-);
-width = 1000;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (454,1118);
-},
-{
-name = top;
-pos = (519,1512);
-}
-);
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(265,1280,l),
-(283,1389,o),
-(392,1475,o),
-(513,1475,cs),
-(634,1475,o),
-(715,1389,o),
-(697,1280,c),
-(743,1280,l),
-(765,1415,o),
-(667,1520,o),
-(521,1520,cs),
-(375,1520,o),
-(241,1415,o),
-(219,1280,c)
-);
-}
-);
-width = 724;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (489,1056);
-},
-{
-name = top;
-pos = (559,1480);
-}
-);
-layerId = m008;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(366,1216,l),
-(381,1302,o),
-(453,1363,o),
-(540,1363,cs),
-(627,1363,o),
-(679,1302,o),
-(664,1216,c),
-(816,1216,l),
-(841,1368,o),
-(729,1488,o),
-(560,1488,cs),
-(391,1488,o),
-(239,1368,o),
-(214,1216,c)
-);
-}
-);
-width = 802;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (587,1056);
-},
-{
-name = top;
-pos = (659,1490);
-}
-);
-layerId = m010;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(457,1164,l),
-(469,1240,o),
-(544,1299,o),
-(627,1299,cs),
-(709,1299,o),
-(763,1240,o),
-(751,1164,c),
-(1005,1164,l),
-(1036,1351,o),
-(883.992,1498,o),
-(659.992,1498,cs),
-(435.992,1498,o),
-(236,1351,o),
-(205,1164,c)
-);
-}
-);
-width = 1000;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (450,1056);
-},
-{
-name = top;
-pos = (515,1448);
-}
-);
-layerId = m012;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(260,1216,l),
-(278,1325,o),
-(388,1411,o),
-(509,1411,cs),
-(630,1411,o),
-(710,1325,o),
-(692,1216,c),
-(738,1216,l),
-(761,1351,o),
-(662,1456,o),
-(516,1456,cs),
-(370,1456,o),
-(237,1351,o),
-(214,1216,c)
-);
-}
-);
-width = 724;
-}
-);
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/breveinvcomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/breveinvcomb.glyph
new file mode 100644
index 000000000..891d47f04
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/breveinvcomb.glyph
@@ -0,0 +1,221 @@
+{
+glyphname = breveinvcomb;
+layers = (
+{
+anchors = (
+{
+name = _top;
+pos = (509,1118);
+},
+{
+name = top;
+pos = (585,1575);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(413,1583,o),
+(263,1451,o),
+(235,1283,c),
+(363,1283,l),
+(380,1382,o),
+(472,1451,o),
+(564,1451,cs),
+(656,1451,o),
+(726,1382,o),
+(709,1283,c),
+(837,1283,l),
+(865,1451,o),
+(759,1583,o),
+(586,1583,cs)
+);
+}
+);
+width = 832;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (604,1118);
+},
+{
+name = top;
+pos = (681,1582);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(458,1590,o),
+(266,1443,o),
+(235,1256,c),
+(447,1256,l),
+(460,1334,o),
+(549,1395,o),
+(650,1395,cs),
+(750,1395,o),
+(818,1334,o),
+(805,1256,c),
+(1019,1256,l),
+(1050,1443,o),
+(906,1590,o),
+(682,1590,cs)
+);
+}
+);
+width = 1024;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (455,1118);
+},
+{
+name = top;
+pos = (521,1515);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(376,1523,o),
+(243,1418,o),
+(220,1283,c),
+(263,1283,l),
+(281,1392,o),
+(394,1478,o),
+(515,1478,cs),
+(636,1478,o),
+(719,1392,o),
+(701,1283,c),
+(744,1283,l),
+(767,1418,o),
+(668,1523,o),
+(522,1523,cs)
+);
+}
+);
+width = 724;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (488,1056);
+},
+{
+name = top;
+pos = (558,1480);
+}
+);
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(390,1488,o),
+(254,1368,o),
+(229,1216,c),
+(357,1216,l),
+(372,1303,o),
+(447,1364,o),
+(539,1364,cs),
+(631,1364,o),
+(686,1303,o),
+(671,1216,c),
+(799,1216,l),
+(824,1368,o),
+(728,1488,o),
+(559,1488,cs)
+);
+}
+);
+width = 800;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (519,1056);
+},
+{
+name = top;
+pos = (594,1507);
+}
+);
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(371,1515,o),
+(178,1368,o),
+(148,1181,c),
+(368,1181,l),
+(381,1265,o),
+(462,1324,o),
+(563,1324,cs),
+(663,1324,o),
+(723,1265,o),
+(710,1181,c),
+(932,1181,l),
+(962,1368,o),
+(819,1515,o),
+(595,1515,cs)
+);
+}
+);
+width = 864;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (440,1056);
+},
+{
+name = top;
+pos = (509,1473);
+}
+);
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(364,1481,o),
+(231,1376,o),
+(208,1241,c),
+(254,1241,l),
+(272,1350,o),
+(384,1438,o),
+(503,1438,cs),
+(622,1438,o),
+(704,1350,o),
+(686,1241,c),
+(732,1241,l),
+(755,1376,o),
+(656,1481,o),
+(510,1481,cs)
+);
+}
+);
+width = 704;
+}
+);
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/breveinverteddoublecmb.glyph b/src/Inter-Italic.glyphspackage/glyphs/breveinverteddoublecmb.glyph
index cc455793a..200567e30 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/breveinverteddoublecmb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/breveinverteddoublecmb.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = breveinverteddoublecmb;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/breveinvnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/breveinvnosp.glyph
deleted file mode 100644
index 3480361f5..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/breveinvnosp.glyph
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-color = (250,227,227,1);
-glyphname = breveinvnosp;
-layers = (
-{
-background = {
-shapes = (
-{
-pos = (-1063,0);
-ref = circumflex;
-}
-);
-};
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-name = ital_gen;
-shapes = (
-{
-alignment = -1;
-pos = (-1006,0);
-ref = breveinv.cn;
-}
-);
-width = 0;
-},
-{
-background = {
-shapes = (
-{
-pos = (-1304,0);
-ref = circumflex;
-}
-);
-};
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-name = ital_gen;
-shapes = (
-{
-alignment = -1;
-pos = (-1162,0);
-ref = breveinv.cn;
-}
-);
-width = 0;
-},
-{
-background = {
-shapes = (
-{
-pos = (-1011,0);
-ref = circumflex;
-}
-);
-};
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-name = ital_gen;
-shapes = (
-{
-alignment = -1;
-pos = (-944,0);
-ref = breveinv.cn;
-}
-);
-width = 0;
-},
-{
-background = {
-shapes = (
-{
-pos = (-996,0);
-ref = circumflex;
-}
-);
-};
-layerId = m008;
-name = ital_gen;
-shapes = (
-{
-alignment = -1;
-pos = (-964,0);
-ref = breveinv.cn;
-}
-);
-width = 0;
-},
-{
-background = {
-shapes = (
-{
-pos = (-1272,0);
-ref = circumflex;
-}
-);
-};
-layerId = m010;
-name = ital_gen;
-shapes = (
-{
-alignment = -1;
-pos = (-1150,0);
-ref = breveinv.cn;
-}
-);
-width = 0;
-},
-{
-background = {
-shapes = (
-{
-pos = (-895,0);
-ref = circumflex;
-}
-);
-};
-layerId = m012;
-name = ital_gen;
-shapes = (
-{
-alignment = -1;
-pos = (-891,0);
-ref = breveinv.cn;
-}
-);
-width = 0;
-}
-);
-unicode = 785;
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/breveinvsubcomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/breveinvsubcomb.glyph
new file mode 100644
index 000000000..a056e67ff
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/breveinvsubcomb.glyph
@@ -0,0 +1,108 @@
+{
+case = minor;
+glyphname = breveinvsubcomb;
+layers = (
+{
+anchors = (
+{
+name = _bottom;
+pos = (323,0);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+pos = (-294,-1773);
+ref = breveinvcomb;
+}
+);
+width = 832;
+},
+{
+anchors = (
+{
+name = _bottom;
+pos = (419,0);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+pos = (-293,-1768);
+ref = breveinvcomb;
+}
+);
+width = 1024;
+},
+{
+anchors = (
+{
+name = _bottom;
+pos = (269,0);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+pos = (-275,-1664);
+ref = breveinvcomb;
+}
+);
+width = 724;
+},
+{
+anchors = (
+{
+name = _bottom;
+pos = (312,0);
+}
+);
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+pos = (-271,-1634);
+ref = breveinvcomb;
+}
+);
+width = 800;
+},
+{
+anchors = (
+{
+name = _bottom;
+pos = (345,0);
+}
+);
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+pos = (-266,-1607);
+ref = breveinvcomb;
+}
+);
+width = 864;
+},
+{
+anchors = (
+{
+name = _bottom;
+pos = (264,0);
+}
+);
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+pos = (-275,-1659);
+ref = breveinvcomb;
+}
+);
+width = 704;
+}
+);
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/breveinvsubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/breveinvsubnosp.glyph
deleted file mode 100644
index c1836fe37..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/breveinvsubnosp.glyph
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-color = (250,227,227,1);
-glyphname = breveinvsubnosp;
-layers = (
-{
-anchors = (
-{
-name = _bottom;
-pos = (-698,0);
-}
-);
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-441,-261,o),
-(-536,-150,o),
-(-723,-150,cs),
-(-909,-150,o),
-(-1043,-261,o),
-(-1069,-418,c),
-(-909,-418,l),
-(-897,-343,o),
-(-847,-272,o),
-(-743,-272,cs),
-(-644,-272,o),
-(-614,-340,o),
-(-627,-418,c),
-(-467,-418,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _bottom;
-pos = (-751,0);
-}
-);
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-391,-229,o),
-(-521,-96,o),
-(-767,-96,cs),
-(-1013,-96,o),
-(-1191,-229,o),
-(-1222,-418,c),
-(-968,-418,l),
-(-958,-357,o),
-(-906,-298,o),
-(-800,-298,cs),
-(-694,-298,o),
-(-664,-357,o),
-(-674,-418,c),
-(-422,-418,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _bottom;
-pos = (-668,0);
-}
-);
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-538,-204,o),
-(-592,-140,o),
-(-695,-140,cs),
-(-795,-140,o),
-(-864,-201,o),
-(-881,-306,c),
-(-835,-306,l),
-(-822,-229,o),
-(-771,-186,o),
-(-695,-186,cs),
-(-621,-186,o),
-(-588,-227,o),
-(-601,-306,c),
-(-555,-306,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _bottom;
-pos = (-652,0);
-}
-);
-layerId = m008;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-395,-261,o),
-(-490,-150,o),
-(-677,-150,cs),
-(-863,-150,o),
-(-997,-261,o),
-(-1023,-418,c),
-(-863,-418,l),
-(-851,-343,o),
-(-801,-272,o),
-(-697,-272,cs),
-(-598,-272,o),
-(-568,-340,o),
-(-581,-418,c),
-(-421,-418,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _bottom;
-pos = (-730,0);
-}
-);
-layerId = m010;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-370,-229,o),
-(-500,-96,o),
-(-746,-96,cs),
-(-992,-96,o),
-(-1170,-229,o),
-(-1201,-418,c),
-(-947,-418,l),
-(-937,-357,o),
-(-885,-298,o),
-(-779,-298,cs),
-(-673,-298,o),
-(-643,-357,o),
-(-653,-418,c),
-(-401,-418,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _bottom;
-pos = (-606,0);
-}
-);
-layerId = m012;
-name = ital_gen;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-474,-204,o),
-(-528,-140,o),
-(-631,-140,cs),
-(-731,-140,o),
-(-800,-201,o),
-(-817,-306,c),
-(-771,-306,l),
-(-758,-229,o),
-(-707,-186,o),
-(-631,-186,cs),
-(-557,-186,o),
-(-524,-227,o),
-(-537,-306,c),
-(-491,-306,l)
-);
-}
-);
-width = 0;
-}
-);
-unicode = 815;
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/brevenosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/brevenosp.glyph
deleted file mode 100644
index a826bd832..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/brevenosp.glyph
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-color = (250,227,227,1);
-glyphname = brevenosp;
-layers = (
-{
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-305,1420,o),
-(-358,1353,o),
-(-456,1352,cs),
-(-559,1353,o),
-(-588,1420,o),
-(-576,1496,c),
-(-736,1496,l),
-(-762,1338,o),
-(-663,1228,o),
-(-478,1228,cs),
-(-294,1228,o),
-(-160,1338,o),
-(-134,1496,c),
-(-294,1496,l)
-);
-}
-);
-width = 0;
-},
-{
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-403,1492,o),
-(-449,1434,o),
-(-556,1434,cs),
-(-665,1434,o),
-(-697,1495,o),
-(-684,1556,c),
-(-934,1556,l),
-(-967,1364,o),
-(-833,1233,o),
-(-590,1234,cs),
-(-348,1233,o),
-(-167,1364,o),
-(-134,1556,c),
-(-390,1556,l)
-);
-}
-);
-width = 30;
-},
-{
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-262,1412,o),
-(-310,1370,o),
-(-386,1370,cs),
-(-461,1370,o),
-(-495,1412,o),
-(-482,1490,c),
-(-528,1490,l),
-(-545,1388,o),
-(-495,1324,o),
-(-392,1324,cs),
-(-291,1324,o),
-(-220,1388,o),
-(-202,1490,c),
-(-248,1490,l)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m008;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-337,1420,o),
-(-390,1353,o),
-(-488,1352,cs),
-(-591,1353,o),
-(-620,1420,o),
-(-608,1496,c),
-(-768,1496,l),
-(-794,1338,o),
-(-695,1228,o),
-(-510,1228,cs),
-(-326,1228,o),
-(-192,1338,o),
-(-166,1496,c),
-(-326,1496,l)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m010;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-419,1492,o),
-(-465,1434,o),
-(-572,1434,cs),
-(-681,1434,o),
-(-713,1495,o),
-(-700,1556,c),
-(-950,1556,l),
-(-983,1364,o),
-(-849,1233,o),
-(-606,1234,cs),
-(-364,1233,o),
-(-183,1364,o),
-(-150,1556,c),
-(-406,1556,l)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m012;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-326,1412,o),
-(-374,1370,o),
-(-450,1370,cs),
-(-525,1370,o),
-(-559,1412,o),
-(-546,1490,c),
-(-592,1490,l),
-(-609,1388,o),
-(-559,1324,o),
-(-456,1324,cs),
-(-355,1324,o),
-(-284,1388,o),
-(-266,1490,c),
-(-312,1490,l)
-);
-}
-);
-width = 0;
-}
-);
-unicode = 774;
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/brevesubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/brevesubcomb.glyph
index 78d20dd79..2a8c7464e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/brevesubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/brevesubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = brevesubnosp;
+glyphname = brevesubcomb;
 layers = (
 {
 anchors = (
@@ -189,5 +188,4 @@ nodes = (
 width = 0;
 }
 );
-unicode = 814;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/bridgeinvsubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/bridgeinvsubcomb.glyph
index 4c185b166..ec01afdc8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/bridgeinvsubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/bridgeinvsubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = bridgeinvsubnosp;
+glyphname = bridgeinvsubcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -65,5 +64,4 @@ ref = uni02FD;
 width = 0;
 }
 );
-unicode = 826;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/bridgesubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/bridgesubcomb.glyph
index 14d0295f6..bcaa7eb2d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/bridgesubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/bridgesubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = bridgesubnosp;
+glyphname = bridgesubcomb;
 layers = (
 {
 anchors = (
@@ -237,5 +236,4 @@ nodes = (
 width = 0;
 }
 );
-unicode = 810;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/c.glyph b/src/Inter-Italic.glyphspackage/glyphs/c.glyph
index 7ddd388d0..a6eb2f7d1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/c.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/c.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = c;
 kernLeft = o;
 kernRight = o;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/cacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/cacute.glyph
index e8bb291e9..2685c798c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/cacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/cacute.glyph
@@ -5,78 +5,84 @@ kernRight = o;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = c;
 },
 {
-pos = (393,186);
-ref = acute;
+pos = (513,186);
+ref = acutecomb;
 }
 );
 width = 1151;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = c;
 },
 {
-pos = (370,186);
-ref = acute;
+pos = (500,186);
+ref = acutecomb;
 }
 );
 width = 1239;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = c;
 },
 {
-pos = (407,186);
-ref = acute;
+pos = (547,186);
+ref = acutecomb;
 }
 );
 width = 1127;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = c;
 },
 {
-pos = (432,206);
-ref = acute;
+pos = (472,206);
+ref = acutecomb;
 }
 );
 width = 1072;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = c;
 },
 {
-pos = (423,206);
-ref = acute;
+pos = (447,206);
+ref = acutecomb;
 }
 );
 width = 1194;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = c;
 },
 {
-pos = (434,206);
-ref = acute;
+pos = (494,206);
+ref = acutecomb;
 }
 );
 width = 1015;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/cadauna.glyph b/src/Inter-Italic.glyphspackage/glyphs/cadauna.glyph
index c848dade7..dec67546b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/cadauna.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/cadauna.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = cadauna;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/candrabindunosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/candrabinducomb.glyph
index 7c7de021b..d96b531f3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/candrabindunosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/candrabinducomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = candrabindunosp;
+glyphname = candrabinducomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -255,5 +254,4 @@ nodes = (
 width = 0;
 }
 );
-unicode = 784;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/careof.glyph b/src/Inter-Italic.glyphspackage/glyphs/careof.glyph
index a60189113..5f0f52636 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/careof.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/careof.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = careof;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/caron.glyph b/src/Inter-Italic.glyphspackage/glyphs/caron.glyph
index da3cd4bd3..77991c83a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/caron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/caron.glyph
@@ -2,193 +2,71 @@
 glyphname = caron;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (590,1304);
-}
-);
-guides = (
-{
-pos = (755,1720);
-}
-);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(319,1566,l),
-(317,1554,l),
-(501,1250,l),
-(659,1250,l),
-(945,1554,l),
-(947,1566,l),
-(783,1566,l),
-(599,1362,l),
-(481,1566,l)
-);
+alignment = 1;
+ref = caroncomb;
 }
 );
-width = 930;
+width = 833;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (769,1304);
-}
-);
-guides = (
-{
-pos = (1248,1720);
-}
-);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(343,1592,l),
-(341,1582,l),
-(620,1250,l),
-(900,1250,l),
-(1289,1582,l),
-(1291,1592,l),
-(959,1592,l),
-(790,1432,l),
-(675,1592,l)
-);
+alignment = 1;
+ref = caroncomb;
 }
 );
-width = 1292;
+width = 1024;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (551,1288);
-}
-);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(320,1536,l),
-(319,1530,l),
-(540,1256,l),
-(552,1256,l),
-(865,1530,l),
-(866,1536,l),
-(810,1536,l),
-(555,1312,l),
-(374,1536,l)
-);
+alignment = 1;
+ref = caroncomb;
 }
 );
-width = 862;
+width = 864;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (556,1262);
-}
-);
-guides = (
-{
-pos = (463,1720);
-}
-);
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(280,1490,l),
-(279,1486,l),
-(464,1216,l),
-(630,1216,l),
-(907,1486,l),
-(908,1490,l),
-(736,1490,l),
-(565,1314,l),
-(450,1490,l)
-);
+alignment = 1;
+ref = caroncomb;
 }
 );
-width = 867;
+width = 800;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (751,1262);
-}
-);
-guides = (
-{
-pos = (1152,1720);
-}
-);
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(315,1490,l),
-(315,1489,l),
-(555,1164,l),
-(915,1164,l),
-(1263,1489,l),
-(1263,1490,l),
-(931,1490,l),
-(761,1322,l),
-(647,1490,l)
-);
+alignment = 1;
+ref = caroncomb;
 }
 );
-width = 1260;
+width = 864;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (484,1262);
-}
-);
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(247,1490,l),
-(247,1489,l),
-(453,1216,l),
-(497,1216,l),
-(797,1489,l),
-(797,1490,l),
-(738,1490,l),
-(482,1255,l),
-(307,1490,l)
-);
+alignment = 1;
+ref = caroncomb;
 }
 );
-width = 734;
+width = 704;
 }
 );
 unicode = 711;
-userData = {
-interface.gridadjust.original = "{'width': 1273, 'leftMargin': 194, 'rightMargin': 210}";
-"interface.width-adjustments" = (
--16
-);
-};
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/caronbelowcmb.glyph b/src/Inter-Italic.glyphspackage/glyphs/caronbelowcmb.glyph
index c49d41232..8f2488255 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/caronbelowcmb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/caronbelowcmb.glyph
@@ -1,126 +1,65 @@
 {
-color = (250,227,227,1);
 glyphname = caronbelowcmb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-690,-416,l),
-(-396,-140,l),
-(-392,-128,l),
-(-556,-128,l),
-(-734,-296,l),
-(-846,-128,l),
-(-1010,-128,l),
-(-1012,-140,l),
-(-808,-416,l)
-);
+ref = caronsubcomb;
 }
 );
-width = 0;
+width = 833;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-762,-384,l),
-(-358,-102,l),
-(-354,-88,l),
-(-652,-88,l),
-(-840,-210,l),
-(-990,-88,l),
-(-1278,-88,l),
-(-1280,-108,l),
-(-978,-384,l)
-);
+ref = caronsubcomb;
 }
 );
-width = 26;
+width = 1024;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-670,-436,l),
-(-360,-206,l),
-(-356,-200,l),
-(-424,-200,l),
-(-672,-384,l),
-(-850,-200,l),
-(-904,-200,l),
-(-906,-206,l),
-(-682,-436,l)
-);
+ref = caronsubcomb;
 }
 );
-width = 0;
+width = 864;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-722,-416,l),
-(-428,-140,l),
-(-424,-128,l),
-(-588,-128,l),
-(-766,-296,l),
-(-878,-128,l),
-(-1042,-128,l),
-(-1044,-140,l),
-(-840,-416,l)
-);
+ref = caronsubcomb;
 }
 );
-width = 0;
+width = 800;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-778,-384,l),
-(-374,-102,l),
-(-370,-88,l),
-(-668,-88,l),
-(-856,-210,l),
-(-1006,-88,l),
-(-1294,-88,l),
-(-1296,-108,l),
-(-994,-384,l)
-);
+ref = caronsubcomb;
 }
 );
-width = 0;
+width = 864;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-734,-436,l),
-(-424,-206,l),
-(-420,-200,l),
-(-488,-200,l),
-(-736,-384,l),
-(-914,-200,l),
-(-968,-200,l),
-(-970,-206,l),
-(-746,-436,l)
-);
+ref = caronsubcomb;
 }
 );
-width = 0;
+width = 704;
 }
 );
 unicode = 812;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/caroncmb.glyph b/src/Inter-Italic.glyphspackage/glyphs/caroncmb.glyph
deleted file mode 100644
index fa2226bfd..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/caroncmb.glyph
+++ /dev/null
@@ -1,163 +0,0 @@
-{
-color = (250,227,227,1);
-glyphname = caroncmb;
-layers = (
-{
-anchors = (
-{
-name = _top;
-pos = (-486,1198);
-}
-);
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-416,1254,l),
-(-122,1528,l),
-(-120,1538,l),
-(-282,1538,l),
-(-460,1370,l),
-(-574,1538,l),
-(-736,1538,l),
-(-738,1528,l),
-(-536,1254,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-546,1198);
-}
-);
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-432,1240,l),
-(-26,1522,l),
-(-24,1536,l),
-(-322,1536,l),
-(-510,1410,l),
-(-658,1536,l),
-(-946,1536,l),
-(-950,1516,l),
-(-648,1240,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-470,1198);
-}
-);
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-456,1256,l),
-(-144,1486,l),
-(-142,1492,l),
-(-210,1492,l),
-(-456,1310,l),
-(-636,1492,l),
-(-688,1492,l),
-(-690,1486,l),
-(-466,1256,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-518,1198);
-}
-);
-layerId = m008;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-448,1254,l),
-(-154,1528,l),
-(-152,1538,l),
-(-314,1538,l),
-(-492,1370,l),
-(-606,1538,l),
-(-768,1538,l),
-(-770,1528,l),
-(-568,1254,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-562,1198);
-}
-);
-layerId = m010;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-448,1240,l),
-(-42,1522,l),
-(-40,1536,l),
-(-338,1536,l),
-(-526,1410,l),
-(-674,1536,l),
-(-962,1536,l),
-(-966,1516,l),
-(-664,1240,l)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-534,1198);
-}
-);
-layerId = m012;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-520,1256,l),
-(-208,1486,l),
-(-206,1492,l),
-(-274,1492,l),
-(-520,1310,l),
-(-700,1492,l),
-(-752,1492,l),
-(-754,1486,l),
-(-530,1256,l)
-);
-}
-);
-width = 0;
-}
-);
-unicode = 780;
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/caroncomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/caroncomb.glyph
new file mode 100644
index 000000000..5ba115bd8
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/caroncomb.glyph
@@ -0,0 +1,263 @@
+{
+glyphname = caroncomb;
+layers = (
+{
+anchors = (
+{
+name = _top;
+pos = (509,1118);
+},
+{
+name = top;
+pos = (582,1557);
+}
+);
+background = {
+shapes = (
+{
+pos = (-47,0);
+ref = acute;
+}
+);
+};
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(268,1557,l),
+(266,1548,l),
+(452,1283,l),
+(618,1283,l),
+(894,1548,l),
+(896,1557,l),
+(724,1557,l),
+(553,1381,l),
+(438,1557,l)
+);
+}
+);
+width = 833;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (604,1118);
+},
+{
+name = top;
+pos = (681,1582);
+}
+);
+background = {
+shapes = (
+{
+pos = (-134,0);
+ref = acute;
+}
+);
+};
+guides = (
+{
+pos = (0,1256);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(207,1582,l),
+(206,1576,l),
+(487,1256,l),
+(767,1256,l),
+(1154,1576,l),
+(1155,1582,l),
+(823,1582,l),
+(653,1416,l),
+(539,1582,l)
+);
+}
+);
+width = 1024;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (524,1118);
+},
+{
+name = top;
+pos = (597,1557);
+}
+);
+background = {
+shapes = (
+{
+ref = acute;
+}
+);
+};
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(324,1557,l),
+(323,1551,l),
+(543,1277,l),
+(555,1277,l),
+(869,1551,l),
+(870,1557,l),
+(814,1557,l),
+(559,1333,l),
+(378,1557,l)
+);
+}
+);
+width = 864;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (487,1056);
+},
+{
+name = top;
+pos = (559,1490);
+}
+);
+background = {
+shapes = (
+{
+pos = (-34,0);
+ref = acute;
+}
+);
+};
+guides = (
+{
+pos = (0,1192);
+},
+{
+pos = (0,1490);
+}
+);
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(245,1490,l),
+(245,1489,l),
+(429,1216,l),
+(595,1216,l),
+(873,1489,l),
+(873,1490,l),
+(701,1490,l),
+(530,1314,l),
+(415,1490,l)
+);
+}
+);
+width = 800;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (520,1056);
+},
+{
+name = top;
+pos = (595,1507);
+}
+);
+background = {
+shapes = (
+{
+pos = (-63,0);
+ref = acute;
+}
+);
+};
+guides = (
+{
+pos = (1,1181);
+}
+);
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(188,1507,l),
+(188,1506,l),
+(389,1181,l),
+(685,1181,l),
+(1000,1506,l),
+(1000,1507,l),
+(716,1507,l),
+(564,1347,l),
+(472,1507,l)
+);
+}
+);
+width = 864;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (439,1056);
+},
+{
+name = top;
+pos = (515,1515);
+}
+);
+background = {
+shapes = (
+{
+pos = (-16,0);
+ref = acute;
+}
+);
+};
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(240,1515,l),
+(240,1514,l),
+(446,1241,l),
+(490,1241,l),
+(790,1514,l),
+(790,1515,l),
+(732,1515,l),
+(475,1280,l),
+(299,1515,l)
+);
+}
+);
+width = 704;
+}
+);
+unicode = 780;
+userData = {
+interface.gridadjust.original = "{'width': 1273, 'leftMargin': 194, 'rightMargin': 210}";
+"interface.width-adjustments" = (
+-16
+);
+};
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/carondot.uc.glyph b/src/Inter-Italic.glyphspackage/glyphs/carondot.uc.glyph
index 16c9336d4..da414acc0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/carondot.uc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/carondot.uc.glyph
@@ -1,5 +1,4 @@
 {
-color = 4;
 glyphname = carondot.uc;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/caronnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/caronnosp.glyph
deleted file mode 100644
index 29e889a15..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/caronnosp.glyph
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-glyphname = caronnosp;
-layers = (
-{
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-742,1518,l),
-(-748,1498,l),
-(-532,1254,l),
-(-414,1254,l),
-(-114,1502,l),
-(-110,1518,l),
-(-282,1518,l),
-(-454,1374,l),
-(-574,1518,l)
-);
-}
-);
-width = 0;
-},
-{
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-998,1534,l),
-(-998,1522,l),
-(-724,1254,l),
-(-456,1254,l),
-(-104,1516,l),
-(-102,1534,l),
-(-418,1534,l),
-(-568,1400,l),
-(-674,1534,l)
-);
-}
-);
-width = 26;
-},
-{
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-572,1538,l),
-(-574,1534,l),
-(-424,1254,l),
-(-378,1254,l),
-(-136,1534,l),
-(-136,1538,l),
-(-190,1538,l),
-(-396,1300,l),
-(-522,1538,l)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m008;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-774,1518,l),
-(-780,1498,l),
-(-564,1254,l),
-(-446,1254,l),
-(-146,1502,l),
-(-142,1518,l),
-(-314,1518,l),
-(-486,1374,l),
-(-606,1518,l)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m010;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-1014,1534,l),
-(-1014,1522,l),
-(-740,1254,l),
-(-472,1254,l),
-(-120,1516,l),
-(-118,1534,l),
-(-434,1534,l),
-(-584,1400,l),
-(-690,1534,l)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m012;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-636,1538,l),
-(-638,1534,l),
-(-488,1254,l),
-(-442,1254,l),
-(-200,1534,l),
-(-200,1538,l),
-(-254,1538,l),
-(-460,1300,l),
-(-586,1538,l)
-);
-}
-);
-width = 0;
-}
-);
-unicode = 57608;
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/caronsubcomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/caronsubcomb.glyph
new file mode 100644
index 000000000..2a11b1793
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/caronsubcomb.glyph
@@ -0,0 +1,79 @@
+{
+case = minor;
+glyphname = caronsubcomb;
+layers = (
+{
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+pos = (-285,-1722);
+ref = caroncomb;
+}
+);
+width = 833;
+},
+{
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+pos = (-284,-1717);
+ref = caroncomb;
+}
+);
+width = 1024;
+},
+{
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+pos = (-279,-1683);
+ref = caroncomb;
+}
+);
+width = 864;
+},
+{
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+pos = (-277,-1676);
+ref = caroncomb;
+}
+);
+width = 800;
+},
+{
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+pos = (-269,-1624);
+ref = caroncomb;
+}
+);
+width = 864;
+},
+{
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+pos = (-281,-1700);
+ref = caroncomb;
+}
+);
+width = 704;
+}
+);
+unicode = 57609;
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/caronsubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/caronsubnosp.glyph
deleted file mode 100644
index ba84aa78b..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/caronsubnosp.glyph
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-glyphname = caronsubnosp;
-layers = (
-{
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-alignment = -1;
-pos = (-1044,-1670);
-ref = caron;
-}
-);
-width = 0;
-},
-{
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-alignment = -1;
-pos = (-1192,-1608);
-ref = caron;
-}
-);
-width = 0;
-},
-{
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-alignment = -1;
-pos = (-958,-1708);
-ref = caron;
-}
-);
-width = 0;
-},
-{
-layerId = m008;
-shapes = (
-{
-alignment = -1;
-pos = (-1044,-1670);
-ref = caron;
-}
-);
-width = 0;
-},
-{
-layerId = m010;
-shapes = (
-{
-alignment = -1;
-pos = (-1192,-1608);
-ref = caron;
-}
-);
-width = 0;
-},
-{
-layerId = m012;
-shapes = (
-{
-alignment = -1;
-pos = (-958,-1708);
-ref = caron;
-}
-);
-width = 0;
-}
-);
-unicode = 57609;
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ccaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/ccaron.glyph
index 50b4e8e7f..745aaa304 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ccaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ccaron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (140,0);
-ref = caron;
+pos = (221,186);
+ref = caroncomb;
 }
 );
 width = 1151;
@@ -23,8 +23,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (-3,0);
-ref = caron;
+pos = (162,186);
+ref = caroncomb;
 }
 );
 width = 1239;
@@ -36,8 +36,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (161,16);
-ref = caron;
+pos = (188,186);
+ref = caroncomb;
 }
 );
 width = 1127;
@@ -49,8 +49,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (128,0);
-ref = caron;
+pos = (197,206);
+ref = caroncomb;
 }
 );
 width = 1072;
@@ -62,8 +62,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (-23,0);
-ref = caron;
+pos = (208,206);
+ref = caroncomb;
 }
 );
 width = 1194;
@@ -75,8 +75,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (168,0);
-ref = caron;
+pos = (213,206);
+ref = caroncomb;
 }
 );
 width = 1015;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ccedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/ccedilla.glyph
index c196463c8..448888051 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ccedilla.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ccedilla.glyph
@@ -11,7 +11,7 @@ ref = c;
 },
 {
 pos = (328,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1151;
@@ -24,7 +24,7 @@ ref = c;
 },
 {
 pos = (186,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1239;
@@ -37,7 +37,7 @@ ref = c;
 },
 {
 pos = (374,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1127;
@@ -50,7 +50,7 @@ ref = c;
 },
 {
 pos = (321,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1072;
@@ -63,7 +63,7 @@ ref = c;
 },
 {
 pos = (171,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1194;
@@ -76,7 +76,7 @@ ref = c;
 },
 {
 pos = (385,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1015;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ccedillaacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/ccedillaacute.glyph
index 65381512c..78e2ff305 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ccedillaacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ccedillaacute.glyph
@@ -5,102 +5,108 @@ kernRight = o;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = c;
 },
 {
 pos = (328,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (393,186);
-ref = acute;
+pos = (513,186);
+ref = acutecomb;
 }
 );
 width = 1151;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = c;
 },
 {
 pos = (186,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (370,186);
-ref = acute;
+pos = (500,186);
+ref = acutecomb;
 }
 );
 width = 1239;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = c;
 },
 {
 pos = (374,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (407,186);
-ref = acute;
+pos = (547,186);
+ref = acutecomb;
 }
 );
 width = 1127;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = c;
 },
 {
 pos = (321,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (432,206);
-ref = acute;
+pos = (472,206);
+ref = acutecomb;
 }
 );
 width = 1072;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = c;
 },
 {
 pos = (171,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (423,206);
-ref = acute;
+pos = (447,206);
+ref = acutecomb;
 }
 );
 width = 1194;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = c;
 },
 {
 pos = (385,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (434,206);
-ref = acute;
+pos = (494,206);
+ref = acutecomb;
 }
 );
 width = 1015;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ccircumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/ccircumflex.glyph
index bfdb1710f..ac9b0b2c7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ccircumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ccircumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (142,0);
-ref = circumflex;
+pos = (221,186);
+ref = circumflexcomb;
 }
 );
 width = 1151;
@@ -23,8 +23,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (-4,0);
-ref = circumflex;
+pos = (162,186);
+ref = circumflexcomb;
 }
 );
 width = 1239;
@@ -36,8 +36,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (157,0);
-ref = circumflex;
+pos = (187,186);
+ref = circumflexcomb;
 }
 );
 width = 1127;
@@ -49,8 +49,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (130,0);
-ref = circumflex;
+pos = (196,206);
+ref = circumflexcomb;
 }
 );
 width = 1072;
@@ -62,8 +62,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (-24,0);
-ref = circumflex;
+pos = (209,206);
+ref = circumflexcomb;
 }
 );
 width = 1194;
@@ -75,8 +75,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (171,0);
-ref = circumflex;
+pos = (212,206);
+ref = circumflexcomb;
 }
 );
 width = 1015;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/cdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/cdotaccent.glyph
index cd676cb1c..202886fd2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/cdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/cdotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (362,0);
-ref = dotaccent;
+pos = (393,186);
+ref = dotaccentcomb;
 }
 );
 width = 1151;
@@ -25,8 +25,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (308,0);
-ref = dotaccent;
+pos = (339,186);
+ref = dotaccentcomb;
 }
 );
 width = 1239;
@@ -39,8 +39,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (402,0);
-ref = dotaccent;
+pos = (433,186);
+ref = dotaccentcomb;
 }
 );
 width = 1127;
@@ -53,8 +53,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (350,0);
-ref = dotaccent;
+pos = (384,206);
+ref = dotaccentcomb;
 }
 );
 width = 1072;
@@ -67,8 +67,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (286,0);
-ref = dotaccent;
+pos = (320,206);
+ref = dotaccentcomb;
 }
 );
 width = 1194;
@@ -81,8 +81,8 @@ shapes = (
 ref = c;
 },
 {
-pos = (414,0);
-ref = dotaccent;
+pos = (442,206);
+ref = dotaccentcomb;
 }
 );
 width = 1015;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/cedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/cedilla.glyph
index 8ece5e1f3..3c44b3ac4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/cedilla.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/cedilla.glyph
@@ -1,211 +1,72 @@
 {
-color = (204,240,242,1);
 glyphname = cedilla;
 layers = (
 {
-anchors = (
-{
-name = _cedilla;
-pos = (186,0);
-}
-);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(58,-136,l),
-(169,-145,o),
-(212,-163,o),
-(200,-230,cs),
-(189,-297,o),
-(119,-323,o),
-(30,-322,c),
-(14,-436,l),
-(215,-436,o),
-(335,-349,o),
-(354,-224,cs),
-(375,-111,o),
-(308,-64,o),
-(232,-52,c),
-(256,6,l),
-(114,6,l)
-);
+alignment = 1;
+ref = cedillacomb;
 }
 );
 width = 546;
 },
 {
-anchors = (
-{
-name = _cedilla;
-pos = (364,0);
-}
-);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(236,-146,l),
-(326,-160,o),
-(367,-195,o),
-(354,-250,cs),
-(340,-308,o),
-(259,-340,o),
-(116,-340,c),
-(90,-494,l),
-(364,-495,o),
-(544,-399,o),
-(568,-242,cs),
-(585,-148,o),
-(527,-79,o),
-(416,-62,c),
-(440,6,l),
-(296,6,l)
-);
+alignment = 1;
+ref = cedillacomb;
 }
 );
 width = 914;
 },
 {
-anchors = (
-{
-name = _cedilla;
-pos = (122,0);
-}
-);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(62,-96,l),
-(170,-95,o),
-(216,-138,o),
-(204,-222,cs),
-(193,-292,o),
-(144,-326,o),
-(34,-328,c),
-(30,-376,l),
-(157,-371,o),
-(233,-323,o),
-(250,-222,cs),
-(265,-131,o),
-(224,-68,o),
-(126,-52,c),
-(146,6,l),
-(100,6,l)
-);
+alignment = 1;
+ref = cedillacomb;
 }
 );
 width = 418;
 },
 {
-anchors = (
-{
-name = _cedilla;
-pos = (154,0);
-}
-);
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(26,-136,l),
-(137,-145,o),
-(180,-163,o),
-(168,-230,cs),
-(157,-297,o),
-(87,-323,o),
-(-2,-322,c),
-(-18,-436,l),
-(183,-436,o),
-(303,-349,o),
-(322,-224,cs),
-(343,-111,o),
-(276,-64,o),
-(200,-52,c),
-(224,6,l),
-(82,6,l)
-);
+alignment = 1;
+ref = cedillacomb;
 }
 );
 width = 482;
 },
 {
-anchors = (
-{
-name = _cedilla;
-pos = (348,0);
-}
-);
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(220,-146,l),
-(310,-160,o),
-(351,-195,o),
-(338,-250,cs),
-(324,-308,o),
-(243,-340,o),
-(100,-340,c),
-(74,-494,l),
-(348,-495,o),
-(528,-399,o),
-(552,-242,cs),
-(569,-148,o),
-(511,-79,o),
-(400,-62,c),
-(424,6,l),
-(280,6,l)
-);
+alignment = 1;
+ref = cedillacomb;
 }
 );
 width = 882;
 },
 {
-anchors = (
-{
-name = _cedilla;
-pos = (58,0);
-}
-);
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-2,-96,l),
-(106,-95,o),
-(152,-138,o),
-(140,-222,cs),
-(129,-292,o),
-(80,-326,o),
-(-30,-328,c),
-(-34,-376,l),
-(93,-371,o),
-(169,-323,o),
-(186,-222,cs),
-(201,-131,o),
-(160,-68,o),
-(62,-52,c),
-(82,6,l),
-(36,6,l)
-);
+alignment = 1;
+ref = cedillacomb;
 }
 );
 width = 290;
 }
 );
 unicode = 184;
-userData = {
-interface.gridadjust.original = "{'width': 701, 'leftMargin': 165, 'rightMargin': 107}";
-"interface.width-adjustments" = (
--16
-);
-};
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/cedillacomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/cedillacomb.glyph
new file mode 100644
index 000000000..c4b3da926
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/cedillacomb.glyph
@@ -0,0 +1,210 @@
+{
+glyphname = cedillacomb;
+layers = (
+{
+anchors = (
+{
+name = _cedilla;
+pos = (186,0);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+shapes = (
+{
+closed = 1;
+nodes = (
+(58,-136,l),
+(169,-145,o),
+(212,-163,o),
+(200,-230,cs),
+(189,-297,o),
+(119,-323,o),
+(30,-322,c),
+(14,-436,l),
+(215,-436,o),
+(335,-349,o),
+(354,-224,cs),
+(375,-111,o),
+(308,-64,o),
+(232,-52,c),
+(256,6,l),
+(114,6,l)
+);
+}
+);
+width = 546;
+},
+{
+anchors = (
+{
+name = _cedilla;
+pos = (364,0);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+shapes = (
+{
+closed = 1;
+nodes = (
+(236,-146,l),
+(326,-160,o),
+(367,-195,o),
+(354,-250,cs),
+(340,-308,o),
+(259,-340,o),
+(116,-340,c),
+(90,-494,l),
+(364,-495,o),
+(544,-399,o),
+(568,-242,cs),
+(585,-148,o),
+(527,-79,o),
+(416,-62,c),
+(440,6,l),
+(296,6,l)
+);
+}
+);
+width = 914;
+},
+{
+anchors = (
+{
+name = _cedilla;
+pos = (122,0);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+shapes = (
+{
+closed = 1;
+nodes = (
+(62,-96,l),
+(170,-95,o),
+(216,-138,o),
+(204,-222,cs),
+(193,-292,o),
+(144,-326,o),
+(34,-328,c),
+(30,-376,l),
+(157,-371,o),
+(233,-323,o),
+(250,-222,cs),
+(265,-131,o),
+(224,-68,o),
+(126,-52,c),
+(146,6,l),
+(100,6,l)
+);
+}
+);
+width = 418;
+},
+{
+anchors = (
+{
+name = _cedilla;
+pos = (154,0);
+}
+);
+layerId = m008;
+shapes = (
+{
+closed = 1;
+nodes = (
+(26,-136,l),
+(137,-145,o),
+(180,-163,o),
+(168,-230,cs),
+(157,-297,o),
+(87,-323,o),
+(-2,-322,c),
+(-18,-436,l),
+(183,-436,o),
+(303,-349,o),
+(322,-224,cs),
+(343,-111,o),
+(276,-64,o),
+(200,-52,c),
+(224,6,l),
+(82,6,l)
+);
+}
+);
+width = 482;
+},
+{
+anchors = (
+{
+name = _cedilla;
+pos = (348,0);
+}
+);
+layerId = m010;
+shapes = (
+{
+closed = 1;
+nodes = (
+(220,-146,l),
+(310,-160,o),
+(351,-195,o),
+(338,-250,cs),
+(324,-308,o),
+(243,-340,o),
+(100,-340,c),
+(74,-494,l),
+(348,-495,o),
+(528,-399,o),
+(552,-242,cs),
+(569,-148,o),
+(511,-79,o),
+(400,-62,c),
+(424,6,l),
+(280,6,l)
+);
+}
+);
+width = 882;
+},
+{
+anchors = (
+{
+name = _cedilla;
+pos = (58,0);
+}
+);
+layerId = m012;
+shapes = (
+{
+closed = 1;
+nodes = (
+(-2,-96,l),
+(106,-95,o),
+(152,-138,o),
+(140,-222,cs),
+(129,-292,o),
+(80,-326,o),
+(-30,-328,c),
+(-34,-376,l),
+(93,-371,o),
+(169,-323,o),
+(186,-222,cs),
+(201,-131,o),
+(160,-68,o),
+(62,-52,c),
+(82,6,l),
+(36,6,l)
+);
+}
+);
+width = 290;
+}
+);
+unicode = 807;
+userData = {
+interface.gridadjust.original = "{'width': 701, 'leftMargin': 165, 'rightMargin': 107}";
+"interface.width-adjustments" = (
+-16
+);
+};
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/cedillanosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/cedillanosp.glyph
deleted file mode 100644
index 54d585a99..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/cedillanosp.glyph
+++ /dev/null
@@ -1,169 +0,0 @@
-{
-color = (250,227,227,1);
-glyphname = cedillanosp;
-layers = (
-{
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-826,-136,l),
-(-716,-145,o),
-(-672,-163,o),
-(-684,-230,cs),
-(-695,-297,o),
-(-768,-323,o),
-(-856,-322,c),
-(-870,-436,l),
-(-669,-436,o),
-(-550,-349,o),
-(-530,-224,cs),
-(-509,-108,o),
-(-576,-64,o),
-(-652,-52,c),
-(-628,0,l),
-(-770,0,l)
-);
-}
-);
-width = 0;
-},
-{
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-1016,-136,l),
-(-917,-140,o),
-(-882,-160,o),
-(-888,-200,cs),
-(-897,-250,o),
-(-932,-271,o),
-(-980,-270,c),
-(-1006,-486,l),
-(-745,-486,o),
-(-588,-381,o),
-(-564,-224,cs),
-(-545,-111,o),
-(-615,-64,o),
-(-692,-52,c),
-(-670,14,l),
-(-958,14,l)
-);
-}
-);
-width = 44;
-},
-{
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-694,-96,l),
-(-586,-95,o),
-(-540,-138,o),
-(-552,-222,cs),
-(-564,-292,o),
-(-612,-326,o),
-(-722,-328,c),
-(-728,-376,l),
-(-599,-371,o),
-(-524,-323,o),
-(-506,-222,cs),
-(-491,-131,o),
-(-532,-68,o),
-(-630,-52,c),
-(-610,6,l),
-(-656,6,l)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m008;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-858,-136,l),
-(-748,-145,o),
-(-704,-163,o),
-(-716,-230,cs),
-(-727,-297,o),
-(-800,-323,o),
-(-888,-322,c),
-(-902,-436,l),
-(-701,-436,o),
-(-582,-349,o),
-(-562,-224,cs),
-(-541,-108,o),
-(-608,-64,o),
-(-684,-52,c),
-(-660,0,l),
-(-802,0,l)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m010;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-1032,-136,l),
-(-933,-140,o),
-(-898,-160,o),
-(-904,-200,cs),
-(-913,-250,o),
-(-948,-271,o),
-(-996,-270,c),
-(-1022,-486,l),
-(-761,-486,o),
-(-604,-381,o),
-(-580,-224,cs),
-(-561,-111,o),
-(-631,-64,o),
-(-708,-52,c),
-(-686,14,l),
-(-974,14,l)
-);
-}
-);
-width = 12;
-},
-{
-layerId = m012;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-758,-96,l),
-(-650,-95,o),
-(-604,-138,o),
-(-616,-222,cs),
-(-628,-292,o),
-(-676,-326,o),
-(-786,-328,c),
-(-792,-376,l),
-(-663,-371,o),
-(-588,-323,o),
-(-570,-222,cs),
-(-555,-131,o),
-(-596,-68,o),
-(-694,-52,c),
-(-674,6,l),
-(-720,6,l)
-);
-}
-);
-width = 0;
-}
-);
-unicode = 807;
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/chedescenderabkhasiancyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/chedescenderabkhasiancyrillic.glyph
index c70f9b1ef..c3ca507a0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/chedescenderabkhasiancyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/chedescenderabkhasiancyrillic.glyph
@@ -10,7 +10,7 @@ ref = cheabkhasiancyrillic;
 },
 {
 pos = (535,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1382;
@@ -23,7 +23,7 @@ ref = cheabkhasiancyrillic;
 },
 {
 pos = (447,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1514;
@@ -36,7 +36,7 @@ ref = cheabkhasiancyrillic;
 },
 {
 pos = (413,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1160;
@@ -49,7 +49,7 @@ ref = cheabkhasiancyrillic;
 },
 {
 pos = (586,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1332;
@@ -62,7 +62,7 @@ ref = cheabkhasiancyrillic;
 },
 {
 pos = (542,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1571;
@@ -75,7 +75,7 @@ ref = cheabkhasiancyrillic;
 },
 {
 pos = (515,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1135;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/chedieresiscyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/chedieresiscyrillic.glyph
index 32704b2e2..ee41884e2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/chedieresiscyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/chedieresiscyrillic.glyph
@@ -11,7 +11,7 @@ ref = checyrillic;
 },
 {
 pos = (18,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1175;
@@ -25,7 +25,7 @@ ref = checyrillic;
 },
 {
 pos = (1,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1273;
@@ -39,7 +39,7 @@ ref = checyrillic;
 },
 {
 pos = (23,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1147;
@@ -53,7 +53,7 @@ ref = checyrillic;
 },
 {
 pos = (23,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1115;
@@ -67,7 +67,7 @@ ref = checyrillic;
 },
 {
 pos = (3,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1238;
@@ -81,7 +81,7 @@ ref = checyrillic;
 },
 {
 pos = (10,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1018;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/circumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/circumflex.glyph
index a7e030cd2..e3031ce4a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/circumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/circumflex.glyph
@@ -2,140 +2,71 @@
 glyphname = circumflex;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (588,1304);
-}
-);
-guides = (
-{
-pos = (569,1720);
-}
-);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 name = ital_gen;
 shapes = (
 {
-alignment = -1;
-angle = 180;
-pos = (1211,2816);
-ref = caron;
+alignment = 1;
+ref = circumflexcomb;
 }
 );
-width = 930;
+width = 833;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (770,1304);
-}
-);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 name = ital_gen;
 shapes = (
 {
-alignment = -1;
-angle = 180;
-pos = (1577,2842);
-ref = caron;
+alignment = 1;
+ref = circumflexcomb;
 }
 );
-width = 1292;
+width = 1024;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (555,1304);
-}
-);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 name = ital_gen;
 shapes = (
 {
-alignment = -1;
-angle = 180;
-pos = (1138,2786);
-ref = caron;
+alignment = 1;
+ref = circumflexcomb;
 }
 );
-width = 862;
+width = 864;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (554,1262);
-}
-);
-guides = (
-{
-pos = (288,1720);
-}
-);
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-alignment = -1;
-angle = 180;
-pos = (1139,2706);
-ref = caron;
+alignment = 1;
+ref = circumflexcomb;
 }
 );
-width = 867;
+width = 800;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (752,1262);
-}
-);
-guides = (
-{
-pos = (978,1720);
-}
-);
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
-alignment = -1;
-angle = 180;
-pos = (1525,2654);
-ref = caron;
+alignment = 1;
+ref = circumflexcomb;
 }
 );
-width = 1260;
+width = 864;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (481,1262);
-}
-);
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
-alignment = -1;
-angle = 180;
-pos = (994,2706);
-ref = caron;
+alignment = 1;
+ref = circumflexcomb;
 }
 );
-width = 734;
+width = 705;
 }
 );
-metricWidth = caron;
 unicode = 710;
-userData = {
-"interface.width-adjustments" = (
--16
-);
-};
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/circumflexacutecomb.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/circumflexacutecomb.cn.glyph
index 3aa1bb90f..857c713fd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/circumflexacutecomb.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/circumflexacutecomb.cn.glyph
@@ -29,7 +29,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-52,-28);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
@@ -67,7 +67,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-138,-27);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
@@ -106,7 +106,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-4,-31);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
@@ -141,7 +141,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-39,-50);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
@@ -173,7 +173,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-131,0);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
@@ -206,7 +206,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-14,-50);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/circumflexcomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/circumflexcomb.glyph
new file mode 100644
index 000000000..1c3747d9d
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/circumflexcomb.glyph
@@ -0,0 +1,262 @@
+{
+glyphname = circumflexcomb;
+layers = (
+{
+anchors = (
+{
+name = _top;
+pos = (509,1118);
+},
+{
+name = top;
+pos = (582,1557);
+}
+);
+background = {
+shapes = (
+{
+pos = (1,0);
+ref = acute;
+}
+);
+};
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(566,1459,l),
+(678,1283,l),
+(850,1283,l),
+(852,1292,l),
+(664,1557,l),
+(498,1557,l),
+(224,1292,l),
+(222,1283,l),
+(392,1283,l)
+);
+}
+);
+width = 833;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (604,1118);
+},
+{
+name = top;
+pos = (681,1582);
+}
+);
+background = {
+shapes = (
+{
+ref = acute;
+}
+);
+};
+guides = (
+{
+pos = (0,1256);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(654,1422,l),
+(769,1256,l),
+(1101,1256,l),
+(1102,1262,l),
+(821,1582,l),
+(541,1582,l),
+(154,1262,l),
+(153,1256,l),
+(485,1256,l)
+);
+}
+);
+width = 1024;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (525,1118);
+},
+{
+name = top;
+pos = (599,1563);
+}
+);
+background = {
+shapes = (
+{
+pos = (1,0);
+ref = acute;
+}
+);
+};
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(588,1507,l),
+(769,1283,l),
+(825,1283,l),
+(826,1289,l),
+(604,1563,l),
+(592,1563,l),
+(280,1289,l),
+(279,1283,l),
+(333,1283,l)
+);
+}
+);
+width = 864;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (488,1056);
+},
+{
+name = top;
+pos = (560,1490);
+}
+);
+background = {
+shapes = (
+{
+pos = (1,0);
+ref = acute;
+}
+);
+};
+guides = (
+{
+pos = (1,1490);
+},
+{
+pos = (1,1192);
+}
+);
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(543,1392,l),
+(656,1216,l),
+(828,1216,l),
+(828,1217,l),
+(642,1490,l),
+(476,1490,l),
+(200,1217,l),
+(200,1216,l),
+(370,1216,l)
+);
+}
+);
+width = 800;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (519,1056);
+},
+{
+name = top;
+pos = (594,1507);
+}
+);
+background = {
+shapes = (
+{
+pos = (-154,0);
+ref = acute;
+}
+);
+};
+guides = (
+{
+pos = (0,1181);
+}
+);
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(562.001,1341,l),
+(662,1181,l),
+(946,1181,l),
+(946,1182,l),
+(737,1507,l),
+(441,1507,l),
+(134,1182,l),
+(134,1181,l),
+(418,1181,l)
+);
+}
+);
+width = 864;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (440,1056);
+},
+{
+name = top;
+pos = (516,1515);
+}
+);
+background = {
+shapes = (
+{
+pos = (-119,0);
+ref = acute;
+}
+);
+};
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(508,1476,l),
+(687,1241,l),
+(745,1241,l),
+(746,1242,l),
+(537,1515,l),
+(493,1515,l),
+(196,1242,l),
+(195,1241,l),
+(254,1241,l)
+);
+}
+);
+width = 705;
+}
+);
+unicode = 770;
+userData = {
+"interface.width-adjustments" = (
+-16
+);
+};
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/circumflexgravecomb.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/circumflexgravecomb.cn.glyph
index fd1f7f45a..3fdda03e9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/circumflexgravecomb.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/circumflexgravecomb.cn.glyph
@@ -29,7 +29,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-52,-28);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
@@ -67,7 +67,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-138,-27);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
@@ -106,7 +106,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-4,-31);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
@@ -141,7 +141,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-39,-50);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
@@ -173,7 +173,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-131,0);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
@@ -206,7 +206,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-14,-50);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/circumflexhookcomb.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/circumflexhookcomb.cn.glyph
index 89a99f1f0..297c73b5d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/circumflexhookcomb.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/circumflexhookcomb.cn.glyph
@@ -25,7 +25,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-52,-28);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
@@ -59,7 +59,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-138,-27);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
@@ -94,7 +94,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-4,-31);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
@@ -125,7 +125,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-39,-50);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
@@ -163,7 +163,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-131,0);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
@@ -192,7 +192,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-14,-50);
-ref = circumflex;
+ref = circumflexcomb;
 },
 {
 alignment = -1;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/circumflexnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/circumflexnosp.glyph
deleted file mode 100644
index eb35573ff..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/circumflexnosp.glyph
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-color = (250,227,227,1);
-glyphname = circumflexnosp;
-layers = (
-{
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-alignment = -1;
-pos = (-1070,0);
-ref = circumflex;
-}
-);
-width = 0;
-},
-{
-guides = (
-{
-angle = 90;
-pos = (-936,1912);
-}
-);
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-alignment = -1;
-pos = (-1314,0);
-ref = circumflex;
-}
-);
-width = 20;
-},
-{
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-alignment = -1;
-pos = (-926,0);
-ref = circumflex;
-}
-);
-width = 0;
-},
-{
-layerId = m008;
-shapes = (
-{
-alignment = -1;
-pos = (-1070,0);
-ref = circumflex;
-}
-);
-width = 0;
-},
-{
-guides = (
-{
-angle = 90;
-pos = (-968,1912);
-}
-);
-layerId = m010;
-shapes = (
-{
-alignment = -1;
-pos = (-1314,0);
-ref = circumflex;
-}
-);
-width = 0;
-},
-{
-layerId = m012;
-shapes = (
-{
-alignment = -1;
-pos = (-926,0);
-ref = circumflex;
-}
-);
-width = 0;
-}
-);
-unicode = 770;
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/circumflexsubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/circumflexsubcomb.glyph
index 20b7f710d..1a250a463 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/circumflexsubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/circumflexsubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = circumflexsubnosp;
+glyphname = circumflexsubcomb;
 layers = (
 {
 anchors = (
@@ -25,7 +24,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1324,-1668);
-ref = circumflex;
+ref = circumflexcomb;
 }
 );
 width = 0;
@@ -53,7 +52,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1596,-1668);
-ref = circumflex;
+ref = circumflexcomb;
 }
 );
 width = 0;
@@ -81,7 +80,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1218,-1668);
-ref = circumflex;
+ref = circumflexcomb;
 }
 );
 width = 0;
@@ -105,7 +104,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1318,-1634);
-ref = circumflex;
+ref = circumflexcomb;
 }
 );
 width = 0;
@@ -129,7 +128,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1582,-1582);
-ref = circumflex;
+ref = circumflexcomb;
 }
 );
 width = 1;
@@ -157,11 +156,10 @@ shapes = (
 {
 alignment = -1;
 pos = (-1210,-1634);
-ref = circumflex;
+ref = circumflexcomb;
 }
 );
 width = 0;
 }
 );
-unicode = 813;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/commaabovecmb.glyph b/src/Inter-Italic.glyphspackage/glyphs/commaabovecmb.glyph
index 92d0a1ed0..d676f1445 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/commaabovecmb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/commaabovecmb.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = commaabovecmb;
 layers = (
 {
@@ -7,8 +6,8 @@ layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
 angle = 180;
-pos = (-1132,2546);
-ref = commaturnsupnosp;
+pos = (143,1984);
+ref = commaturnsupcomb;
 }
 );
 width = 0;
@@ -18,11 +17,11 @@ layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
 angle = 180;
-pos = (-1266,2630);
-ref = commaturnsupnosp;
+pos = (189,1984);
+ref = commaturnsupcomb;
 }
 );
-width = 70;
+width = 46;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -31,7 +30,7 @@ shapes = (
 alignment = -1;
 angle = 180;
 pos = (-1054,2496);
-ref = commaturnsupnosp;
+ref = commaturnsupcomb;
 }
 );
 width = 0;
@@ -41,8 +40,8 @@ layerId = m008;
 shapes = (
 {
 angle = 180;
-pos = (-1196,2546);
-ref = commaturnsupnosp;
+pos = (154,1984);
+ref = commaturnsupcomb;
 }
 );
 width = 0;
@@ -52,11 +51,11 @@ layerId = m010;
 shapes = (
 {
 angle = 180;
-pos = (-1298,2630);
-ref = commaturnsupnosp;
+pos = (168,1984);
+ref = commaturnsupcomb;
 }
 );
-width = 38;
+width = 14;
 },
 {
 layerId = m012;
@@ -65,7 +64,7 @@ shapes = (
 alignment = -1;
 angle = 180;
 pos = (-1182,2496);
-ref = commaturnsupnosp;
+ref = commaturnsupcomb;
 }
 );
 width = 0;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/commaaboverightcmb.glyph b/src/Inter-Italic.glyphspackage/glyphs/commaaboverightcmb.glyph
index 2ba273ddf..8485f58e8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/commaaboverightcmb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/commaaboverightcmb.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = commaaboverightcmb;
 layers = (
 {
@@ -7,8 +6,8 @@ layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
 angle = 180;
-pos = (-590,2546);
-ref = commaturnsupnosp;
+pos = (143,1984);
+ref = commaturnsupcomb;
 }
 );
 width = 0;
@@ -18,11 +17,11 @@ layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
 angle = 180;
-pos = (-642,2630);
-ref = commaturnsupnosp;
+pos = (189,1984);
+ref = commaturnsupcomb;
 }
 );
-width = 6;
+width = 46;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -31,7 +30,7 @@ shapes = (
 alignment = -1;
 angle = 180;
 pos = (-558,2496);
-ref = commaturnsupnosp;
+ref = commaturnsupcomb;
 }
 );
 width = 0;
@@ -41,8 +40,8 @@ layerId = m008;
 shapes = (
 {
 angle = 180;
-pos = (-654,2546);
-ref = commaturnsupnosp;
+pos = (154,1984);
+ref = commaturnsupcomb;
 }
 );
 width = 0;
@@ -52,11 +51,11 @@ layerId = m010;
 shapes = (
 {
 angle = 180;
-pos = (-674,2630);
-ref = commaturnsupnosp;
+pos = (168,1984);
+ref = commaturnsupcomb;
 }
 );
-width = 0;
+width = 14;
 },
 {
 layerId = m012;
@@ -65,7 +64,7 @@ shapes = (
 alignment = -1;
 angle = 180;
 pos = (-686,2496);
-ref = commaturnsupnosp;
+ref = commaturnsupcomb;
 }
 );
 width = 0;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/commaaccentright.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/commaaccentright.cn.glyph
index 9d70840ac..9d0a4d29f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/commaaccentright.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/commaaccentright.cn.glyph
@@ -1,5 +1,4 @@
 {
-color = 4;
 glyphname = commaaccentright.cn;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/commabelowcmb.glyph b/src/Inter-Italic.glyphspackage/glyphs/commabelowcmb.glyph
index cdb3a4374..7996e3e7c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/commabelowcmb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/commabelowcmb.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = commabelowcmb;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/commasuprevnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/commasuprevcomb.glyph
index f9f22a6bf..0cc151f86 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/commasuprevnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/commasuprevcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = commasuprevnosp;
+glyphname = commasuprevcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -63,5 +62,4 @@ ref = commareversedmod;
 width = 0;
 }
 );
-unicode = 788;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/commaturnsupnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/commaturnsupcomb.glyph
index 53aaa0503..ac67faf2e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/commaturnsupnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/commaturnsupcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = commaturnsupnosp;
+glyphname = commaturnsupcomb;
 layers = (
 {
 anchors = (
@@ -213,5 +212,4 @@ nodes = (
 width = 0;
 }
 );
-unicode = 786;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/commercialM_inusS_ign.glyph b/src/Inter-Italic.glyphspackage/glyphs/commercialM_inusS_ign.glyph
index de5f48099..98e5815f2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/commercialM_inusS_ign.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/commercialM_inusS_ign.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = commercialMinusSign;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/cyrillicbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/cyrillicbreve.glyph
index 40387028a..7ad92cca9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/cyrillicbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/cyrillicbreve.glyph
@@ -5,7 +5,7 @@ layers = (
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-ref = breve;
+ref = brevecomb;
 }
 );
 width = 920;
@@ -16,7 +16,7 @@ shapes = (
 {
 alignment = -1;
 pos = (12,0);
-ref = breve;
+ref = brevecomb;
 }
 );
 width = 1032;
@@ -27,7 +27,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-8,0);
-ref = breve;
+ref = brevecomb;
 }
 );
 width = 850;
@@ -36,7 +36,7 @@ width = 850;
 layerId = m008;
 shapes = (
 {
-ref = breve;
+ref = brevecomb;
 }
 );
 width = 856;
@@ -47,7 +47,7 @@ shapes = (
 {
 alignment = -1;
 pos = (12,0);
-ref = breve;
+ref = brevecomb;
 }
 );
 width = 1000;
@@ -58,7 +58,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-8,0);
-ref = breve;
+ref = brevecomb;
 }
 );
 width = 722;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/d.glyph b/src/Inter-Italic.glyphspackage/glyphs/d.glyph
index 35d4f29b0..334895f00 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/d.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/d.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = d;
 kernLeft = o;
 kernRight = H;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dasiapneumatacyrilliccmb.glyph b/src/Inter-Italic.glyphspackage/glyphs/dasiapneumatacyrilliccmb.glyph
index fc17d9056..99c77808f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dasiapneumatacyrilliccmb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dasiapneumatacyrilliccmb.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = dasiapneumatacyrilliccmb;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dblgravecmb.glyph b/src/Inter-Italic.glyphspackage/glyphs/dblgravecmb.glyph
index bf3cd76b8..3b2e00ae5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dblgravecmb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dblgravecmb.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = dblgravecmb;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dcircumflexbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/dcircumflexbelow.glyph
index b03496bff..c0621280f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dcircumflexbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dcircumflexbelow.glyph
@@ -11,7 +11,7 @@ ref = d;
 },
 {
 pos = (1194,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1251;
@@ -24,7 +24,7 @@ ref = d;
 },
 {
 pos = (1330,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1323;
@@ -37,7 +37,7 @@ ref = d;
 },
 {
 pos = (1108,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1190;
@@ -50,7 +50,7 @@ ref = d;
 },
 {
 pos = (1172,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1160;
@@ -63,7 +63,7 @@ ref = d;
 },
 {
 pos = (1323,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1282;
@@ -76,7 +76,7 @@ ref = d;
 },
 {
 pos = (1104,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ddotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/ddotaccent.glyph
index dce115768..4dd30b7d0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ddotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ddotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = d;
 },
 {
-pos = (380,186);
-ref = dotaccent;
+pos = (411,372);
+ref = dotaccentcomb;
 }
 );
 width = 1251;
@@ -25,8 +25,8 @@ shapes = (
 ref = d;
 },
 {
-pos = (248,186);
-ref = dotaccent;
+pos = (279,372);
+ref = dotaccentcomb;
 }
 );
 width = 1323;
@@ -39,8 +39,8 @@ shapes = (
 ref = d;
 },
 {
-pos = (416,186);
-ref = dotaccent;
+pos = (447,372);
+ref = dotaccentcomb;
 }
 );
 width = 1190;
@@ -53,8 +53,8 @@ shapes = (
 ref = d;
 },
 {
-pos = (367,228);
-ref = dotaccent;
+pos = (401,434);
+ref = dotaccentcomb;
 }
 );
 width = 1160;
@@ -67,8 +67,8 @@ shapes = (
 ref = d;
 },
 {
-pos = (235,228);
-ref = dotaccent;
+pos = (269,434);
+ref = dotaccentcomb;
 }
 );
 width = 1282;
@@ -81,8 +81,8 @@ shapes = (
 ref = d;
 },
 {
-pos = (414,0);
-ref = dotaccent;
+pos = (442,206);
+ref = dotaccentcomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/diaeresistonosnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/diaeresistonoscomb.glyph
index 83b98d49c..a8eb894f8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/diaeresistonosnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/diaeresistonoscomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = diaeresistonosnosp;
+glyphname = diaeresistonoscomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -69,5 +68,4 @@ ref = dieresistonos;
 width = 0;
 }
 );
-unicode = 836;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dialytikaperispomeni.glyph b/src/Inter-Italic.glyphspackage/glyphs/dialytikaperispomeni.glyph
index e8405691c..21a6c72ab 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dialytikaperispomeni.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dialytikaperispomeni.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = dialytikaperispomeni;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/diamondwhite_x.glyph b/src/Inter-Italic.glyphspackage/glyphs/diamondwhite_x.glyph
index 33ce6e04b..25fae26d8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/diamondwhite_x.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/diamondwhite_x.glyph
@@ -1,5 +1,4 @@
 {
-color = (247,242,212,1);
 glyphname = diamondwhite_x;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/dieresis.glyph
index e75b1a197..da2cb981d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dieresis.glyph
@@ -1,105 +1,24 @@
 {
-color = (204,240,242,1);
 glyphname = dieresis;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (694,1118);
-},
-{
-name = top;
-pos = (763,1536);
-}
-);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(997,1304,o),
-(1057,1356,o),
-(1068,1420,cs),
-(1079,1484,o),
-(1035,1536,o),
-(971,1536,cs),
-(907,1536,o),
-(847,1484,o),
-(836,1420,cs),
-(825,1356,o),
-(869,1304,o),
-(933,1304,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(579,1304,o),
-(639,1356,o),
-(650,1420,cs),
-(661,1484,o),
-(617,1536,o),
-(553,1536,cs),
-(489,1536,o),
-(429,1484,o),
-(418,1420,cs),
-(407,1356,o),
-(451,1304,o),
-(515,1304,cs)
-);
+alignment = 1;
+ref = dieresiscomb;
 }
 );
 width = 1201;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (758,1118);
-},
-{
-name = top;
-pos = (835,1585);
-}
-);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1107,1247,o),
-(1199,1323,o),
-(1214,1416,cs),
-(1230,1509,o),
-(1163,1585,o),
-(1066,1585,cs),
-(969,1585,o),
-(878,1509,o),
-(862,1416,cs),
-(847,1323,o),
-(913,1247,o),
-(1010,1247,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(645,1247,o),
-(737,1323,o),
-(752,1416,cs),
-(768,1509,o),
-(701,1585,o),
-(604,1585,cs),
-(507,1585,o),
-(416,1509,o),
-(400,1416,cs),
-(385,1323,o),
-(451,1247,o),
-(548,1247,cs)
-);
+alignment = 1;
+ref = dieresiscomb;
 }
 );
 width = 1331;
@@ -216,103 +135,23 @@ nodes = (
 width = 942;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (675,1118);
-},
-{
-name = top;
-pos = (733,1467);
-}
-);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(945,1373,o),
-(970,1394,o),
-(974,1420,cs),
-(978,1446,o),
-(961,1467,o),
-(935,1467,cs),
-(909,1467,o),
-(884,1446,o),
-(880,1420,cs),
-(876,1394,o),
-(893,1373,o),
-(919,1373,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(541,1373,o),
-(566,1394,o),
-(570,1420,cs),
-(574,1446,o),
-(557,1467,o),
-(531,1467,cs),
-(505,1467,o),
-(480,1446,o),
-(476,1420,cs),
-(472,1394,o),
-(489,1373,o),
-(515,1373,cs)
-);
+alignment = 1;
+ref = dieresiscomb;
 }
 );
 width = 1165;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (657,1056);
-},
-{
-name = top;
-pos = (729,1490);
-}
-);
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(963,1262,o),
-(1024,1314,o),
-(1034,1378,cs),
-(1045,1442,o),
-(1001,1494,o),
-(937,1494,cs),
-(873,1494,o),
-(813,1442,o),
-(802,1378,cs),
-(792,1314,o),
-(835,1262,o),
-(899,1262,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(545,1262,o),
-(606,1314,o),
-(616,1378,cs),
-(627,1442,o),
-(583,1494,o),
-(519,1494,cs),
-(455,1494,o),
-(395,1442,o),
-(384,1378,cs),
-(374,1314,o),
-(417,1262,o),
-(481,1262,cs)
-);
+alignment = 1;
+ref = dieresiscomb;
 }
 );
 width = 1137;
@@ -370,52 +209,12 @@ nodes = (
 width = 1198;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (737,1056);
-},
-{
-name = top;
-pos = (813,1513);
-}
-);
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1086,1175,o),
-(1177,1251,o),
-(1192,1344,cs),
-(1208,1437,o),
-(1141,1513,o),
-(1044,1513,cs),
-(947,1513,o),
-(856,1437,o),
-(840,1344,cs),
-(825,1251,o),
-(892,1175,o),
-(989,1175,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(622,1175,o),
-(713,1251,o),
-(728,1344,cs),
-(744,1437,o),
-(677,1513,o),
-(580,1513,cs),
-(483,1513,o),
-(392,1437,o),
-(376,1344,cs),
-(361,1251,o),
-(428,1175,o),
-(525,1175,cs)
-);
+alignment = 1;
+ref = dieresiscomb;
 }
 );
 width = 1298;
@@ -480,58 +279,17 @@ nodes = (
 width = 942;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (622,1056);
-},
-{
-name = top;
-pos = (694,1490);
-}
-);
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(895,1331,o),
-(920,1352,o),
-(924,1378,cs),
-(928,1404,o),
-(911,1425,o),
-(885,1425,cs),
-(859,1425,o),
-(834,1404,o),
-(830,1378,cs),
-(826,1352,o),
-(843,1331,o),
-(869,1331,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(491,1331,o),
-(516,1352,o),
-(520,1378,cs),
-(524,1404,o),
-(507,1425,o),
-(481,1425,cs),
-(455,1425,o),
-(430,1404,o),
-(426,1378,cs),
-(422,1352,o),
-(439,1331,o),
-(465,1331,cs)
-);
+alignment = 1;
+ref = dieresiscomb;
 }
 );
 width = 1069;
 }
 );
-metricWidth = n;
 unicode = 168;
 userData = {
 "interface.width-adjustments" = (
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dieresis.three.glyph b/src/Inter-Italic.glyphspackage/glyphs/dieresis.three.glyph
index b059ffb0f..196ef5ab5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dieresis.three.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dieresis.three.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = dieresis.three;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dieresisacutecomb.lc.glyph b/src/Inter-Italic.glyphspackage/glyphs/dieresisacutecomb.lc.glyph
index 86e118e16..69fd34080 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dieresisacutecomb.lc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dieresisacutecomb.lc.glyph
@@ -29,7 +29,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-10,-28);
-ref = dieresis;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
@@ -57,7 +57,7 @@ shapes = (
 {
 alignment = -1;
 pos = (154,-24);
-ref = dieresis;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
@@ -92,7 +92,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-160,-28);
-ref = dieresis;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
@@ -123,7 +123,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-14,-50);
-ref = dieresis;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
@@ -151,7 +151,7 @@ shapes = (
 {
 alignment = -1;
 pos = (155,0);
-ref = dieresis;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
@@ -183,7 +183,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-142,-50);
-ref = dieresis;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dieresisacutecomb.uc.glyph b/src/Inter-Italic.glyphspackage/glyphs/dieresisacutecomb.uc.glyph
index 41876f26e..73d4c4896 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dieresisacutecomb.uc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dieresisacutecomb.uc.glyph
@@ -30,7 +30,7 @@ nodes = (
 {
 alignment = -1;
 pos = (-923,371);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 0;
@@ -65,7 +65,7 @@ nodes = (
 {
 alignment = -1;
 pos = (-814,495);
-ref = dieresis;
+ref = dieresiscomb;
 scale = (0.9346,0.9028);
 }
 );
@@ -93,7 +93,7 @@ nodes = (
 {
 alignment = -1;
 pos = (-987,372);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 0;
@@ -127,7 +127,7 @@ nodes = (
 {
 alignment = -1;
 pos = (-916,414);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 0;
@@ -162,7 +162,7 @@ nodes = (
 {
 alignment = -1;
 pos = (-809,528);
-ref = dieresis;
+ref = dieresiscomb;
 scale = (0.9346,0.9028);
 }
 );
@@ -190,7 +190,7 @@ nodes = (
 {
 alignment = -1;
 pos = (-980,413);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 0;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dieresiscaroncomb.uc.glyph b/src/Inter-Italic.glyphspackage/glyphs/dieresiscaroncomb.uc.glyph
index 1cdd45fa1..5d0bef627 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dieresiscaroncomb.uc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dieresiscaroncomb.uc.glyph
@@ -1,5 +1,4 @@
 {
-color = 4;
 glyphname = dieresiscaroncomb.uc;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dieresiscomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/dieresiscomb.glyph
new file mode 100644
index 000000000..7f6cd69ec
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/dieresiscomb.glyph
@@ -0,0 +1,316 @@
+{
+glyphname = dieresiscomb;
+layers = (
+{
+anchors = (
+{
+name = _top;
+pos = (694,1118);
+},
+{
+name = top;
+pos = (763,1536);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(997,1304,o),
+(1057,1356,o),
+(1068,1420,cs),
+(1079,1484,o),
+(1035,1536,o),
+(971,1536,cs),
+(907,1536,o),
+(847,1484,o),
+(836,1420,cs),
+(825,1356,o),
+(869,1304,o),
+(933,1304,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(579,1304,o),
+(639,1356,o),
+(650,1420,cs),
+(661,1484,o),
+(617,1536,o),
+(553,1536,cs),
+(489,1536,o),
+(429,1484,o),
+(418,1420,cs),
+(407,1356,o),
+(451,1304,o),
+(515,1304,cs)
+);
+}
+);
+width = 1201;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (758,1118);
+},
+{
+name = top;
+pos = (835,1585);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1107,1247,o),
+(1199,1323,o),
+(1214,1416,cs),
+(1230,1509,o),
+(1163,1585,o),
+(1066,1585,cs),
+(969,1585,o),
+(878,1509,o),
+(862,1416,cs),
+(847,1323,o),
+(913,1247,o),
+(1010,1247,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(645,1247,o),
+(737,1323,o),
+(752,1416,cs),
+(768,1509,o),
+(701,1585,o),
+(604,1585,cs),
+(507,1585,o),
+(416,1509,o),
+(400,1416,cs),
+(385,1323,o),
+(451,1247,o),
+(548,1247,cs)
+);
+}
+);
+width = 1331;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (675,1118);
+},
+{
+name = top;
+pos = (733,1467);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(945,1373,o),
+(970,1394,o),
+(974,1420,cs),
+(978,1446,o),
+(961,1467,o),
+(935,1467,cs),
+(909,1467,o),
+(884,1446,o),
+(880,1420,cs),
+(876,1394,o),
+(893,1373,o),
+(919,1373,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(541,1373,o),
+(566,1394,o),
+(570,1420,cs),
+(574,1446,o),
+(557,1467,o),
+(531,1467,cs),
+(505,1467,o),
+(480,1446,o),
+(476,1420,cs),
+(472,1394,o),
+(489,1373,o),
+(515,1373,cs)
+);
+}
+);
+width = 1165;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (657,1056);
+},
+{
+name = top;
+pos = (729,1490);
+}
+);
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(963,1262,o),
+(1024,1314,o),
+(1034,1378,cs),
+(1045,1442,o),
+(1001,1494,o),
+(937,1494,cs),
+(873,1494,o),
+(813,1442,o),
+(802,1378,cs),
+(792,1314,o),
+(835,1262,o),
+(899,1262,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(545,1262,o),
+(606,1314,o),
+(616,1378,cs),
+(627,1442,o),
+(583,1494,o),
+(519,1494,cs),
+(455,1494,o),
+(395,1442,o),
+(384,1378,cs),
+(374,1314,o),
+(417,1262,o),
+(481,1262,cs)
+);
+}
+);
+width = 1137;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (737,1056);
+},
+{
+name = top;
+pos = (813,1513);
+}
+);
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1086,1175,o),
+(1177,1251,o),
+(1192,1344,cs),
+(1208,1437,o),
+(1141,1513,o),
+(1044,1513,cs),
+(947,1513,o),
+(856,1437,o),
+(840,1344,cs),
+(825,1251,o),
+(892,1175,o),
+(989,1175,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(622,1175,o),
+(713,1251,o),
+(728,1344,cs),
+(744,1437,o),
+(677,1513,o),
+(580,1513,cs),
+(483,1513,o),
+(392,1437,o),
+(376,1344,cs),
+(361,1251,o),
+(428,1175,o),
+(525,1175,cs)
+);
+}
+);
+width = 1298;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (622,1056);
+},
+{
+name = top;
+pos = (683,1425);
+}
+);
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(895,1331,o),
+(920,1352,o),
+(924,1378,cs),
+(928,1404,o),
+(911,1425,o),
+(885,1425,cs),
+(859,1425,o),
+(834,1404,o),
+(830,1378,cs),
+(826,1352,o),
+(843,1331,o),
+(869,1331,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(491,1331,o),
+(516,1352,o),
+(520,1378,cs),
+(524,1404,o),
+(507,1425,o),
+(481,1425,cs),
+(455,1425,o),
+(430,1404,o),
+(426,1378,cs),
+(422,1352,o),
+(439,1331,o),
+(465,1331,cs)
+);
+}
+);
+width = 1069;
+}
+);
+metricWidth = n;
+unicode = 776;
+userData = {
+com.typemytype.robofont.guideline.magnetic.tzzgauAfuT = 5;
+};
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dieresisgravecomb.lc.glyph b/src/Inter-Italic.glyphspackage/glyphs/dieresisgravecomb.lc.glyph
index a79ef586e..caa79066a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dieresisgravecomb.lc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dieresisgravecomb.lc.glyph
@@ -25,7 +25,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-5,-28);
-ref = dieresis;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
@@ -59,7 +59,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-4,-24);
-ref = dieresis;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
@@ -94,7 +94,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-5,-28);
-ref = dieresis;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
@@ -125,7 +125,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-9,-50);
-ref = dieresis;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
@@ -153,7 +153,7 @@ shapes = (
 {
 alignment = -1;
 pos = (0,1);
-ref = dieresis;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
@@ -185,7 +185,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-9,-50);
-ref = dieresis;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dieresismacroncomb.lc.glyph b/src/Inter-Italic.glyphspackage/glyphs/dieresismacroncomb.lc.glyph
index 253ab8a55..867ec0ff7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dieresismacroncomb.lc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dieresismacroncomb.lc.glyph
@@ -2,95 +2,201 @@
 glyphname = dieresismacroncomb.lc;
 layers = (
 {
+anchors = (
+{
+name = _top;
+pos = (793,1118);
+}
+);
 guides = (
 {
-angle = -99.4;
-pos = (-624,2396);
+pos = (101,1717);
+},
+{
+pos = (101,1392);
+},
+{
+pos = (101,1717);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-58,-354);
-ref = dieresismacroncomb.uc;
+pos = (96,-28);
+ref = dieresiscomb;
+},
+{
+alignment = -1;
+pos = (285,439);
+ref = macroncomb;
+scale = (1,0.9);
+}
+);
+width = 1201;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (757,1118);
 }
 );
-width = 0;
+guides = (
+{
+pos = (0,1765);
+},
+{
+pos = (0,1392);
 },
 {
+pos = (0,1765);
+}
+);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-56,-340);
-ref = dieresismacroncomb.uc;
+pos = (-4,-24);
+ref = dieresiscomb;
+},
+{
+alignment = -1;
+pos = (353,632);
+ref = macroncomb;
+scale = (1,0.8);
 }
 );
-width = 0;
+width = 1331;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (785,1118);
+}
+);
 guides = (
 {
-angle = -99.4;
-pos = (-518,2396);
+pos = (111,1681);
+},
+{
+pos = (111,1392);
+},
+{
+pos = (111,1681);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-54,-326);
-ref = dieresismacroncomb.uc;
+pos = (106,-28);
+ref = dieresiscomb;
+},
+{
+alignment = -1;
+pos = (336,261);
+ref = macroncomb;
 }
 );
-width = 0;
+width = 1165;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (685,1056);
+}
+);
 guides = (
 {
-angle = -99.4;
-pos = (-688,2396);
+pos = (30,1624);
+},
+{
+pos = (30,1328);
 }
 );
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-58,-354);
-ref = dieresismacroncomb.uc;
+pos = (21,-50);
+ref = dieresiscomb;
+},
+{
+alignment = -1;
+pos = (250,413);
+ref = macroncomb;
+scale = (1,0.9);
 }
 );
-width = 0;
+width = 1137;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (736,1056);
+}
+);
+guides = (
+{
+pos = (0,1704);
+}
+);
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-56,-340);
-ref = dieresismacroncomb.uc;
+ref = dieresiscomb;
+},
+{
+alignment = -1;
+pos = (350,516);
+ref = macroncomb;
+scale = (1,0.9);
 }
 );
-width = 0;
+width = 1298;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (716,1056);
+}
+);
 guides = (
 {
-angle = -99.4;
-pos = (-646,2396);
+pos = (95,1328);
+},
+{
+pos = (95,1584);
 }
 );
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-54,-326);
-ref = dieresismacroncomb.uc;
+pos = (86,-50);
+ref = dieresiscomb;
+},
+{
+alignment = -1;
+pos = (279,206);
+ref = macroncomb;
 }
 );
-width = 0;
+width = 1069;
 }
 );
+metricWidth = dieresis;
 unicode = 57613;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dieresismacroncomb.uc.glyph b/src/Inter-Italic.glyphspackage/glyphs/dieresismacroncomb.uc.glyph
index 7d17a721b..462ab911b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dieresismacroncomb.uc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dieresismacroncomb.uc.glyph
@@ -23,7 +23,7 @@ shapes = (
 {
 alignment = -1;
 pos = (61,372);
-ref = dieresisnosp;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
@@ -51,7 +51,7 @@ shapes = (
 {
 alignment = -1;
 pos = (102,372);
-ref = dieresisnosp;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
@@ -82,7 +82,7 @@ name = ital_gen;
 shapes = (
 {
 pos = (6,372);
-ref = dieresisnosp;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
@@ -105,7 +105,7 @@ shapes = (
 {
 alignment = -1;
 pos = (74,414);
-ref = dieresisnosp;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
@@ -133,7 +133,7 @@ shapes = (
 {
 alignment = -1;
 pos = (110,414);
-ref = dieresisnosp;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
@@ -164,7 +164,7 @@ name = ital_gen;
 shapes = (
 {
 pos = (8,414);
-ref = dieresisnosp;
+ref = dieresiscomb;
 },
 {
 alignment = -1;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dieresisnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/dieresisnosp.glyph
deleted file mode 100644
index da4bbdc3f..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/dieresisnosp.glyph
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-color = (250,227,227,1);
-glyphname = dieresisnosp;
-layers = (
-{
-guides = (
-{
-angle = 90;
-pos = (-836,1740);
-}
-);
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-alignment = -1;
-pos = (-1202,0);
-ref = dieresis;
-}
-);
-width = 0;
-},
-{
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-alignment = -1;
-pos = (-1224,0);
-ref = dieresis;
-}
-);
-width = 38;
-},
-{
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-alignment = -1;
-pos = (-1186,0);
-ref = dieresis;
-}
-);
-width = 0;
-},
-{
-guides = (
-{
-angle = 90;
-pos = (-900,1740);
-}
-);
-layerId = m008;
-shapes = (
-{
-alignment = -1;
-pos = (-1202,0);
-ref = dieresis;
-}
-);
-width = 0;
-},
-{
-layerId = m010;
-shapes = (
-{
-alignment = -1;
-pos = (-1224,0);
-ref = dieresis;
-}
-);
-width = 6;
-},
-{
-layerId = m012;
-shapes = (
-{
-alignment = -1;
-pos = (-1186,0);
-ref = dieresis;
-}
-);
-width = 0;
-}
-);
-unicode = 776;
-userData = {
-com.typemytype.robofont.guideline.magnetic.tzzgauAfuT = 5;
-};
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dieresistonos.glyph b/src/Inter-Italic.glyphspackage/glyphs/dieresistonos.glyph
index 5b24cc730..3b9166d3f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dieresistonos.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dieresistonos.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = dieresistonos;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dieresistonos_narrow.glyph b/src/Inter-Italic.glyphspackage/glyphs/dieresistonos_narrow.glyph
index d22b2e5ca..c4f64f36e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dieresistonos_narrow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dieresistonos_narrow.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = dieresistonos_narrow;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dlinebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/dlinebelow.glyph
index fb54df30e..79258ee31 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dlinebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dlinebelow.glyph
@@ -51,7 +51,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (142,0);
+pos = (143,0);
 ref = macronsub;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/dotaccent.glyph
index 80c6cca1d..86ca185ad 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dotaccent.glyph
@@ -1,188 +1,68 @@
 {
-color = (204,240,242,1);
 glyphname = dotaccent;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (368,1304);
-}
-);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(435,1304,o),
-(498,1356,o),
-(509,1420,cs),
-(520,1484,o),
-(473,1536,o),
-(406,1536,cs),
-(339,1536,o),
-(276,1484,o),
-(265,1420,cs),
-(254,1356,o),
-(301,1304,o),
-(368,1304,cs)
-);
+alignment = 1;
+ref = dotaccentcomb;
 }
 );
 width = 488;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (458,1304);
-}
-);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(555,1232,o),
-(658,1314,o),
-(674,1416,cs),
-(691,1518,o),
-(616,1600,o),
-(507,1600,cs),
-(398,1600,o),
-(295,1518,o),
-(278,1416,cs),
-(262,1314,o),
-(337,1232,o),
-(446,1232,cs)
-);
+alignment = 1;
+ref = dotaccentcomb;
 }
 );
 width = 670;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (310,1304);
-}
-);
-guides = (
-{
-pos = (753,1880);
-}
-);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(339,1320,o),
-(362,1342,o),
-(366,1368,cs),
-(371,1393,o),
-(354,1414,o),
-(328,1414,cs),
-(303,1414,o),
-(279,1393,o),
-(274,1368,cs),
-(270,1342,o),
-(288,1320,o),
-(313,1320,cs)
-);
+alignment = 1;
+ref = dotaccentcomb;
 }
 );
 width = 372;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (334,1262);
-}
-);
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(401,1262,o),
-(465,1314,o),
-(475,1378,cs),
-(486,1442,o),
-(439,1494,o),
-(372,1494,cs),
-(305,1494,o),
-(242,1442,o),
-(231,1378,cs),
-(221,1314,o),
-(267,1262,o),
-(334,1262,cs)
-);
+alignment = 1;
+ref = dotaccentcomb;
 }
 );
 width = 424;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (442,1262);
-}
-);
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(523,1166,o),
-(615,1242,o),
-(630,1335,cs),
-(645,1428,o),
-(579,1504,o),
-(482,1504,cs),
-(385,1504,o),
-(293,1428,o),
-(278,1335,cs),
-(263,1242,o),
-(329,1166,o),
-(426,1166,cs)
-);
+alignment = 1;
+ref = dotaccentcomb;
 }
 );
 width = 638;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (238,1262);
-}
-);
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(267,1278,o),
-(290,1300,o),
-(295,1326,cs),
-(299,1351,o),
-(282,1372,o),
-(256,1372,cs),
-(231,1372,o),
-(207,1351,o),
-(203,1326,cs),
-(198,1300,o),
-(216,1278,o),
-(241,1278,cs)
-);
+alignment = 1;
+ref = dotaccentcomb;
 }
 );
 width = 244;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dotaccentcomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/dotaccentcomb.glyph
new file mode 100644
index 000000000..4d9d2d60a
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/dotaccentcomb.glyph
@@ -0,0 +1,210 @@
+{
+glyphname = dotaccentcomb;
+layers = (
+{
+anchors = (
+{
+name = _top;
+pos = (337,1118);
+},
+{
+name = top;
+pos = (406,1536);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(435,1304,o),
+(498,1356,o),
+(509,1420,cs),
+(520,1484,o),
+(473,1536,o),
+(406,1536,cs),
+(339,1536,o),
+(276,1484,o),
+(265,1420,cs),
+(254,1356,o),
+(301,1304,o),
+(368,1304,cs)
+);
+}
+);
+width = 488;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (427,1118);
+},
+{
+name = top;
+pos = (507,1600);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(555,1232,o),
+(658,1314,o),
+(674,1416,cs),
+(691,1518,o),
+(616,1600,o),
+(507,1600,cs),
+(398,1600,o),
+(295,1518,o),
+(278,1416,cs),
+(262,1314,o),
+(337,1232,o),
+(446,1232,cs)
+);
+}
+);
+width = 670;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (279,1118);
+},
+{
+name = top;
+pos = (337,1467);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(347,1373,o),
+(372,1394,o),
+(376,1420,cs),
+(380,1446,o),
+(363,1467,o),
+(337,1467,cs),
+(311,1467,o),
+(286,1446,o),
+(282,1420,cs),
+(278,1394,o),
+(295,1373,o),
+(321,1373,cs)
+);
+}
+);
+width = 372;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (300,1056);
+},
+{
+name = top;
+pos = (372,1494);
+}
+);
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(398,1262,o),
+(459,1314,o),
+(469,1378,cs),
+(480,1442,o),
+(436,1494,o),
+(372,1494,cs),
+(308,1494,o),
+(248,1442,o),
+(237,1378,cs),
+(227,1314,o),
+(270,1262,o),
+(334,1262,cs)
+);
+}
+);
+width = 424;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (408,1056);
+},
+{
+name = top;
+pos = (484,1513);
+}
+);
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(525,1175,o),
+(616,1251,o),
+(631,1344,cs),
+(647,1437,o),
+(580,1513,o),
+(483,1513,cs),
+(386,1513,o),
+(295,1437,o),
+(279,1344,cs),
+(264,1251,o),
+(331,1175,o),
+(428,1175,cs)
+);
+}
+);
+width = 638;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (210,1056);
+},
+{
+name = top;
+pos = (271,1425);
+}
+);
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(281,1331,o),
+(306,1352,o),
+(310,1378,cs),
+(314,1404,o),
+(297,1425,o),
+(271,1425,cs),
+(245,1425,o),
+(220,1404,o),
+(216,1378,cs),
+(212,1352,o),
+(229,1331,o),
+(255,1331,cs)
+);
+}
+);
+width = 244;
+}
+);
+unicode = 775;
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/dotbelow.glyph
index 5e0947077..0adaa68b4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dotbelow.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = dotbelow;
 layers = (
 {
@@ -26,7 +25,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1122,-1670);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 0;
@@ -61,7 +60,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1148,-1684);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 0;
@@ -90,7 +89,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1018,-1652);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 0;
@@ -119,7 +118,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1122,-1670);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 0;
@@ -154,7 +153,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1148,-1684);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 0;
@@ -183,7 +182,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1018,-1652);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 0;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dotdblsubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/dotdblsubcomb.glyph
index 98fc65c09..fb9faef53 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dotdblsubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dotdblsubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = dotdblsubnosp;
+glyphname = dotdblsubcomb;
 layers = (
 {
 anchors = (
@@ -149,5 +148,4 @@ ref = dotbelow;
 width = 0;
 }
 );
-unicode = 804;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dotmacron.lc.glyph b/src/Inter-Italic.glyphspackage/glyphs/dotmacron.lc.glyph
index 126c8afda..01556697b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dotmacron.lc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dotmacron.lc.glyph
@@ -5,7 +5,15 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (-466,1304);
+pos = (486,1118);
+}
+);
+guides = (
+{
+pos = (150,1392);
+},
+{
+pos = (150,1717);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -13,17 +21,31 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-62,-376);
-ref = dotmacroncomb.uc;
+pos = (145,-28);
+ref = dotaccentcomb;
+},
+{
+alignment = -1;
+pos = (-22,439);
+ref = macroncomb;
+scale = (1,0.9);
 }
 );
-width = 0;
+width = 488;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-581,1304);
+pos = (459,1118);
+}
+);
+guides = (
+{
+pos = (33,1392);
+},
+{
+pos = (33,1765);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -31,17 +53,31 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-69,-380);
-ref = dotmacroncomb.uc;
+pos = (29,-24);
+ref = dotaccentcomb;
+},
+{
+alignment = -1;
+pos = (56,632);
+ref = macroncomb;
+scale = (1,0.8);
 }
 );
-width = 2;
+width = 670;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-529,1304);
+pos = (405,1118);
+}
+);
+guides = (
+{
+pos = (127,1392);
+},
+{
+pos = (127,1681);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -49,17 +85,30 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-186,-350);
-ref = dotmacroncomb.uc;
+pos = (122,-28);
+ref = dotaccentcomb;
+},
+{
+alignment = -1;
+pos = (-44,261);
+ref = macroncomb;
 }
 );
-width = 1;
+width = 372;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-500,1262);
+pos = (378,1056);
+}
+);
+guides = (
+{
+pos = (79,1328);
+},
+{
+pos = (79,1624);
 }
 );
 layerId = m008;
@@ -67,17 +116,28 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-68,-414);
-ref = dotmacroncomb.uc;
+pos = (70,-50);
+ref = dotaccentcomb;
+},
+{
+alignment = -1;
+pos = (-57,413);
+ref = macroncomb;
+scale = (1,0.9);
 }
 );
-width = 0;
+width = 424;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-598,1262);
+pos = (431,1056);
+}
+);
+guides = (
+{
+pos = (24,1704);
 }
 );
 layerId = m010;
@@ -85,17 +145,31 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-80,-449);
-ref = dotmacroncomb.uc;
+pos = (24,0);
+ref = dotaccentcomb;
+},
+{
+alignment = -1;
+pos = (44,516);
+ref = macroncomb;
+scale = (1,0.9);
 }
 );
-width = 3;
+width = 638;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-599,1262);
+pos = (321,1056);
+}
+);
+guides = (
+{
+pos = (112,1328);
+},
+{
+pos = (112,1584);
 }
 );
 layerId = m012;
@@ -103,12 +177,18 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-200,-414);
-ref = dotmacroncomb.uc;
+pos = (103,-50);
+ref = dotaccentcomb;
+},
+{
+alignment = -1;
+pos = (-116,206);
+ref = macroncomb;
 }
 );
-width = 0;
+width = 244;
 }
 );
+metricWidth = dotaccent;
 unicode = 57612;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dotnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/dotnosp.glyph
deleted file mode 100644
index 3d54c1cb1..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/dotnosp.glyph
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-color = (250,227,227,1);
-glyphname = dotnosp;
-layers = (
-{
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-alignment = -1;
-pos = (-830,0);
-ref = dotaccent;
-}
-);
-width = 0;
-},
-{
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-alignment = -1;
-pos = (-1000,0);
-ref = dotaccent;
-}
-);
-width = 46;
-},
-{
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-alignment = -1;
-pos = (-728,0);
-ref = dotaccent;
-}
-);
-width = 0;
-},
-{
-layerId = m008;
-shapes = (
-{
-alignment = -1;
-pos = (-830,0);
-ref = dotaccent;
-}
-);
-width = 0;
-},
-{
-layerId = m010;
-shapes = (
-{
-alignment = -1;
-pos = (-1000,0);
-ref = dotaccent;
-}
-);
-width = 14;
-},
-{
-layerId = m012;
-shapes = (
-{
-alignment = -1;
-pos = (-728,0);
-ref = dotaccent;
-}
-);
-width = 0;
-}
-);
-unicode = 775;
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/downtackmod.glyph b/src/Inter-Italic.glyphspackage/glyphs/downtackmod.glyph
index 14b6d2701..288915163 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/downtackmod.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/downtackmod.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = downtackmod;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/e.glyph b/src/Inter-Italic.glyphspackage/glyphs/e.glyph
index bee852895..eb2854986 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/e.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/e.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = e;
 kernLeft = o;
 kernRight = o;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/eacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/eacute.glyph
index 2bba3a518..5ca1f0d49 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/eacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/eacute.glyph
@@ -5,78 +5,84 @@ kernRight = e;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = e;
 },
 {
-pos = (389,186);
-ref = acute;
+pos = (509,186);
+ref = acutecomb;
 }
 );
 width = 1173;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = e;
 },
 {
-pos = (350,186);
-ref = acute;
+pos = (480,186);
+ref = acutecomb;
 }
 );
 width = 1239;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = e;
 },
 {
-pos = (411,186);
-ref = acute;
+pos = (551,186);
+ref = acutecomb;
 }
 );
 width = 1129;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = e;
 },
 {
-pos = (441,206);
-ref = acute;
+pos = (481,206);
+ref = acutecomb;
 }
 );
 width = 1082;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = e;
 },
 {
-pos = (416,206);
-ref = acute;
+pos = (440,206);
+ref = acutecomb;
 }
 );
 width = 1202;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = e;
 },
 {
-pos = (437,248);
-ref = acute;
+pos = (497,248);
+ref = acutecomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ebreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/ebreve.glyph
index 3a4cb4720..0ae86f5ea 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ebreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ebreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (143,0);
-ref = breve;
+pos = (250,186);
+ref = brevecomb;
 }
 );
 width = 1173;
@@ -23,8 +23,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (111,0);
-ref = breve;
+pos = (174,186);
+ref = brevecomb;
 }
 );
 width = 1239;
@@ -36,8 +36,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (177,0);
-ref = breve;
+pos = (272,186);
+ref = brevecomb;
 }
 );
 width = 1129;
@@ -49,8 +49,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (143,0);
-ref = breve;
+pos = (206,206);
+ref = brevecomb;
 }
 );
 width = 1082;
@@ -62,8 +62,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (103,0);
-ref = breve;
+pos = (153,206);
+ref = brevecomb;
 }
 );
 width = 1202;
@@ -75,8 +75,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (123,42);
-ref = breve;
+pos = (215,248);
+ref = brevecomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ecaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/ecaron.glyph
index 8188d7cd1..8cf2f32cc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ecaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ecaron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (136,0);
-ref = caron;
+pos = (217,186);
+ref = caroncomb;
 }
 );
 width = 1173;
@@ -23,8 +23,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (-23,0);
-ref = caron;
+pos = (142,186);
+ref = caroncomb;
 }
 );
 width = 1239;
@@ -36,8 +36,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (165,16);
-ref = caron;
+pos = (192,186);
+ref = caroncomb;
 }
 );
 width = 1129;
@@ -49,8 +49,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (137,0);
-ref = caron;
+pos = (206,206);
+ref = caroncomb;
 }
 );
 width = 1082;
@@ -62,8 +62,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (-30,0);
-ref = caron;
+pos = (201,206);
+ref = caroncomb;
 }
 );
 width = 1202;
@@ -75,8 +75,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (171,42);
-ref = caron;
+pos = (216,248);
+ref = caroncomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ecedillabreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/ecedillabreve.glyph
index bacd711b7..d4ec2016d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ecedillabreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ecedillabreve.glyph
@@ -11,11 +11,11 @@ ref = e;
 },
 {
 pos = (326,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (143,0);
-ref = breve;
+pos = (250,186);
+ref = brevecomb;
 }
 );
 width = 1173;
@@ -28,11 +28,11 @@ ref = e;
 },
 {
 pos = (172,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (111,0);
-ref = breve;
+pos = (174,186);
+ref = brevecomb;
 }
 );
 width = 1239;
@@ -45,11 +45,11 @@ ref = e;
 },
 {
 pos = (382,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (177,0);
-ref = breve;
+pos = (272,186);
+ref = brevecomb;
 }
 );
 width = 1129;
@@ -62,11 +62,11 @@ ref = e;
 },
 {
 pos = (336,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (143,0);
-ref = breve;
+pos = (206,206);
+ref = brevecomb;
 }
 );
 width = 1082;
@@ -79,11 +79,11 @@ ref = e;
 },
 {
 pos = (173,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (103,0);
-ref = breve;
+pos = (153,206);
+ref = brevecomb;
 }
 );
 width = 1202;
@@ -96,11 +96,11 @@ ref = e;
 },
 {
 pos = (385,0);
-ref = cedilla;
+ref = cedillacomb;
 },
 {
-pos = (123,42);
-ref = breve;
+pos = (215,248);
+ref = brevecomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ecircumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/ecircumflex.glyph
index b2750e70e..cbd21cea4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ecircumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ecircumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (138,0);
-ref = circumflex;
+pos = (217,186);
+ref = circumflexcomb;
 }
 );
 width = 1173;
@@ -23,8 +23,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (-24,0);
-ref = circumflex;
+pos = (142,186);
+ref = circumflexcomb;
 }
 );
 width = 1239;
@@ -36,8 +36,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (161,0);
-ref = circumflex;
+pos = (191,186);
+ref = circumflexcomb;
 }
 );
 width = 1129;
@@ -49,8 +49,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (139,0);
-ref = circumflex;
+pos = (205,206);
+ref = circumflexcomb;
 }
 );
 width = 1082;
@@ -62,8 +62,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (-31,0);
-ref = circumflex;
+pos = (202,206);
+ref = circumflexcomb;
 }
 );
 width = 1202;
@@ -75,8 +75,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (174,42);
-ref = circumflex;
+pos = (215,248);
+ref = circumflexcomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ecircumflexbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/ecircumflexbelow.glyph
index be1eccc5a..1f95f9a3b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ecircumflexbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ecircumflexbelow.glyph
@@ -11,7 +11,7 @@ ref = e;
 },
 {
 pos = (1184,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1173;
@@ -24,7 +24,7 @@ ref = e;
 },
 {
 pos = (1296,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1239;
@@ -37,7 +37,7 @@ ref = e;
 },
 {
 pos = (1104,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1129;
@@ -50,7 +50,7 @@ ref = e;
 },
 {
 pos = (1185,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1082;
@@ -63,7 +63,7 @@ ref = e;
 },
 {
 pos = (1290,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1202;
@@ -76,7 +76,7 @@ ref = e;
 },
 {
 pos = (1100,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ecircumflexdotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/ecircumflexdotbelow.glyph
index 7f8f5d852..5c6582505 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ecircumflexdotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ecircumflexdotbelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (138,0);
-ref = circumflex;
+pos = (217,186);
+ref = circumflexcomb;
 },
 {
 pos = (1206,0);
@@ -27,8 +27,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (-24,0);
-ref = circumflex;
+pos = (142,186);
+ref = circumflexcomb;
 },
 {
 pos = (1160,0);
@@ -44,8 +44,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (161,0);
-ref = circumflex;
+pos = (191,186);
+ref = circumflexcomb;
 },
 {
 pos = (1152,0);
@@ -61,8 +61,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (139,0);
-ref = circumflex;
+pos = (205,206);
+ref = circumflexcomb;
 },
 {
 pos = (1212,0);
@@ -78,8 +78,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (-31,0);
-ref = circumflex;
+pos = (202,206);
+ref = circumflexcomb;
 },
 {
 pos = (1158,0);
@@ -95,8 +95,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (174,42);
-ref = circumflex;
+pos = (215,248);
+ref = circumflexcomb;
 },
 {
 pos = (1155,0);
diff --git a/src/Inter-Italic.glyphspackage/glyphs/edieresis-cy.glyph b/src/Inter-Italic.glyphspackage/glyphs/edieresis-cy.glyph
index c30de6734..b5df15660 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/edieresis-cy.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/edieresis-cy.glyph
@@ -9,7 +9,7 @@ ref = ereversedcyrillic;
 },
 {
 pos = (-2,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1150;
@@ -22,7 +22,7 @@ ref = ereversedcyrillic;
 },
 {
 pos = (-36,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1238;
@@ -35,7 +35,7 @@ ref = ereversedcyrillic;
 },
 {
 pos = (-7,144);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1125;
@@ -48,7 +48,7 @@ ref = ereversedcyrillic;
 },
 {
 pos = (-9,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1071;
@@ -61,7 +61,7 @@ ref = ereversedcyrillic;
 },
 {
 pos = (-23,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1194;
@@ -74,7 +74,7 @@ ref = ereversedcyrillic;
 },
 {
 pos = (-12,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 998;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/edieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/edieresis.glyph
index c74993829..37f88d6c4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/edieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/edieresis.glyph
@@ -17,7 +17,7 @@ ref = e;
 },
 {
 pos = (32,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1173;
@@ -30,7 +30,7 @@ ref = e;
 },
 {
 pos = (-12,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1239;
@@ -43,7 +43,7 @@ ref = e;
 },
 {
 pos = (41,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1129;
@@ -62,7 +62,7 @@ ref = e;
 },
 {
 pos = (36,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1082;
@@ -75,7 +75,7 @@ ref = e;
 },
 {
 pos = (-16,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1202;
@@ -88,7 +88,7 @@ ref = e;
 },
 {
 pos = (33,248);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/edotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/edotaccent.glyph
index 32b3d86b0..c5a7a212c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/edotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/edotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (358,0);
-ref = dotaccent;
+pos = (389,186);
+ref = dotaccentcomb;
 }
 );
 width = 1173;
@@ -25,8 +25,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (288,0);
-ref = dotaccent;
+pos = (319,186);
+ref = dotaccentcomb;
 }
 );
 width = 1239;
@@ -39,8 +39,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (406,0);
-ref = dotaccent;
+pos = (437,186);
+ref = dotaccentcomb;
 }
 );
 width = 1129;
@@ -53,8 +53,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (359,0);
-ref = dotaccent;
+pos = (393,206);
+ref = dotaccentcomb;
 }
 );
 width = 1082;
@@ -67,8 +67,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (279,0);
-ref = dotaccent;
+pos = (313,206);
+ref = dotaccentcomb;
 }
 );
 width = 1202;
@@ -81,8 +81,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (417,42);
-ref = dotaccent;
+pos = (445,248);
+ref = dotaccentcomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/egrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/egrave.glyph
index c36e0340b..59f72ddb8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/egrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/egrave.glyph
@@ -11,7 +11,7 @@ ref = e;
 },
 {
 pos = (224,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1173;
@@ -24,7 +24,7 @@ ref = e;
 },
 {
 pos = (136,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1239;
@@ -37,7 +37,7 @@ ref = e;
 },
 {
 pos = (259,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1129;
@@ -50,7 +50,7 @@ ref = e;
 },
 {
 pos = (276,206);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1082;
@@ -63,7 +63,7 @@ ref = e;
 },
 {
 pos = (153,206);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1202;
@@ -75,8 +75,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (242,248);
-ref = grave;
+pos = (246,248);
+ref = gravecomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ehookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/ehookabove.glyph
index 2de9f3992..e842c02f0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ehookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ehookabove.glyph
@@ -11,7 +11,7 @@ ref = e;
 },
 {
 pos = (369,186);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1173;
@@ -24,7 +24,7 @@ ref = e;
 },
 {
 pos = (340,186);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1239;
@@ -37,7 +37,7 @@ ref = e;
 },
 {
 pos = (403,186);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1129;
@@ -50,7 +50,7 @@ ref = e;
 },
 {
 pos = (341,206);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1082;
@@ -63,7 +63,7 @@ ref = e;
 },
 {
 pos = (310,206);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1202;
@@ -75,8 +75,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (349,248);
-ref = hookabove;
+pos = (343,248);
+ref = hookabovecomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/eightroman.glyph b/src/Inter-Italic.glyphspackage/glyphs/eightroman.glyph
index af3da8d33..9779d0e24 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/eightroman.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/eightroman.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = eightroman;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/einvertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/einvertedbreve.glyph
index d605da0c9..3d6078720 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/einvertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/einvertedbreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (1230,186);
-ref = breveinvnosp;
+pos = (217,186);
+ref = breveinvcomb;
 }
 );
 width = 1173;
@@ -23,8 +23,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (1316,186);
-ref = breveinvnosp;
+pos = (142,186);
+ref = breveinvcomb;
 }
 );
 width = 1239;
@@ -36,8 +36,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (1206,186);
-ref = breveinvnosp;
+pos = (261,186);
+ref = breveinvcomb;
 }
 );
 width = 1129;
@@ -49,8 +49,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (1168,206);
-ref = breveinvnosp;
+pos = (205,206);
+ref = breveinvcomb;
 }
 );
 width = 1082;
@@ -62,8 +62,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (1284,206);
-ref = breveinvnosp;
+pos = (202,206);
+ref = breveinvcomb;
 }
 );
 width = 1202;
@@ -75,8 +75,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (1096,248);
-ref = breveinvnosp;
+pos = (215,248);
+ref = breveinvcomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/elevenroman.glyph b/src/Inter-Italic.glyphspackage/glyphs/elevenroman.glyph
index 2ed8f73d5..18bea85ac 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/elevenroman.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/elevenroman.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = elevenroman;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/emacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/emacron.glyph
index 6e0f35073..3b331ca28 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/emacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/emacron.glyph
@@ -5,78 +5,84 @@ kernRight = e;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = e;
 },
 {
 pos = (146,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1173;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = e;
 },
 {
 pos = (237,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1239;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = e;
 },
 {
 pos = (223,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1129;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = e;
 },
 {
-pos = (190,206);
-ref = macron;
+pos = (189,206);
+ref = macroncomb;
 }
 );
 width = 1082;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = e;
 },
 {
 pos = (249,206);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1202;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = e;
 },
 {
 pos = (183,248);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/emacronacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/emacronacute.glyph
index 8d3f528fc..e839291f7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/emacronacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/emacronacute.glyph
@@ -12,7 +12,7 @@ ref = e;
 {
 alignment = 1;
 pos = (146,186);
-ref = macronacutecomb.lc;
+ref = macronacutecomb;
 }
 );
 width = 1173;
@@ -26,7 +26,7 @@ ref = e;
 {
 alignment = 1;
 pos = (238,186);
-ref = macronacutecomb.lc;
+ref = macronacutecomb;
 }
 );
 width = 1239;
@@ -40,7 +40,7 @@ ref = e;
 {
 alignment = 1;
 pos = (224,186);
-ref = macronacutecomb.lc;
+ref = macronacutecomb;
 }
 );
 width = 1129;
@@ -54,7 +54,7 @@ ref = e;
 {
 alignment = 1;
 pos = (190,206);
-ref = macronacutecomb.lc;
+ref = macronacutecomb;
 }
 );
 width = 1082;
@@ -67,8 +67,8 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (250,206);
-ref = macronacutecomb.lc;
+pos = (249,206);
+ref = macronacutecomb;
 }
 );
 width = 1202;
@@ -82,7 +82,7 @@ ref = e;
 {
 alignment = 1;
 pos = (183,248);
-ref = macronacutecomb.lc;
+ref = macronacutecomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/emacrongrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/emacrongrave.glyph
index b5936c116..58b150173 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/emacrongrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/emacrongrave.glyph
@@ -11,7 +11,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (146,186);
+pos = (-26,186);
 ref = macrongravecomb.lc;
 }
 );
@@ -25,7 +25,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (238,186);
+pos = (162,186);
 ref = macrongravecomb.lc;
 }
 );
@@ -39,7 +39,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (224,186);
+pos = (97,186);
 ref = macrongravecomb.lc;
 }
 );
@@ -53,7 +53,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (190,206);
+pos = (90,206);
 ref = macrongravecomb.lc;
 }
 );
@@ -67,7 +67,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (344,206);
+pos = (245,206);
 ref = macrongravecomb.lc;
 }
 );
@@ -81,7 +81,7 @@ ref = e;
 },
 {
 alignment = 1;
-pos = (183,248);
+pos = (71,248);
 ref = macrongravecomb.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/emquad.glyph b/src/Inter-Italic.glyphspackage/glyphs/emquad.glyph
index 9c257e35b..83e3d6c4c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/emquad.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/emquad.glyph
@@ -1,5 +1,4 @@
 {
-color = (237,229,250,1);
 glyphname = emquad;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/emspace.glyph b/src/Inter-Italic.glyphspackage/glyphs/emspace.glyph
index ddd6b913b..b2af2e8f5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/emspace.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/emspace.glyph
@@ -1,5 +1,4 @@
 {
-color = (237,229,250,1);
 glyphname = emspace;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/enquad.glyph b/src/Inter-Italic.glyphspackage/glyphs/enquad.glyph
index 4b1f1c0e1..a6f3df0e0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/enquad.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/enquad.glyph
@@ -1,5 +1,4 @@
 {
-color = (237,229,250,1);
 glyphname = enquad;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/enspace.glyph b/src/Inter-Italic.glyphspackage/glyphs/enspace.glyph
index e32cccafb..cc6a01a1a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/enspace.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/enspace.glyph
@@ -1,5 +1,4 @@
 {
-color = (237,229,250,1);
 glyphname = enspace;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/esdescendercyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/esdescendercyrillic.glyph
index 42f0214ce..26c9f6b15 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/esdescendercyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/esdescendercyrillic.glyph
@@ -11,7 +11,7 @@ ref = c;
 },
 {
 pos = (328,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1151;
@@ -24,7 +24,7 @@ ref = c;
 },
 {
 pos = (186,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1239;
@@ -37,7 +37,7 @@ ref = c;
 },
 {
 pos = (374,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1127;
@@ -50,7 +50,7 @@ ref = c;
 },
 {
 pos = (321,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1072;
@@ -63,7 +63,7 @@ ref = c;
 },
 {
 pos = (171,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1194;
@@ -76,7 +76,7 @@ ref = c;
 },
 {
 pos = (385,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1015;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/etilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/etilde.glyph
index a91efa16f..0581b2e59 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/etilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/etilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (91,0);
-ref = tilde;
+pos = (121,186);
+ref = tildecomb;
 }
 );
 width = 1173;
@@ -23,8 +23,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (111,0);
-ref = tilde;
+pos = (141,186);
+ref = tildecomb;
 }
 );
 width = 1239;
@@ -36,8 +36,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (82,0);
-ref = tilde;
+pos = (120,186);
+ref = tildecomb;
 }
 );
 width = 1129;
@@ -49,8 +49,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (92,0);
-ref = tilde;
+pos = (125,206);
+ref = tildecomb;
 }
 );
 width = 1082;
@@ -62,8 +62,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (87,0);
-ref = tilde;
+pos = (121,206);
+ref = tildecomb;
 }
 );
 width = 1202;
@@ -75,8 +75,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (90,42);
-ref = tilde;
+pos = (120,248);
+ref = tildecomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/etildebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/etildebelow.glyph
index 333409045..a77866ea1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/etildebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/etildebelow.glyph
@@ -11,7 +11,7 @@ ref = e;
 },
 {
 pos = (1226,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1173;
@@ -24,7 +24,7 @@ ref = e;
 },
 {
 pos = (1342,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1239;
@@ -37,7 +37,7 @@ ref = e;
 },
 {
 pos = (1079,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1129;
@@ -50,7 +50,7 @@ ref = e;
 },
 {
 pos = (1227,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1082;
@@ -63,7 +63,7 @@ ref = e;
 },
 {
 pos = (1320,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1202;
@@ -76,7 +76,7 @@ ref = e;
 },
 {
 pos = (1073,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/eurocurrency.glyph b/src/Inter-Italic.glyphspackage/glyphs/eurocurrency.glyph
index d80855ea2..bde6b249b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/eurocurrency.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/eurocurrency.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = eurocurrency;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ezhcaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/ezhcaron.glyph
index 55fdfc27d..587347f60 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ezhcaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ezhcaron.glyph
@@ -10,8 +10,8 @@ ref = dzeabkhasiancyrillic;
 },
 {
 alignment = 1;
-pos = (175,0);
-ref = caron;
+pos = (256,186);
+ref = caroncomb;
 }
 );
 width = 1309;
@@ -24,8 +24,8 @@ ref = dzeabkhasiancyrillic;
 },
 {
 alignment = 1;
-pos = (42,0);
-ref = caron;
+pos = (207,186);
+ref = caroncomb;
 }
 );
 width = 1383;
@@ -38,8 +38,8 @@ ref = dzeabkhasiancyrillic;
 },
 {
 alignment = 1;
-pos = (190,16);
-ref = caron;
+pos = (217,186);
+ref = caroncomb;
 }
 );
 width = 1258;
@@ -52,8 +52,8 @@ ref = dzeabkhasiancyrillic;
 },
 {
 alignment = 1;
-pos = (175,0);
-ref = caron;
+pos = (244,206);
+ref = caroncomb;
 }
 );
 width = 1233;
@@ -66,8 +66,8 @@ ref = dzeabkhasiancyrillic;
 },
 {
 alignment = 1;
-pos = (39,0);
-ref = caron;
+pos = (270,206);
+ref = caroncomb;
 }
 );
 width = 1344;
@@ -80,8 +80,8 @@ ref = dzeabkhasiancyrillic;
 },
 {
 alignment = 1;
-pos = (182,0);
-ref = caron;
+pos = (227,206);
+ref = caroncomb;
 }
 );
 width = 1130;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/f.glyph b/src/Inter-Italic.glyphspackage/glyphs/f.glyph
index e755337df..95d7beaa2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/f.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/f.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = f;
 kernLeft = f;
 kernRight = f;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/fdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/fdotaccent.glyph
index b59e864b7..81bcc5099 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/fdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/fdotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = f;
 },
 {
-pos = (199,372);
-ref = dotaccent;
+pos = (230,558);
+ref = dotaccentcomb;
 }
 );
 width = 703;
@@ -25,8 +25,8 @@ shapes = (
 ref = f;
 },
 {
-pos = (220,372);
-ref = dotaccent;
+pos = (251,558);
+ref = dotaccentcomb;
 }
 );
 width = 838;
@@ -39,8 +39,8 @@ shapes = (
 ref = f;
 },
 {
-pos = (114,372);
-ref = dotaccent;
+pos = (145,558);
+ref = dotaccentcomb;
 }
 );
 width = 582;
@@ -53,8 +53,8 @@ shapes = (
 ref = f;
 },
 {
-pos = (176,414);
-ref = dotaccent;
+pos = (210,620);
+ref = dotaccentcomb;
 }
 );
 width = 571;
@@ -67,8 +67,8 @@ shapes = (
 ref = f;
 },
 {
-pos = (217,414);
-ref = dotaccent;
+pos = (251,620);
+ref = dotaccentcomb;
 }
 );
 width = 839;
@@ -81,8 +81,8 @@ shapes = (
 ref = f;
 },
 {
-pos = (218,414);
-ref = dotaccent;
+pos = (246,620);
+ref = dotaccentcomb;
 }
 );
 width = 484;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/firsttonechinese.glyph b/src/Inter-Italic.glyphspackage/glyphs/firsttonechinese.glyph
index 9126de0de..677dcffac 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/firsttonechinese.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/firsttonechinese.glyph
@@ -3,69 +3,68 @@ glyphname = firsttonechinese;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (-32,0);
-ref = macron;
+pos = (172,0);
+ref = macroncomb;
 }
 );
-width = 920;
+width = 976;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (94,0);
-ref = macron;
+pos = (76,0);
+ref = macroncomb;
 }
 );
-width = 1318;
+width = 833;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (-108,0);
-ref = macron;
+pos = (127,0);
+ref = macroncomb;
 }
 );
-width = 680;
+width = 801;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (-32,0);
-ref = macron;
+ref = macroncomb;
 }
 );
-width = 856;
+width = 832;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (94,0);
-ref = macron;
+pos = (44,0);
+ref = macroncomb;
 }
 );
-width = 1286;
+width = 769;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (-108,0);
-ref = macron;
+pos = (112,0);
+ref = macroncomb;
 }
 );
-width = 552;
+width = 768;
 }
 );
 unicode = 713;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/fiveroman.glyph b/src/Inter-Italic.glyphspackage/glyphs/fiveroman.glyph
index 829330acb..38d5abe7b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/fiveroman.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/fiveroman.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = fiveroman;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/fourroman.glyph b/src/Inter-Italic.glyphspackage/glyphs/fourroman.glyph
index a2d9d3ee4..7f898f5e6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/fourroman.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/fourroman.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = fourroman;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/fourthtonechinese.glyph b/src/Inter-Italic.glyphspackage/glyphs/fourthtonechinese.glyph
index 4b386754c..1dd8878bf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/fourthtonechinese.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/fourthtonechinese.glyph
@@ -7,7 +7,7 @@ shapes = (
 {
 alignment = -1;
 pos = (96,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 734;
@@ -18,7 +18,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-18,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 838;
@@ -29,7 +29,7 @@ shapes = (
 {
 alignment = -1;
 pos = (166,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 670;
@@ -40,7 +40,7 @@ shapes = (
 {
 alignment = -1;
 pos = (96,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 670;
@@ -51,7 +51,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-18,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 806;
@@ -62,7 +62,7 @@ shapes = (
 {
 alignment = -1;
 pos = (166,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 542;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/g.glyph b/src/Inter-Italic.glyphspackage/glyphs/g.glyph
index 3687e7ceb..537580c0c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/g.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/g.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = g;
 kernLeft = o;
 kernRight = g;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/gacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/gacute.glyph
index a968de53b..23e80c4cc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/gacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/gacute.glyph
@@ -5,78 +5,84 @@ kernRight = g;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = g;
 },
 {
-pos = (410,186);
-ref = acute;
+pos = (530,186);
+ref = acutecomb;
 }
 );
 width = 1247;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = g;
 },
 {
-pos = (362,186);
-ref = acute;
+pos = (492,186);
+ref = acutecomb;
 }
 );
 width = 1325;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = g;
 },
 {
-pos = (413,186);
-ref = acute;
+pos = (553,186);
+ref = acutecomb;
 }
 );
 width = 1191;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = g;
 },
 {
-pos = (416,206);
-ref = acute;
+pos = (456,206);
+ref = acutecomb;
 }
 );
 width = 1138;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = g;
 },
 {
-pos = (455,206);
-ref = acute;
+pos = (479,206);
+ref = acutecomb;
 }
 );
 width = 1252;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = g;
 },
 {
-pos = (442,248);
-ref = acute;
+pos = (502,248);
+ref = acutecomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/gbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/gbreve.glyph
index 57eff73da..871f3d975 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/gbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/gbreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (164,0);
-ref = breve;
+pos = (271,186);
+ref = brevecomb;
 }
 );
 width = 1247;
@@ -23,8 +23,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (123,0);
-ref = breve;
+pos = (186,186);
+ref = brevecomb;
 }
 );
 width = 1325;
@@ -36,8 +36,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (179,0);
-ref = breve;
+pos = (274,186);
+ref = brevecomb;
 }
 );
 width = 1191;
@@ -49,8 +49,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (118,0);
-ref = breve;
+pos = (181,206);
+ref = brevecomb;
 }
 );
 width = 1138;
@@ -62,8 +62,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (142,0);
-ref = breve;
+pos = (192,206);
+ref = brevecomb;
 }
 );
 width = 1252;
@@ -75,8 +75,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (128,42);
-ref = breve;
+pos = (220,248);
+ref = brevecomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/gcaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/gcaron.glyph
index a4bbac2bd..fb6494bb1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/gcaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/gcaron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (157,0);
-ref = caron;
+pos = (238,186);
+ref = caroncomb;
 }
 );
 width = 1247;
@@ -23,8 +23,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (-11,0);
-ref = caron;
+pos = (154,186);
+ref = caroncomb;
 }
 );
 width = 1325;
@@ -36,8 +36,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (167,16);
-ref = caron;
+pos = (194,186);
+ref = caroncomb;
 }
 );
 width = 1191;
@@ -49,8 +49,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (112,0);
-ref = caron;
+pos = (181,206);
+ref = caroncomb;
 }
 );
 width = 1138;
@@ -62,8 +62,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (9,0);
-ref = caron;
+pos = (240,206);
+ref = caroncomb;
 }
 );
 width = 1252;
@@ -75,8 +75,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (176,42);
-ref = caron;
+pos = (221,248);
+ref = caroncomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/gcircumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/gcircumflex.glyph
index c7fc02aa2..22f4155e1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/gcircumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/gcircumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (159,0);
-ref = circumflex;
+pos = (238,186);
+ref = circumflexcomb;
 }
 );
 width = 1247;
@@ -23,8 +23,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (-12,0);
-ref = circumflex;
+pos = (154,186);
+ref = circumflexcomb;
 }
 );
 width = 1325;
@@ -36,8 +36,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (163,0);
-ref = circumflex;
+pos = (193,186);
+ref = circumflexcomb;
 }
 );
 width = 1191;
@@ -49,8 +49,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (114,0);
-ref = circumflex;
+pos = (180,206);
+ref = circumflexcomb;
 }
 );
 width = 1138;
@@ -62,8 +62,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (8,0);
-ref = circumflex;
+pos = (241,206);
+ref = circumflexcomb;
 }
 );
 width = 1252;
@@ -75,8 +75,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (179,42);
-ref = circumflex;
+pos = (220,248);
+ref = circumflexcomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/gdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/gdotaccent.glyph
index d97a64dd1..e03672218 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/gdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/gdotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (379,0);
-ref = dotaccent;
+pos = (410,186);
+ref = dotaccentcomb;
 }
 );
 width = 1247;
@@ -25,8 +25,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (300,0);
-ref = dotaccent;
+pos = (331,186);
+ref = dotaccentcomb;
 }
 );
 width = 1325;
@@ -39,8 +39,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (408,0);
-ref = dotaccent;
+pos = (439,186);
+ref = dotaccentcomb;
 }
 );
 width = 1191;
@@ -53,8 +53,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (334,0);
-ref = dotaccent;
+pos = (368,206);
+ref = dotaccentcomb;
 }
 );
 width = 1138;
@@ -67,8 +67,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (318,0);
-ref = dotaccent;
+pos = (352,206);
+ref = dotaccentcomb;
 }
 );
 width = 1252;
@@ -81,8 +81,8 @@ shapes = (
 ref = g;
 },
 {
-pos = (422,42);
-ref = dotaccent;
+pos = (450,248);
+ref = dotaccentcomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/gjecyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/gjecyrillic.glyph
index 10d58e397..4b7960253 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/gjecyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/gjecyrillic.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (285,186);
-ref = acute;
+pos = (405,186);
+ref = acutecomb;
 }
 );
 width = 887;
@@ -25,8 +25,8 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (248,186);
-ref = acute;
+pos = (378,186);
+ref = acutecomb;
 }
 );
 width = 944;
@@ -39,8 +39,8 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (313,186);
-ref = acute;
+pos = (453,186);
+ref = acutecomb;
 }
 );
 width = 862;
@@ -53,8 +53,8 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (336,206);
-ref = acute;
+pos = (376,206);
+ref = acutecomb;
 }
 );
 width = 815;
@@ -67,8 +67,8 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (321,206);
-ref = acute;
+pos = (345,206);
+ref = acutecomb;
 }
 );
 width = 919;
@@ -81,8 +81,8 @@ shapes = (
 ref = "ge-cy";
 },
 {
-pos = (334,206);
-ref = acute;
+pos = (394,206);
+ref = acutecomb;
 }
 );
 width = 748;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/gmacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/gmacron.glyph
index 281dffe3a..ebd0cd82e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/gmacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/gmacron.glyph
@@ -5,78 +5,84 @@ kernRight = g;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = g;
 },
 {
 pos = (167,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1247;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = g;
 },
 {
 pos = (249,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1325;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = g;
 },
 {
 pos = (225,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1191;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = g;
 },
 {
-pos = (165,206);
-ref = macron;
+pos = (164,206);
+ref = macroncomb;
 }
 );
 width = 1138;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = g;
 },
 {
 pos = (288,206);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1252;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = g;
 },
 {
 pos = (188,248);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/grave.glyph b/src/Inter-Italic.glyphspackage/glyphs/grave.glyph
index ad046ecb6..a666e4d78 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/grave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/grave.glyph
@@ -1,181 +1,68 @@
 {
-color = (204,240,242,1);
 glyphname = grave;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (502,1118);
-},
-{
-name = top;
-pos = (575,1557);
-}
-);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(613,1283,l),
-(519,1557,l),
-(325,1557,l),
-(471,1283,l)
-);
+alignment = 1;
+ref = gravecomb;
 }
 );
 width = 653;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (610,1118);
-},
-{
-name = top;
-pos = (687,1582);
-}
-);
-guides = (
-{
-pos = (0,1256);
-}
-);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(767,1256,l),
-(683,1582,l),
-(339,1582,l),
-(503,1256,l)
-);
+alignment = 1;
+ref = gravecomb;
 }
 );
 width = 822;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (457,1118);
-},
-{
-name = top;
-pos = (526,1557);
-}
-);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(512,1283,l),
-(405,1557,l),
-(345,1557,l),
-(466,1283,l)
-);
+alignment = 1;
+ref = gravecomb;
 }
 );
 width = 572;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (417,1056);
-},
-{
-name = top;
-pos = (493,1515);
-}
-);
-guides = (
-{
-pos = (0,1241);
-}
-);
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(531,1241,l),
-(437,1515,l),
-(243,1515,l),
-(389,1241,l)
-);
+alignment = 1;
+ref = gravecomb;
 }
 );
 width = 493;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (568,1056);
-},
-{
-name = top;
-pos = (643,1507);
-}
-);
-guides = (
-{
-angle = 80.6;
-pos = (481,1107);
-},
-{
-pos = (1,1181);
-},
-{
-pos = (1,1507);
-}
-);
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(743,1181,l),
-(594,1507,l),
-(226,1507,l),
-(479,1181,l)
-);
+alignment = 1;
+ref = gravecomb;
 }
 );
 width = 699;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (413,1056);
-},
-{
-name = top;
-pos = (485,1515);
-}
-);
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(469,1241,l),
-(321,1515,l),
-(263,1515,l),
-(418,1241,l)
-);
+alignment = 1;
+ref = gravecomb;
 }
 );
 width = 451;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/grave_compact.glyph b/src/Inter-Italic.glyphspackage/glyphs/grave_compact.glyph
index 4c307602d..26dd81d91 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/grave_compact.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/grave_compact.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = grave_compact;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/gravecomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/gravecomb.glyph
index 73c37a4c6..e915eb8ff 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/gravecomb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/gravecomb.glyph
@@ -1,122 +1,193 @@
 {
-color = (250,227,227,1);
 glyphname = gravecomb;
 layers = (
 {
-background = {
-shapes = (
+anchors = (
 {
-closed = 1;
-nodes = (
-(-708,1536,l),
-(-494,1240,l),
-(-324,1240,l),
-(-466,1536,l)
+name = _top;
+pos = (502,1118);
+},
+{
+name = top;
+pos = (575,1557);
+}
 );
+guides = (
+{
+pos = (0,1264);
 }
 );
-};
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(-706,1536,l),
-(-492,1240,l),
-(-322,1240,l),
-(-466,1536,l)
+(600,1264,l),
+(509,1557,l),
+(315,1557,l),
+(458,1264,l)
 );
 }
 );
-width = 0;
+width = 653;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (610,1118);
 },
 {
+name = top;
+pos = (687,1582);
+}
+);
+guides = (
+{
+pos = (0,1256);
+}
+);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(-896,1536,l),
-(-652,1216,l),
-(-350,1216,l),
-(-504,1536,l)
+(767,1256,l),
+(683,1582,l),
+(339,1582,l),
+(503,1256,l)
 );
 }
 );
-width = 46;
+width = 822;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (457,1118);
 },
 {
+name = top;
+pos = (526,1557);
+}
+);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(-542,1536,l),
-(-388,1254,l),
-(-334,1254,l),
-(-472,1536,l)
+(512,1283,l),
+(405,1557,l),
+(345,1557,l),
+(466,1283,l)
 );
 }
 );
-width = 0;
+width = 572;
 },
 {
-background = {
-shapes = (
+anchors = (
 {
-closed = 1;
-nodes = (
-(-708,1536,l),
-(-494,1240,l),
-(-324,1240,l),
-(-466,1536,l)
+name = _top;
+pos = (417,1056);
+},
+{
+name = top;
+pos = (489,1490);
+}
 );
+guides = (
+{
+pos = (0,1192);
 }
 );
-};
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(-738,1536,l),
-(-524,1240,l),
-(-354,1240,l),
-(-498,1536,l)
+(513,1192,l),
+(423,1490,l),
+(229,1490,l),
+(371,1192,l)
 );
 }
 );
-width = 0;
+width = 493;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (568,1056);
+},
+{
+name = top;
+pos = (643,1507);
+}
+);
+guides = (
+{
+angle = 80.6;
+pos = (481,1107);
 },
 {
+pos = (1,1181);
+},
+{
+pos = (1,1507);
+}
+);
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(-912,1536,l),
-(-668,1216,l),
-(-366,1216,l),
-(-520,1536,l)
+(743,1181,l),
+(594,1507,l),
+(226,1507,l),
+(479,1181,l)
 );
 }
 );
-width = 14;
+width = 699;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (409,1056);
 },
 {
+name = top;
+pos = (481,1490);
+}
+);
+guides = (
+{
+pos = (0,1192);
+}
+);
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(-606,1536,l),
-(-452,1254,l),
-(-398,1254,l),
-(-536,1536,l)
+(459,1192,l),
+(390,1490,l),
+(332,1490,l),
+(414,1192,l)
 );
 }
 );
-width = 0;
+width = 451;
 }
 );
 unicode = 768;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/graveleftnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/graveleftcomb.glyph
index cba68948a..a8f16b9d8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/graveleftnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/graveleftcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = graveleftnosp;
+glyphname = graveleftcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -8,7 +7,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-286,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 0;
@@ -19,7 +18,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-404,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 0;
@@ -30,7 +29,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-216,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 0;
@@ -41,7 +40,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-286,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 0;
@@ -52,7 +51,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-404,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 0;
@@ -63,11 +62,10 @@ shapes = (
 {
 alignment = -1;
 pos = (-216,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 0;
 }
 );
-unicode = 832;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/gravelowmod.glyph b/src/Inter-Italic.glyphspackage/glyphs/gravelowmod.glyph
index f577ad7a2..d1559a6fe 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/gravelowmod.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/gravelowmod.glyph
@@ -7,7 +7,7 @@ shapes = (
 {
 alignment = -1;
 pos = (96,-1600);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 734;
@@ -18,7 +18,7 @@ shapes = (
 {
 alignment = -1;
 pos = (12,-1600);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 840;
@@ -29,7 +29,7 @@ shapes = (
 {
 alignment = -1;
 pos = (148,-1600);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 670;
@@ -40,7 +40,7 @@ shapes = (
 {
 alignment = -1;
 pos = (96,-1600);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 670;
@@ -51,7 +51,7 @@ shapes = (
 {
 alignment = -1;
 pos = (12,-1600);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 808;
@@ -62,7 +62,7 @@ shapes = (
 {
 alignment = -1;
 pos = (148,-1600);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 542;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/gravesubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/gravesubcomb.glyph
index a8634e401..ff2add3ff 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/gravesubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/gravesubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = gravesubnosp;
+glyphname = gravesubcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -8,7 +7,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-872,-1630);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 0;
@@ -19,7 +18,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1036,-1606);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 2;
@@ -30,7 +29,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-776,-1644);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 0;
@@ -41,7 +40,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-872,-1630);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 0;
@@ -52,7 +51,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1036,-1606);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 0;
@@ -63,11 +62,10 @@ shapes = (
 {
 alignment = -1;
 pos = (-776,-1644);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 0;
 }
 );
-unicode = 790;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/h.glyph b/src/Inter-Italic.glyphspackage/glyphs/h.glyph
index 1f43d8287..6d2f79b14 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/h.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/h.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = h;
 kernLeft = B;
 kernRight = a;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hairspace.glyph b/src/Inter-Italic.glyphspackage/glyphs/hairspace.glyph
index a1bd63efd..b4986d6d9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hairspace.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/hairspace.glyph
@@ -1,5 +1,4 @@
 {
-color = (237,229,250,1);
 glyphname = hairspace;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hbrevebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/hbrevebelow.glyph
index 1a0eff61e..a0b71f17a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hbrevebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/hbrevebelow.glyph
@@ -11,7 +11,7 @@ ref = h;
 },
 {
 pos = (1189,0);
-ref = brevesubnosp;
+ref = brevesubcomb;
 }
 );
 width = 1212;
@@ -24,7 +24,7 @@ ref = h;
 },
 {
 pos = (1369,2);
-ref = brevesubnosp;
+ref = brevesubcomb;
 }
 );
 width = 1330;
@@ -37,7 +37,7 @@ ref = h;
 },
 {
 pos = (1099,-2);
-ref = brevesubnosp;
+ref = brevesubcomb;
 }
 );
 width = 1164;
@@ -50,7 +50,7 @@ ref = h;
 },
 {
 pos = (1197,0);
-ref = brevesubnosp;
+ref = brevesubcomb;
 }
 );
 width = 1139;
@@ -63,7 +63,7 @@ ref = h;
 },
 {
 pos = (1375,2);
-ref = brevesubnosp;
+ref = brevesubcomb;
 }
 );
 width = 1298;
@@ -76,7 +76,7 @@ ref = h;
 },
 {
 pos = (1105,-2);
-ref = brevesubnosp;
+ref = brevesubcomb;
 }
 );
 width = 1036;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hcedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/hcedilla.glyph
index 7baf1721d..9a8b5093f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hcedilla.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/hcedilla.glyph
@@ -12,7 +12,7 @@ ref = h;
 {
 anchor = cedilla;
 pos = (-17,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1212;
@@ -26,7 +26,7 @@ ref = h;
 {
 anchor = cedilla;
 pos = (-163,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1330;
@@ -40,7 +40,7 @@ ref = h;
 {
 anchor = cedilla;
 pos = (6,-6);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1164;
@@ -54,7 +54,7 @@ ref = h;
 {
 anchor = cedilla;
 pos = (-9,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1139;
@@ -68,7 +68,7 @@ ref = h;
 {
 anchor = cedilla;
 pos = (-149,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1298;
@@ -82,7 +82,7 @@ ref = h;
 {
 anchor = cedilla;
 pos = (12,-6);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1036;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hcircumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/hcircumflex.glyph
index 6a2d17bd2..b69cc2a56 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hcircumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/hcircumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (-160,372);
-ref = circumflex;
+pos = (-81,558);
+ref = circumflexcomb;
 }
 );
 width = 1212;
@@ -23,8 +23,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (-290,372);
-ref = circumflex;
+pos = (-124,558);
+ref = circumflexcomb;
 }
 );
 width = 1330;
@@ -36,8 +36,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (-149,372);
-ref = circumflex;
+pos = (-119,558);
+ref = circumflexcomb;
 }
 );
 width = 1164;
@@ -49,8 +49,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (-150,414);
-ref = circumflex;
+pos = (-84,620);
+ref = circumflexcomb;
 }
 );
 width = 1139;
@@ -62,8 +62,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (-276,414);
-ref = circumflex;
+pos = (-43,620);
+ref = circumflexcomb;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (-132,414);
-ref = circumflex;
+pos = (-91,620);
+ref = circumflexcomb;
 }
 );
 width = 1036;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hdieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/hdieresis.glyph
index 3130b3066..ac8b65ec8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hdieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/hdieresis.glyph
@@ -11,7 +11,7 @@ ref = h;
 },
 {
 pos = (-266,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1212;
@@ -24,7 +24,7 @@ ref = h;
 },
 {
 pos = (-278,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1330;
@@ -37,7 +37,7 @@ ref = h;
 },
 {
 pos = (-269,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1164;
@@ -50,7 +50,7 @@ ref = h;
 },
 {
 pos = (-253,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1139;
@@ -63,7 +63,7 @@ ref = h;
 },
 {
 pos = (-261,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1298;
@@ -76,7 +76,7 @@ ref = h;
 },
 {
 pos = (-273,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1036;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/hdotaccent.glyph
index 056bb3219..bc2093565 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/hdotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (60,372);
-ref = dotaccent;
+pos = (91,558);
+ref = dotaccentcomb;
 }
 );
 width = 1212;
@@ -25,8 +25,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (22,372);
-ref = dotaccent;
+pos = (53,558);
+ref = dotaccentcomb;
 }
 );
 width = 1330;
@@ -39,8 +39,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (96,372);
-ref = dotaccent;
+pos = (127,558);
+ref = dotaccentcomb;
 }
 );
 width = 1164;
@@ -53,8 +53,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (70,414);
-ref = dotaccent;
+pos = (104,620);
+ref = dotaccentcomb;
 }
 );
 width = 1139;
@@ -67,8 +67,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (34,414);
-ref = dotaccent;
+pos = (68,620);
+ref = dotaccentcomb;
 }
 );
 width = 1298;
@@ -81,8 +81,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (111,414);
-ref = dotaccent;
+pos = (139,620);
+ref = dotaccentcomb;
 }
 );
 width = 1036;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hlinebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/hlinebelow.glyph
index 96481be24..681de2099 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hlinebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/hlinebelow.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (156,0);
+pos = (157,0);
 ref = macronsub;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = h;
 },
 {
-pos = (265,0);
+pos = (264,0);
 ref = macronsub;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hookabove_compact.glyph b/src/Inter-Italic.glyphspackage/glyphs/hookabove_compact.glyph
index 40713fca4..f347f9e76 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hookabove_compact.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/hookabove_compact.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = hookabove_compact;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/hookabovecomb.glyph
index e5e26909a..a87d5c628 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/hookabovecomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = hookabove;
+glyphname = hookabovecomb;
 layers = (
 {
 anchors = (
@@ -221,31 +220,14 @@ width = 650;
 anchors = (
 {
 name = _top;
-pos = (306,1056);
+pos = (312,1056);
 }
 );
 background = {
 shapes = (
 {
-pos = (-58,0);
+pos = (70,0);
 ref = acute;
-},
-{
-closed = 1;
-nodes = (
-(336,1309,ls),
-(414,1425,o),
-(354,1515,o),
-(197,1515,cs),
-(60,1515,l),
-(60,1400,l),
-(197,1400,ls),
-(227,1400,o),
-(234,1386,o),
-(220,1359,cs),
-(158,1241,l),
-(290,1241,l)
-);
 }
 );
 };
@@ -255,23 +237,23 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(437,1322,ls),
-(530,1427,o),
-(503,1515,o),
-(369,1515,cs),
-(264,1515,l),
-(256,1469,l),
-(361,1469,ls),
-(457,1469,o),
-(470,1422,o),
-(397,1337,cs),
-(314,1241,l),
-(364,1241,l)
+(421,1297,ls),
+(493,1415,o),
+(485,1490,o),
+(351,1490,cs),
+(246,1490,l),
+(238,1445,l),
+(343,1445,ls),
+(439,1445,o),
+(438,1409,o),
+(381,1312,cs),
+(311,1192,l),
+(356,1192,l)
 );
 }
 );
 width = 443;
 }
 );
-unicode = 60936;
+unicode = 777;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hooksubpalatnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/hooksubpalatcomb.glyph
index b3ce2ca2d..75f34c35d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hooksubpalatnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/hooksubpalatcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = hooksubpalatnosp;
+glyphname = hooksubpalatcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -165,5 +164,4 @@ nodes = (
 width = 0;
 }
 );
-unicode = 801;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hooksubretronosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/hooksubretrocomb.glyph
index bf2c74f8e..9b28b324b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hooksubretronosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/hooksubretrocomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = hooksubretronosp;
+glyphname = hooksubretrocomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -165,5 +164,4 @@ nodes = (
 width = 0;
 }
 );
-unicode = 802;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hornnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/horncomb.glyph
index 027a078b9..1ec8a91a7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hornnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/horncomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = hornnosp;
+glyphname = horncomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hungarumlaut.glyph b/src/Inter-Italic.glyphspackage/glyphs/hungarumlaut.glyph
index c90bdd577..e50b4210e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hungarumlaut.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/hungarumlaut.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = hungarumlaut;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/i.glyph b/src/Inter-Italic.glyphspackage/glyphs/i.glyph
index d175df6eb..7836fd4d0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/i.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/i.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = i;
 kernLeft = idotless;
 kernRight = idotless;
@@ -18,7 +17,8 @@ shapes = (
 ref = idotless;
 },
 {
-ref = dotaccent;
+pos = (31,186);
+ref = dotaccentcomb;
 }
 );
 width = 487;
@@ -39,8 +39,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-32,0);
-ref = dotaccent;
+pos = (-1,186);
+ref = dotaccentcomb;
 }
 );
 width = 607;
@@ -53,8 +53,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (34,0);
-ref = dotaccent;
+pos = (65,186);
+ref = dotaccentcomb;
 }
 );
 width = 443;
@@ -67,8 +67,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (1,0);
-ref = dotaccent;
+pos = (35,206);
+ref = dotaccentcomb;
 }
 );
 width = 427;
@@ -89,8 +89,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-34,0);
-ref = dotaccent;
+pos = (0,206);
+ref = dotaccentcomb;
 }
 );
 width = 573;
@@ -103,8 +103,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (41,0);
-ref = dotaccent;
+pos = (69,206);
+ref = dotaccentcomb;
 }
 );
 width = 315;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/iacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/iacute.glyph
index 86e29abbb..2e9c9ae62 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/iacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/iacute.glyph
@@ -5,82 +5,89 @@ kernRight = idotless;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = idotless;
 },
 {
-pos = (31,186);
-ref = acute;
+pos = (151,186);
+ref = acutecomb;
 }
 );
 width = 487;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = idotless;
 },
 {
-pos = (30,186);
-ref = acute;
+pos = (160,186);
+ref = acutecomb;
 }
 );
 width = 607;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = idotless;
 },
 {
-pos = (39,186);
-ref = acute;
+pos = (179,186);
+ref = acutecomb;
 }
 );
 width = 443;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = idotless;
 },
 {
-pos = (83,206);
-ref = acute;
+pos = (123,206);
+ref = acutecomb;
 }
 );
 width = 427;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = idotless;
 },
 {
-pos = (103,206);
-ref = acute;
+pos = (127,206);
+ref = acutecomb;
 }
 );
 width = 573;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = idotless;
 },
 {
-pos = (61,206);
-ref = acute;
+pos = (121,206);
+ref = acutecomb;
 }
 );
 width = 315;
 }
 );
+metricLeft = l;
 unicode = 237;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ibreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/ibreve.glyph
index 3da278b27..591c58c7b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ibreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ibreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-215,0);
-ref = breve;
+pos = (-108,186);
+ref = brevecomb;
 }
 );
 width = 487;
@@ -23,8 +23,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-209,0);
-ref = breve;
+pos = (-146,186);
+ref = brevecomb;
 }
 );
 width = 607;
@@ -36,8 +36,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-195,0);
-ref = breve;
+pos = (-100,186);
+ref = brevecomb;
 }
 );
 width = 443;
@@ -49,8 +49,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-215,0);
-ref = breve;
+pos = (-152,206);
+ref = brevecomb;
 }
 );
 width = 427;
@@ -62,8 +62,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-210,0);
-ref = breve;
+pos = (-160,206);
+ref = brevecomb;
 }
 );
 width = 573;
@@ -75,8 +75,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-253,0);
-ref = breve;
+pos = (-161,206);
+ref = brevecomb;
 }
 );
 width = 315;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/icaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/icaron.glyph
index 1982a35b6..a5a64ed4e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/icaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/icaron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-222,0);
-ref = caron;
+pos = (-141,186);
+ref = caroncomb;
 }
 );
 width = 487;
@@ -23,8 +23,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-343,0);
-ref = caron;
+pos = (-178,186);
+ref = caroncomb;
 }
 );
 width = 607;
@@ -36,8 +36,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-207,16);
-ref = caron;
+pos = (-180,186);
+ref = caroncomb;
 }
 );
 width = 443;
@@ -49,8 +49,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-221,0);
-ref = caron;
+pos = (-152,206);
+ref = caroncomb;
 }
 );
 width = 427;
@@ -62,8 +62,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-343,0);
-ref = caron;
+pos = (-112,206);
+ref = caroncomb;
 }
 );
 width = 573;
@@ -75,8 +75,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-205,0);
-ref = caron;
+pos = (-160,206);
+ref = caroncomb;
 }
 );
 width = 315;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/icircumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/icircumflex.glyph
index 9d5d6c87d..50c60e0d7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/icircumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/icircumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-220,0);
-ref = circumflex;
+pos = (-141,186);
+ref = circumflexcomb;
 }
 );
 width = 487;
@@ -23,8 +23,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-344,0);
-ref = circumflex;
+pos = (-178,186);
+ref = circumflexcomb;
 }
 );
 width = 607;
@@ -36,8 +36,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-211,0);
-ref = circumflex;
+pos = (-181,186);
+ref = circumflexcomb;
 }
 );
 width = 443;
@@ -49,8 +49,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-219,0);
-ref = circumflex;
+pos = (-153,206);
+ref = circumflexcomb;
 }
 );
 width = 427;
@@ -62,8 +62,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-344,0);
-ref = circumflex;
+pos = (-111,206);
+ref = circumflexcomb;
 }
 );
 width = 573;
@@ -75,8 +75,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-202,0);
-ref = circumflex;
+pos = (-161,206);
+ref = circumflexcomb;
 }
 );
 width = 315;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/idieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/idieresis.glyph
index 42bcd4f2e..67646b87c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/idieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/idieresis.glyph
@@ -22,7 +22,7 @@ ref = idotless;
 },
 {
 pos = (-326,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 487;
@@ -36,7 +36,7 @@ ref = idotless;
 },
 {
 pos = (-332,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 607;
@@ -50,7 +50,7 @@ ref = idotless;
 },
 {
 pos = (-331,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 443;
@@ -64,7 +64,7 @@ ref = idotless;
 },
 {
 pos = (-322,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 427;
@@ -78,7 +78,7 @@ ref = idotless;
 },
 {
 pos = (-329,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 573;
@@ -92,7 +92,7 @@ ref = idotless;
 },
 {
 pos = (-343,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 315;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/idieresiscyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/idieresiscyrillic.glyph
index cf4df9a4b..7236ba32a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/idieresiscyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/idieresiscyrillic.glyph
@@ -12,7 +12,7 @@ ref = iicyrillic;
 },
 {
 pos = (30,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1201;
@@ -26,7 +26,7 @@ ref = iicyrillic;
 },
 {
 pos = (31,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1331;
@@ -40,7 +40,7 @@ ref = iicyrillic;
 },
 {
 pos = (31,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1165;
@@ -54,7 +54,7 @@ ref = iicyrillic;
 },
 {
 pos = (33,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1137;
@@ -68,7 +68,7 @@ ref = iicyrillic;
 },
 {
 pos = (34,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1299;
@@ -82,7 +82,7 @@ ref = iicyrillic;
 },
 {
 pos = (18,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1036;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/iebrevecyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/iebrevecyrillic.glyph
index be70fa5ab..6ffd8f353 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/iebrevecyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/iebrevecyrillic.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (143,0);
-ref = breve;
+pos = (250,186);
+ref = brevecomb;
 }
 );
 width = 1173;
@@ -23,8 +23,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (111,0);
-ref = breve;
+pos = (174,186);
+ref = brevecomb;
 }
 );
 width = 1239;
@@ -36,8 +36,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (177,0);
-ref = breve;
+pos = (272,186);
+ref = brevecomb;
 }
 );
 width = 1129;
@@ -49,8 +49,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (143,0);
-ref = breve;
+pos = (206,206);
+ref = brevecomb;
 }
 );
 width = 1082;
@@ -62,8 +62,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (103,0);
-ref = breve;
+pos = (153,206);
+ref = brevecomb;
 }
 );
 width = 1202;
@@ -75,8 +75,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (123,42);
-ref = breve;
+pos = (215,248);
+ref = brevecomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/igrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/igrave.glyph
index 6b0d35b6b..ed5bb69f4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/igrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/igrave.glyph
@@ -11,7 +11,7 @@ ref = idotless;
 },
 {
 pos = (-134,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 487;
@@ -24,7 +24,7 @@ ref = idotless;
 },
 {
 pos = (-184,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 607;
@@ -37,7 +37,7 @@ ref = idotless;
 },
 {
 pos = (-113,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 443;
@@ -50,7 +50,7 @@ ref = idotless;
 },
 {
 pos = (-82,206);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 427;
@@ -63,7 +63,7 @@ ref = idotless;
 },
 {
 pos = (-160,206);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 573;
@@ -75,8 +75,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-134,206);
-ref = grave;
+pos = (-130,206);
+ref = gravecomb;
 }
 );
 width = 315;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ihookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/ihookabove.glyph
index 32bb55586..f84e87b35 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ihookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ihookabove.glyph
@@ -11,7 +11,7 @@ ref = idotless;
 },
 {
 pos = (11,186);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 487;
@@ -24,7 +24,7 @@ ref = idotless;
 },
 {
 pos = (20,186);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 607;
@@ -37,7 +37,7 @@ ref = idotless;
 },
 {
 pos = (31,186);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 443;
@@ -50,7 +50,7 @@ ref = idotless;
 },
 {
 pos = (-17,206);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 427;
@@ -63,7 +63,7 @@ ref = idotless;
 },
 {
 pos = (-3,206);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 573;
@@ -75,8 +75,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-27,206);
-ref = hookabove;
+pos = (-33,206);
+ref = hookabovecomb;
 }
 );
 width = 315;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/iinvertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/iinvertedbreve.glyph
index 48edccd07..0060bb3d9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/iinvertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/iinvertedbreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (872,186);
-ref = breveinvnosp;
+pos = (-141,186);
+ref = breveinvcomb;
 }
 );
 width = 487;
@@ -23,8 +23,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (996,186);
-ref = breveinvnosp;
+pos = (-178,186);
+ref = breveinvcomb;
 }
 );
 width = 607;
@@ -36,8 +36,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (834,186);
-ref = breveinvnosp;
+pos = (-111,186);
+ref = breveinvcomb;
 }
 );
 width = 443;
@@ -49,8 +49,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (810,206);
-ref = breveinvnosp;
+pos = (-153,206);
+ref = breveinvcomb;
 }
 );
 width = 427;
@@ -62,8 +62,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (971,206);
-ref = breveinvnosp;
+pos = (-111,206);
+ref = breveinvcomb;
 }
 );
 width = 573;
@@ -75,8 +75,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (720,206);
-ref = breveinvnosp;
+pos = (-161,206);
+ref = breveinvcomb;
 }
 );
 width = 315;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/iishortcyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/iishortcyrillic.glyph
index 6b660ba7a..b526c1638 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/iishortcyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/iishortcyrillic.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (141,0);
-ref = breve;
+pos = (248,186);
+ref = brevecomb;
 }
 );
 width = 1201;
@@ -25,8 +25,8 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (154,0);
-ref = breve;
+pos = (217,186);
+ref = brevecomb;
 }
 );
 width = 1331;
@@ -39,8 +39,8 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (167,0);
-ref = breve;
+pos = (262,186);
+ref = brevecomb;
 }
 );
 width = 1165;
@@ -53,8 +53,8 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (140,0);
-ref = breve;
+pos = (203,206);
+ref = brevecomb;
 }
 );
 width = 1137;
@@ -67,8 +67,8 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (153,0);
-ref = breve;
+pos = (203,206);
+ref = brevecomb;
 }
 );
 width = 1299;
@@ -81,8 +81,8 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (108,0);
-ref = breve;
+pos = (200,206);
+ref = brevecomb;
 }
 );
 width = 1036;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/imacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/imacron.glyph
index ff6bda6c4..2220ce482 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/imacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/imacron.glyph
@@ -5,78 +5,84 @@ kernRight = idieresis;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = idotless;
 },
 {
 pos = (-212,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 487;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = idotless;
 },
 {
 pos = (-83,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 607;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = idotless;
 },
 {
 pos = (-149,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 443;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = idotless;
 },
 {
-pos = (-168,206);
-ref = macron;
+pos = (-169,206);
+ref = macroncomb;
 }
 );
 width = 427;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = idotless;
 },
 {
 pos = (-64,206);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 573;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = idotless;
 },
 {
 pos = (-193,206);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 315;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/imacroncyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/imacroncyrillic.glyph
index b649f1504..207c254c5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/imacroncyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/imacroncyrillic.glyph
@@ -12,7 +12,7 @@ ref = iicyrillic;
 },
 {
 pos = (144,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1201;
@@ -26,7 +26,7 @@ ref = iicyrillic;
 },
 {
 pos = (280,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1331;
@@ -40,7 +40,7 @@ ref = iicyrillic;
 },
 {
 pos = (213,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1165;
@@ -53,8 +53,8 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (187,206);
-ref = macron;
+pos = (186,206);
+ref = macroncomb;
 }
 );
 width = 1137;
@@ -68,7 +68,7 @@ ref = iicyrillic;
 },
 {
 pos = (299,206);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1299;
@@ -82,7 +82,7 @@ ref = iicyrillic;
 },
 {
 pos = (168,206);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1036;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/iogonek.glyph b/src/Inter-Italic.glyphspackage/glyphs/iogonek.glyph
index 2939501b6..7adc8365e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/iogonek.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/iogonek.glyph
@@ -12,7 +12,8 @@ alignment = 1;
 ref = uni012F.ccmp;
 },
 {
-ref = dotaccent;
+pos = (31,186);
+ref = dotaccentcomb;
 }
 );
 width = 487;
@@ -26,8 +27,8 @@ alignment = 1;
 ref = uni012F.ccmp;
 },
 {
-pos = (-32,0);
-ref = dotaccent;
+pos = (-1,186);
+ref = dotaccentcomb;
 }
 );
 width = 607;
@@ -41,8 +42,8 @@ alignment = 1;
 ref = uni012F.ccmp;
 },
 {
-pos = (34,0);
-ref = dotaccent;
+pos = (65,186);
+ref = dotaccentcomb;
 }
 );
 width = 443;
@@ -56,8 +57,8 @@ alignment = 1;
 ref = uni012F.ccmp;
 },
 {
-pos = (1,0);
-ref = dotaccent;
+pos = (35,206);
+ref = dotaccentcomb;
 }
 );
 width = 427;
@@ -71,8 +72,8 @@ alignment = 1;
 ref = uni012F.ccmp;
 },
 {
-pos = (-34,0);
-ref = dotaccent;
+pos = (0,206);
+ref = dotaccentcomb;
 }
 );
 width = 573;
@@ -86,8 +87,8 @@ alignment = 1;
 ref = uni012F.ccmp;
 },
 {
-pos = (41,0);
-ref = dotaccent;
+pos = (69,206);
+ref = dotaccentcomb;
 }
 );
 width = 315;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/iotadieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/iotadieresis.glyph
index 33697de47..2636031ba 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/iotadieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/iotadieresis.glyph
@@ -11,7 +11,7 @@ ref = iota;
 },
 {
 pos = (-336,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 544;
@@ -24,7 +24,7 @@ ref = iota;
 },
 {
 pos = (-302,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 736;
@@ -37,7 +37,7 @@ ref = iota;
 },
 {
 pos = (-331,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 442;
@@ -50,7 +50,7 @@ ref = iota;
 },
 {
 pos = (-325,248);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 480;
@@ -63,7 +63,7 @@ ref = iota;
 },
 {
 pos = (-291,248);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 702;
@@ -76,7 +76,7 @@ ref = iota;
 },
 {
 pos = (-336,248);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 314;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/iotasubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/iotasubcomb.glyph
index 387898c37..ccfc4ebeb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/iotasubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/iotasubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = iotasubnosp;
+glyphname = iotasubcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -166,5 +165,4 @@ width = 0;
 }
 );
 note = "similar or identical to uni1FBE";
-unicode = 837;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/itilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/itilde.glyph
index beceb36ae..370fe22c3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/itilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/itilde.glyph
@@ -11,8 +11,8 @@ ref = idotless;
 },
 {
 alignment = 1;
-pos = (-267,0);
-ref = tilde;
+pos = (-237,186);
+ref = tildecomb;
 }
 );
 width = 487;
@@ -24,8 +24,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-209,0);
-ref = tilde;
+pos = (-179,186);
+ref = tildecomb;
 }
 );
 width = 607;
@@ -38,8 +38,8 @@ ref = idotless;
 },
 {
 alignment = 1;
-pos = (-290,0);
-ref = tilde;
+pos = (-252,186);
+ref = tildecomb;
 }
 );
 width = 443;
@@ -52,8 +52,8 @@ ref = idotless;
 },
 {
 alignment = 1;
-pos = (-266,0);
-ref = tilde;
+pos = (-233,206);
+ref = tildecomb;
 }
 );
 width = 427;
@@ -65,8 +65,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-226,0);
-ref = tilde;
+pos = (-192,206);
+ref = tildecomb;
 }
 );
 width = 573;
@@ -79,8 +79,8 @@ ref = idotless;
 },
 {
 alignment = 1;
-pos = (-286,0);
-ref = tilde;
+pos = (-256,206);
+ref = tildecomb;
 }
 );
 width = 315;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/itildebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/itildebelow.glyph
index 836ba36c2..5bb6a61b9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/itildebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/itildebelow.glyph
@@ -17,7 +17,7 @@ ref = i;
 },
 {
 pos = (868,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 487;
@@ -30,7 +30,7 @@ ref = i;
 },
 {
 pos = (1026,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 607;
@@ -43,7 +43,7 @@ ref = i;
 },
 {
 pos = (707,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 443;
@@ -62,7 +62,7 @@ ref = i;
 },
 {
 pos = (869,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 427;
@@ -75,7 +75,7 @@ ref = i;
 },
 {
 pos = (1007,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 573;
@@ -88,7 +88,7 @@ ref = i;
 },
 {
 pos = (704,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 315;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/j.glyph b/src/Inter-Italic.glyphspackage/glyphs/j.glyph
index b65fcb184..7103e5cf6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/j.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/j.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = j;
 kernLeft = jdotless;
 kernRight = idotless;
@@ -18,8 +17,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-4,0);
-ref = dotaccent;
+pos = (27,186);
+ref = dotaccentcomb;
 }
 );
 width = 488;
@@ -44,8 +43,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-33,0);
-ref = dotaccent;
+pos = (-2,186);
+ref = dotaccentcomb;
 }
 );
 width = 606;
@@ -58,8 +57,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (40,0);
-ref = dotaccent;
+pos = (71,186);
+ref = dotaccentcomb;
 }
 );
 width = 449;
@@ -78,8 +77,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-1,0);
-ref = dotaccent;
+pos = (33,206);
+ref = dotaccentcomb;
 }
 );
 width = 424;
@@ -104,8 +103,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-33,0);
-ref = dotaccent;
+pos = (1,206);
+ref = dotaccentcomb;
 }
 );
 width = 574;
@@ -118,8 +117,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (52,42);
-ref = dotaccent;
+pos = (80,248);
+ref = dotaccentcomb;
 }
 );
 width = 320;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/jcaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/jcaron.glyph
index e50935650..6b87ac312 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/jcaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/jcaron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-226,0);
-ref = caron;
+pos = (-145,186);
+ref = caroncomb;
 }
 );
 width = 488;
@@ -23,8 +23,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-344,0);
-ref = caron;
+pos = (-179,186);
+ref = caroncomb;
 }
 );
 width = 606;
@@ -36,8 +36,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-201,16);
-ref = caron;
+pos = (-174,186);
+ref = caroncomb;
 }
 );
 width = 449;
@@ -49,8 +49,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-223,0);
-ref = caron;
+pos = (-154,206);
+ref = caroncomb;
 }
 );
 width = 424;
@@ -62,8 +62,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-342,0);
-ref = caron;
+pos = (-111,206);
+ref = caroncomb;
 }
 );
 width = 574;
@@ -75,8 +75,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-194,42);
-ref = caron;
+pos = (-149,248);
+ref = caroncomb;
 }
 );
 width = 320;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/jcircumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/jcircumflex.glyph
index 3cefaba7b..9c32d5fce 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/jcircumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/jcircumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-224,0);
-ref = circumflex;
+pos = (-145,186);
+ref = circumflexcomb;
 }
 );
 width = 488;
@@ -23,8 +23,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-345,0);
-ref = circumflex;
+pos = (-179,186);
+ref = circumflexcomb;
 }
 );
 width = 606;
@@ -36,8 +36,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-205,0);
-ref = circumflex;
+pos = (-175,186);
+ref = circumflexcomb;
 }
 );
 width = 449;
@@ -49,8 +49,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-221,0);
-ref = circumflex;
+pos = (-155,206);
+ref = circumflexcomb;
 }
 );
 width = 424;
@@ -62,8 +62,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-343,0);
-ref = circumflex;
+pos = (-110,206);
+ref = circumflexcomb;
 }
 );
 width = 574;
@@ -75,8 +75,8 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-191,42);
-ref = circumflex;
+pos = (-150,248);
+ref = circumflexcomb;
 }
 );
 width = 320;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/jcrosstail.glyph b/src/Inter-Italic.glyphspackage/glyphs/jcrosstail.glyph
index da53cdbdc..478e6a8be 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/jcrosstail.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/jcrosstail.glyph
@@ -11,8 +11,8 @@ pos = (-2,0);
 ref = jcrosstail.ccmp;
 },
 {
-pos = (222,0);
-ref = dotaccent;
+pos = (253,186);
+ref = dotaccentcomb;
 }
 );
 width = 710;
@@ -26,8 +26,8 @@ pos = (-2,0);
 ref = jcrosstail.ccmp;
 },
 {
-pos = (416,0);
-ref = dotaccent;
+pos = (447,186);
+ref = dotaccentcomb;
 }
 );
 width = 1137;
@@ -41,8 +41,8 @@ pos = (2,0);
 ref = jcrosstail.ccmp;
 },
 {
-pos = (124,0);
-ref = dotaccent;
+pos = (155,186);
+ref = dotaccentcomb;
 }
 );
 width = 457;
@@ -55,8 +55,8 @@ shapes = (
 ref = jcrosstail.ccmp;
 },
 {
-pos = (225,0);
-ref = dotaccent;
+pos = (259,206);
+ref = dotaccentcomb;
 }
 );
 width = 646;
@@ -69,8 +69,8 @@ shapes = (
 ref = jcrosstail.ccmp;
 },
 {
-pos = (416,0);
-ref = dotaccent;
+pos = (450,206);
+ref = dotaccentcomb;
 }
 );
 width = 1106;
@@ -84,8 +84,8 @@ pos = (-5,0);
 ref = jcrosstail.ccmp;
 },
 {
-pos = (124,0);
-ref = dotaccent;
+pos = (152,206);
+ref = dotaccentcomb;
 }
 );
 width = 326;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/k.base.glyph b/src/Inter-Italic.glyphspackage/glyphs/k.base.glyph
index 345d8cdbc..ee05d646a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/k.base.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/k.base.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = k.base;
 kernLeft = B;
 kernRight = k;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/k.glyph b/src/Inter-Italic.glyphspackage/glyphs/k.glyph
index b26d172a9..7692c59ea 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/k.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/k.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = k;
 kernLeft = B;
 kernRight = k;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/kacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/kacute.glyph
index 00a352f6f..25ca313e5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/kacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/kacute.glyph
@@ -5,78 +5,84 @@ kernRight = k;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = k;
 },
 {
-pos = (94,558);
-ref = acute;
+pos = (214,558);
+ref = acutecomb;
 }
 );
 width = 1115;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = k;
 },
 {
-pos = (93,558);
-ref = acute;
+pos = (223,558);
+ref = acutecomb;
 }
 );
 width = 1243;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = k;
 },
 {
-pos = (104,558);
-ref = acute;
+pos = (244,558);
+ref = acutecomb;
 }
 );
 width = 999;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = k;
 },
 {
-pos = (151,620);
-ref = acute;
+pos = (191,620);
+ref = acutecomb;
 }
 );
 width = 1041;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = k;
 },
 {
-pos = (171,620);
-ref = acute;
+pos = (195,620);
+ref = acutecomb;
 }
 );
 width = 1202;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = k;
 },
 {
-pos = (130,620);
-ref = acute;
+pos = (190,620);
+ref = acutecomb;
 }
 );
 width = 870;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/kcaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/kcaron.glyph
index 479631d32..a214e0c86 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/kcaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/kcaron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = k;
 },
 {
-pos = (-159,372);
-ref = caron;
+pos = (-78,558);
+ref = caroncomb;
 }
 );
 width = 1115;
@@ -23,8 +23,8 @@ shapes = (
 ref = k;
 },
 {
-pos = (-280,372);
-ref = caron;
+pos = (-115,558);
+ref = caroncomb;
 }
 );
 width = 1243;
@@ -36,8 +36,8 @@ shapes = (
 ref = k;
 },
 {
-pos = (-142,388);
-ref = caron;
+pos = (-115,558);
+ref = caroncomb;
 }
 );
 width = 999;
@@ -49,8 +49,8 @@ shapes = (
 ref = k;
 },
 {
-pos = (-153,414);
-ref = caron;
+pos = (-84,620);
+ref = caroncomb;
 }
 );
 width = 1041;
@@ -62,8 +62,8 @@ shapes = (
 ref = k;
 },
 {
-pos = (-275,414);
-ref = caron;
+pos = (-44,620);
+ref = caroncomb;
 }
 );
 width = 1202;
@@ -75,8 +75,8 @@ shapes = (
 ref = k;
 },
 {
-pos = (-136,414);
-ref = caron;
+pos = (-91,620);
+ref = caroncomb;
 }
 );
 width = 870;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/kjecyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/kjecyrillic.glyph
index ffb35bf0b..dced3967f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/kjecyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/kjecyrillic.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = kacyrillic;
 },
 {
-pos = (337,186);
-ref = acute;
+pos = (457,186);
+ref = acutecomb;
 }
 );
 width = 1100;
@@ -25,8 +25,8 @@ shapes = (
 ref = kacyrillic;
 },
 {
-pos = (360,186);
-ref = acute;
+pos = (490,186);
+ref = acutecomb;
 }
 );
 width = 1266;
@@ -39,8 +39,8 @@ shapes = (
 ref = kacyrillic;
 },
 {
-pos = (305,186);
-ref = acute;
+pos = (445,186);
+ref = acutecomb;
 }
 );
 width = 974;
@@ -53,8 +53,8 @@ shapes = (
 ref = kacyrillic;
 },
 {
-pos = (388,206);
-ref = acute;
+pos = (428,206);
+ref = acutecomb;
 }
 );
 width = 1034;
@@ -67,8 +67,8 @@ shapes = (
 ref = kacyrillic;
 },
 {
-pos = (433,206);
-ref = acute;
+pos = (457,206);
+ref = acutecomb;
 }
 );
 width = 1238;
@@ -81,8 +81,8 @@ shapes = (
 ref = kacyrillic;
 },
 {
-pos = (333,248);
-ref = acute;
+pos = (393,248);
+ref = acutecomb;
 }
 );
 width = 844;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/klinebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/klinebelow.glyph
index a4a09b214..70aa77ed4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/klinebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/klinebelow.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (130,0);
+pos = (131,0);
 ref = macronsub;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = k;
 },
 {
-pos = (229,0);
+pos = (228,0);
 ref = macronsub;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/koronisaccentleft.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/koronisaccentleft.cn.glyph
index 51c7774d6..36a0f0f3c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/koronisaccentleft.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/koronisaccentleft.cn.glyph
@@ -1,5 +1,4 @@
 {
-color = 4;
 glyphname = koronisaccentleft.cn;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/koroniscmb.glyph b/src/Inter-Italic.glyphspackage/glyphs/koroniscmb.glyph
index 4ae6bb5aa..4cd74901c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/koroniscmb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/koroniscmb.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = koroniscmb;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/l.glyph b/src/Inter-Italic.glyphspackage/glyphs/l.glyph
index 5a8332d69..a8a753de2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/l.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/l.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = l;
 kernLeft = B;
 kernRight = H;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/lacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/lacute.glyph
index c199f0156..458d4eefe 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/lacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/lacute.glyph
@@ -5,78 +5,84 @@ kernRight = H;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = l;
 },
 {
-pos = (90,558);
-ref = acute;
+pos = (210,558);
+ref = acutecomb;
 }
 );
 width = 486;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = l;
 },
 {
-pos = (91,558);
-ref = acute;
+pos = (221,558);
+ref = acutecomb;
 }
 );
 width = 606;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = l;
 },
 {
-pos = (102,558);
-ref = acute;
+pos = (242,558);
+ref = acutecomb;
 }
 );
 width = 442;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = l;
 },
 {
-pos = (150,620);
-ref = acute;
+pos = (190,620);
+ref = acutecomb;
 }
 );
 width = 427;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = l;
 },
 {
-pos = (171,620);
-ref = acute;
+pos = (195,620);
+ref = acutecomb;
 }
 );
 width = 573;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = l;
 },
 {
-pos = (131,620);
-ref = acute;
+pos = (191,620);
+ref = acutecomb;
 }
 );
 width = 315;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/lacute.ss02.glyph b/src/Inter-Italic.glyphspackage/glyphs/lacute.ss02.glyph
index 52a19ebfb..4742dcd7e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/lacute.ss02.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/lacute.ss02.glyph
@@ -6,78 +6,90 @@ kernRight = H;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (93,558);
-ref = acute;
+pos = (213,558);
+ref = acutecomb;
 }
 );
-width = 530;
+width = 532;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (92,558);
-ref = acute;
+pos = (222,558);
+ref = acutecomb;
 }
 );
 width = 674;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (5,372);
-ref = acute;
+pos = (243,558);
+ref = acutecomb;
 }
 );
 width = 450;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (150,620);
-ref = acute;
+pos = (190,620);
+ref = acutecomb;
 }
 );
-width = 466;
+width = 468;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (-55,414);
-ref = acute;
+pos = (195,620);
+ref = acutecomb;
 }
 );
 width = 642;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = l.ss02;
 },
 {
-pos = (-49,414);
-ref = acute;
+pos = (190,620);
+ref = acutecomb;
 }
 );
 width = 322;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/lcircumflexbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/lcircumflexbelow.glyph
index 10fb149f7..0e0b7aaaa 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/lcircumflexbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/lcircumflexbelow.glyph
@@ -11,7 +11,7 @@ ref = l;
 },
 {
 pos = (823,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 486;
@@ -24,7 +24,7 @@ ref = l;
 },
 {
 pos = (975,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 606;
@@ -37,7 +37,7 @@ ref = l;
 },
 {
 pos = (733,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 442;
@@ -50,7 +50,7 @@ ref = l;
 },
 {
 pos = (826,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 427;
@@ -63,7 +63,7 @@ ref = l;
 },
 {
 pos = (976,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 573;
@@ -76,7 +76,7 @@ ref = l;
 },
 {
 pos = (732,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 315;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/lcircumflexbelow.ss02.glyph b/src/Inter-Italic.glyphspackage/glyphs/lcircumflexbelow.ss02.glyph
index 3b581b265..fab9df507 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/lcircumflexbelow.ss02.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/lcircumflexbelow.ss02.glyph
@@ -12,7 +12,7 @@ ref = l.ss02;
 },
 {
 pos = (900,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 530;
@@ -25,7 +25,7 @@ ref = l.ss02;
 },
 {
 pos = (1040,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 674;
@@ -38,7 +38,7 @@ ref = l.ss02;
 },
 {
 pos = (820,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 450;
@@ -51,7 +51,7 @@ ref = l.ss02;
 },
 {
 pos = (890,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 466;
@@ -64,7 +64,7 @@ ref = l.ss02;
 },
 {
 pos = (1033,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 642;
@@ -77,7 +77,7 @@ ref = l.ss02;
 },
 {
 pos = (804,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 322;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ldot.glyph b/src/Inter-Italic.glyphspackage/glyphs/ldot.glyph
index 2dad5a95f..fa6996a48 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ldot.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ldot.glyph
@@ -13,7 +13,7 @@ ref = l;
 {
 alignment = -1;
 pos = (212,-588);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 654;
@@ -29,7 +29,7 @@ ref = l;
 {
 alignment = -1;
 pos = (366,-608);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 974;
@@ -45,7 +45,7 @@ ref = l;
 {
 alignment = -1;
 pos = (120,-576);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 450;
@@ -60,7 +60,7 @@ ref = l;
 {
 alignment = -1;
 pos = (212,-588);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 590;
@@ -76,7 +76,7 @@ ref = l;
 {
 alignment = -1;
 pos = (366,-608);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 942;
@@ -92,7 +92,7 @@ ref = l;
 {
 alignment = -1;
 pos = (120,-576);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 322;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ldot.ss02.glyph b/src/Inter-Italic.glyphspackage/glyphs/ldot.ss02.glyph
index 2d88624a5..52ca14d36 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ldot.ss02.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ldot.ss02.glyph
@@ -14,7 +14,7 @@ ref = l.ss02;
 {
 alignment = -1;
 pos = (204,-588);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 646;
@@ -30,7 +30,7 @@ ref = l.ss02;
 {
 alignment = -1;
 pos = (366,-608);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 974;
@@ -46,7 +46,7 @@ ref = l.ss02;
 {
 alignment = -1;
 pos = (108,-576);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 440;
@@ -61,7 +61,7 @@ ref = l.ss02;
 {
 alignment = -1;
 pos = (204,-588);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 582;
@@ -77,7 +77,7 @@ ref = l.ss02;
 {
 alignment = -1;
 pos = (366,-608);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 942;
@@ -93,7 +93,7 @@ ref = l.ss02;
 {
 alignment = -1;
 pos = (108,-576);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 316;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ldotbelowmacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/ldotbelowmacron.glyph
index c031008b8..8f423e475 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ldotbelowmacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ldotbelowmacron.glyph
@@ -5,6 +5,7 @@ kernRight = H;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = l;
@@ -15,13 +16,14 @@ ref = dotbelow;
 },
 {
 pos = (-153,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 486;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = l;
@@ -32,13 +34,14 @@ ref = dotbelow;
 },
 {
 pos = (-22,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 606;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = l;
@@ -49,13 +52,14 @@ ref = dotbelow;
 },
 {
 pos = (-86,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 442;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = l;
@@ -65,14 +69,15 @@ pos = (853,0);
 ref = dotbelow;
 },
 {
-pos = (-101,620);
-ref = macron;
+pos = (-102,620);
+ref = macroncomb;
 }
 );
 width = 427;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = l;
@@ -83,13 +88,14 @@ ref = dotbelow;
 },
 {
 pos = (4,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 573;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = l;
@@ -100,7 +106,7 @@ ref = dotbelow;
 },
 {
 pos = (-123,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 315;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ldotbelowmacron.ss02.glyph b/src/Inter-Italic.glyphspackage/glyphs/ldotbelowmacron.ss02.glyph
index 8e4564a71..2f171fe41 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ldotbelowmacron.ss02.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ldotbelowmacron.ss02.glyph
@@ -6,8 +6,10 @@ kernRight = H;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = l.ss02;
 },
 {
@@ -16,15 +18,17 @@ ref = dotbelow;
 },
 {
 pos = (-150,558);
-ref = macron;
+ref = macroncomb;
 }
 );
-width = 530;
+width = 532;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = l.ss02;
 },
 {
@@ -33,15 +37,17 @@ ref = dotbelow;
 },
 {
 pos = (-21,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 674;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = l.ss02;
 },
 {
@@ -50,15 +56,17 @@ ref = dotbelow;
 },
 {
 pos = (-85,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 450;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = l.ss02;
 },
 {
@@ -66,16 +74,18 @@ pos = (917,0);
 ref = dotbelow;
 },
 {
-pos = (-101,620);
-ref = macron;
+pos = (-102,620);
+ref = macroncomb;
 }
 );
-width = 466;
+width = 468;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = l.ss02;
 },
 {
@@ -84,15 +94,17 @@ ref = dotbelow;
 },
 {
 pos = (4,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 642;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = l.ss02;
 },
 {
@@ -101,7 +113,7 @@ ref = dotbelow;
 },
 {
 pos = (-124,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 322;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/linevertnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/linevertcomb.glyph
index 366269fce..c979b5cb6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/linevertnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/linevertcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = linevertnosp;
+glyphname = linevertcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -65,5 +64,4 @@ ref = linevert;
 width = 0;
 }
 );
-unicode = 781;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/linevertdblnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/linevertdblcomb.glyph
index d3d5b3ed9..98814545f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/linevertdblnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/linevertdblcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = linevertdblnosp;
+glyphname = linevertdblcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -91,5 +90,4 @@ ref = linevert;
 width = 0;
 }
 );
-unicode = 782;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/linevertsubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/linevertsubcomb.glyph
index cd4867770..7b47ed02d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/linevertsubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/linevertsubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = linevertsubnosp;
+glyphname = linevertsubcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -65,5 +64,4 @@ ref = linevert;
 width = 0;
 }
 );
-unicode = 809;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/llinebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/llinebelow.glyph
index 01e863694..4ee564bdb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/llinebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/llinebelow.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-204,0);
+pos = (-203,0);
 ref = macronsub;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-98,0);
+pos = (-99,0);
 ref = macronsub;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/llinebelow.ss02.glyph b/src/Inter-Italic.glyphspackage/glyphs/llinebelow.ss02.glyph
index cf2e9dc26..3e8e992ad 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/llinebelow.ss02.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/llinebelow.ss02.glyph
@@ -50,7 +50,7 @@ shapes = (
 ref = l.ss02;
 },
 {
-pos = (-140,0);
+pos = (-139,0);
 ref = macronsub;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/lowdownarrowheadmod.glyph b/src/Inter-Italic.glyphspackage/glyphs/lowdownarrowheadmod.glyph
index cc2fa32b4..29dbed979 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/lowdownarrowheadmod.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/lowdownarrowheadmod.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = lowdownarrowheadmod;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/m.glyph b/src/Inter-Italic.glyphspackage/glyphs/m.glyph
index cc11bd578..351e1f78e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/m.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/m.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = m;
 kernLeft = m;
 kernRight = a;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/macron.glyph b/src/Inter-Italic.glyphspackage/glyphs/macron.glyph
index f9ec7c450..f7ef244fa 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/macron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/macron.glyph
@@ -1,159 +1,68 @@
 {
-color = (204,240,242,1);
 glyphname = macron;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (580,1118);
-},
-{
-name = top;
-pos = (641,1489);
-}
-);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(366,1489,l),
-(343,1351,l),
-(895,1351,l),
-(918,1489,l)
-);
+alignment = 1;
+ref = macroncomb;
 }
 );
 width = 976;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (509,1118);
-},
-{
-name = top;
-pos = (578,1532);
-}
-);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(278,1532,l),
-(239,1300,l),
-(839,1300,l),
-(878,1532,l)
-);
+alignment = 1;
+ref = macroncomb;
 }
 );
 width = 833;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (493,1118);
-},
-{
-name = top;
-pos = (547,1443);
-}
-);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(314,1443,l),
-(306,1397,l),
-(772,1397,l),
-(780,1443,l)
-);
+alignment = 1;
+ref = macroncomb;
 }
 );
 width = 801;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (503,1056);
-},
-{
-name = top;
-pos = (568,1448);
-}
-);
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(292,1448,l),
-(269,1308,l),
-(821,1308,l),
-(844,1448,l)
-);
+alignment = 1;
+ref = macroncomb;
 }
 );
 width = 832;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (472,1056);
-},
-{
-name = top;
-pos = (544,1494);
-}
-);
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(244,1494,l),
-(206,1262,l),
-(806,1262,l),
-(844,1494,l)
-);
+alignment = 1;
+ref = macroncomb;
 }
 );
-width = 768;
+width = 769;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (472,1056);
-},
-{
-name = top;
-pos = (529,1401);
-}
-);
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(297,1401,l),
-(289,1355,l),
-(753,1355,l),
-(761,1401,l)
-);
+alignment = 1;
+ref = macroncomb;
 }
 );
 width = 768;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/macronacutecomb.lc.glyph b/src/Inter-Italic.glyphspackage/glyphs/macronacutecomb.glyph
index bd6b92d5c..73d88dc36 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/macronacutecomb.lc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/macronacutecomb.glyph
@@ -1,5 +1,5 @@
 {
-glyphname = macronacutecomb.lc;
+glyphname = macronacutecomb;
 layers = (
 {
 anchors = (
@@ -25,7 +25,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-5,-28);
-ref = macron;
+ref = macroncomb;
 },
 {
 alignment = -1;
@@ -59,7 +59,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-4,-24);
-ref = macron;
+ref = macroncomb;
 },
 {
 alignment = -1;
@@ -94,7 +94,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-5,-28);
-ref = macron;
+ref = macroncomb;
 },
 {
 alignment = -1;
@@ -125,7 +125,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-3,-18);
-ref = macron;
+ref = macroncomb;
 },
 {
 alignment = -1;
@@ -139,12 +139,18 @@ width = 832;
 anchors = (
 {
 name = _top;
-pos = (471,1056);
+pos = (472,1056);
 }
 );
 guides = (
 {
-pos = (0,1552);
+pos = (1,1536);
+},
+{
+pos = (1,1318);
+},
+{
+pos = (1,1846);
 }
 );
 layerId = m010;
@@ -152,17 +158,17 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (1,8);
-ref = macron;
+pos = (-1,-8);
+ref = macroncomb;
 },
 {
 alignment = -1;
-pos = (291,489);
+pos = (274,413);
 ref = acute_compact;
-scale = (0.9,0.9);
+scale = (0.9,0.9509);
 }
 );
-width = 774;
+width = 763;
 },
 {
 anchors = (
@@ -185,7 +191,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-8,-50);
-ref = macron;
+ref = macroncomb;
 },
 {
 alignment = -1;
@@ -196,4 +202,5 @@ ref = acute_compact;
 width = 769;
 }
 );
+unicode = 7620;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/macroncomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/macroncomb.glyph
index 7a999349d..cae084710 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/macroncomb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/macroncomb.glyph
@@ -1,120 +1,161 @@
 {
-color = (250,227,227,1);
 glyphname = macroncomb;
 layers = (
 {
 anchors = (
 {
 name = _top;
-pos = (-462,1304);
+pos = (580,1118);
+},
+{
+name = top;
+pos = (641,1489);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (-1050,0);
-ref = macron;
+closed = 1;
+nodes = (
+(366,1489,l),
+(343,1351,l),
+(895,1351,l),
+(918,1489,l)
+);
 }
 );
-width = 0;
+width = 976;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-530,1304);
-}
-);
-guides = (
+pos = (509,1118);
+},
 {
-angle = -99.4;
-pos = (-794,1764);
+name = top;
+pos = (578,1532);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (-1312,0);
-ref = macron;
+closed = 1;
+nodes = (
+(278,1532,l),
+(239,1300,l),
+(839,1300,l),
+(878,1532,l)
+);
 }
 );
-width = 32;
+width = 833;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-450,1304);
+pos = (493,1118);
+},
+{
+name = top;
+pos = (547,1443);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (-870,0);
-ref = macron;
+closed = 1;
+nodes = (
+(314,1443,l),
+(306,1397,l),
+(772,1397,l),
+(780,1443,l)
+);
 }
 );
-width = 0;
+width = 801;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-494,1304);
+pos = (504,1056);
+},
+{
+name = top;
+pos = (564,1416);
 }
 );
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (-1050,0);
-ref = macron;
+closed = 1;
+nodes = (
+(287,1416,l),
+(264,1276,l),
+(816,1276,l),
+(839,1416,l)
+);
 }
 );
-width = 0;
+width = 832;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-546,1304);
-}
-);
-guides = (
+pos = (472,1056);
+},
 {
-angle = -99.4;
-pos = (-826,1764);
+name = top;
+pos = (535,1436);
 }
 );
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (-1312,0);
-ref = macron;
+closed = 1;
+nodes = (
+(235,1436,l),
+(196,1204,l),
+(796,1204,l),
+(835,1436,l)
+);
 }
 );
-width = 0;
+width = 769;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-514,1304);
+pos = (472,1056);
+},
+{
+name = top;
+pos = (529,1401);
 }
 );
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (-870,0);
-ref = macron;
+closed = 1;
+nodes = (
+(297,1401,l),
+(289,1355,l),
+(753,1355,l),
+(761,1401,l)
+);
 }
 );
-width = 0;
+width = 768;
 }
 );
 unicode = 772;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/macrondieresiscomb.lc.glyph b/src/Inter-Italic.glyphspackage/glyphs/macrondieresiscomb.lc.glyph
index dfed8acc2..2ccd550e1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/macrondieresiscomb.lc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/macrondieresiscomb.lc.glyph
@@ -5,356 +5,199 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (-472,1282);
+pos = (703,1118);
+}
+);
+guides = (
+{
+pos = (123,1717);
 },
 {
-name = mkmktop_acc;
-pos = (-372,1870);
+pos = (123,1392);
+},
+{
+pos = (123,1717);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-780,1446,l),
-(-802,1298,l),
-(-120,1298,l),
-(-96,1446,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-745,1597,o),
-(-713,1548,o),
-(-638,1548,cs),
-(-561,1548,o),
-(-515,1600,o),
-(-504,1658,cs),
-(-495,1719,o),
-(-527,1769,o),
-(-600,1768,cs),
-(-675,1769,o),
-(-724,1719,o),
-(-734,1658,cs)
-);
+alignment = -1;
+pos = (118,-28);
+ref = macroncomb;
 },
 {
-closed = 1;
-nodes = (
-(-314,1594,o),
-(-285,1548,o),
-(-210,1548,cs),
-(-134,1548,o),
-(-84,1594,o),
-(-76,1656,cs),
-(-64,1716,o),
-(-96,1766,o),
-(-172,1766,cs),
-(-247,1766,o),
-(-294,1716,o),
-(-306,1656,cs)
-);
+alignment = -1;
+pos = (60,297);
+ref = dieresiscomb;
 }
 );
-width = 0;
+width = 632;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-582,1300);
+pos = (509,1118);
+}
+);
+guides = (
+{
+pos = (1,1765);
 },
 {
-name = mkmktop_acc;
-pos = (-474,1954);
+pos = (1,1392);
+},
+{
+pos = (1,1765);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-922,1464,l),
-(-952,1280,l),
-(-222,1280,l),
-(-192,1464,l)
-);
+alignment = -1;
+pos = (-3,-24);
+ref = macroncomb;
 },
 {
-closed = 1;
-nodes = (
-(-977,1617,o),
-(-911,1553,o),
-(-824,1554,cs),
-(-733,1553,o),
-(-649,1617,o),
-(-634,1696,cs),
-(-623,1775,o),
-(-687,1839,o),
-(-776,1838,cs),
-(-864,1839,o),
-(-951,1775,o),
-(-962,1696,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-419,1617,o),
-(-349,1553,o),
-(-262,1554,cs),
-(-175,1553,o),
-(-90,1617,o),
-(-76,1696,cs),
-(-64,1777,o),
-(-131,1839,o),
-(-216,1838,cs),
-(-303,1839,o),
-(-393,1777,o),
-(-404,1696,cs)
-);
+alignment = -1;
+pos = (-191,349);
+ref = dieresiscomb;
 }
 );
-width = 26;
+width = 681;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-404,1274);
+pos = (603,1118);
+}
+);
+guides = (
+{
+pos = (111,1681);
+},
+{
+pos = (111,1392);
 },
 {
-name = mkmktop_acc;
-pos = (-312,1822);
+pos = (111,1681);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-610,1362,l),
-(-618,1314,l),
-(-152,1314,l),
-(-146,1362,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-537,1533,o),
-(-516,1510,o),
-(-488,1510,cs),
-(-464,1510,o),
-(-441,1530,o),
-(-438,1550,cs),
-(-433,1580,o),
-(-452,1603,o),
-(-482,1602,cs),
-(-505,1603,o),
-(-527,1583,o),
-(-530,1562,cs)
-);
+alignment = -1;
+pos = (106,-28);
+ref = macroncomb;
 },
 {
-closed = 1;
-nodes = (
-(-257,1536,o),
-(-237,1510,o),
-(-208,1510,cs),
-(-185,1510,o),
-(-164,1527,o),
-(-158,1550,cs),
-(-151,1579,o),
-(-173,1603,o),
-(-202,1602,cs),
-(-225,1603,o),
-(-247,1583,o),
-(-252,1562,cs)
-);
+alignment = -1;
+pos = (-28,261);
+ref = dieresiscomb;
 }
 );
-width = 0;
+width = 547;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-504,1282);
+pos = (554,1056);
+}
+);
+guides = (
+{
+pos = (51,1328);
 },
 {
-name = mkmktop_acc;
-pos = (-404,1870);
+pos = (51,1648);
 }
 );
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-812,1446,l),
-(-834,1298,l),
-(-152,1298,l),
-(-128,1446,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-777,1597,o),
-(-745,1548,o),
-(-670,1548,cs),
-(-593,1548,o),
-(-547,1600,o),
-(-536,1658,cs),
-(-527,1719,o),
-(-559,1769,o),
-(-632,1768,cs),
-(-707,1769,o),
-(-756,1719,o),
-(-766,1658,cs)
-);
+alignment = -1;
+pos = (48,-18);
+ref = macroncomb;
 },
 {
-closed = 1;
-nodes = (
-(-346,1594,o),
-(-317,1548,o),
-(-242,1548,cs),
-(-166,1548,o),
-(-116,1594,o),
-(-108,1656,cs),
-(-96,1716,o),
-(-128,1766,o),
-(-204,1766,cs),
-(-279,1766,o),
-(-326,1716,o),
-(-338,1656,cs)
-);
+alignment = -1;
+pos = (-57,270);
+ref = dieresiscomb;
 }
 );
-width = 0;
+width = 832;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-598,1300);
+pos = (463,1056);
+}
+);
+guides = (
+{
+pos = (-8,1696);
 },
 {
-name = mkmktop_acc;
-pos = (-490,1954);
+pos = (-8,1318);
 }
 );
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-938,1464,l),
-(-968,1280,l),
-(-238,1280,l),
-(-208,1464,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-993,1617,o),
-(-927,1553,o),
-(-840,1554,cs),
-(-749,1553,o),
-(-665,1617,o),
-(-650,1696,cs),
-(-639,1775,o),
-(-703,1839,o),
-(-792,1838,cs),
-(-880,1839,o),
-(-967,1775,o),
-(-978,1696,cs)
-);
+alignment = -1;
+pos = (-9,-2);
+ref = macroncomb;
 },
 {
-closed = 1;
-nodes = (
-(-435,1617,o),
-(-365,1553,o),
-(-278,1554,cs),
-(-191,1553,o),
-(-106,1617,o),
-(-92,1696,cs),
-(-80,1777,o),
-(-147,1839,o),
-(-232,1838,cs),
-(-319,1839,o),
-(-409,1777,o),
-(-420,1696,cs)
-);
+alignment = -1;
+pos = (-128,486);
+ref = dieresiscomb;
+scale = (0.9,0.9);
 }
 );
-width = 0;
+width = 681;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-468,1274);
+pos = (567,1056);
+}
+);
+guides = (
+{
+pos = (96,1328);
 },
 {
-name = mkmktop_acc;
-pos = (-376,1822);
+pos = (96,1584);
 }
 );
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-674,1362,l),
-(-682,1314,l),
-(-216,1314,l),
-(-210,1362,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-601,1533,o),
-(-580,1510,o),
-(-552,1510,cs),
-(-528,1510,o),
-(-505,1530,o),
-(-502,1550,cs),
-(-497,1580,o),
-(-516,1603,o),
-(-546,1602,cs),
-(-569,1603,o),
-(-591,1583,o),
-(-594,1562,cs)
-);
+alignment = -1;
+pos = (87,-50);
+ref = macroncomb;
 },
 {
-closed = 1;
-nodes = (
-(-321,1536,o),
-(-301,1510,o),
-(-272,1510,cs),
-(-249,1510,o),
-(-228,1527,o),
-(-222,1550,cs),
-(-215,1579,o),
-(-237,1603,o),
-(-266,1602,cs),
-(-289,1603,o),
-(-311,1583,o),
-(-316,1562,cs)
-);
+alignment = -1;
+pos = (-20,206);
+ref = dieresiscomb;
 }
 );
-width = 0;
+width = 544;
 }
 );
+metricWidth = macron;
 unicode = 57617;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/macrongravecomb.lc.glyph b/src/Inter-Italic.glyphspackage/glyphs/macrongravecomb.lc.glyph
index e00422da1..0c5330199 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/macrongravecomb.lc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/macrongravecomb.lc.glyph
@@ -5,18 +5,18 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (580,1118);
+pos = (752,1118);
 }
 );
 guides = (
 {
-pos = (0,1616);
+pos = (172,1616);
 },
 {
-pos = (0,1392);
+pos = (172,1392);
 },
 {
-pos = (0,1717);
+pos = (172,1717);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -24,12 +24,12 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-5,-28);
-ref = macron;
+pos = (167,-28);
+ref = macroncomb;
 },
 {
 alignment = -1;
-pos = (125,333);
+pos = (297,333);
 ref = grave_compact;
 }
 );
@@ -39,18 +39,18 @@ width = 976;
 anchors = (
 {
 name = _top;
-pos = (508,1118);
+pos = (584,1118);
 }
 );
 guides = (
 {
-pos = (0,1632);
+pos = (76,1632);
 },
 {
-pos = (0,1392);
+pos = (76,1392);
 },
 {
-pos = (0,1765);
+pos = (76,1765);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -58,12 +58,12 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-4,-24);
-ref = macron;
+pos = (72,-24);
+ref = macroncomb;
 },
 {
 alignment = -1;
-pos = (120,627);
+pos = (196,627);
 ref = grave_compact;
 scale = (0.8,0.8);
 }
@@ -74,18 +74,18 @@ width = 833;
 anchors = (
 {
 name = _top;
-pos = (492,1118);
+pos = (619,1118);
 }
 );
 guides = (
 {
-pos = (0,1616);
+pos = (127,1616);
 },
 {
-pos = (0,1392);
+pos = (127,1392);
 },
 {
-pos = (0,1681);
+pos = (127,1681);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -93,12 +93,12 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-5,-28);
-ref = macron;
+pos = (122,-28);
+ref = macroncomb;
 },
 {
 alignment = -1;
-pos = (91,333);
+pos = (218,333);
 ref = grave_compact;
 }
 );
@@ -108,15 +108,15 @@ width = 800;
 anchors = (
 {
 name = _top;
-pos = (503,1056);
+pos = (603,1056);
 }
 );
 guides = (
 {
-pos = (0,1328);
+pos = (100,1328);
 },
 {
-pos = (0,1520);
+pos = (100,1520);
 }
 );
 layerId = m008;
@@ -124,27 +124,33 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-3,-18);
-ref = macron;
+pos = (97,-18);
+ref = macroncomb;
 },
 {
 alignment = -1;
-pos = (122,279);
+pos = (222,279);
 ref = grave_compact;
 }
 );
-width = 859;
+width = 832;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (377,1056);
+pos = (476,1056);
 }
 );
 guides = (
 {
-pos = (-94,1552);
+pos = (5,1318);
+},
+{
+pos = (5,1846);
+},
+{
+pos = (5,1536);
 }
 );
 layerId = m010;
@@ -152,31 +158,31 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-93,8);
-ref = macron;
+pos = (4,-2);
+ref = macroncomb;
 },
 {
 alignment = -1;
-pos = (-82,489);
+pos = (5,414);
 ref = grave_compact;
-scale = (0.9,0.9);
+scale = (0.9,0.95);
 }
 );
-width = 674;
+width = 729;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (472,1056);
+pos = (584,1056);
 }
 );
 guides = (
 {
-pos = (1,1328);
+pos = (113,1328);
 },
 {
-pos = (1,1520);
+pos = (113,1520);
 }
 );
 layerId = m012;
@@ -184,12 +190,12 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (-8,-50);
-ref = macron;
+pos = (104,-50);
+ref = macroncomb;
 },
 {
 alignment = -1;
-pos = (110,279);
+pos = (222,279);
 ref = grave_compact;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/macronsub.glyph b/src/Inter-Italic.glyphspackage/glyphs/macronsub.glyph
index 7ddcd961f..cc65baf20 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/macronsub.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/macronsub.glyph
@@ -14,7 +14,7 @@ name = ital_gen;
 shapes = (
 {
 pos = (-285,-1722);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 976;
@@ -31,7 +31,7 @@ name = ital_gen;
 shapes = (
 {
 pos = (-284,-1714);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 833;
@@ -48,7 +48,7 @@ name = ital_gen;
 shapes = (
 {
 pos = (-279,-1686);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 801;
@@ -57,15 +57,15 @@ width = 801;
 anchors = (
 {
 name = _bottom;
-pos = (329,0);
+pos = (328,0);
 }
 );
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-pos = (-281,-1700);
-ref = macron;
+pos = (-271,-1636);
+ref = macroncomb;
 }
 );
 width = 832;
@@ -74,18 +74,18 @@ width = 832;
 anchors = (
 {
 name = _bottom;
-pos = (296,0);
+pos = (297,0);
 }
 );
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
-pos = (-274,-1658);
-ref = macron;
+pos = (-260,-1573);
+ref = macroncomb;
 }
 );
-width = 768;
+width = 769;
 },
 {
 anchors = (
@@ -99,7 +99,7 @@ name = ital_gen;
 shapes = (
 {
 pos = (-281,-1700);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 768;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/macronsubcomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/macronsubcomb.glyph
new file mode 100644
index 000000000..46245b9fc
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/macronsubcomb.glyph
@@ -0,0 +1,108 @@
+{
+case = minor;
+glyphname = macronsubcomb;
+layers = (
+{
+anchors = (
+{
+name = _bottom;
+pos = (396,0);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+pos = (-285,-1722);
+ref = macroncomb;
+}
+);
+width = 976;
+},
+{
+anchors = (
+{
+name = _bottom;
+pos = (324,0);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+pos = (-284,-1714);
+ref = macroncomb;
+}
+);
+width = 833;
+},
+{
+anchors = (
+{
+name = _bottom;
+pos = (308,0);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+pos = (-279,-1686);
+ref = macroncomb;
+}
+);
+width = 801;
+},
+{
+anchors = (
+{
+name = _bottom;
+pos = (328,0);
+}
+);
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+pos = (-271,-1636);
+ref = macroncomb;
+}
+);
+width = 832;
+},
+{
+anchors = (
+{
+name = _bottom;
+pos = (297,0);
+}
+);
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+pos = (-260,-1573);
+ref = macroncomb;
+}
+);
+width = 769;
+},
+{
+anchors = (
+{
+name = _bottom;
+pos = (296,0);
+}
+);
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+pos = (-281,-1700);
+ref = macroncomb;
+}
+);
+width = 768;
+}
+);
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/macute.glyph b/src/Inter-Italic.glyphspackage/glyphs/macute.glyph
index 5f1042647..c6918d69c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/macute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/macute.glyph
@@ -5,78 +5,84 @@ kernRight = a;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = m;
 },
 {
-pos = (677,186);
-ref = acute;
+pos = (797,186);
+ref = acutecomb;
 }
 );
 width = 1783;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = m;
 },
 {
-pos = (694,186);
-ref = acute;
+pos = (824,186);
+ref = acutecomb;
 }
 );
 width = 1933;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = m;
 },
 {
-pos = (675,186);
-ref = acute;
+pos = (815,186);
+ref = acutecomb;
 }
 );
 width = 1711;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = m;
 },
 {
-pos = (730,206);
-ref = acute;
+pos = (770,206);
+ref = acutecomb;
 }
 );
 width = 1719;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = m;
 },
 {
-pos = (761,206);
-ref = acute;
+pos = (785,206);
+ref = acutecomb;
 }
 );
 width = 1889;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = m;
 },
 {
-pos = (727,206);
-ref = acute;
+pos = (787,206);
+ref = acutecomb;
 }
 );
 width = 1647;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/mdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/mdotaccent.glyph
index 404bfc183..836a05f18 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/mdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/mdotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = m;
 },
 {
-pos = (646,0);
-ref = dotaccent;
+pos = (677,186);
+ref = dotaccentcomb;
 }
 );
 width = 1783;
@@ -25,8 +25,8 @@ shapes = (
 ref = m;
 },
 {
-pos = (632,0);
-ref = dotaccent;
+pos = (663,186);
+ref = dotaccentcomb;
 }
 );
 width = 1933;
@@ -39,8 +39,8 @@ shapes = (
 ref = m;
 },
 {
-pos = (670,0);
-ref = dotaccent;
+pos = (701,186);
+ref = dotaccentcomb;
 }
 );
 width = 1711;
@@ -53,8 +53,8 @@ shapes = (
 ref = m;
 },
 {
-pos = (648,0);
-ref = dotaccent;
+pos = (682,206);
+ref = dotaccentcomb;
 }
 );
 width = 1719;
@@ -67,8 +67,8 @@ shapes = (
 ref = m;
 },
 {
-pos = (624,0);
-ref = dotaccent;
+pos = (658,206);
+ref = dotaccentcomb;
 }
 );
 width = 1889;
@@ -81,8 +81,8 @@ shapes = (
 ref = m;
 },
 {
-pos = (707,0);
-ref = dotaccent;
+pos = (735,206);
+ref = dotaccentcomb;
 }
 );
 width = 1647;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/minusmod.glyph b/src/Inter-Italic.glyphspackage/glyphs/minusmod.glyph
index c031d46f9..dc38b85dd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/minusmod.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/minusmod.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = minusmod;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/n.glyph b/src/Inter-Italic.glyphspackage/glyphs/n.glyph
index ce0ae26f7..967d14f60 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/n.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/n.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = n;
 kernLeft = m;
 kernRight = a;
@@ -20,7 +19,7 @@ pos = (66,0);
 },
 {
 name = top;
-pos = (724,1304);
+pos = (693,1118);
 },
 {
 name = topr;
@@ -83,7 +82,7 @@ pos = (10,0);
 },
 {
 name = top;
-pos = (788,1304);
+pos = (757,1118);
 },
 {
 name = topr;
@@ -145,7 +144,7 @@ pos = (106,0);
 },
 {
 name = top;
-pos = (708,1304);
+pos = (677,1118);
 },
 {
 name = topr;
@@ -159,9 +158,9 @@ shapes = (
 closed = 1;
 nodes = (
 (308,945,o),
-(483,1086,o),
-(680,1086,cs),
-(879,1086,o),
+(475,1086,o),
+(672,1086,cs),
+(871,1086,o),
 (985,948,o),
 (952,750,cs),
 (828,0,l),
@@ -200,7 +199,7 @@ pos = (39,0);
 },
 {
 name = top;
-pos = (690,1262);
+pos = (656,1056);
 },
 {
 name = topr;
@@ -255,7 +254,7 @@ pos = (-1,0);
 },
 {
 name = top;
-pos = (770,1262);
+pos = (736,1056);
 },
 {
 name = topr;
@@ -317,7 +316,7 @@ pos = (47,0);
 },
 {
 name = top;
-pos = (658,1262);
+pos = (624,1056);
 },
 {
 name = topr;
@@ -361,9 +360,9 @@ shapes = (
 closed = 1;
 nodes = (
 (239,884,o),
-(427,1026,o),
-(635,1026,cs),
-(838,1026,o),
+(419,1026,o),
+(627,1026,cs),
+(830,1026,o),
 (949,891,o),
 (915,688,cs),
 (801,0,l),
diff --git a/src/Inter-Italic.glyphspackage/glyphs/nacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/nacute.glyph
index 8362a4a3f..91bc17be9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/nacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/nacute.glyph
@@ -5,78 +5,84 @@ kernRight = a;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = n;
 },
 {
-pos = (387,186);
-ref = acute;
+pos = (476,0);
+ref = acutecomb;
 }
 );
 width = 1201;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = n;
 },
 {
-pos = (392,186);
-ref = acute;
+pos = (491,0);
+ref = acutecomb;
 }
 );
 width = 1331;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = n;
 },
 {
-pos = (403,186);
-ref = acute;
+pos = (512,0);
+ref = acutecomb;
 }
 );
 width = 1165;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = n;
 },
 {
-pos = (438,206);
-ref = acute;
+pos = (444,0);
+ref = acutecomb;
 }
 );
 width = 1137;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = n;
 },
 {
-pos = (465,206);
-ref = acute;
+pos = (455,0);
+ref = acutecomb;
 }
 );
 width = 1298;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = n;
 },
 {
-pos = (440,206);
-ref = acute;
+pos = (466,0);
+ref = acutecomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ncaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/ncaron.glyph
index 3058b6f8e..660dc9fa6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ncaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ncaron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (134,0);
-ref = caron;
+pos = (184,0);
+ref = caroncomb;
 }
 );
 width = 1201;
@@ -23,8 +23,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (19,0);
-ref = caron;
+pos = (153,0);
+ref = caroncomb;
 }
 );
 width = 1331;
@@ -36,8 +36,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (157,16);
-ref = caron;
+pos = (153,0);
+ref = caroncomb;
 }
 );
 width = 1165;
@@ -49,8 +49,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (134,0);
-ref = caron;
+pos = (169,0);
+ref = caroncomb;
 }
 );
 width = 1137;
@@ -62,8 +62,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (19,0);
-ref = caron;
+pos = (216,0);
+ref = caroncomb;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (174,0);
-ref = caron;
+pos = (185,0);
+ref = caroncomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ncircumflexbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/ncircumflexbelow.glyph
index dc98df0f0..2abb43f57 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ncircumflexbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ncircumflexbelow.glyph
@@ -11,7 +11,7 @@ ref = n;
 },
 {
 pos = (1182,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1201;
@@ -24,7 +24,7 @@ ref = n;
 },
 {
 pos = (1338,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1331;
@@ -37,7 +37,7 @@ ref = n;
 },
 {
 pos = (1094,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1165;
@@ -50,7 +50,7 @@ ref = n;
 },
 {
 pos = (1182,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1137;
@@ -63,7 +63,7 @@ ref = n;
 },
 {
 pos = (1339,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1298;
@@ -76,7 +76,7 @@ ref = n;
 },
 {
 pos = (1108,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ndotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/ndotaccent.glyph
index fc55e4041..fe2802972 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ndotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ndotaccent.glyph
@@ -12,7 +12,7 @@ ref = n;
 },
 {
 pos = (356,0);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 1201;
@@ -26,7 +26,7 @@ ref = n;
 },
 {
 pos = (330,0);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 1331;
@@ -40,7 +40,7 @@ ref = n;
 },
 {
 pos = (398,0);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 1165;
@@ -54,7 +54,7 @@ ref = n;
 },
 {
 pos = (356,0);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 1137;
@@ -68,7 +68,7 @@ ref = n;
 },
 {
 pos = (328,0);
-ref = dotaccent;
+ref = dotaccentcomb;
 }
 );
 width = 1298;
@@ -81,8 +81,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (420,0);
-ref = dotaccent;
+pos = (414,0);
+ref = dotaccentcomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/nineroman.glyph b/src/Inter-Italic.glyphspackage/glyphs/nineroman.glyph
index 38b497507..c7e5282d3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/nineroman.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/nineroman.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = nineroman;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/nlinebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/nlinebelow.glyph
index 11ee9168e..8ae204e5f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/nlinebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/nlinebelow.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (152,0);
+pos = (153,0);
 ref = macronsub;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = n;
 },
 {
-pos = (265,0);
+pos = (264,0);
 ref = macronsub;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ntilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/ntilde.glyph
index d3fa349bc..c800daa41 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ntilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ntilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (89,0);
-ref = tilde;
+pos = (88,0);
+ref = tildecomb;
 }
 );
 width = 1201;
@@ -23,8 +23,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (153,0);
-ref = tilde;
+pos = (152,0);
+ref = tildecomb;
 }
 );
 width = 1331;
@@ -36,8 +36,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (74,0);
-ref = tilde;
+pos = (81,0);
+ref = tildecomb;
 }
 );
 width = 1165;
@@ -49,8 +49,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (89,0);
-ref = tilde;
+pos = (88,0);
+ref = tildecomb;
 }
 );
 width = 1137;
@@ -63,7 +63,7 @@ ref = n;
 },
 {
 pos = (136,0);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (93,0);
-ref = tilde;
+pos = (89,0);
+ref = tildecomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/numeralgreeksub.glyph b/src/Inter-Italic.glyphspackage/glyphs/numeralgreeksub.glyph
index 0826acc2f..916248703 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/numeralgreeksub.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/numeralgreeksub.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = numeralgreeksub;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/o.glyph b/src/Inter-Italic.glyphspackage/glyphs/o.glyph
index b2ef4e21a..bb48fcbca 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/o.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/o.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = o;
 kernLeft = o;
 kernRight = o;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/oacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/oacute.glyph
index c3f672855..eb38462e2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/oacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/oacute.glyph
@@ -5,78 +5,84 @@ kernRight = o;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
-pos = (366,0);
-ref = acute;
+pos = (486,0);
+ref = acutecomb;
 }
 );
 width = 1222;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
-pos = (337,0);
-ref = acute;
+pos = (467,0);
+ref = acutecomb;
 }
 );
 width = 1280;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
-pos = (382,0);
-ref = acute;
+pos = (522,0);
+ref = acutecomb;
 }
 );
 width = 1186;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
-pos = (398,0);
-ref = acute;
+pos = (438,0);
+ref = acutecomb;
 }
 );
 width = 1124;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
-pos = (405,0);
-ref = acute;
+pos = (429,0);
+ref = acutecomb;
 }
 );
 width = 1244;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
-pos = (400,0);
-ref = acute;
+pos = (460,0);
+ref = acutecomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/obarreddieresiscyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/obarreddieresiscyrillic.glyph
index f6d99894c..20b521830 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/obarreddieresiscyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/obarreddieresiscyrillic.glyph
@@ -11,7 +11,7 @@ ref = fitacyrillic;
 },
 {
 pos = (9,0);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1222;
@@ -24,7 +24,7 @@ ref = fitacyrillic;
 },
 {
 pos = (-25,0);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1280;
@@ -37,7 +37,7 @@ ref = fitacyrillic;
 },
 {
 pos = (12,0);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1186;
@@ -50,7 +50,7 @@ ref = fitacyrillic;
 },
 {
 pos = (-7,0);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1124;
@@ -63,7 +63,7 @@ ref = fitacyrillic;
 },
 {
 pos = (-27,0);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1244;
@@ -76,7 +76,7 @@ ref = fitacyrillic;
 },
 {
 pos = (-4,0);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/obreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/obreve.glyph
index 520810878..cef5c7e40 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/obreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/obreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (120,-186);
-ref = breve;
+pos = (227,0);
+ref = brevecomb;
 }
 );
 width = 1222;
@@ -23,8 +23,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (98,-186);
-ref = breve;
+pos = (161,0);
+ref = brevecomb;
 }
 );
 width = 1280;
@@ -36,8 +36,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (148,-186);
-ref = breve;
+pos = (243,0);
+ref = brevecomb;
 }
 );
 width = 1186;
@@ -49,8 +49,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (100,-206);
-ref = breve;
+pos = (163,0);
+ref = brevecomb;
 }
 );
 width = 1124;
@@ -62,8 +62,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (92,-206);
-ref = breve;
+pos = (142,0);
+ref = brevecomb;
 }
 );
 width = 1244;
@@ -75,8 +75,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (86,-206);
-ref = breve;
+pos = (178,0);
+ref = brevecomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ocaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/ocaron.glyph
index a5645e5f7..82926fe64 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ocaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ocaron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (113,-186);
-ref = caron;
+pos = (194,0);
+ref = caroncomb;
 }
 );
 width = 1222;
@@ -23,8 +23,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (-36,-186);
-ref = caron;
+pos = (129,0);
+ref = caroncomb;
 }
 );
 width = 1280;
@@ -36,8 +36,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (136,-170);
-ref = caron;
+pos = (163,0);
+ref = caroncomb;
 }
 );
 width = 1186;
@@ -49,8 +49,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (94,-206);
-ref = caron;
+pos = (163,0);
+ref = caroncomb;
 }
 );
 width = 1124;
@@ -62,8 +62,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (-41,-206);
-ref = caron;
+pos = (190,0);
+ref = caroncomb;
 }
 );
 width = 1244;
@@ -75,8 +75,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (134,-206);
-ref = caron;
+pos = (179,0);
+ref = caroncomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ocircumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/ocircumflex.glyph
index bdb05d16c..41e814d01 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ocircumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ocircumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (115,-186);
-ref = circumflex;
+pos = (194,0);
+ref = circumflexcomb;
 }
 );
 width = 1222;
@@ -23,8 +23,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (-37,-186);
-ref = circumflex;
+pos = (129,0);
+ref = circumflexcomb;
 }
 );
 width = 1280;
@@ -36,8 +36,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (132,-186);
-ref = circumflex;
+pos = (162,0);
+ref = circumflexcomb;
 }
 );
 width = 1186;
@@ -49,8 +49,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (96,-206);
-ref = circumflex;
+pos = (162,0);
+ref = circumflexcomb;
 }
 );
 width = 1124;
@@ -62,8 +62,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (-42,-206);
-ref = circumflex;
+pos = (191,0);
+ref = circumflexcomb;
 }
 );
 width = 1244;
@@ -75,8 +75,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (137,-206);
-ref = circumflex;
+pos = (178,0);
+ref = circumflexcomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ocircumflexdotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/ocircumflexdotbelow.glyph
index 755529543..f8b137e1c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ocircumflexdotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ocircumflexdotbelow.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (115,-186);
-ref = circumflex;
+pos = (194,0);
+ref = circumflexcomb;
 },
 {
 pos = (1214,0);
@@ -27,8 +27,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (-37,-186);
-ref = circumflex;
+pos = (129,0);
+ref = circumflexcomb;
 },
 {
 pos = (1178,0);
@@ -44,8 +44,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (132,-186);
-ref = circumflex;
+pos = (162,0);
+ref = circumflexcomb;
 },
 {
 pos = (1154,0);
@@ -61,8 +61,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (96,-206);
-ref = circumflex;
+pos = (162,0);
+ref = circumflexcomb;
 },
 {
 pos = (1203,0);
@@ -78,8 +78,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (-42,-206);
-ref = circumflex;
+pos = (191,0);
+ref = circumflexcomb;
 },
 {
 pos = (1181,0);
@@ -95,8 +95,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (137,-206);
-ref = circumflex;
+pos = (178,0);
+ref = circumflexcomb;
 },
 {
 pos = (1159,0);
diff --git a/src/Inter-Italic.glyphspackage/glyphs/odieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/odieresis.glyph
index 280e3ffb8..b345cbf1c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/odieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/odieresis.glyph
@@ -11,7 +11,7 @@ ref = o;
 },
 {
 pos = (9,0);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1222;
@@ -24,7 +24,7 @@ ref = o;
 },
 {
 pos = (-25,0);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1280;
@@ -37,7 +37,7 @@ ref = o;
 },
 {
 pos = (12,0);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1186;
@@ -50,7 +50,7 @@ ref = o;
 },
 {
 pos = (-7,0);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1124;
@@ -63,7 +63,7 @@ ref = o;
 },
 {
 pos = (-27,0);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1244;
@@ -76,7 +76,7 @@ ref = o;
 },
 {
 pos = (-4,0);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ogonek.A_.glyph b/src/Inter-Italic.glyphspackage/glyphs/ogonek.A_.glyph
index 54c701399..82f3ab9de 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ogonek.A_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ogonek.A_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = ogonek.A;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ogonek.O_.glyph b/src/Inter-Italic.glyphspackage/glyphs/ogonek.O_.glyph
index 2acef1635..377534aad 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ogonek.O_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ogonek.O_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = ogonek.O;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ogonek.U_.glyph b/src/Inter-Italic.glyphspackage/glyphs/ogonek.U_.glyph
index cfb544a75..dfd89f74c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ogonek.U_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ogonek.U_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = ogonek.U;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ogonek.a.glyph b/src/Inter-Italic.glyphspackage/glyphs/ogonek.a.glyph
index b65697cb6..eeba4b4b7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ogonek.a.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ogonek.a.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = ogonek.a;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ogonek.e.glyph b/src/Inter-Italic.glyphspackage/glyphs/ogonek.e.glyph
index 1226a617e..b5d3ca869 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ogonek.e.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ogonek.e.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = ogonek.e;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ogonek.glyph b/src/Inter-Italic.glyphspackage/glyphs/ogonek.glyph
index 90377bbbc..47ae1f5ee 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ogonek.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ogonek.glyph
@@ -1,286 +1,73 @@
 {
-color = (204,240,242,1);
 glyphname = ogonek;
 layers = (
 {
-anchors = (
-{
-name = _ogonek;
-pos = (343,0);
-}
-);
-background = {
-shapes = (
-{
-ref = ogonek.a;
-}
-);
-};
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(243,-436,o),
-(304,-409,o),
-(348,-386,c),
-(310,-260,l),
-(286,-273,o),
-(251,-288,o),
-(211,-288,cs),
-(154,-288,o),
-(132,-258,o),
-(140,-209,cs),
-(154,-124,o),
-(245,-64,o),
-(343,0,c),
-(178,16,l),
-(57,-57,o),
-(-23,-147,o),
-(-39,-244,cs),
-(-60,-368,o),
-(34,-436,o),
-(162,-436,cs)
-);
+alignment = 1;
+ref = ogonekcomb;
 }
 );
 width = 545;
 },
 {
-anchors = (
-{
-name = _ogonek;
-pos = (437,0);
-}
-);
-background = {
-shapes = (
-{
-ref = ogonek.a;
-}
-);
-};
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(247,-426,o),
-(349,-407,o),
-(411,-375,c),
-(372,-195,l),
-(350,-207,o),
-(327,-214,o),
-(305,-214,cs),
-(263,-214,o),
-(246,-188,o),
-(252.995,-145,cs),
-(263,-86,o),
-(310,-37,o),
-(437,0,c),
-(65,27,l),
-(-9,-23,o),
-(-70,-107,o),
-(-85,-200,cs),
-(-109,-342,o),
-(-13,-426,o),
-(165,-426,cs)
-);
+alignment = 1;
+ref = ogonekcomb;
 }
 );
 width = 530;
 },
 {
-anchors = (
-{
-name = _ogonek;
-pos = (180,0);
-}
-);
-background = {
-shapes = (
-{
-pos = (1,0);
-ref = ogonek.a;
-}
-);
-};
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(79,-426,o),
-(104,-421,o),
-(130,-412,c),
-(120,-369,l),
-(101,-376,o),
-(81,-380,o),
-(59,-380,cs),
-(2,-380,o),
-(-62,-353,o),
-(-49,-271,cs),
-(-33,-177,o),
-(68,-89,o),
-(180,0,c),
-(136,11,l),
-(29,-70,o),
-(-77,-162,o),
-(-95,-271,cs),
-(-113,-379,o),
-(-32,-426,o),
-(51,-426,cs)
-);
+alignment = 1;
+ref = ogonekcomb;
 }
 );
 width = 493;
 },
 {
-anchors = (
-{
-name = _ogonek;
-pos = (317,0);
-}
-);
-background = {
-shapes = (
-{
-pos = (1,0);
-ref = ogonek.a;
-}
-);
-};
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(169,-418,o),
-(209,-418,o),
-(248,-418,c),
-(272,-272,l),
-(254,-272,o),
-(228,-272,o),
-(210,-272,cs),
-(149,-272,o),
-(127,-246,o),
-(135,-202,cs),
-(143,-150,o),
-(187,-104,o),
-(317,0,c),
-(230,57,l),
-(54,-35,o),
-(-21,-119,o),
-(-39,-230,cs),
-(-60,-354,o),
-(7,-418,o),
-(130,-418,cs)
-);
+alignment = 1;
+ref = ogonekcomb;
 }
 );
 width = 483;
 },
 {
-anchors = (
-{
-name = _ogonek;
-pos = (479,0);
-}
-);
-background = {
-shapes = (
-{
-ref = ogonek.a;
-}
-);
-};
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(277,-418,o),
-(360,-418,o),
-(410,-418,c),
-(447,-192,l),
-(428,-192,o),
-(410,-192,o),
-(391,-192,cs),
-(340,-192,o),
-(316,-175,o),
-(323,-133,cs),
-(331,-87,o),
-(369,-52,o),
-(479,0,c),
-(86,27,l),
-(1,-44,o),
-(-59,-116,o),
-(-73,-202,cs),
-(-96,-339,o),
-(11,-418,o),
-(227,-418,cs)
-);
+alignment = 1;
+ref = ogonekcomb;
 }
 );
 width = 567;
 },
 {
-anchors = (
-{
-name = _ogonek;
-pos = (183,0);
-}
-);
-background = {
-shapes = (
-{
-pos = (1,0);
-ref = ogonek.a;
-}
-);
-};
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(83,-418,o),
-(94,-418,o),
-(106,-418,c),
-(113,-372,l),
-(101,-372,o),
-(90,-372,o),
-(78,-372,cs),
-(-41,-372,o),
-(-59,-323,o),
-(-50,-264,cs),
-(-36,-181,o),
-(30,-112,o),
-(183,0,c),
-(160,30,l),
-(2,-86,o),
-(-79,-165,o),
-(-96,-264,cs),
-(-110,-350,o),
-(-70,-418,o),
-(71,-418,cs)
-);
+alignment = 1;
+ref = ogonekcomb;
 }
 );
-width = 365;
+width = 364;
 }
 );
+note = "aka ogonekcomb";
 unicode = 731;
-userData = {
-interface.gridadjust.original = "{'width': 776, 'leftMargin': 66, 'rightMargin': 214}";
-"interface.width-adjustments" = (
--16
-);
-};
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ogonek.o.glyph b/src/Inter-Italic.glyphspackage/glyphs/ogonek.o.glyph
index 9922a9a17..a649ad73f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ogonek.o.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ogonek.o.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = ogonek.o;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ogonekcomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/ogonekcomb.glyph
new file mode 100644
index 000000000..5ec08c528
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/ogonekcomb.glyph
@@ -0,0 +1,285 @@
+{
+glyphname = ogonekcomb;
+layers = (
+{
+anchors = (
+{
+name = _ogonek;
+pos = (343,0);
+}
+);
+background = {
+shapes = (
+{
+ref = ogonek.a;
+}
+);
+};
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(243,-436,o),
+(304,-409,o),
+(348,-386,c),
+(310,-260,l),
+(286,-273,o),
+(251,-288,o),
+(211,-288,cs),
+(154,-288,o),
+(132,-258,o),
+(140,-209,cs),
+(154,-124,o),
+(245,-64,o),
+(343,0,c),
+(178,16,l),
+(57,-57,o),
+(-23,-147,o),
+(-39,-244,cs),
+(-60,-368,o),
+(34,-436,o),
+(162,-436,cs)
+);
+}
+);
+width = 545;
+},
+{
+anchors = (
+{
+name = _ogonek;
+pos = (437,0);
+}
+);
+background = {
+shapes = (
+{
+ref = ogonek.a;
+}
+);
+};
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(247,-426,o),
+(349,-407,o),
+(411,-375,c),
+(372,-195,l),
+(350,-207,o),
+(327,-214,o),
+(305,-214,cs),
+(263,-214,o),
+(246,-188,o),
+(252.995,-145,cs),
+(263,-86,o),
+(310,-37,o),
+(437,0,c),
+(65,27,l),
+(-9,-23,o),
+(-70,-107,o),
+(-85,-200,cs),
+(-109,-342,o),
+(-13,-426,o),
+(165,-426,cs)
+);
+}
+);
+width = 530;
+},
+{
+anchors = (
+{
+name = _ogonek;
+pos = (180,0);
+}
+);
+background = {
+shapes = (
+{
+pos = (1,0);
+ref = ogonek.a;
+}
+);
+};
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(79,-426,o),
+(104,-421,o),
+(130,-412,c),
+(120,-369,l),
+(101,-376,o),
+(81,-380,o),
+(59,-380,cs),
+(2,-380,o),
+(-62,-353,o),
+(-49,-271,cs),
+(-33,-177,o),
+(68,-89,o),
+(180,0,c),
+(136,11,l),
+(29,-70,o),
+(-77,-162,o),
+(-95,-271,cs),
+(-113,-379,o),
+(-32,-426,o),
+(51,-426,cs)
+);
+}
+);
+width = 493;
+},
+{
+anchors = (
+{
+name = _ogonek;
+pos = (317,0);
+}
+);
+background = {
+shapes = (
+{
+pos = (1,0);
+ref = ogonek.a;
+}
+);
+};
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(169,-418,o),
+(209,-418,o),
+(248,-418,c),
+(272,-272,l),
+(254,-272,o),
+(228,-272,o),
+(210,-272,cs),
+(149,-272,o),
+(127,-246,o),
+(135,-202,cs),
+(143,-150,o),
+(187,-104,o),
+(317,0,c),
+(230,57,l),
+(54,-35,o),
+(-21,-119,o),
+(-39,-230,cs),
+(-60,-354,o),
+(7,-418,o),
+(130,-418,cs)
+);
+}
+);
+width = 483;
+},
+{
+anchors = (
+{
+name = _ogonek;
+pos = (479,0);
+}
+);
+background = {
+shapes = (
+{
+ref = ogonek.a;
+}
+);
+};
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(277,-418,o),
+(360,-418,o),
+(410,-418,c),
+(447,-192,l),
+(428,-192,o),
+(410,-192,o),
+(391,-192,cs),
+(340,-192,o),
+(316,-175,o),
+(323,-133,cs),
+(331,-87,o),
+(369,-52,o),
+(479,0,c),
+(86,27,l),
+(1,-44,o),
+(-59,-116,o),
+(-73,-202,cs),
+(-96,-339,o),
+(11,-418,o),
+(227,-418,cs)
+);
+}
+);
+width = 567;
+},
+{
+anchors = (
+{
+name = _ogonek;
+pos = (188,0);
+}
+);
+background = {
+shapes = (
+{
+pos = (1,0);
+ref = ogonek.a;
+}
+);
+};
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(88,-418,o),
+(99,-418,o),
+(111,-418,c),
+(118,-372,l),
+(106,-372,o),
+(95,-372,o),
+(83,-372,cs),
+(-36,-372,o),
+(-54,-323,o),
+(-45,-264,cs),
+(-31,-181,o),
+(35,-112,o),
+(188,0,c),
+(165,30,l),
+(7,-86,o),
+(-74,-165,o),
+(-91,-264,cs),
+(-105,-350,o),
+(-65,-418,o),
+(76,-418,cs)
+);
+}
+);
+width = 364;
+}
+);
+unicode = 808;
+userData = {
+interface.gridadjust.original = "{'width': 776, 'leftMargin': 66, 'rightMargin': 214}";
+"interface.width-adjustments" = (
+-16
+);
+};
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ogoneknosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/ogoneknosp.glyph
deleted file mode 100644
index 9da3a79d7..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/ogoneknosp.glyph
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-color = (250,227,227,1);
-glyphname = ogoneknosp;
-layers = (
-{
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-alignment = -1;
-pos = (-916,0);
-ref = ogonek;
-}
-);
-width = 0;
-},
-{
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-alignment = -1;
-pos = (-1038,0);
-ref = ogonek;
-}
-);
-width = 50;
-},
-{
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-alignment = -1;
-pos = (-844,0);
-ref = ogonek;
-}
-);
-width = 0;
-},
-{
-layerId = m008;
-shapes = (
-{
-alignment = -1;
-pos = (-916,0);
-ref = ogonek;
-}
-);
-width = 0;
-},
-{
-layerId = m010;
-shapes = (
-{
-alignment = -1;
-pos = (-1038,0);
-ref = ogonek;
-}
-);
-width = 18;
-},
-{
-layerId = m012;
-shapes = (
-{
-alignment = -1;
-pos = (-844,0);
-ref = ogonek;
-}
-);
-width = 0;
-}
-);
-note = "aka ogonekcomb";
-unicode = 808;
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ograve.glyph b/src/Inter-Italic.glyphspackage/glyphs/ograve.glyph
index 11da049c0..40cbeca9f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ograve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ograve.glyph
@@ -11,7 +11,7 @@ ref = o;
 },
 {
 pos = (201,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1222;
@@ -24,7 +24,7 @@ ref = o;
 },
 {
 pos = (123,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1280;
@@ -37,7 +37,7 @@ ref = o;
 },
 {
 pos = (230,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1186;
@@ -50,7 +50,7 @@ ref = o;
 },
 {
 pos = (233,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1124;
@@ -63,7 +63,7 @@ ref = o;
 },
 {
 pos = (142,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1244;
@@ -75,8 +75,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (205,0);
-ref = grave;
+pos = (209,0);
+ref = gravecomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ohookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/ohookabove.glyph
index 9a15c324d..e8576aef6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ohookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ohookabove.glyph
@@ -11,7 +11,7 @@ ref = o;
 },
 {
 pos = (346,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1222;
@@ -24,7 +24,7 @@ ref = o;
 },
 {
 pos = (327,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1280;
@@ -37,7 +37,7 @@ ref = o;
 },
 {
 pos = (374,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1186;
@@ -50,7 +50,7 @@ ref = o;
 },
 {
 pos = (298,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1124;
@@ -63,7 +63,7 @@ ref = o;
 },
 {
 pos = (299,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1244;
@@ -75,8 +75,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (312,0);
-ref = hookabove;
+pos = (306,0);
+ref = hookabovecomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ohornacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/ohornacute.glyph
index da4b99ecc..33cda86cb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ohornacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ohornacute.glyph
@@ -5,78 +5,84 @@ kernRight = o;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = ohorn;
 },
 {
-pos = (366,0);
-ref = acute;
+pos = (486,0);
+ref = acutecomb;
 }
 );
 width = 1222;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = ohorn;
 },
 {
-pos = (337,0);
-ref = acute;
+pos = (467,0);
+ref = acutecomb;
 }
 );
 width = 1280;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = ohorn;
 },
 {
-pos = (382,0);
-ref = acute;
+pos = (522,0);
+ref = acutecomb;
 }
 );
 width = 1186;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = ohorn;
 },
 {
-pos = (398,0);
-ref = acute;
+pos = (438,0);
+ref = acutecomb;
 }
 );
 width = 1124;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = ohorn;
 },
 {
-pos = (405,0);
-ref = acute;
+pos = (429,0);
+ref = acutecomb;
 }
 );
 width = 1244;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = ohorn;
 },
 {
-pos = (400,0);
-ref = acute;
+pos = (460,0);
+ref = acutecomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ohorngrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/ohorngrave.glyph
index 14eafb9c0..e79e60dae 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ohorngrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ohorngrave.glyph
@@ -11,7 +11,7 @@ ref = ohorn;
 },
 {
 pos = (201,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1222;
@@ -24,7 +24,7 @@ ref = ohorn;
 },
 {
 pos = (123,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1280;
@@ -37,7 +37,7 @@ ref = ohorn;
 },
 {
 pos = (230,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1186;
@@ -50,7 +50,7 @@ ref = ohorn;
 },
 {
 pos = (233,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1124;
@@ -63,7 +63,7 @@ ref = ohorn;
 },
 {
 pos = (142,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1244;
@@ -75,8 +75,8 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (205,0);
-ref = grave;
+pos = (209,0);
+ref = gravecomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ohornhookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/ohornhookabove.glyph
index b39b01956..7ac0a679b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ohornhookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ohornhookabove.glyph
@@ -11,7 +11,7 @@ ref = ohorn;
 },
 {
 pos = (346,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1222;
@@ -24,7 +24,7 @@ ref = ohorn;
 },
 {
 pos = (327,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1280;
@@ -37,7 +37,7 @@ ref = ohorn;
 },
 {
 pos = (374,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1186;
@@ -50,7 +50,7 @@ ref = ohorn;
 },
 {
 pos = (298,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1124;
@@ -63,7 +63,7 @@ ref = ohorn;
 },
 {
 pos = (299,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1244;
@@ -75,8 +75,8 @@ shapes = (
 ref = ohorn;
 },
 {
-pos = (312,0);
-ref = hookabove;
+pos = (306,0);
+ref = hookabovecomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ohorntilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/ohorntilde.glyph
index 63c149d23..23e691a97 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ohorntilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ohorntilde.glyph
@@ -5,78 +5,88 @@ kernRight = o;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = ohorn;
 },
 {
-pos = (68,-186);
-ref = tilde;
+pos = (98,0);
+ref = tildecomb;
 }
 );
 width = 1222;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = ohorn;
 },
 {
-pos = (98,-186);
-ref = tilde;
+alignment = -1;
+pos = (301,422);
+ref = tildecomb;
+scale = (0.6847,0.7019);
 }
 );
 width = 1280;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = ohorn;
 },
 {
-pos = (53,-186);
-ref = tilde;
+pos = (90,0);
+ref = tildecomb;
 }
 );
 width = 1186;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = ohorn;
 },
 {
-pos = (49,-206);
-ref = tilde;
+pos = (82,0);
+ref = tildecomb;
 }
 );
 width = 1124;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = ohorn;
 },
 {
-pos = (76,-206);
-ref = tilde;
+alignment = -1;
+pos = (300,278);
+ref = tildecomb;
+scale = (0.7276,0.7939);
 }
 );
 width = 1244;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = ohorn;
 },
 {
-pos = (53,-206);
-ref = tilde;
+pos = (82,0);
+ref = tildecomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/oinvertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/oinvertedbreve.glyph
index 1acc52879..543047683 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/oinvertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/oinvertedbreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (1207,0);
-ref = breveinvnosp;
+pos = (194,0);
+ref = breveinvcomb;
 }
 );
 width = 1222;
@@ -23,8 +23,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (1303,0);
-ref = breveinvnosp;
+pos = (129,0);
+ref = breveinvcomb;
 }
 );
 width = 1280;
@@ -36,8 +36,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (1177,0);
-ref = breveinvnosp;
+pos = (232,0);
+ref = breveinvcomb;
 }
 );
 width = 1186;
@@ -49,8 +49,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (1125,0);
-ref = breveinvnosp;
+pos = (162,0);
+ref = breveinvcomb;
 }
 );
 width = 1124;
@@ -62,8 +62,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (1273,0);
-ref = breveinvnosp;
+pos = (191,0);
+ref = breveinvcomb;
 }
 );
 width = 1244;
@@ -75,8 +75,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (1059,0);
-ref = breveinvnosp;
+pos = (178,0);
+ref = breveinvcomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/omacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/omacron.glyph
index 214bba3b9..ae39aba22 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/omacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/omacron.glyph
@@ -5,78 +5,84 @@ kernRight = o;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
 pos = (123,0);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1222;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
 pos = (224,0);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1280;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
 pos = (194,0);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1186;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
-pos = (147,0);
-ref = macron;
+pos = (146,0);
+ref = macroncomb;
 }
 );
 width = 1124;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
 pos = (238,0);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1244;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
 pos = (146,0);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/omacronacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/omacronacute.glyph
index 2b804dcca..1537de904 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/omacronacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/omacronacute.glyph
@@ -11,7 +11,7 @@ ref = o;
 },
 {
 pos = (123,0);
-ref = macronacutecomb.lc;
+ref = macronacutecomb;
 }
 );
 width = 1222;
@@ -24,7 +24,7 @@ ref = o;
 },
 {
 pos = (225,0);
-ref = macronacutecomb.lc;
+ref = macronacutecomb;
 }
 );
 width = 1280;
@@ -37,7 +37,7 @@ ref = o;
 },
 {
 pos = (195,0);
-ref = macronacutecomb.lc;
+ref = macronacutecomb;
 }
 );
 width = 1186;
@@ -50,7 +50,7 @@ ref = o;
 },
 {
 pos = (147,0);
-ref = macronacutecomb.lc;
+ref = macronacutecomb;
 }
 );
 width = 1124;
@@ -62,8 +62,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (239,0);
-ref = macronacutecomb.lc;
+pos = (238,0);
+ref = macronacutecomb;
 }
 );
 width = 1244;
@@ -76,7 +76,7 @@ ref = o;
 },
 {
 pos = (146,0);
-ref = macronacutecomb.lc;
+ref = macronacutecomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/omacrongrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/omacrongrave.glyph
index 60b89a99e..65b6a147e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/omacrongrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/omacrongrave.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (123,0);
+pos = (-49,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (225,0);
+pos = (149,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (195,0);
+pos = (68,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (147,0);
+pos = (47,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (333,0);
+pos = (234,0);
 ref = macrongravecomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (146,0);
+pos = (34,0);
 ref = macrongravecomb.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/oneroman.glyph b/src/Inter-Italic.glyphspackage/glyphs/oneroman.glyph
index d356f0e14..2edcb5b32 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/oneroman.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/oneroman.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = oneroman;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/oogonekmacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/oogonekmacron.glyph
index 99d0adc08..7950774cf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/oogonekmacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/oogonekmacron.glyph
@@ -5,6 +5,7 @@ kernRight = o;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = oogonek;
@@ -12,13 +13,14 @@ ref = oogonek;
 {
 alignment = 1;
 pos = (123,0);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1222;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = oogonek;
@@ -26,13 +28,14 @@ ref = oogonek;
 {
 alignment = 1;
 pos = (224,0);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1280;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = oogonek;
@@ -40,27 +43,29 @@ ref = oogonek;
 {
 alignment = 1;
 pos = (194,0);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1186;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = oogonek;
 },
 {
 alignment = 1;
-pos = (147,0);
-ref = macron;
+pos = (146,0);
+ref = macroncomb;
 }
 );
 width = 1124;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = oogonek;
@@ -68,13 +73,14 @@ ref = oogonek;
 {
 alignment = 1;
 pos = (238,0);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1244;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = oogonek;
@@ -82,7 +88,7 @@ ref = oogonek;
 {
 alignment = 1;
 pos = (146,0);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/oslashacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/oslashacute.glyph
index 74817830e..fd13aab46 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/oslashacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/oslashacute.glyph
@@ -5,78 +5,84 @@ kernRight = o;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = oslash;
 },
 {
-pos = (366,0);
-ref = acute;
+pos = (486,0);
+ref = acutecomb;
 }
 );
 width = 1222;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = oslash;
 },
 {
-pos = (337,0);
-ref = acute;
+pos = (467,0);
+ref = acutecomb;
 }
 );
 width = 1280;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = oslash;
 },
 {
-pos = (382,2);
-ref = acute;
+pos = (522,2);
+ref = acutecomb;
 }
 );
 width = 1186;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = oslash;
 },
 {
-pos = (398,0);
-ref = acute;
+pos = (438,0);
+ref = acutecomb;
 }
 );
 width = 1124;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = oslash;
 },
 {
-pos = (405,0);
-ref = acute;
+pos = (429,0);
+ref = acutecomb;
 }
 );
 width = 1244;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = oslash;
 },
 {
-pos = (400,0);
-ref = acute;
+pos = (460,0);
+ref = acutecomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/otilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/otilde.glyph
index cd823f1d3..8cc70023c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/otilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/otilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (68,-186);
-ref = tilde;
+pos = (98,0);
+ref = tildecomb;
 }
 );
 width = 1222;
@@ -23,8 +23,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (98,-186);
-ref = tilde;
+pos = (128,0);
+ref = tildecomb;
 }
 );
 width = 1280;
@@ -36,8 +36,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (53,-186);
-ref = tilde;
+pos = (91,0);
+ref = tildecomb;
 }
 );
 width = 1186;
@@ -49,8 +49,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (49,-206);
-ref = tilde;
+pos = (82,0);
+ref = tildecomb;
 }
 );
 width = 1124;
@@ -62,8 +62,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (76,-206);
-ref = tilde;
+pos = (110,0);
+ref = tildecomb;
 }
 );
 width = 1244;
@@ -75,8 +75,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (53,-206);
-ref = tilde;
+pos = (83,0);
+ref = tildecomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/otildedieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/otildedieresis.glyph
index 93747f298..af85ae2aa 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/otildedieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/otildedieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1171,-170);
+pos = (99,0);
 ref = tildedieresiscomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1315,-180);
+pos = (140,0);
 ref = tildedieresiscomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1089,-164);
+pos = (91,0);
 ref = tildedieresiscomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1150,-232);
+pos = (82,0);
 ref = tildedieresiscomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1308,-242);
+pos = (135,0);
 ref = tildedieresiscomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1084,-226);
+pos = (82,0);
 ref = tildedieresiscomb.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/overscorenosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/overscorecomb.glyph
index 00367d9aa..dde80a3b6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/overscorenosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/overscorecomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = overscorenosp;
+glyphname = overscorecomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -65,5 +64,4 @@ ref = underscore;
 width = 0;
 }
 );
-unicode = 773;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/overscoredblnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/overscoredblcomb.glyph
index 5d34371b4..e2161ab1b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/overscoredblnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/overscoredblcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = overscoredblnosp;
+glyphname = overscoredblcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -147,5 +146,4 @@ nodes = (
 width = 0;
 }
 );
-unicode = 831;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/p.glyph b/src/Inter-Italic.glyphspackage/glyphs/p.glyph
index 3588e016a..9214b8dcf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/p.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/p.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = p;
 kernLeft = m;
 kernRight = o;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/pacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/pacute.glyph
index 6549308f9..ae8228a09 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/pacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/pacute.glyph
@@ -5,78 +5,84 @@ kernRight = o;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = p;
 },
 {
-pos = (445,186);
-ref = acute;
+pos = (565,186);
+ref = acutecomb;
 }
 );
 width = 1246;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = p;
 },
 {
-pos = (456,186);
-ref = acute;
+pos = (586,186);
+ref = acutecomb;
 }
 );
 width = 1322;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = p;
 },
 {
-pos = (447,186);
-ref = acute;
+pos = (587,186);
+ref = acutecomb;
 }
 );
 width = 1190;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = p;
 },
 {
-pos = (517,206);
-ref = acute;
+pos = (557,206);
+ref = acutecomb;
 }
 );
 width = 1159;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = p;
 },
 {
-pos = (455,206);
-ref = acute;
+pos = (479,206);
+ref = acutecomb;
 }
 );
 width = 1280;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = p;
 },
 {
-pos = (475,248);
-ref = acute;
+pos = (535,248);
+ref = acutecomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/palatalizationcyrilliccmb.glyph b/src/Inter-Italic.glyphspackage/glyphs/palatalizationcyrilliccmb.glyph
index 9c565c4f6..b2871be9c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/palatalizationcyrilliccmb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/palatalizationcyrilliccmb.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = palatalizationcyrilliccmb;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/pdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/pdotaccent.glyph
index d004e5cbd..d27c4667a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/pdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/pdotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = p;
 },
 {
-pos = (414,0);
-ref = dotaccent;
+pos = (445,186);
+ref = dotaccentcomb;
 }
 );
 width = 1246;
@@ -25,8 +25,8 @@ shapes = (
 ref = p;
 },
 {
-pos = (394,0);
-ref = dotaccent;
+pos = (425,186);
+ref = dotaccentcomb;
 }
 );
 width = 1322;
@@ -39,8 +39,8 @@ shapes = (
 ref = p;
 },
 {
-pos = (442,0);
-ref = dotaccent;
+pos = (473,186);
+ref = dotaccentcomb;
 }
 );
 width = 1190;
@@ -53,8 +53,8 @@ shapes = (
 ref = p;
 },
 {
-pos = (435,0);
-ref = dotaccent;
+pos = (469,206);
+ref = dotaccentcomb;
 }
 );
 width = 1159;
@@ -67,8 +67,8 @@ shapes = (
 ref = p;
 },
 {
-pos = (318,0);
-ref = dotaccent;
+pos = (352,206);
+ref = dotaccentcomb;
 }
 );
 width = 1280;
@@ -81,8 +81,8 @@ shapes = (
 ref = p;
 },
 {
-pos = (455,42);
-ref = dotaccent;
+pos = (483,248);
+ref = dotaccentcomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/perispomenigreekcmb.glyph b/src/Inter-Italic.glyphspackage/glyphs/perispomenigreekcmb.glyph
index 9d4f5722f..9dec8d14d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/perispomenigreekcmb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/perispomenigreekcmb.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = perispomenigreekcmb;
 layers = (
 {
@@ -8,7 +7,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1074,0);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
@@ -19,7 +18,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1230,0);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 30;
@@ -30,7 +29,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-980,0);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
@@ -41,7 +40,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1074,0);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
@@ -52,7 +51,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1230,0);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
@@ -63,7 +62,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-980,0);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/plusmod.glyph b/src/Inter-Italic.glyphspackage/glyphs/plusmod.glyph
index 848c0ef08..dffb5bc30 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/plusmod.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/plusmod.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = plusmod;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/psilipneumatacyrilliccmb.glyph b/src/Inter-Italic.glyphspackage/glyphs/psilipneumatacyrilliccmb.glyph
index 59dc5b4cc..bdfd8fcbe 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/psilipneumatacyrilliccmb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/psilipneumatacyrilliccmb.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = psilipneumatacyrilliccmb;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/punctuationspace.glyph b/src/Inter-Italic.glyphspackage/glyphs/punctuationspace.glyph
index 53c1f383b..8c1d361f5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/punctuationspace.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/punctuationspace.glyph
@@ -1,5 +1,4 @@
 {
-color = (237,229,250,1);
 glyphname = punctuationspace;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/q.glyph b/src/Inter-Italic.glyphspackage/glyphs/q.glyph
index 8f219475d..0b6541c68 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/q.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/q.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = q;
 kernLeft = o;
 kernRight = g;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/qofdagesh.glyph b/src/Inter-Italic.glyphspackage/glyphs/qofdagesh.glyph
index 5beaaf61f..64d4a300b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/qofdagesh.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/qofdagesh.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = qofdagesh;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/quarteremspace.glyph b/src/Inter-Italic.glyphspackage/glyphs/quarteremspace.glyph
index 47e009df1..fdfb44705 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/quarteremspace.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/quarteremspace.glyph
@@ -1,5 +1,4 @@
 {
-color = (237,229,250,1);
 glyphname = quarteremspace;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/racute.glyph b/src/Inter-Italic.glyphspackage/glyphs/racute.glyph
index b936bae37..4a22abb7f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/racute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/racute.glyph
@@ -5,78 +5,84 @@ kernRight = r;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = r;
 },
 {
-pos = (209,186);
-ref = acute;
+pos = (329,186);
+ref = acutecomb;
 }
 );
 width = 763;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = r;
 },
 {
-pos = (210,186);
-ref = acute;
+pos = (340,186);
+ref = acutecomb;
 }
 );
 width = 889;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = r;
 },
 {
-pos = (247,186);
-ref = acute;
+pos = (387,186);
+ref = acutecomb;
 }
 );
 width = 667;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = r;
 },
 {
-pos = (237,206);
-ref = acute;
+pos = (277,206);
+ref = acutecomb;
 }
 );
 width = 660;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = r;
 },
 {
-pos = (289,248);
-ref = acute;
+pos = (313,248);
+ref = acutecomb;
 }
 );
 width = 853;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = r;
 },
 {
-pos = (275,248);
-ref = acute;
+pos = (335,248);
+ref = acutecomb;
 }
 );
 width = 539;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rcaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/rcaron.glyph
index b9ba35d8f..46cf57137 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rcaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rcaron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (-44,0);
-ref = caron;
+pos = (37,186);
+ref = caroncomb;
 }
 );
 width = 763;
@@ -23,8 +23,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (-163,0);
-ref = caron;
+pos = (2,186);
+ref = caroncomb;
 }
 );
 width = 889;
@@ -36,8 +36,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (1,16);
-ref = caron;
+pos = (28,186);
+ref = caroncomb;
 }
 );
 width = 667;
@@ -49,8 +49,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (-67,0);
-ref = caron;
+pos = (2,206);
+ref = caroncomb;
 }
 );
 width = 660;
@@ -62,8 +62,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (-157,42);
-ref = caron;
+pos = (74,248);
+ref = caroncomb;
 }
 );
 width = 853;
@@ -75,8 +75,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (9,42);
-ref = caron;
+pos = (54,248);
+ref = caroncomb;
 }
 );
 width = 539;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/rdotaccent.glyph
index e72a4340a..436f7cd87 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rdotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (178,0);
-ref = dotaccent;
+pos = (209,186);
+ref = dotaccentcomb;
 }
 );
 width = 763;
@@ -25,8 +25,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (148,0);
-ref = dotaccent;
+pos = (179,186);
+ref = dotaccentcomb;
 }
 );
 width = 889;
@@ -39,8 +39,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (242,0);
-ref = dotaccent;
+pos = (273,186);
+ref = dotaccentcomb;
 }
 );
 width = 667;
@@ -53,8 +53,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (155,0);
-ref = dotaccent;
+pos = (189,206);
+ref = dotaccentcomb;
 }
 );
 width = 660;
@@ -67,8 +67,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (152,42);
-ref = dotaccent;
+pos = (186,248);
+ref = dotaccentcomb;
 }
 );
 width = 853;
@@ -81,8 +81,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (255,42);
-ref = dotaccent;
+pos = (283,248);
+ref = dotaccentcomb;
 }
 );
 width = 539;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rdotbelowmacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/rdotbelowmacron.glyph
index ff8ff9c32..95d83dd02 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rdotbelowmacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rdotbelowmacron.glyph
@@ -5,6 +5,7 @@ kernRight = r;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = r;
@@ -15,13 +16,14 @@ ref = dotbelow;
 },
 {
 pos = (-34,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 763;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = r;
@@ -32,13 +34,14 @@ ref = dotbelow;
 },
 {
 pos = (97,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 889;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = r;
@@ -49,13 +52,14 @@ ref = dotbelow;
 },
 {
 pos = (59,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 667;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = r;
@@ -65,14 +69,15 @@ pos = (851,0);
 ref = dotbelow;
 },
 {
-pos = (-14,206);
-ref = macron;
+pos = (-15,206);
+ref = macroncomb;
 }
 );
 width = 660;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = r;
@@ -83,13 +88,14 @@ ref = dotbelow;
 },
 {
 pos = (122,248);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 853;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = r;
@@ -100,7 +106,7 @@ ref = dotbelow;
 },
 {
 pos = (21,248);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 539;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/response.glyph b/src/Inter-Italic.glyphspackage/glyphs/response.glyph
index e9dccb97c..ad2030cf1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/response.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/response.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = response;
 kernLeft = B;
 kernRight = R;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rhotichookmod.glyph b/src/Inter-Italic.glyphspackage/glyphs/rhotichookmod.glyph
index 91d3a15c6..11cc2d7f0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rhotichookmod.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rhotichookmod.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = rhotichookmod;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/righthalfringabovecomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/righthalfringabovecomb.glyph
new file mode 100644
index 000000000..c80d9a349
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/righthalfringabovecomb.glyph
@@ -0,0 +1,204 @@
+{
+glyphname = righthalfringabovecomb;
+layers = (
+{
+anchors = (
+{
+name = _top;
+pos = (239,1118);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(314,1189,o),
+(449,1301,o),
+(472,1440,cs),
+(495,1579,o),
+(397,1691,o),
+(252,1691,c),
+(231,1566,l),
+(301,1566,o),
+(348,1510,o),
+(336,1440,cs),
+(325,1370,o),
+(260,1314,o),
+(190,1314,c),
+(169,1189,l)
+);
+}
+);
+width = 336;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (248,1118);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(309,1199,o),
+(457,1316,o),
+(481,1461,cs),
+(505,1606,o),
+(396,1723,o),
+(239,1723,c),
+(215,1576,l),
+(279,1576,o),
+(321,1525,o),
+(311,1461,cs),
+(300,1397,o),
+(241,1346,o),
+(177,1346,c),
+(152,1199,l)
+);
+}
+);
+width = 337;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (248,1118);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(295,1255,o),
+(381,1329,o),
+(396,1420,cs),
+(411,1511,o),
+(349,1585,o),
+(258,1585,c),
+(251,1539,l),
+(317,1539,o),
+(361,1486,o),
+(350,1420,cs),
+(339,1354,o),
+(277,1301,o),
+(211,1301,c),
+(204,1255,l)
+);
+}
+);
+width = 308;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (236,1056);
+}
+);
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(309,1146,o),
+(434,1250,o),
+(455,1378,cs),
+(476,1506,o),
+(386,1610,o),
+(252,1610,c),
+(232,1490,l),
+(294,1490,o),
+(335,1440,o),
+(325,1378,cs),
+(315,1316,o),
+(257,1266,o),
+(195,1266,c),
+(175,1146,l)
+);
+}
+);
+width = 327;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (237,1056);
+}
+);
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(298,1137,o),
+(423,1236,o),
+(446,1378,cs),
+(470,1520,o),
+(378,1619,o),
+(224,1619,c),
+(200,1472,l),
+(255,1472,o),
+(287,1433,o),
+(278,1378,cs),
+(269,1323,o),
+(224,1284,o),
+(169,1284,c),
+(144,1137,l)
+);
+}
+);
+width = 328;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (243,1056);
+}
+);
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(289,1227,o),
+(370,1295,o),
+(384,1378,cs),
+(398,1461,o),
+(339,1529,o),
+(253,1529,c),
+(246,1483,l),
+(307,1483,o),
+(348,1436,o),
+(338,1378,cs),
+(329,1320,o),
+(272,1273,o),
+(211,1273,c),
+(203,1227,l)
+);
+}
+);
+width = 328;
+}
+);
+unicode = 855;
+userData = {
+interface.gridadjust.original = "{'width': 393, 'leftMargin': 55, 'rightMargin': 55}";
+"interface.width-adjustments" = (
+-16
+);
+};
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ring.glyph b/src/Inter-Italic.glyphspackage/glyphs/ring.glyph
index 35374dd7f..a65edabc9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ring.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ring.glyph
@@ -1,393 +1,72 @@
 {
-color = (204,240,242,1);
 glyphname = ring;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (442,1304);
-}
-);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(593,1242,o),
-(721,1350,o),
-(736,1490,cs),
-(751,1629,o),
-(652,1745,o),
-(504,1746,cs),
-(355,1745,o),
-(224,1629,o),
-(210,1490,cs),
-(195,1350,o),
-(297,1242,o),
-(446,1242,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(378,1353,o),
-(326,1420,o),
-(334,1490,cs),
-(343,1562,o),
-(407,1632,o),
-(488,1632,cs),
-(570,1632,o),
-(623,1562,o),
-(614,1490,cs),
-(605,1420,o),
-(541,1353,o),
-(460,1352,cs)
-);
+alignment = 1;
+ref = ringcomb;
 }
 );
-width = 640;
+width = 608;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (564,1304);
-}
-);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(695,1233,o),
-(815,1338,o),
-(830,1466,cs),
-(844,1594,o),
-(748,1699,o),
-(616,1698,cs),
-(486,1699,o),
-(367,1594,o),
-(352,1466,cs),
-(337,1338,o),
-(433,1233,o),
-(564,1234,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(527,1376,o),
-(489,1417,o),
-(494,1466,cs),
-(500,1516,o),
-(547,1556,o),
-(602,1556,cs),
-(655,1556,o),
-(692,1516,o),
-(686,1466,cs),
-(681,1417,o),
-(634,1376,o),
-(582,1376,cs)
-);
+alignment = 1;
+ref = ringcomb;
 }
 );
-width = 884;
+width = 864;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (530,1108);
-},
-{
-name = mkmktop_acc;
-pos = (576,1396);
-}
-);
-associatedMasterId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-layerId = "0AFEF468-DA4A-4F83-9B4D-E2B0808EC702";
-name = "Oct 10 18, 23:07";
-shapes = (
-{
-closed = 1;
-nodes = (
-(311,1111,o),
-(390,1033,o),
-(524,1032,cs),
-(655,1033,o),
-(756,1111,o),
-(774,1210,cs),
-(791,1306,o),
-(716,1393,o),
-(584,1394,cs),
-(451,1393,o),
-(346,1306,o),
-(328,1210,c)
-);
-},
-{
-closed = 1;
-nodes = (
-(460,1263,o),
-(506,1300,o),
-(568,1300,cs),
-(625,1300,o),
-(660,1263,o),
-(652,1210,cs),
-(643,1158,o),
-(599,1117,o),
-(538,1118,cs),
-(474,1117,o),
-(442,1158,o),
-(450,1210,c)
-);
-}
-);
-width = 888;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (370,1304);
-}
-);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(463,1257,o),
-(544,1329,o),
-(552,1422,cs),
-(561,1516,o),
-(500,1588,o),
-(408,1588,cs),
-(314,1588,o),
-(233,1516,o),
-(222,1422,cs),
-(209,1329,o),
-(276,1257,o),
-(370,1256,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(308,1303,o),
-(262,1356,o),
-(268,1422,cs),
-(273,1489,o),
-(335,1542,o),
-(402,1542,cs),
-(468,1542,o),
-(515,1489,o),
-(506,1422,cs),
-(497,1356,o),
-(442,1303,o),
-(376,1304,cs)
-);
+alignment = 1;
+ref = ringcomb;
 }
 );
 width = 488;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (410,1304);
-}
-);
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(561,1242,o),
-(689,1350,o),
-(704,1490,cs),
-(719,1629,o),
-(620,1745,o),
-(472,1746,cs),
-(323,1745,o),
-(192,1629,o),
-(178,1490,cs),
-(163,1350,o),
-(265,1242,o),
-(414,1242,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(346,1353,o),
-(294,1420,o),
-(302,1490,cs),
-(311,1562,o),
-(375,1632,o),
-(456,1632,cs),
-(538,1632,o),
-(591,1562,o),
-(582,1490,cs),
-(573,1420,o),
-(509,1353,o),
-(428,1352,cs)
-);
+alignment = 1;
+ref = ringcomb;
 }
 );
 width = 576;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (548,1304);
-}
-);
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(679,1233,o),
-(799,1338,o),
-(814,1466,cs),
-(828,1594,o),
-(732,1699,o),
-(600,1698,cs),
-(470,1699,o),
-(351,1594,o),
-(336,1466,cs),
-(321,1338,o),
-(417,1233,o),
-(548,1234,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(511,1376,o),
-(473,1417,o),
-(478,1466,cs),
-(484,1516,o),
-(531,1556,o),
-(586,1556,cs),
-(639,1556,o),
-(676,1516,o),
-(670,1466,cs),
-(665,1417,o),
-(618,1376,o),
-(566,1376,cs)
-);
+alignment = 1;
+ref = ringcomb;
 }
 );
-width = 852;
+width = 864;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (530,1108);
-},
-{
-name = mkmktop_acc;
-pos = (576,1396);
-}
-);
-associatedMasterId = m010;
-layerId = "4108906D-2ABF-4FF4-8A57-461C0BFA3150";
-name = "Oct 10 18, 23:07";
-shapes = (
-{
-closed = 1;
-nodes = (
-(311,1111,o),
-(390,1033,o),
-(524,1032,cs),
-(655,1033,o),
-(756,1111,o),
-(774,1210,cs),
-(791,1306,o),
-(716,1393,o),
-(584,1394,cs),
-(451,1393,o),
-(346,1306,o),
-(328,1210,c)
-);
-},
-{
-closed = 1;
-nodes = (
-(460,1263,o),
-(506,1300,o),
-(568,1300,cs),
-(625,1300,o),
-(660,1263,o),
-(652,1210,cs),
-(643,1158,o),
-(599,1117,o),
-(538,1118,cs),
-(474,1117,o),
-(442,1158,o),
-(450,1210,c)
-);
-}
-);
-width = 888;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (306,1304);
-}
-);
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(399,1257,o),
-(480,1329,o),
-(488,1422,cs),
-(497,1516,o),
-(436,1588,o),
-(344,1588,cs),
-(250,1588,o),
-(169,1516,o),
-(158,1422,cs),
-(145,1329,o),
-(212,1257,o),
-(306,1256,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(244,1303,o),
-(198,1356,o),
-(204,1422,cs),
-(209,1489,o),
-(271,1542,o),
-(338,1542,cs),
-(404,1542,o),
-(451,1489,o),
-(442,1422,cs),
-(433,1356,o),
-(378,1303,o),
-(312,1304,cs)
-);
+alignment = 1;
+ref = ringcomb;
 }
 );
-width = 360;
+width = 576;
 }
 );
-note = "recipe: offset curve 30, no auto; then redrawn two circles manually for perfect fit.";
 unicode = 730;
-userData = {
-"interface.width-adjustments" = (
--16
-);
-};
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ringacute.lc.glyph b/src/Inter-Italic.glyphspackage/glyphs/ringacute.lc.glyph
index 6ecb1e10d..8f9852f5a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ringacute.lc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ringacute.lc.glyph
@@ -21,7 +21,7 @@ nodes = (
 },
 {
 pos = (-72,-408);
-ref = ring.uc;
+ref = ringcomb.uc;
 scale = (1,0.95);
 }
 );
@@ -47,7 +47,7 @@ nodes = (
 },
 {
 pos = (-164,-336);
-ref = ring.uc;
+ref = ringcomb.uc;
 scale = (1,0.95);
 }
 );
@@ -73,7 +73,7 @@ nodes = (
 },
 {
 pos = (-54,-446);
-ref = ring.uc;
+ref = ringcomb.uc;
 scale = (1,0.95);
 }
 );
@@ -99,7 +99,7 @@ nodes = (
 },
 {
 pos = (-72,-408);
-ref = ring.uc;
+ref = ringcomb.uc;
 scale = (1,0.95);
 }
 );
@@ -125,7 +125,7 @@ nodes = (
 },
 {
 pos = (-164,-336);
-ref = ring.uc;
+ref = ringcomb.uc;
 scale = (1,0.95);
 }
 );
@@ -151,7 +151,7 @@ nodes = (
 },
 {
 pos = (-54,-446);
-ref = ring.uc;
+ref = ringcomb.uc;
 scale = (1,0.95);
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ringacute.uc.glyph b/src/Inter-Italic.glyphspackage/glyphs/ringacute.uc.glyph
index 49c068431..cf1b3f187 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ringacute.uc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ringacute.uc.glyph
@@ -21,7 +21,7 @@ nodes = (
 },
 {
 pos = (-72,-408);
-ref = ring.uc;
+ref = ringcomb.uc;
 scale = (1,0.95);
 }
 );
@@ -47,7 +47,7 @@ nodes = (
 },
 {
 pos = (-164,-336);
-ref = ring.uc;
+ref = ringcomb.uc;
 scale = (1,0.95);
 }
 );
@@ -73,7 +73,7 @@ nodes = (
 },
 {
 pos = (-54,-446);
-ref = ring.uc;
+ref = ringcomb.uc;
 scale = (1,0.95);
 }
 );
@@ -99,7 +99,7 @@ nodes = (
 },
 {
 pos = (-72,-408);
-ref = ring.uc;
+ref = ringcomb.uc;
 scale = (1,0.95);
 }
 );
@@ -125,7 +125,7 @@ nodes = (
 },
 {
 pos = (-164,-336);
-ref = ring.uc;
+ref = ringcomb.uc;
 scale = (1,0.95);
 }
 );
@@ -151,7 +151,7 @@ nodes = (
 },
 {
 pos = (-54,-446);
-ref = ring.uc;
+ref = ringcomb.uc;
 scale = (1,0.95);
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ringcomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/ringcomb.glyph
new file mode 100644
index 000000000..8a514d72c
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/ringcomb.glyph
@@ -0,0 +1,398 @@
+{
+glyphname = ringcomb;
+layers = (
+{
+anchors = (
+{
+name = _top;
+pos = (397,1118);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(554,1189,o),
+(689,1301,o),
+(712,1440,cs),
+(735,1579,o),
+(637,1691,o),
+(492,1691,cs),
+(347,1691,o),
+(211,1579,o),
+(188,1440,cs),
+(165,1301,o),
+(264,1189,o),
+(409,1189,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(360,1314,o),
+(313,1370,o),
+(324,1440,cs),
+(336,1510,o),
+(401,1566,o),
+(471,1566,cs),
+(541,1566,o),
+(588,1510,o),
+(576,1440,cs),
+(565,1370,o),
+(500,1314,o),
+(430,1314,cs)
+);
+}
+);
+width = 608;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (524,1118);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(694,1199,o),
+(842,1316,o),
+(866,1461,cs),
+(890,1606,o),
+(781,1723,o),
+(624,1723,cs),
+(467,1723,o),
+(320,1606,o),
+(296,1461,cs),
+(272,1316,o),
+(380,1199,o),
+(537,1199,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(498,1346,o),
+(455,1397,o),
+(466,1461,cs),
+(476,1525,o),
+(536,1576,o),
+(600,1576,cs),
+(664,1576,o),
+(706,1525,o),
+(696,1461,cs),
+(685,1397,o),
+(626,1346,o),
+(562,1346,cs)
+);
+}
+);
+width = 864;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (530,1108);
+},
+{
+name = mkmktop_acc;
+pos = (576,1396);
+}
+);
+associatedMasterId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+layerId = "0AFEF468-DA4A-4F83-9B4D-E2B0808EC702";
+name = "Oct 10 18, 23:07";
+shapes = (
+{
+closed = 1;
+nodes = (
+(311,1111,o),
+(390,1033,o),
+(524,1032,cs),
+(655,1033,o),
+(756,1111,o),
+(774,1210,cs),
+(791,1306,o),
+(716,1393,o),
+(584,1394,cs),
+(451,1393,o),
+(346,1306,o),
+(328,1210,c)
+);
+},
+{
+closed = 1;
+nodes = (
+(460,1263,o),
+(506,1300,o),
+(568,1300,cs),
+(625,1300,o),
+(660,1263,o),
+(652,1210,cs),
+(643,1158,o),
+(599,1117,o),
+(538,1118,cs),
+(474,1117,o),
+(442,1158,o),
+(450,1210,c)
+);
+}
+);
+width = 888;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (333,1118);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(447,1255,o),
+(533,1329,o),
+(548,1420,cs),
+(563,1511,o),
+(501,1585,o),
+(410,1585,cs),
+(319,1585,o),
+(233,1511,o),
+(218,1420,cs),
+(203,1329,o),
+(265,1255,o),
+(356,1255,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(289,1301,o),
+(253,1354,o),
+(264,1420,cs),
+(275,1486,o),
+(345,1539,o),
+(411,1539,cs),
+(477,1539,o),
+(513,1486,o),
+(502,1420,cs),
+(491,1354,o),
+(421,1301,o),
+(355,1301,cs)
+);
+}
+);
+width = 488;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (376,1056);
+}
+);
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(525,1146,o),
+(650,1250,o),
+(671,1378,cs),
+(692,1506,o),
+(602,1610,o),
+(468,1610,cs),
+(334,1610,o),
+(208,1506,o),
+(187,1378,cs),
+(166,1250,o),
+(257,1146,o),
+(391,1146,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(341,1266,o),
+(307,1316,o),
+(317,1378,cs),
+(327,1440,o),
+(394,1490,o),
+(456,1490,cs),
+(518,1490,o),
+(551,1440,o),
+(541,1378,cs),
+(531,1316,o),
+(465,1266,o),
+(403,1266,cs)
+);
+}
+);
+width = 576;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (520,1056);
+}
+);
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(687,1137,o),
+(812,1236,o),
+(835,1378,cs),
+(859,1520,o),
+(767,1619,o),
+(613,1619,cs),
+(460,1619,o),
+(335,1520,o),
+(311,1378,cs),
+(288,1236,o),
+(380,1137,o),
+(533,1137,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(503,1284,o),
+(470,1323,o),
+(479,1378,cs),
+(488,1433,o),
+(534,1472,o),
+(589,1472,cs),
+(644,1472,o),
+(676,1433,o),
+(667,1378,cs),
+(658,1323,o),
+(613,1284,o),
+(558,1284,cs)
+);
+}
+);
+width = 864;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (530,1108);
+},
+{
+name = mkmktop_acc;
+pos = (576,1396);
+}
+);
+associatedMasterId = m010;
+layerId = "4108906D-2ABF-4FF4-8A57-461C0BFA3150";
+name = "Oct 10 18, 23:07";
+shapes = (
+{
+closed = 1;
+nodes = (
+(311,1111,o),
+(390,1033,o),
+(524,1032,cs),
+(655,1033,o),
+(756,1111,o),
+(774,1210,cs),
+(791,1306,o),
+(716,1393,o),
+(584,1394,cs),
+(451,1393,o),
+(346,1306,o),
+(328,1210,c)
+);
+},
+{
+closed = 1;
+nodes = (
+(460,1263,o),
+(506,1300,o),
+(568,1300,cs),
+(625,1300,o),
+(660,1263,o),
+(652,1210,cs),
+(643,1158,o),
+(599,1117,o),
+(538,1118,cs),
+(474,1117,o),
+(442,1158,o),
+(450,1210,c)
+);
+}
+);
+width = 888;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (376,1056);
+}
+);
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(490,1227,o),
+(571,1295,o),
+(585,1378,cs),
+(599,1461,o),
+(540,1529,o),
+(454,1529,cs),
+(368,1529,o),
+(287,1461,o),
+(273,1378,cs),
+(259,1295,o),
+(318,1227,o),
+(404,1227,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(343,1273,o),
+(310,1320,o),
+(319,1378,cs),
+(329,1436,o),
+(394,1483,o),
+(455,1483,cs),
+(516,1483,o),
+(549,1436,o),
+(539,1378,cs),
+(530,1320,o),
+(465,1273,o),
+(404,1273,cs)
+);
+}
+);
+width = 576;
+}
+);
+note = "recipe: offset curve 30, no auto; then redrawn two circles manually for perfect fit.";
+unicode = 778;
+userData = {
+"interface.width-adjustments" = (
+-16
+);
+};
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ring.uc.glyph b/src/Inter-Italic.glyphspackage/glyphs/ringcomb.uc.glyph
index e9e19cd51..8460529c6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ring.uc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ringcomb.uc.glyph
@@ -1,5 +1,5 @@
 {
-glyphname = ring.uc;
+glyphname = ringcomb.uc;
 layers = (
 {
 anchors = (
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ringhalfleftcentered.glyph b/src/Inter-Italic.glyphspackage/glyphs/ringhalfleftcentered.glyph
index 4cfdedab0..91c8ae8d2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ringhalfleftcentered.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ringhalfleftcentered.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = ringhalfleftcentered;
 kernLeft = bullet;
 kernRight = bullet;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ringhalfright.glyph b/src/Inter-Italic.glyphspackage/glyphs/ringhalfright.glyph
index 86772a23c..b67cfbafd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ringhalfright.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ringhalfright.glyph
@@ -2,203 +2,71 @@
 glyphname = ringhalfright;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (239,1118);
-}
-);
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(288,1220,o),
-(395,1298,o),
-(414,1414,cs),
-(434,1533,o),
-(354,1618,o),
-(240,1618,c),
-(224,1524,l),
-(280,1524,o),
-(319,1478,o),
-(308,1414,cs),
-(298,1356,o),
-(245,1310,o),
-(189,1310,c),
-(174,1220,l)
-);
+alignment = 1;
+ref = righthalfringabovecomb;
 }
 );
-width = 336;
+width = 308;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (248,1118);
-}
-);
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(287,1217,o),
-(395,1299,o),
-(414,1416,cs),
-(434,1535,o),
-(353,1615,o),
-(239,1615,c),
-(216,1475,l),
-(255,1475,o),
-(280,1452,o),
-(274,1416,cs),
-(269,1382,o),
-(235,1355,o),
-(196,1355,c),
-(173,1217,l)
-);
+alignment = 1;
+ref = righthalfringabovecomb;
 }
 );
-width = 336;
+width = 328;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (248,1118);
-}
-);
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(326,1586,o),
-(378,1523,o),
-(363,1432,cs),
-(348,1341,o),
-(275,1278,o),
-(184,1278,c),
-(176,1232,l),
-(286,1232,o),
-(391,1322,o),
-(409,1432,cs),
-(427,1542,o),
-(352,1632,o),
-(242,1632,c),
-(235,1586,l)
-);
+alignment = 1;
+ref = righthalfringabovecomb;
 }
 );
-width = 308;
+width = 336;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (237,1056);
-}
-);
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(282,1178,o),
-(387,1268,o),
-(405,1378,cs),
-(423,1488,o),
-(348,1578,o),
-(238,1578,c),
-(222,1482,l),
-(286,1482,o),
-(320,1442,o),
-(309,1378,cs),
-(299,1314,o),
-(252,1274,o),
-(188,1274,c),
-(172,1178,l)
-);
+alignment = 1;
+ref = righthalfringabovecomb;
 }
 );
-width = 328;
+width = 327;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (237,1056);
-}
-);
-layerId = m010;
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(260,1444,o),
-(278,1422,o),
-(271,1378,cs),
-(264,1334,o),
-(238,1312,o),
-(194,1312,c),
-(172,1178,l),
-(295,1178,o),
-(385,1255,o),
-(405,1378,cs),
-(425,1501,o),
-(361,1578,o),
-(238,1578,c),
-(216,1444,l)
-);
+alignment = 1;
+ref = righthalfringabovecomb;
 }
 );
-width = 328;
+width = 337;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (243,1056);
-}
-);
-layerId = m012;
+layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(322,1532,o),
-(374,1469,o),
-(359,1378,cs),
-(344,1287,o),
-(271,1224,o),
-(180,1224,c),
-(172,1178,l),
-(282,1178,o),
-(387,1268,o),
-(405,1378,cs),
-(423,1488,o),
-(348,1578,o),
-(238,1578,c),
-(231,1532,l)
-);
+alignment = 1;
+ref = righthalfringabovecomb;
 }
 );
 width = 328;
 }
 );
 unicode = 702;
-userData = {
-interface.gridadjust.original = "{'width': 393, 'leftMargin': 55, 'rightMargin': 55}";
-"interface.width-adjustments" = (
--16
-);
-};
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ringhalfrightcentered.glyph b/src/Inter-Italic.glyphspackage/glyphs/ringhalfrightcentered.glyph
index 4191e29d8..a6edf1ed0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ringhalfrightcentered.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ringhalfrightcentered.glyph
@@ -1,72 +1,77 @@
 {
 case = minor;
-color = (204,240,242,1);
 glyphname = ringhalfrightcentered;
 kernLeft = bullet;
 kernRight = bullet;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
 pos = (-94,-566);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 336;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
 pos = (-93,-563);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
-width = 336;
+width = 337;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
 pos = (-94,-566);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 308;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
 pos = (-94,-566);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
-width = 328;
+width = 327;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
 pos = (-93,-563);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 328;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 alignment = 1;
 pos = (-94,-566);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 328;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ringlefthalfsubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/ringlefthalfsubcomb.glyph
index 4c2b6f568..1eccceb49 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ringlefthalfsubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ringlefthalfsubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = ringlefthalfsubnosp;
+glyphname = ringlefthalfsubcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -63,5 +62,4 @@ ref = ringhalfleft;
 width = 0;
 }
 );
-unicode = 796;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ringnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/ringnosp.glyph
deleted file mode 100644
index 689a27550..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/ringnosp.glyph
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-color = (250,227,227,1);
-glyphname = ringnosp;
-layers = (
-{
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-alignment = -1;
-pos = (-928,46);
-ref = ring;
-}
-);
-width = 0;
-},
-{
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-alignment = -1;
-pos = (-1032,-18);
-ref = ring;
-}
-);
-width = 38;
-},
-{
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-alignment = -1;
-pos = (-866,84);
-ref = ring;
-}
-);
-width = 0;
-},
-{
-layerId = m008;
-shapes = (
-{
-alignment = -1;
-pos = (-928,46);
-ref = ring;
-}
-);
-width = 0;
-},
-{
-layerId = m010;
-shapes = (
-{
-alignment = -1;
-pos = (-1032,-18);
-ref = ring;
-}
-);
-width = 6;
-},
-{
-layerId = m012;
-shapes = (
-{
-alignment = -1;
-pos = (-866,84);
-ref = ring;
-}
-);
-width = 0;
-}
-);
-unicode = 778;
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ringrighthalfsubcomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/ringrighthalfsubcomb.glyph
new file mode 100644
index 000000000..611496161
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/ringrighthalfsubcomb.glyph
@@ -0,0 +1,78 @@
+{
+case = minor;
+glyphname = ringrighthalfsubcomb;
+layers = (
+{
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+pos = (-292,-1761);
+ref = righthalfringabovecomb;
+}
+);
+width = 336;
+},
+{
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+pos = (-299,-1807);
+ref = righthalfringabovecomb;
+}
+);
+width = 337;
+},
+{
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+pos = (-279,-1686);
+ref = righthalfringabovecomb;
+}
+);
+width = 308;
+},
+{
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+pos = (-281,-1700);
+ref = righthalfringabovecomb;
+}
+);
+width = 327;
+},
+{
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+pos = (-280,-1690);
+ref = righthalfringabovecomb;
+}
+);
+width = 328;
+},
+{
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+pos = (-282,-1700);
+ref = righthalfringabovecomb;
+}
+);
+width = 328;
+}
+);
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ringrighthalfsubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/ringrighthalfsubnosp.glyph
deleted file mode 100644
index e9fd95e37..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/ringrighthalfsubnosp.glyph
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-color = (250,227,227,1);
-glyphname = ringrighthalfsubnosp;
-layers = (
-{
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-pos = (-992,-1592);
-ref = ringhalfright;
-}
-);
-width = 0;
-},
-{
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-pos = (-1144,-1594);
-ref = ringhalfright;
-}
-);
-width = 0;
-},
-{
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-alignment = -1;
-pos = (-906,-1592);
-ref = ringhalfright;
-}
-);
-width = 0;
-},
-{
-layerId = m008;
-shapes = (
-{
-pos = (-992,-1592);
-ref = ringhalfright;
-}
-);
-width = 0;
-},
-{
-layerId = m010;
-shapes = (
-{
-pos = (-1144,-1594);
-ref = ringhalfright;
-}
-);
-width = 0;
-},
-{
-layerId = m012;
-shapes = (
-{
-alignment = -1;
-pos = (-906,-1592);
-ref = ringhalfright;
-}
-);
-width = 0;
-}
-);
-unicode = 825;
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ringsubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/ringsubcomb.glyph
index b1d585a29..25c02e118 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ringsubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ringsubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = ringsubnosp;
+glyphname = ringsubcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -8,7 +7,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1158,-1670);
-ref = ring;
+ref = ringcomb;
 }
 );
 width = 0;
@@ -19,7 +18,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1012,-1550);
-ref = ring;
+ref = ringcomb;
 }
 );
 width = 8;
@@ -30,7 +29,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1246,-1742);
-ref = ring;
+ref = ringcomb;
 }
 );
 width = 0;
@@ -41,7 +40,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1158,-1670);
-ref = ring;
+ref = ringcomb;
 }
 );
 width = 0;
@@ -52,7 +51,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1012,-1550);
-ref = ring;
+ref = ringcomb;
 }
 );
 width = 0;
@@ -63,11 +62,10 @@ shapes = (
 {
 alignment = -1;
 pos = (-1246,-1742);
-ref = ring;
+ref = ringcomb;
 }
 );
 width = 0;
 }
 );
-unicode = 805;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rinvertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/rinvertedbreve.glyph
index ff90f4703..9346da920 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rinvertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rinvertedbreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (1050,186);
-ref = breveinvnosp;
+pos = (37,186);
+ref = breveinvcomb;
 }
 );
 width = 763;
@@ -23,8 +23,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (1176,186);
-ref = breveinvnosp;
+pos = (2,186);
+ref = breveinvcomb;
 }
 );
 width = 889;
@@ -36,8 +36,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (1042,186);
-ref = breveinvnosp;
+pos = (97,186);
+ref = breveinvcomb;
 }
 );
 width = 667;
@@ -49,8 +49,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (964,206);
-ref = breveinvnosp;
+pos = (1,206);
+ref = breveinvcomb;
 }
 );
 width = 660;
@@ -62,8 +62,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (1157,248);
-ref = breveinvnosp;
+pos = (75,248);
+ref = breveinvcomb;
 }
 );
 width = 853;
@@ -75,8 +75,8 @@ shapes = (
 ref = r;
 },
 {
-pos = (934,248);
-ref = breveinvnosp;
+pos = (53,248);
+ref = breveinvcomb;
 }
 );
 width = 539;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rlinebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/rlinebelow.glyph
index f9e5c8403..e51eb7dd0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rlinebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rlinebelow.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (-206,0);
+pos = (-205,0);
 ref = macronsub;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = r;
 },
 {
-pos = (-97,0);
+pos = (-98,0);
 ref = macronsub;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romaneight.glyph b/src/Inter-Italic.glyphspackage/glyphs/romaneight.glyph
index 818ea4e96..40d1cefd6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romaneight.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romaneight.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = romaneight;
 kernLeft = V;
 kernRight = H;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romaneleven.glyph b/src/Inter-Italic.glyphspackage/glyphs/romaneleven.glyph
index 8a13382f2..c1c6b68e6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romaneleven.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romaneleven.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = romaneleven;
 kernLeft = X;
 kernRight = H;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romanfifty.glyph b/src/Inter-Italic.glyphspackage/glyphs/romanfifty.glyph
index aad930790..ba7a4d5eb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romanfifty.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romanfifty.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = romanfifty;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romanfive.glyph b/src/Inter-Italic.glyphspackage/glyphs/romanfive.glyph
index 3c6feb1f1..f103c0cd6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romanfive.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romanfive.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = romanfive;
 kernLeft = V;
 kernRight = V;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romanfivehundred.glyph b/src/Inter-Italic.glyphspackage/glyphs/romanfivehundred.glyph
index 292b50254..a9ffe27e8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romanfivehundred.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romanfivehundred.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = romanfivehundred;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romanfour.glyph b/src/Inter-Italic.glyphspackage/glyphs/romanfour.glyph
index 14124a7eb..d4748e1d8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romanfour.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romanfour.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = romanfour;
 kernLeft = B;
 kernRight = V;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romanhundred.glyph b/src/Inter-Italic.glyphspackage/glyphs/romanhundred.glyph
index 26c6b3d85..356077af4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romanhundred.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romanhundred.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = romanhundred;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romannine.glyph b/src/Inter-Italic.glyphspackage/glyphs/romannine.glyph
index 3ffb70b54..358a0f158 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romannine.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romannine.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = romannine;
 kernLeft = B;
 kernRight = X;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romanone.glyph b/src/Inter-Italic.glyphspackage/glyphs/romanone.glyph
index 58e5aab12..f339ae78c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romanone.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romanone.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = romanone;
 kernLeft = B;
 kernRight = H;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romanseven.glyph b/src/Inter-Italic.glyphspackage/glyphs/romanseven.glyph
index de64db6df..a3bfd510d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romanseven.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romanseven.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = romanseven;
 kernLeft = V;
 kernRight = H;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romansix.glyph b/src/Inter-Italic.glyphspackage/glyphs/romansix.glyph
index 0575c5c63..2268eff52 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romansix.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romansix.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = romansix;
 kernLeft = V;
 kernRight = H;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romanten.glyph b/src/Inter-Italic.glyphspackage/glyphs/romanten.glyph
index 79859fffd..daf65ca58 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romanten.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romanten.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = romanten;
 kernLeft = X;
 kernRight = X;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romanthousand.glyph b/src/Inter-Italic.glyphspackage/glyphs/romanthousand.glyph
index 7f2d050fe..5757ba38b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romanthousand.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romanthousand.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = romanthousand;
 kernLeft = B;
 kernRight = H;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romanthree.glyph b/src/Inter-Italic.glyphspackage/glyphs/romanthree.glyph
index d0d6bc99e..f82ee61d2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romanthree.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romanthree.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = romanthree;
 kernLeft = B;
 kernRight = H;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romantwelve.glyph b/src/Inter-Italic.glyphspackage/glyphs/romantwelve.glyph
index ea63a7991..372cb9232 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romantwelve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romantwelve.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = romantwelve;
 kernLeft = X;
 kernRight = H;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romantwo.glyph b/src/Inter-Italic.glyphspackage/glyphs/romantwo.glyph
index 7adb419b2..31d5e0168 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romantwo.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romantwo.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = romantwo;
 kernLeft = B;
 kernRight = H;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/s.glyph b/src/Inter-Italic.glyphspackage/glyphs/s.glyph
index ffb0b3e87..2d8dc7df0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/s.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/s.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = s;
 kernLeft = s;
 kernRight = s;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/sacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/sacute.glyph
index 6640de47b..084d44caf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/sacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/sacute.glyph
@@ -5,78 +5,84 @@ kernRight = s;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = s;
 },
 {
-pos = (339,186);
-ref = acute;
+pos = (459,186);
+ref = acutecomb;
 }
 );
 width = 1071;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = s;
 },
 {
-pos = (329,186);
-ref = acute;
+pos = (459,186);
+ref = acutecomb;
 }
 );
 width = 1203;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = s;
 },
 {
-pos = (337,186);
-ref = acute;
+pos = (477,186);
+ref = acutecomb;
 }
 );
 width = 1011;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = s;
 },
 {
-pos = (357,206);
-ref = acute;
+pos = (397,206);
+ref = acutecomb;
 }
 );
 width = 973;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = s;
 },
 {
-pos = (389,206);
-ref = acute;
+pos = (413,206);
+ref = acutecomb;
 }
 );
 width = 1144;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = s;
 },
 {
-pos = (364,206);
-ref = acute;
+pos = (424,206);
+ref = acutecomb;
 }
 );
 width = 915;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/scaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/scaron.glyph
index 372ed00d1..8019e33a9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/scaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/scaron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (86,0);
-ref = caron;
+pos = (167,186);
+ref = caroncomb;
 }
 );
 width = 1071;
@@ -23,8 +23,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (-44,0);
-ref = caron;
+pos = (121,186);
+ref = caroncomb;
 }
 );
 width = 1203;
@@ -36,8 +36,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (91,16);
-ref = caron;
+pos = (118,186);
+ref = caroncomb;
 }
 );
 width = 1011;
@@ -49,8 +49,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (53,0);
-ref = caron;
+pos = (122,206);
+ref = caroncomb;
 }
 );
 width = 973;
@@ -62,8 +62,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (-57,0);
-ref = caron;
+pos = (174,206);
+ref = caroncomb;
 }
 );
 width = 1144;
@@ -75,8 +75,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (98,0);
-ref = caron;
+pos = (143,206);
+ref = caroncomb;
 }
 );
 width = 915;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/scedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/scedilla.glyph
index 6887b3bc4..8d8a935bb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/scedilla.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/scedilla.glyph
@@ -11,7 +11,7 @@ ref = s;
 },
 {
 pos = (266,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1071;
@@ -24,7 +24,7 @@ ref = s;
 },
 {
 pos = (157,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1203;
@@ -37,7 +37,7 @@ ref = s;
 },
 {
 pos = (298,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1011;
@@ -50,7 +50,7 @@ ref = s;
 },
 {
 pos = (271,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 973;
@@ -63,7 +63,7 @@ ref = s;
 },
 {
 pos = (163,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1144;
@@ -76,7 +76,7 @@ ref = s;
 },
 {
 pos = (316,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 915;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/schwadieresiscyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/schwadieresiscyrillic.glyph
index 07b05bc42..5b0673d15 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/schwadieresiscyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/schwadieresiscyrillic.glyph
@@ -11,7 +11,7 @@ ref = schwa;
 },
 {
 pos = (28,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1173;
@@ -24,7 +24,7 @@ ref = schwa;
 },
 {
 pos = (-14,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1239;
@@ -37,7 +37,7 @@ ref = schwa;
 },
 {
 pos = (37,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1129;
@@ -50,7 +50,7 @@ ref = schwa;
 },
 {
 pos = (65,248);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1082;
@@ -63,7 +63,7 @@ ref = schwa;
 },
 {
 pos = (7,248);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1202;
@@ -76,7 +76,7 @@ ref = schwa;
 },
 {
 pos = (90,248);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/scircumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/scircumflex.glyph
index 3918823eb..54094d8e4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/scircumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/scircumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (88,0);
-ref = circumflex;
+pos = (167,186);
+ref = circumflexcomb;
 }
 );
 width = 1071;
@@ -23,8 +23,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (-45,0);
-ref = circumflex;
+pos = (121,186);
+ref = circumflexcomb;
 }
 );
 width = 1203;
@@ -36,8 +36,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (87,0);
-ref = circumflex;
+pos = (117,186);
+ref = circumflexcomb;
 }
 );
 width = 1011;
@@ -49,8 +49,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (55,0);
-ref = circumflex;
+pos = (121,206);
+ref = circumflexcomb;
 }
 );
 width = 973;
@@ -62,8 +62,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (-58,0);
-ref = circumflex;
+pos = (175,206);
+ref = circumflexcomb;
 }
 );
 width = 1144;
@@ -75,8 +75,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (101,0);
-ref = circumflex;
+pos = (142,206);
+ref = circumflexcomb;
 }
 );
 width = 915;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/sdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/sdotaccent.glyph
index ba0d2fb0d..d6d9b44f4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/sdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/sdotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (308,0);
-ref = dotaccent;
+pos = (339,186);
+ref = dotaccentcomb;
 }
 );
 width = 1071;
@@ -25,8 +25,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (267,0);
-ref = dotaccent;
+pos = (298,186);
+ref = dotaccentcomb;
 }
 );
 width = 1203;
@@ -39,8 +39,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (332,0);
-ref = dotaccent;
+pos = (363,186);
+ref = dotaccentcomb;
 }
 );
 width = 1011;
@@ -53,8 +53,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (275,0);
-ref = dotaccent;
+pos = (309,206);
+ref = dotaccentcomb;
 }
 );
 width = 973;
@@ -67,8 +67,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (252,0);
-ref = dotaccent;
+pos = (286,206);
+ref = dotaccentcomb;
 }
 );
 width = 1144;
@@ -81,8 +81,8 @@ shapes = (
 ref = s;
 },
 {
-pos = (344,0);
-ref = dotaccent;
+pos = (372,206);
+ref = dotaccentcomb;
 }
 );
 width = 915;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/sdotbelowdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/sdotbelowdotaccent.glyph
index c3c43be8a..fe48c810d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/sdotbelowdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/sdotbelowdotaccent.glyph
@@ -15,8 +15,8 @@ pos = (1150,0);
 ref = dotbelow;
 },
 {
-pos = (308,0);
-ref = dotaccent;
+pos = (339,186);
+ref = dotaccentcomb;
 }
 );
 width = 1071;
@@ -33,8 +33,8 @@ pos = (1143,0);
 ref = dotbelow;
 },
 {
-pos = (267,0);
-ref = dotaccent;
+pos = (298,186);
+ref = dotaccentcomb;
 }
 );
 width = 1203;
@@ -51,8 +51,8 @@ pos = (1074,0);
 ref = dotbelow;
 },
 {
-pos = (332,0);
-ref = dotaccent;
+pos = (363,186);
+ref = dotaccentcomb;
 }
 );
 width = 1011;
@@ -69,8 +69,8 @@ pos = (1155,0);
 ref = dotbelow;
 },
 {
-pos = (275,0);
-ref = dotaccent;
+pos = (309,206);
+ref = dotaccentcomb;
 }
 );
 width = 973;
@@ -87,8 +87,8 @@ pos = (1149,0);
 ref = dotbelow;
 },
 {
-pos = (252,0);
-ref = dotaccent;
+pos = (286,206);
+ref = dotaccentcomb;
 }
 );
 width = 1144;
@@ -105,8 +105,8 @@ pos = (1088,0);
 ref = dotbelow;
 },
 {
-pos = (344,0);
-ref = dotaccent;
+pos = (372,206);
+ref = dotaccentcomb;
 }
 );
 width = 915;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/seagullsubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/seagullsubcomb.glyph
index 50c9509f9..fa4a8e8a8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/seagullsubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/seagullsubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = seagullsubnosp;
+glyphname = seagullsubcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -268,5 +267,4 @@ width = 0;
 }
 );
 note = "position under \"x\".\012offset curve settings:\012L: 32,32,0%\012R: 70,80,0%\012B: 110,90,0%";
-unicode = 828;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/secondtonechinese.glyph b/src/Inter-Italic.glyphspackage/glyphs/secondtonechinese.glyph
index 22664c9ea..299322dd7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/secondtonechinese.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/secondtonechinese.glyph
@@ -3,69 +3,75 @@ glyphname = secondtonechinese;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (20,0);
-ref = acute;
+pos = (148,0);
+ref = acutecomb;
 }
 );
-width = 734;
+width = 735;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (20,0);
-ref = acute;
+pos = (150,0);
+ref = acutecomb;
 }
 );
 width = 834;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (20,0);
-ref = acute;
+pos = (160,0);
+ref = acutecomb;
 }
 );
-width = 672;
+width = 673;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
 pos = (20,0);
-ref = acute;
+ref = acutecomb;
 }
 );
 width = 670;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (20,0);
-ref = acute;
+pos = (44,0);
+ref = acutecomb;
 }
 );
-width = 802;
+width = 801;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 alignment = -1;
-pos = (20,0);
-ref = acute;
+pos = (86,0);
+ref = acutecomb;
 }
 );
-width = 544;
+width = 620;
 }
 );
 unicode = 714;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/sevenroman.glyph b/src/Inter-Italic.glyphspackage/glyphs/sevenroman.glyph
index eb9165c85..33fab677e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/sevenroman.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/sevenroman.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = sevenroman;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/sixroman.glyph b/src/Inter-Italic.glyphspackage/glyphs/sixroman.glyph
index 6d10c9597..4fe59e100 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/sixroman.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/sixroman.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = sixroman;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/sixthemspace.glyph b/src/Inter-Italic.glyphspackage/glyphs/sixthemspace.glyph
index b3d793ca2..8d82bf3cd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/sixthemspace.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/sixthemspace.glyph
@@ -1,5 +1,4 @@
 {
-color = (237,229,250,1);
 glyphname = sixthemspace;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/slashlongcomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/slashlongcomb.glyph
index b600f1e21..32b39b8ce 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/slashlongcomb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/slashlongcomb.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = slashlongcomb;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/slashshortnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/slashshortcomb.glyph
index 29a0c93e1..5665bcd30 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/slashshortnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/slashshortcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = slashshortnosp;
+glyphname = slashshortcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/slongdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/slongdotaccent.glyph
index b66813722..67989c411 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/slongdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/slongdotaccent.glyph
@@ -11,8 +11,8 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (213,372);
-ref = dotaccent;
+pos = (244,558);
+ref = dotaccentcomb;
 }
 );
 width = 737;
@@ -27,8 +27,8 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (238,372);
-ref = dotaccent;
+pos = (269,558);
+ref = dotaccentcomb;
 }
 );
 width = 841;
@@ -43,8 +43,8 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (202,372);
-ref = dotaccent;
+pos = (233,558);
+ref = dotaccentcomb;
 }
 );
 width = 679;
@@ -59,8 +59,8 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (220,414);
-ref = dotaccent;
+pos = (254,620);
+ref = dotaccentcomb;
 }
 );
 width = 683;
@@ -75,8 +75,8 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (212,414);
-ref = dotaccent;
+pos = (246,620);
+ref = dotaccentcomb;
 }
 );
 width = 829;
@@ -91,8 +91,8 @@ ref = longs;
 },
 {
 alignment = 1;
-pos = (284,414);
-ref = dotaccent;
+pos = (312,620);
+ref = dotaccentcomb;
 }
 );
 width = 550;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/space.glyph b/src/Inter-Italic.glyphspackage/glyphs/space.glyph
index ede774590..f14db4f68 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/space.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/space.glyph
@@ -1,5 +1,4 @@
 {
-color = (237,229,250,1);
 glyphname = space;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/spaceopenbox.glyph b/src/Inter-Italic.glyphspackage/glyphs/spaceopenbox.glyph
index a247b18b7..353a101c2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/spaceopenbox.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/spaceopenbox.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = spaceopenbox;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/squaresubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/squaresubcomb.glyph
index 078eadc80..ee11675b8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/squaresubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/squaresubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = squaresubnosp;
+glyphname = squaresubcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -147,5 +146,4 @@ nodes = (
 width = 0;
 }
 );
-unicode = 827;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/t.glyph b/src/Inter-Italic.glyphspackage/glyphs/t.glyph
index 76bd918cb..e8ff361c1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/t.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/t.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = t;
 kernLeft = t;
 kernRight = t;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tackdownsubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/tackdownsubcomb.glyph
index e7cc230d4..f40ab7d49 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tackdownsubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tackdownsubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = tackdownsubnosp;
+glyphname = tackdownsubcomb;
 layers = (
 {
 anchors = (
@@ -130,5 +129,4 @@ width = 0;
 }
 );
 note = "align under x";
-unicode = 798;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tackleftsubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/tackleftsubcomb.glyph
index 2b522a42b..bd926b9c1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tackleftsubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tackleftsubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = tackleftsubnosp;
+glyphname = tackleftsubcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -147,5 +146,4 @@ nodes = (
 width = 0;
 }
 );
-unicode = 792;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tackrightsubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/tackrightsubcomb.glyph
index 56f61f204..89acd554a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tackrightsubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tackrightsubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = tackrightsubnosp;
+glyphname = tackrightsubcomb;
 layers = (
 {
 anchors = (
@@ -183,5 +182,4 @@ nodes = (
 width = 0;
 }
 );
-unicode = 793;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tackupsubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/tackupsubcomb.glyph
index 296e67ce7..044eb9ad9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tackupsubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tackupsubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = tackupsubnosp;
+glyphname = tackupsubcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -65,5 +64,4 @@ ref = uptackmod;
 width = 0;
 }
 );
-unicode = 797;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tcedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/tcedilla.glyph
index a5807ebfb..69b8a25ac 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tcedilla.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tcedilla.glyph
@@ -12,7 +12,7 @@ ref = t;
 {
 anchor = cedilla;
 pos = (199,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 692;
@@ -26,7 +26,7 @@ ref = t;
 {
 anchor = cedilla;
 pos = (103,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 820;
@@ -40,7 +40,7 @@ ref = t;
 {
 anchor = cedilla;
 pos = (161,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 569;
@@ -54,7 +54,7 @@ ref = t;
 {
 anchor = cedilla;
 pos = (199,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 568;
@@ -68,7 +68,7 @@ ref = t;
 {
 anchor = cedilla;
 pos = (134,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 839;
@@ -82,7 +82,7 @@ ref = t;
 {
 anchor = cedilla;
 pos = (187,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 494;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tcircumflexbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/tcircumflexbelow.glyph
index 1d8e86f36..ae9cb6e74 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tcircumflexbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tcircumflexbelow.glyph
@@ -11,7 +11,7 @@ ref = t;
 },
 {
 pos = (975,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 692;
@@ -24,7 +24,7 @@ ref = t;
 },
 {
 pos = (1127,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 820;
@@ -37,7 +37,7 @@ ref = t;
 },
 {
 pos = (863,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 569;
@@ -50,7 +50,7 @@ ref = t;
 },
 {
 pos = (952,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 568;
@@ -63,7 +63,7 @@ ref = t;
 },
 {
 pos = (1154,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 839;
@@ -76,7 +76,7 @@ ref = t;
 },
 {
 pos = (883,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 494;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tdieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/tdieresis.glyph
index b80131552..4a9535a1d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tdieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tdieresis.glyph
@@ -11,7 +11,7 @@ ref = t;
 },
 {
 pos = (-242,372);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 692;
@@ -24,7 +24,7 @@ ref = t;
 },
 {
 pos = (-230,424);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 820;
@@ -37,7 +37,7 @@ ref = t;
 },
 {
 pos = (-283,372);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 569;
@@ -50,7 +50,7 @@ ref = t;
 },
 {
 pos = (-258,434);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 568;
@@ -63,7 +63,7 @@ ref = t;
 },
 {
 pos = (-196,486);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 839;
@@ -76,7 +76,7 @@ ref = t;
 },
 {
 pos = (-274,434);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 494;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/tdotaccent.glyph
index e0caa7f09..adea02b80 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tdotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = t;
 },
 {
-pos = (84,186);
-ref = dotaccent;
+pos = (115,372);
+ref = dotaccentcomb;
 }
 );
 width = 692;
@@ -25,8 +25,8 @@ shapes = (
 ref = t;
 },
 {
-pos = (70,238);
-ref = dotaccent;
+pos = (101,424);
+ref = dotaccentcomb;
 }
 );
 width = 820;
@@ -39,8 +39,8 @@ shapes = (
 ref = t;
 },
 {
-pos = (82,186);
-ref = dotaccent;
+pos = (113,372);
+ref = dotaccentcomb;
 }
 );
 width = 569;
@@ -53,8 +53,8 @@ shapes = (
 ref = t;
 },
 {
-pos = (65,228);
-ref = dotaccent;
+pos = (99,434);
+ref = dotaccentcomb;
 }
 );
 width = 568;
@@ -67,8 +67,8 @@ shapes = (
 ref = t;
 },
 {
-pos = (99,280);
-ref = dotaccent;
+pos = (133,486);
+ref = dotaccentcomb;
 }
 );
 width = 839;
@@ -81,8 +81,8 @@ shapes = (
 ref = t;
 },
 {
-pos = (110,228);
-ref = dotaccent;
+pos = (138,434);
+ref = dotaccentcomb;
 }
 );
 width = 494;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tenroman.glyph b/src/Inter-Italic.glyphspackage/glyphs/tenroman.glyph
index 6eed2b6cc..5298ba010 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tenroman.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tenroman.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = tenroman;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/thinspace.glyph b/src/Inter-Italic.glyphspackage/glyphs/thinspace.glyph
index 850c6c917..171ddeda4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/thinspace.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/thinspace.glyph
@@ -1,5 +1,4 @@
 {
-color = (237,229,250,1);
 glyphname = thinspace;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/thirdemspace.glyph b/src/Inter-Italic.glyphspackage/glyphs/thirdemspace.glyph
index 45045f2d9..81cfaf80a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/thirdemspace.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/thirdemspace.glyph
@@ -1,5 +1,4 @@
 {
-color = (237,229,250,1);
 glyphname = thirdemspace;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/thousandcyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/thousandcyrillic.glyph
index c65c86d1a..493f9316d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/thousandcyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/thousandcyrillic.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = thousandcyrillic;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/threeroman.glyph b/src/Inter-Italic.glyphspackage/glyphs/threeroman.glyph
index 4ae83c3f4..45e4dfcbd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/threeroman.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/threeroman.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = threeroman;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/tilde.glyph
index 9564dc154..bbcf5db90 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tilde.glyph
@@ -1,284 +1,80 @@
 {
-color = (204,240,242,1);
 glyphname = tilde;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (635,1304);
-},
-{
-name = top;
-pos = (696,1676);
-}
-);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(856,1276,o),
-(925,1356,o),
-(950,1479,c),
-(831,1479,l),
-(815,1423,o),
-(796,1399,o),
-(763,1399,cs),
-(696,1399,o),
-(639,1483,o),
-(537,1483,cs),
-(432,1483,o),
-(368,1396,o),
-(345,1279,c),
-(468,1279,l),
-(476,1316,o),
-(498,1357,o),
-(533,1357,cs),
-(582,1357,o),
-(664,1276,o),
-(760,1276,cs)
-);
+alignment = 1;
+ref = tildecomb;
 }
 );
 width = 1024;
 },
 {
-anchors = (
+guides = (
 {
-name = _top;
-pos = (635,1304);
-},
-{
-name = top;
-pos = (696,1676);
+angle = 80.6;
+pos = (-947,2432);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(910,1248,o),
-(1036,1356,o),
-(1074,1562,c),
-(878,1562,l),
-(863.999,1492,o),
-(837,1451,o),
-(781,1451,cs),
-(712,1451,o),
-(681,1568,o),
-(531,1568,cs),
-(393,1568,o),
-(270,1466,o),
-(231,1256,c),
-(429,1256,l),
-(444,1329,o),
-(476,1368,o),
-(523,1368,cs),
-(597,1368,o),
-(622,1248,o),
-(774,1248,cs)
-);
+alignment = 1;
+ref = tildecomb;
 }
 );
-width = 1024;
+width = 1025;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (634,1304);
-},
-{
-name = top;
-pos = (695,1676);
-}
-);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(864,1306,o),
-(957,1366,o),
-(993,1454,c),
-(949,1466,l),
-(921,1398,o),
-(850,1353,o),
-(784,1352,cs),
-(677,1353,o),
-(653,1472,o),
-(518,1472,cs),
-(420,1472,o),
-(329,1409,o),
-(300,1318,c),
-(347,1312,l),
-(367,1378,o),
-(435,1425,o),
-(510,1426,cs),
-(634,1425,o),
-(651,1306,o),
-(776,1306,cs)
-);
+alignment = 1;
+ref = tildecomb;
 }
 );
-width = 1019;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (601,1262);
+width = 1018;
 },
 {
-name = top;
-pos = (670,1676);
-}
-);
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(828,1264,o),
-(897,1344,o),
-(922,1467,c),
-(803,1467,l),
-(787,1411,o),
-(768,1387,o),
-(735,1387,cs),
-(668,1387,o),
-(611,1471,o),
-(509,1471,cs),
-(404,1471,o),
-(340,1384,o),
-(317,1267,c),
-(440,1267,l),
-(448,1304,o),
-(470,1345,o),
-(505,1345,cs),
-(554,1345,o),
-(636,1264,o),
-(732,1264,cs)
-);
+alignment = 1;
+ref = tildecomb;
 }
 );
 width = 960;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (634,1262);
-},
+guides = (
 {
-name = top;
-pos = (703,1676);
+angle = 80.6;
+pos = (-1044,2432);
 }
 );
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(904,1176,o),
-(1031,1284,o),
-(1068,1490,c),
-(872,1490,l),
-(858,1420,o),
-(832,1381,o),
-(776,1381,cs),
-(707,1381,o),
-(675,1496,o),
-(525,1496,cs),
-(387,1496,o),
-(264,1394,o),
-(225,1184,c),
-(423,1184,l),
-(438,1257,o),
-(471,1296,o),
-(518,1296,cs),
-(592,1296,o),
-(616,1176,o),
-(768,1176,cs)
-);
+alignment = 1;
+ref = tildecomb;
 }
 );
-width = 993;
+width = 992;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (565,1262);
-},
-{
-name = top;
-pos = (634,1676);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(672,1258,o),
-(755,1318,o),
-(776,1406,c),
-(730,1418,l),
-(714,1350,o),
-(650,1304,o),
-(584,1304,cs),
-(477,1304,o),
-(433,1424,o),
-(298,1424,cs),
-(200,1424,o),
-(120,1361,o),
-(106,1270,c),
-(154,1264,l),
-(163,1330,o),
-(223,1378,o),
-(298,1378,cs),
-(422,1378,o),
-(459,1258,o),
-(584,1258,cs)
-);
-}
-);
-};
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(774,1257,o),
-(839,1315,o),
-(867,1410,c),
-(820,1410,l),
-(792,1334,o),
-(750,1303,o),
-(693,1303,cs),
-(611,1303,o),
-(586,1421,o),
-(462,1421,cs),
-(377,1421,o),
-(310,1355,o),
-(287,1264,c),
-(333,1264,l),
-(351,1333,o),
-(402,1375,o),
-(468,1375,cs),
-(560,1375,o),
-(586,1257,o),
-(698,1257,cs)
-);
+alignment = 1;
+ref = tildecomb;
 }
 );
 width = 896;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tildeacute.lc.glyph b/src/Inter-Italic.glyphspackage/glyphs/tildeacute.lc.glyph
index 05402e652..79278b5f2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tildeacute.lc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tildeacute.lc.glyph
@@ -25,7 +25,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-4,-27);
-ref = tilde;
+ref = tildecomb;
 },
 {
 alignment = -1;
@@ -59,7 +59,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-4,-24);
-ref = tilde;
+ref = tildecomb;
 },
 {
 alignment = -1;
@@ -94,7 +94,7 @@ shapes = (
 {
 alignment = -1;
 pos = (47,-28);
-ref = tilde;
+ref = tildecomb;
 },
 {
 alignment = -1;
@@ -125,7 +125,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-8,-49);
-ref = tilde;
+ref = tildecomb;
 },
 {
 alignment = -1;
@@ -152,7 +152,7 @@ name = ital_gen;
 shapes = (
 {
 alignment = -1;
-ref = tilde;
+ref = tildecomb;
 },
 {
 alignment = -1;
@@ -184,7 +184,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-3,-50);
-ref = tilde;
+ref = tildecomb;
 },
 {
 alignment = -1;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tildeacutecomb.uc.glyph b/src/Inter-Italic.glyphspackage/glyphs/tildeacutecomb.uc.glyph
index caaecac60..a20726fed 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tildeacutecomb.uc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tildeacutecomb.uc.glyph
@@ -28,7 +28,7 @@ nodes = (
 {
 alignment = -1;
 pos = (-826,320);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
@@ -53,7 +53,7 @@ nodes = (
 },
 {
 pos = (-806,372);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
@@ -78,7 +78,7 @@ nodes = (
 },
 {
 pos = (-816,494);
-ref = tilde;
+ref = tildecomb;
 scale = (0.9346,0.887);
 }
 );
@@ -104,7 +104,7 @@ nodes = (
 },
 {
 pos = (-806,372);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
@@ -129,7 +129,7 @@ nodes = (
 },
 {
 pos = (-817,494);
-ref = tilde;
+ref = tildecomb;
 scale = (0.9346,0.887);
 }
 );
@@ -162,7 +162,7 @@ nodes = (
 {
 alignment = -1;
 pos = (-826,320);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tildecomb.glyph b/src/Inter-Italic.glyphspackage/glyphs/tildecomb.glyph
index 64a2eaadb..206edf98c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tildecomb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tildecomb.glyph
@@ -1,96 +1,286 @@
 {
-color = (250,227,227,1);
 glyphname = tildecomb;
 layers = (
 {
-guides = (
+anchors = (
 {
-angle = 90;
-pos = (-780,2192);
+name = _top;
+pos = (605,1118);
+},
+{
+name = top;
+pos = (671,1519);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (-1022,0);
-ref = tilde;
+closed = 1;
+nodes = (
+(864,1316,o),
+(933,1396,o),
+(957,1519,c),
+(838,1519,l),
+(822,1463,o),
+(803,1439,o),
+(770,1439,cs),
+(703,1439,o),
+(646,1523,o),
+(544,1523,cs),
+(439,1523,o),
+(376,1436,o),
+(352,1319,c),
+(475,1319,l),
+(483,1356,o),
+(505,1397,o),
+(540,1397,cs),
+(589,1397,o),
+(672,1316,o),
+(768,1316,cs)
+);
 }
 );
-width = 0;
+width = 1024;
 },
 {
-guides = (
+anchors = (
+{
+name = _top;
+pos = (605,1118);
+},
 {
-angle = 90;
-pos = (-948,2432);
+name = top;
+pos = (682,1570);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (-1218,0);
-ref = tilde;
+closed = 1;
+nodes = (
+(912,1256,o),
+(1039,1364,o),
+(1076,1570,c),
+(880,1570,l),
+(866,1500,o),
+(840,1459,o),
+(784,1459,cs),
+(715,1459,o),
+(683,1576,o),
+(533,1576,cs),
+(395,1576,o),
+(272,1474,o),
+(233,1264,c),
+(431,1264,l),
+(446,1337,o),
+(479,1376,o),
+(526,1376,cs),
+(600,1376,o),
+(624,1256,o),
+(776,1256,cs)
+);
 }
 );
-width = 30;
+width = 1025;
 },
 {
+anchors = (
+{
+name = _top;
+pos = (596,1118);
+},
+{
+name = top;
+pos = (659,1498);
+}
+);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (-902,0);
-ref = tilde;
+closed = 1;
+nodes = (
+(838,1338,o),
+(904,1396,o),
+(936,1491,c),
+(889,1491,l),
+(860,1415,o),
+(818,1384,o),
+(761,1384,cs),
+(679,1384,o),
+(660,1502,o),
+(536,1502,cs),
+(451,1502,o),
+(379,1436,o),
+(356,1345,c),
+(402,1345,l),
+(419,1414,o),
+(470,1456,o),
+(536,1456,cs),
+(628,1456,o),
+(650,1338,o),
+(762,1338,cs)
+);
 }
 );
-width = 0;
+width = 1018;
 },
 {
-guides = (
+anchors = (
 {
-angle = 90;
-pos = (-844,2192);
+name = _top;
+pos = (568,1056);
+},
+{
+name = top;
+pos = (637,1475);
 }
 );
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (-1022,0);
-ref = tilde;
+closed = 1;
+nodes = (
+(828,1259,o),
+(898,1339,o),
+(922,1462,c),
+(803,1462,l),
+(787,1406,o),
+(768,1382,o),
+(735,1382,cs),
+(668,1382,o),
+(611,1466,o),
+(509,1466,cs),
+(404,1466,o),
+(340,1379,o),
+(317,1262,c),
+(440,1262,l),
+(448,1299,o),
+(470,1340,o),
+(505,1340,cs),
+(554,1340,o),
+(636,1259,o),
+(732,1259,cs)
+);
 }
 );
-width = 0;
+width = 960;
 },
 {
-guides = (
+anchors = (
 {
-angle = 90;
-pos = (-980,2432);
+name = _top;
+pos = (600,1056);
+},
+{
+name = top;
+pos = (675,1498);
 }
 );
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (-1218,0);
-ref = tilde;
+closed = 1;
+nodes = (
+(905,1184,o),
+(1032,1292,o),
+(1069,1498,c),
+(873,1498,l),
+(859,1428,o),
+(833,1389,o),
+(777,1389,cs),
+(708,1389,o),
+(676,1504,o),
+(526,1504,cs),
+(388,1504,o),
+(265,1402,o),
+(226,1192,c),
+(424,1192,l),
+(439,1265,o),
+(472,1304,o),
+(519,1304,cs),
+(593,1304,o),
+(617,1184,o),
+(769,1184,cs)
+);
 }
 );
-width = 0;
+width = 992;
+},
+{
+anchors = (
+{
+name = _top;
+pos = (535,1056);
 },
 {
+name = top;
+pos = (607,1490);
+}
+);
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(676,1258,o),
+(759,1318,o),
+(780,1406,c),
+(734,1418,l),
+(718,1350,o),
+(654,1304,o),
+(588,1304,cs),
+(481,1304,o),
+(437,1424,o),
+(302,1424,cs),
+(204,1424,o),
+(124,1361,o),
+(110,1270,c),
+(158,1264,l),
+(167,1330,o),
+(227,1378,o),
+(302,1378,cs),
+(426,1378,o),
+(463,1258,o),
+(588,1258,cs)
+);
+}
+);
+};
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
-alignment = -1;
-pos = (-902,0);
-ref = tilde;
+closed = 1;
+nodes = (
+(780,1296,o),
+(846,1354,o),
+(878,1449,c),
+(831,1449,l),
+(802,1373,o),
+(760,1342,o),
+(703,1342,cs),
+(621,1342,o),
+(602,1460,o),
+(478,1460,cs),
+(393,1460,o),
+(321,1394,o),
+(298,1303,c),
+(344,1303,l),
+(361,1372,o),
+(412,1414,o),
+(478,1414,cs),
+(570,1414,o),
+(592,1296,o),
+(704,1296,cs)
+);
 }
 );
-width = 0;
+width = 896;
 }
 );
 unicode = 771;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tildedieresiscomb.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/tildedieresiscomb.cn.glyph
deleted file mode 100644
index 9eed192de..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/tildedieresiscomb.cn.glyph
+++ /dev/null
@@ -1,432 +0,0 @@
-{
-glyphname = tildedieresiscomb.cn;
-layers = (
-{
-anchors = (
-{
-name = _top;
-pos = (-472,1262);
-}
-);
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-259,1388,o),
-(-303,1350,o),
-(-346,1350,cs),
-(-431,1350,o),
-(-465,1423,o),
-(-556,1422,cs),
-(-655,1423,o),
-(-736,1332,o),
-(-750,1236,c),
-(-670,1214,l),
-(-660,1263,o),
-(-620,1303,o),
-(-576,1304,cs),
-(-489,1303,o),
-(-474,1228,o),
-(-366,1228,cs),
-(-268,1228,o),
-(-183,1312,o),
-(-166,1410,c),
-(-250,1434,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-774,1545,o),
-(-742,1498,o),
-(-670,1498,cs),
-(-593,1498,o),
-(-544,1545,o),
-(-532,1606,cs),
-(-524,1670,o),
-(-556,1716,o),
-(-632,1716,cs),
-(-707,1716,o),
-(-753,1667,o),
-(-762,1606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-305,1542,o),
-(-273,1495,o),
-(-198,1496,cs),
-(-122,1495,o),
-(-76,1545,o),
-(-64,1606,cs),
-(-55,1667,o),
-(-87,1716,o),
-(-160,1716,cs),
-(-236,1716,o),
-(-285,1667,o),
-(-294,1606,cs)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-576,1278);
-}
-);
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-391,1411,o),
-(-425,1373,o),
-(-456,1374,cs),
-(-542,1373,o),
-(-612,1434,o),
-(-702,1434,cs),
-(-801,1434,o),
-(-882,1347,o),
-(-896,1254,c),
-(-754,1210,l),
-(-745,1257,o),
-(-713,1295,o),
-(-680,1294,cs),
-(-591,1295,o),
-(-548,1233,o),
-(-436,1234,cs),
-(-341,1233,o),
-(-254,1318,o),
-(-236,1414,c),
-(-384,1458,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-900,1571,o),
-(-841,1519,o),
-(-754,1518,cs),
-(-661,1519,o),
-(-585,1571,o),
-(-574,1640,cs),
-(-562,1711,o),
-(-623,1766,o),
-(-712,1766,cs),
-(-801,1766,o),
-(-876,1711,o),
-(-888,1640,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-472,1571,o),
-(-414,1519,o),
-(-322,1518,cs),
-(-233,1519,o),
-(-158,1571,o),
-(-146,1640,cs),
-(-135,1711,o),
-(-193,1766,o),
-(-282,1766,cs),
-(-373,1766,o),
-(-449,1711,o),
-(-460,1640,cs)
-);
-}
-);
-width = 32;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-410,1254);
-}
-);
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-207,1411,o),
-(-238,1364,o),
-(-286,1362,cs),
-(-353,1361,o),
-(-392,1468,o),
-(-478,1468,cs),
-(-553,1468,o),
-(-613,1404,o),
-(-638,1328,c),
-(-596,1322,l),
-(-576,1374,o),
-(-537,1421,o),
-(-482,1422,cs),
-(-411,1421,o),
-(-379,1316,o),
-(-294,1316,cs),
-(-222,1316,o),
-(-169,1380,o),
-(-144,1456,c),
-(-184,1462,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-583,1562,o),
-(-564,1539,o),
-(-534,1538,cs),
-(-511,1539,o),
-(-488,1559,o),
-(-484,1580,cs),
-(-479,1609,o),
-(-500,1632,o),
-(-528,1632,cs),
-(-552,1632,o),
-(-574,1612,o),
-(-578,1592,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-203,1564,o),
-(-184,1539,o),
-(-154,1538,cs),
-(-132,1539,o),
-(-111,1556,o),
-(-104,1580,cs),
-(-97,1608,o),
-(-120,1632,o),
-(-148,1632,cs),
-(-172,1632,o),
-(-194,1612,o),
-(-198,1592,cs)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-504,1262);
-}
-);
-layerId = m008;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-291,1388,o),
-(-335,1350,o),
-(-378,1350,cs),
-(-463,1350,o),
-(-497,1423,o),
-(-588,1422,cs),
-(-687,1423,o),
-(-768,1332,o),
-(-782,1236,c),
-(-702,1214,l),
-(-692,1263,o),
-(-652,1303,o),
-(-608,1304,cs),
-(-521,1303,o),
-(-506,1228,o),
-(-398,1228,cs),
-(-300,1228,o),
-(-215,1312,o),
-(-198,1410,c),
-(-282,1434,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-806,1545,o),
-(-774,1498,o),
-(-702,1498,cs),
-(-625,1498,o),
-(-576,1545,o),
-(-564,1606,cs),
-(-556,1670,o),
-(-588,1716,o),
-(-664,1716,cs),
-(-739,1716,o),
-(-785,1667,o),
-(-794,1606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-337,1542,o),
-(-305,1495,o),
-(-230,1496,cs),
-(-154,1495,o),
-(-108,1545,o),
-(-96,1606,cs),
-(-87,1667,o),
-(-119,1716,o),
-(-192,1716,cs),
-(-268,1716,o),
-(-317,1667,o),
-(-326,1606,cs)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-592,1278);
-}
-);
-layerId = m010;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-407,1411,o),
-(-441,1373,o),
-(-472,1374,cs),
-(-558,1373,o),
-(-628,1434,o),
-(-718,1434,cs),
-(-817,1434,o),
-(-898,1347,o),
-(-912,1254,c),
-(-770,1210,l),
-(-761,1257,o),
-(-729,1295,o),
-(-696,1294,cs),
-(-607,1295,o),
-(-564,1233,o),
-(-452,1234,cs),
-(-357,1233,o),
-(-270,1318,o),
-(-252,1414,c),
-(-400,1458,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-916,1571,o),
-(-857,1519,o),
-(-770,1518,cs),
-(-677,1519,o),
-(-601,1571,o),
-(-590,1640,cs),
-(-578,1711,o),
-(-639,1766,o),
-(-728,1766,cs),
-(-817,1766,o),
-(-892,1711,o),
-(-904,1640,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-488,1571,o),
-(-430,1519,o),
-(-338,1518,cs),
-(-249,1519,o),
-(-174,1571,o),
-(-162,1640,cs),
-(-151,1711,o),
-(-209,1766,o),
-(-298,1766,cs),
-(-389,1766,o),
-(-465,1711,o),
-(-476,1640,cs)
-);
-}
-);
-width = 0;
-},
-{
-anchors = (
-{
-name = _top;
-pos = (-474,1254);
-}
-);
-layerId = m012;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-271,1411,o),
-(-302,1364,o),
-(-350,1362,cs),
-(-417,1361,o),
-(-456,1468,o),
-(-542,1468,cs),
-(-617,1468,o),
-(-677,1404,o),
-(-702,1328,c),
-(-660,1322,l),
-(-640,1374,o),
-(-601,1421,o),
-(-546,1422,cs),
-(-475,1421,o),
-(-443,1316,o),
-(-358,1316,cs),
-(-286,1316,o),
-(-233,1380,o),
-(-208,1456,c),
-(-248,1462,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-647,1562,o),
-(-628,1539,o),
-(-598,1538,cs),
-(-575,1539,o),
-(-552,1559,o),
-(-548,1580,cs),
-(-543,1609,o),
-(-564,1632,o),
-(-592,1632,cs),
-(-616,1632,o),
-(-638,1612,o),
-(-642,1592,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-267,1564,o),
-(-248,1539,o),
-(-218,1538,cs),
-(-196,1539,o),
-(-175,1556,o),
-(-168,1580,cs),
-(-161,1608,o),
-(-184,1632,o),
-(-212,1632,cs),
-(-236,1632,o),
-(-258,1612,o),
-(-262,1592,cs)
-);
-}
-);
-width = 0;
-}
-);
-unicode = 57630;
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tildedieresiscomb.lc.glyph b/src/Inter-Italic.glyphspackage/glyphs/tildedieresiscomb.lc.glyph
index e5f86d55d..6881eadc4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tildedieresiscomb.lc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tildedieresiscomb.lc.glyph
@@ -5,452 +5,191 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (-468,1288);
+pos = (604,1118);
+}
+);
+guides = (
+{
+pos = (0,1717);
 },
 {
-name = mkmktop_acc;
-pos = (-370,1896);
+pos = (0,1392);
+},
+{
+pos = (0,1717);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-739,1626,o),
-(-710,1574,o),
-(-632,1574,cs),
-(-556,1574,o),
-(-509,1623,o),
-(-500,1684,cs),
-(-489,1745,o),
-(-524,1795,o),
-(-596,1794,cs),
-(-672,1795,o),
-(-719,1745,o),
-(-730,1684,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-311,1620,o),
-(-279,1574,o),
-(-204,1574,cs),
-(-128,1574,o),
-(-81,1620,o),
-(-70,1682,cs),
-(-61,1743,o),
-(-93,1792,o),
-(-168,1792,cs),
-(-244,1792,o),
-(-291,1743,o),
-(-300,1682,cs)
-);
+alignment = -1;
+pos = (-5,-27);
+ref = tildecomb;
 },
 {
-closed = 1;
-nodes = (
-(-215,1455,o),
-(-268,1405,o),
-(-322,1406,cs),
-(-428,1405,o),
-(-463,1498,o),
-(-574,1498,cs),
-(-695,1498,o),
-(-806,1393,o),
-(-832,1246,c),
-(-702,1240,l),
-(-692,1297,o),
-(-640,1350,o),
-(-588,1350,cs),
-(-477,1350,o),
-(-468,1257,o),
-(-334,1256,cs),
-(-212,1257,o),
-(-99,1353,o),
-(-72,1504,c),
-(-206,1516,l)
-);
+alignment = -1;
+pos = (-39,297);
+ref = dieresiscomb;
 }
 );
-width = 0;
+width = 1024;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-582,1298);
+pos = (593,1118);
+}
+);
+guides = (
+{
+pos = (-11,1765);
 },
 {
-name = mkmktop_acc;
-pos = (-460,2036);
+pos = (-11,1392);
+},
+{
+pos = (-11,1765);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-963,1699,o),
-(-899,1635,o),
-(-812,1634,cs),
-(-721,1635,o),
-(-634,1699,o),
-(-622,1778,cs),
-(-608,1859,o),
-(-678,1920,o),
-(-766,1920,cs),
-(-849,1920,o),
-(-937,1859,o),
-(-952,1778,cs)
-);
+alignment = -1;
+pos = (-15,-24);
+ref = tildecomb;
 },
 {
-closed = 1;
-nodes = (
-(-404,1699,o),
-(-337,1638,o),
-(-250,1638,cs),
-(-163,1638,o),
-(-76,1699,o),
-(-62,1780,cs),
-(-49,1859,o),
-(-116,1920,o),
-(-204,1920,cs),
-(-291,1920,o),
-(-378,1859,o),
-(-390,1780,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-346,1492,o),
-(-387,1472,o),
-(-428,1472,cs),
-(-529,1472,o),
-(-602,1551,o),
-(-710,1550,cs),
-(-852,1551,o),
-(-975,1411,o),
-(-998,1272,c),
-(-794,1260,l),
-(-785,1321,o),
-(-745,1341,o),
-(-704,1342,cs),
-(-596,1341,o),
-(-553,1260,o),
-(-424,1260,cs),
-(-279,1260,o),
-(-154,1399,o),
-(-130,1544,c),
-(-334,1554,l)
-);
+alignment = -1;
+pos = (-79,514);
+ref = dieresiscomb;
+scale = (1,0.8944);
 }
 );
-width = 26;
+width = 1038;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-402,1282);
+pos = (596,1118);
+}
+);
+guides = (
+{
+pos = (0,1681);
+},
+{
+pos = (0,1392);
 },
 {
-name = mkmktop_acc;
-pos = (-318,1812);
+pos = (0,1681);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-597,1577,o),
-(-578,1553,o),
-(-548,1554,cs),
-(-526,1553,o),
-(-503,1574,o),
-(-498,1594,cs),
-(-494,1623,o),
-(-514,1647,o),
-(-542,1646,cs),
-(-567,1647,o),
-(-588,1627,o),
-(-592,1606,cs)
-);
+alignment = -1;
+pos = (-5,-28);
+ref = tildecomb;
 },
 {
-closed = 1;
-nodes = (
-(-188,1579,o),
-(-169,1553,o),
-(-140,1554,cs),
-(-117,1553,o),
-(-97,1571,o),
-(-90,1594,cs),
-(-82,1623,o),
-(-105,1647,o),
-(-134,1646,cs),
-(-158,1647,o),
-(-180,1626,o),
-(-184,1606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-191,1411,o),
-(-223,1364,o),
-(-272,1362,cs),
-(-353,1361,o),
-(-392,1482,o),
-(-494,1482,cs),
-(-567,1482,o),
-(-628,1419,o),
-(-652,1328,c),
-(-610,1322,l),
-(-591,1388,o),
-(-552,1436,o),
-(-498,1436,cs),
-(-411,1436,o),
-(-379,1316,o),
-(-280,1316,cs),
-(-207,1316,o),
-(-154,1380,o),
-(-130,1470,c),
-(-170,1476,l)
-);
+alignment = -1;
+pos = (-30,261);
+ref = dieresiscomb;
 }
 );
-width = 0;
+width = 1017;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-500,1288);
+pos = (568,1056);
+}
+);
+guides = (
+{
+pos = (0,1328);
 },
 {
-name = mkmktop_acc;
-pos = (-402,1896);
+pos = (0,1648);
 }
 );
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-771,1626,o),
-(-742,1574,o),
-(-664,1574,cs),
-(-588,1574,o),
-(-541,1623,o),
-(-532,1684,cs),
-(-521,1745,o),
-(-556,1795,o),
-(-628,1794,cs),
-(-704,1795,o),
-(-751,1745,o),
-(-762,1684,cs)
-);
+alignment = -1;
+pos = (-9,-49);
+ref = tildecomb;
 },
 {
-closed = 1;
-nodes = (
-(-343,1620,o),
-(-311,1574,o),
-(-236,1574,cs),
-(-160,1574,o),
-(-113,1620,o),
-(-102,1682,cs),
-(-93,1743,o),
-(-125,1792,o),
-(-200,1792,cs),
-(-276,1792,o),
-(-323,1743,o),
-(-332,1682,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-247,1455,o),
-(-300,1405,o),
-(-354,1406,cs),
-(-460,1405,o),
-(-495,1498,o),
-(-606,1498,cs),
-(-727,1498,o),
-(-838,1393,o),
-(-864,1246,c),
-(-734,1240,l),
-(-724,1297,o),
-(-672,1350,o),
-(-620,1350,cs),
-(-509,1350,o),
-(-500,1257,o),
-(-366,1256,cs),
-(-244,1257,o),
-(-131,1353,o),
-(-104,1504,c),
-(-238,1516,l)
-);
+alignment = -1;
+pos = (-44,270);
+ref = dieresiscomb;
 }
 );
-width = 0;
+width = 960;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-598,1298);
-},
-{
-name = mkmktop_acc;
-pos = (-476,2036);
+pos = (575,1056);
 }
 );
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-979,1699,o),
-(-915,1635,o),
-(-828,1634,cs),
-(-737,1635,o),
-(-650,1699,o),
-(-638,1778,cs),
-(-624,1859,o),
-(-694,1920,o),
-(-782,1920,cs),
-(-865,1920,o),
-(-953,1859,o),
-(-968,1778,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-420,1699,o),
-(-353,1638,o),
-(-266,1638,cs),
-(-179,1638,o),
-(-92,1699,o),
-(-78,1780,cs),
-(-65,1859,o),
-(-132,1920,o),
-(-220,1920,cs),
-(-307,1920,o),
-(-394,1859,o),
-(-406,1780,cs)
-);
+alignment = -1;
+pos = (-24,52);
+ref = tildecomb;
+scale = (1,0.9563);
 },
 {
-closed = 1;
-nodes = (
-(-362,1492,o),
-(-403,1472,o),
-(-444,1472,cs),
-(-545,1472,o),
-(-618,1551,o),
-(-726,1550,cs),
-(-868,1551,o),
-(-991,1411,o),
-(-1014,1272,c),
-(-810,1260,l),
-(-801,1321,o),
-(-761,1341,o),
-(-720,1342,cs),
-(-612,1341,o),
-(-569,1260,o),
-(-440,1260,cs),
-(-295,1260,o),
-(-170,1399,o),
-(-146,1544,c),
-(-350,1554,l)
-);
+alignment = -1;
+pos = (14,591);
+ref = dieresiscomb;
+scale = (0.88,0.83);
 }
 );
-width = 0;
+width = 995;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-466,1282);
+pos = (536,1056);
+}
+);
+guides = (
+{
+pos = (1,1328);
 },
 {
-name = mkmktop_acc;
-pos = (-382,1812);
+pos = (1,1584);
 }
 );
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-661,1577,o),
-(-642,1553,o),
-(-612,1554,cs),
-(-590,1553,o),
-(-567,1574,o),
-(-562,1594,cs),
-(-558,1623,o),
-(-578,1647,o),
-(-606,1646,cs),
-(-631,1647,o),
-(-652,1627,o),
-(-656,1606,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(-252,1579,o),
-(-233,1553,o),
-(-204,1554,cs),
-(-181,1553,o),
-(-161,1571,o),
-(-154,1594,cs),
-(-146,1623,o),
-(-169,1647,o),
-(-198,1646,cs),
-(-222,1647,o),
-(-244,1626,o),
-(-248,1606,cs)
-);
+alignment = -1;
+pos = (-8,-50);
+ref = tildecomb;
 },
 {
-closed = 1;
-nodes = (
-(-255,1411,o),
-(-287,1364,o),
-(-336,1362,cs),
-(-417,1361,o),
-(-456,1482,o),
-(-558,1482,cs),
-(-631,1482,o),
-(-692,1419,o),
-(-716,1328,c),
-(-674,1322,l),
-(-655,1388,o),
-(-616,1436,o),
-(-562,1436,cs),
-(-475,1436,o),
-(-443,1316,o),
-(-344,1316,cs),
-(-271,1316,o),
-(-218,1380,o),
-(-194,1470,c),
-(-234,1476,l)
-);
+alignment = -1;
+pos = (-51,206);
+ref = dieresiscomb;
 }
 );
-width = 0;
+width = 896;
 }
 );
-unicode = 57605;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tildedieresiscomb.uc.glyph b/src/Inter-Italic.glyphspackage/glyphs/tildedieresiscomb.uc.glyph
new file mode 100644
index 000000000..83247cb49
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/tildedieresiscomb.uc.glyph
@@ -0,0 +1,71 @@
+{
+glyphname = tildedieresiscomb.uc;
+layers = (
+{
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+ref = tildedieresiscomb.lc;
+}
+);
+width = 1024;
+},
+{
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+ref = tildedieresiscomb.lc;
+}
+);
+width = 1038;
+},
+{
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+ref = tildedieresiscomb.lc;
+}
+);
+width = 1017;
+},
+{
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+ref = tildedieresiscomb.lc;
+}
+);
+width = 960;
+},
+{
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+ref = tildedieresiscomb.lc;
+}
+);
+width = 995;
+},
+{
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+alignment = 1;
+ref = tildedieresiscomb.lc;
+}
+);
+width = 896;
+}
+);
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tildedoublecmb.glyph b/src/Inter-Italic.glyphspackage/glyphs/tildedoublecmb.glyph
index 31b005bfe..afce9527e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tildedoublecmb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tildedoublecmb.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = tildedoublecmb;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tildemacroncomb.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/tildemacroncomb.cn.glyph
index b9a5afdbe..e1e193342 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tildemacroncomb.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tildemacroncomb.cn.glyph
@@ -2,281 +2,70 @@
 glyphname = tildemacroncomb.cn;
 layers = (
 {
-anchors = (
-{
-name = _top;
-pos = (-472,1262);
-}
-);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-259,1385,o),
-(-303,1350,o),
-(-346,1350,cs),
-(-431,1350,o),
-(-465,1423,o),
-(-556,1422,cs),
-(-652,1423,o),
-(-736,1332,o),
-(-750,1236,c),
-(-670,1214,l),
-(-660,1260,o),
-(-620,1303,o),
-(-576,1304,cs),
-(-489,1303,o),
-(-474,1228,o),
-(-366,1228,cs),
-(-268,1228,o),
-(-183,1312,o),
-(-166,1410,c),
-(-250,1434,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-742,1688,l),
-(-766,1536,l),
-(-82,1536,l),
-(-58,1688,l)
-);
+alignment = 1;
+ref = tildemacroncomb.lc;
 }
 );
-width = 0;
+width = 1038;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-582,1248);
-}
-);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-388,1411,o),
-(-425,1373,o),
-(-456,1374,cs),
-(-542,1373,o),
-(-612,1434,o),
-(-702,1434,cs),
-(-801,1434,o),
-(-882,1347,o),
-(-896,1254,c),
-(-754,1210,l),
-(-745,1257,o),
-(-713,1295,o),
-(-680,1294,cs),
-(-591,1295,o),
-(-548,1233,o),
-(-436,1234,cs),
-(-338,1233,o),
-(-251,1321,o),
-(-232,1414,c),
-(-382,1458,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-866,1734,l),
-(-898,1550,l),
-(-168,1550,l),
-(-136,1734,l)
-);
+alignment = 1;
+ref = tildemacroncomb.lc;
 }
 );
-width = 32;
+width = 1025;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-404,1272);
-}
-);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-207,1396,o),
-(-238,1349,o),
-(-286,1348,cs),
-(-353,1348,o),
-(-392,1453,o),
-(-478,1454,cs),
-(-553,1453,o),
-(-613,1390,o),
-(-638,1314,c),
-(-596,1308,l),
-(-576,1359,o),
-(-537,1407,o),
-(-482,1406,cs),
-(-411,1407,o),
-(-379,1302,o),
-(-294,1302,cs),
-(-222,1302,o),
-(-169,1366,o),
-(-144,1442,c),
-(-184,1448,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-580,1594,l),
-(-590,1548,l),
-(-124,1548,l),
-(-114,1594,l)
-);
+alignment = 1;
+ref = tildemacroncomb.lc;
 }
 );
-width = 0;
+width = 1017;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-504,1262);
-}
-);
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-291,1385,o),
-(-335,1350,o),
-(-378,1350,cs),
-(-463,1350,o),
-(-497,1423,o),
-(-588,1422,cs),
-(-684,1423,o),
-(-768,1332,o),
-(-782,1236,c),
-(-702,1214,l),
-(-692,1260,o),
-(-652,1303,o),
-(-608,1304,cs),
-(-521,1303,o),
-(-506,1228,o),
-(-398,1228,cs),
-(-300,1228,o),
-(-215,1312,o),
-(-198,1410,c),
-(-282,1434,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-774,1688,l),
-(-798,1536,l),
-(-114,1536,l),
-(-90,1688,l)
-);
+alignment = 1;
+ref = tildemacroncomb.lc;
 }
 );
-width = 0;
+width = 972;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-598,1248);
-}
-);
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-404,1411,o),
-(-441,1373,o),
-(-472,1374,cs),
-(-558,1373,o),
-(-628,1434,o),
-(-718,1434,cs),
-(-817,1434,o),
-(-898,1347,o),
-(-912,1254,c),
-(-770,1210,l),
-(-761,1257,o),
-(-729,1295,o),
-(-696,1294,cs),
-(-607,1295,o),
-(-564,1233,o),
-(-452,1234,cs),
-(-354,1233,o),
-(-267,1321,o),
-(-248,1414,c),
-(-398,1458,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-882,1734,l),
-(-914,1550,l),
-(-184,1550,l),
-(-152,1734,l)
-);
+alignment = 1;
+ref = tildemacroncomb.lc;
 }
 );
-width = 0;
+width = 992;
 },
 {
-anchors = (
-{
-name = _top;
-pos = (-468,1272);
-}
-);
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-271,1396,o),
-(-302,1349,o),
-(-350,1348,cs),
-(-417,1348,o),
-(-456,1453,o),
-(-542,1454,cs),
-(-617,1453,o),
-(-677,1390,o),
-(-702,1314,c),
-(-660,1308,l),
-(-640,1359,o),
-(-601,1407,o),
-(-546,1406,cs),
-(-475,1407,o),
-(-443,1302,o),
-(-358,1302,cs),
-(-286,1302,o),
-(-233,1366,o),
-(-208,1442,c),
-(-248,1448,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(-644,1594,l),
-(-654,1548,l),
-(-188,1548,l),
-(-178,1594,l)
-);
+alignment = 1;
+ref = tildemacroncomb.lc;
 }
 );
-width = 0;
+width = 896;
 }
 );
-unicode = 57637;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tildemacroncomb.lc.glyph b/src/Inter-Italic.glyphspackage/glyphs/tildemacroncomb.lc.glyph
index 493b65497..4471f4315 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tildemacroncomb.lc.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tildemacroncomb.lc.glyph
@@ -5,302 +5,187 @@ layers = (
 anchors = (
 {
 name = _top;
-pos = (-468,1288);
+pos = (604,1118);
+}
+);
+guides = (
+{
+pos = (0,1392);
 },
 {
-name = mkmktop_acc;
-pos = (-366,1906);
+pos = (0,1717);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-215,1455,o),
-(-268,1405,o),
-(-322,1406,cs),
-(-428,1405,o),
-(-463,1498,o),
-(-574,1498,cs),
-(-695,1498,o),
-(-806,1393,o),
-(-832,1246,c),
-(-702,1240,l),
-(-692,1297,o),
-(-640,1350,o),
-(-588,1350,cs),
-(-477,1350,o),
-(-468,1257,o),
-(-334,1256,cs),
-(-212,1257,o),
-(-99,1353,o),
-(-72,1504,c),
-(-206,1516,l)
-);
+alignment = -1;
+pos = (-5,-27);
+ref = tildecomb;
 },
 {
-closed = 1;
-nodes = (
-(-724,1772,l),
-(-750,1620,l),
-(-66,1620,l),
-(-40,1772,l)
-);
+alignment = -1;
+pos = (96,439);
+ref = macroncomb;
+scale = (1,0.9);
 }
 );
-width = 0;
+width = 1038;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-578,1298);
+pos = (604,1118);
+}
+);
+guides = (
+{
+pos = (0,1392);
 },
 {
-name = mkmktop_acc;
-pos = (-460,2024);
+pos = (0,1765);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-343,1492,o),
-(-383,1472,o),
-(-424,1472,cs),
-(-526,1472,o),
-(-599,1551,o),
-(-706,1550,cs),
-(-852,1551,o),
-(-974,1405,o),
-(-994,1272,c),
-(-792,1260,l),
-(-782,1321,o),
-(-741,1341,o),
-(-702,1342,cs),
-(-593,1341,o),
-(-549,1260,o),
-(-422,1260,cs),
-(-276,1260,o),
-(-151,1399,o),
-(-128,1544,c),
-(-332,1554,l)
-);
+alignment = -1;
+pos = (-4,-24);
+ref = tildecomb;
 },
 {
-closed = 1;
-nodes = (
-(-852,1864,l),
-(-882,1682,l),
-(-152,1682,l),
-(-122,1864,l)
-);
+alignment = -1;
+pos = (202,632);
+ref = macroncomb;
+scale = (1,0.8);
 }
 );
-width = 30;
+width = 1025;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-402,1282);
+pos = (596,1118);
+}
+);
+guides = (
+{
+pos = (0,1392);
 },
 {
-name = mkmktop_acc;
-pos = (-312,1836);
+pos = (0,1681);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-191,1411,o),
-(-223,1364,o),
-(-272,1362,cs),
-(-353,1361,o),
-(-392,1482,o),
-(-494,1482,cs),
-(-567,1482,o),
-(-628,1419,o),
-(-652,1328,c),
-(-610,1322,l),
-(-591,1388,o),
-(-552,1436,o),
-(-498,1436,cs),
-(-411,1436,o),
-(-379,1316,o),
-(-280,1316,cs),
-(-207,1316,o),
-(-154,1380,o),
-(-130,1470,c),
-(-170,1476,l)
-);
+alignment = -1;
+pos = (-5,-28);
+ref = tildecomb;
 },
 {
-closed = 1;
-nodes = (
-(-580,1624,l),
-(-590,1576,l),
-(-124,1576,l),
-(-114,1624,l)
-);
+alignment = -1;
+pos = (147,261);
+ref = macroncomb;
 }
 );
-width = 0;
+width = 1017;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-500,1288);
+pos = (568,1056);
+}
+);
+guides = (
+{
+pos = (0,1328);
 },
 {
-name = mkmktop_acc;
-pos = (-398,1906);
+pos = (0,1624);
 }
 );
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-247,1455,o),
-(-300,1405,o),
-(-354,1406,cs),
-(-460,1405,o),
-(-495,1498,o),
-(-606,1498,cs),
-(-727,1498,o),
-(-838,1393,o),
-(-864,1246,c),
-(-734,1240,l),
-(-724,1297,o),
-(-672,1350,o),
-(-620,1350,cs),
-(-509,1350,o),
-(-500,1257,o),
-(-366,1256,cs),
-(-244,1257,o),
-(-131,1353,o),
-(-104,1504,c),
-(-238,1516,l)
-);
+alignment = -1;
+pos = (-9,-49);
+ref = tildecomb;
 },
 {
-closed = 1;
-nodes = (
-(-756,1772,l),
-(-782,1620,l),
-(-98,1620,l),
-(-72,1772,l)
-);
+alignment = -1;
+pos = (132,413);
+ref = macroncomb;
+scale = (1,0.9);
 }
 );
-width = 0;
+width = 972;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-594,1298);
-},
+pos = (599,1056);
+}
+);
+guides = (
 {
-name = mkmktop_acc;
-pos = (-476,2024);
+pos = (0,1704);
 }
 );
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-359,1492,o),
-(-399,1472,o),
-(-440,1472,cs),
-(-542,1472,o),
-(-615,1551,o),
-(-722,1550,cs),
-(-868,1551,o),
-(-990,1405,o),
-(-1010,1272,c),
-(-808,1260,l),
-(-798,1321,o),
-(-757,1341,o),
-(-718,1342,cs),
-(-609,1341,o),
-(-565,1260,o),
-(-438,1260,cs),
-(-292,1260,o),
-(-167,1399,o),
-(-144,1544,c),
-(-348,1554,l)
-);
+alignment = -1;
+ref = tildecomb;
 },
 {
-closed = 1;
-nodes = (
-(-868,1864,l),
-(-898,1682,l),
-(-168,1682,l),
-(-138,1864,l)
-);
+alignment = -1;
+pos = (215,516);
+ref = macroncomb;
+scale = (1,0.9);
 }
 );
-width = 0;
+width = 992;
 },
 {
 anchors = (
 {
 name = _top;
-pos = (-466,1282);
+pos = (536,1056);
+}
+);
+guides = (
+{
+pos = (1,1328);
 },
 {
-name = mkmktop_acc;
-pos = (-376,1836);
+pos = (1,1584);
 }
 );
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-255,1411,o),
-(-287,1364,o),
-(-336,1362,cs),
-(-417,1361,o),
-(-456,1482,o),
-(-558,1482,cs),
-(-631,1482,o),
-(-692,1419,o),
-(-716,1328,c),
-(-674,1322,l),
-(-655,1388,o),
-(-616,1436,o),
-(-562,1436,cs),
-(-475,1436,o),
-(-443,1316,o),
-(-344,1316,cs),
-(-271,1316,o),
-(-218,1380,o),
-(-194,1470,c),
-(-234,1476,l)
-);
+alignment = -1;
+pos = (-8,-50);
+ref = tildecomb;
 },
 {
-closed = 1;
-nodes = (
-(-644,1624,l),
-(-654,1576,l),
-(-188,1576,l),
-(-178,1624,l)
-);
+alignment = -1;
+pos = (99,206);
+ref = macroncomb;
 }
 );
-width = 0;
+width = 896;
 }
 );
-unicode = 57616;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tildemidnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/tildemidcomb.glyph
index eee9899c1..48d92b26a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tildemidnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tildemidcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = tildemidnosp;
+glyphname = tildemidcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -8,7 +7,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1218,-846);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
@@ -19,7 +18,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1216,-838);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 14;
@@ -30,7 +29,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1222,-852);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
@@ -41,7 +40,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1218,-846);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
@@ -52,7 +51,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1216,-838);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
@@ -63,11 +62,10 @@ shapes = (
 {
 alignment = -1;
 pos = (-1222,-852);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
 }
 );
-unicode = 820;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tildesubnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/tildesubcomb.glyph
index d31608b1c..3497571d1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tildesubnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tildesubcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = tildesubnosp;
+glyphname = tildesubcomb;
 layers = (
 {
 anchors = (
@@ -21,7 +20,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1404,-1620);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
@@ -45,7 +44,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1509,-1676);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 30;
@@ -63,7 +62,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1258,-1590);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
@@ -87,7 +86,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1412,-1662);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
@@ -111,7 +110,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-1498,-1602);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
@@ -129,13 +128,12 @@ shapes = (
 {
 alignment = -1;
 pos = (-1265,-1633);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 0;
 }
 );
-unicode = 816;
 userData = {
 com.typemytype.robofont.guideline.magnetic.ye6wA0pdes = 5;
 };
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tildevertsupnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/tildevertsupcomb.glyph
index 7294aac45..4a22716ed 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tildevertsupnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tildevertsupcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = tildevertsupnosp;
+glyphname = tildevertsupcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -189,5 +188,4 @@ nodes = (
 width = 0;
 }
 );
-unicode = 830;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/titlocyrilliccmb.glyph b/src/Inter-Italic.glyphspackage/glyphs/titlocyrilliccmb.glyph
index 42cfd0c81..46d37fed7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/titlocyrilliccmb.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/titlocyrilliccmb.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = titlocyrilliccmb;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tlinebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/tlinebelow.glyph
index 84855fb55..505e96be3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tlinebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tlinebelow.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (-78,0);
+pos = (-77,0);
 ref = macronsub;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (80,0);
+pos = (79,0);
 ref = macronsub;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tonebarextrahighmod.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/tonebarextrahighmod.cn.glyph
index ce6e50ee1..6076e7d0e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tonebarextrahighmod.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tonebarextrahighmod.cn.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = tonebarextrahighmod.cn;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tonebarextralowmod.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/tonebarextralowmod.cn.glyph
index 72c759454..436435f12 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tonebarextralowmod.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tonebarextralowmod.cn.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = tonebarextralowmod.cn;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tonebarhighmod.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/tonebarhighmod.cn.glyph
index 18826c848..1d20eb33d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tonebarhighmod.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tonebarhighmod.cn.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = tonebarhighmod.cn;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tonebarlowmod.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/tonebarlowmod.cn.glyph
index 2e827d7f3..303e2b8df 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tonebarlowmod.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tonebarlowmod.cn.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = tonebarlowmod.cn;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tonebarmidmod.cn.glyph b/src/Inter-Italic.glyphspackage/glyphs/tonebarmidmod.cn.glyph
index 833e10f7d..a6df73429 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tonebarmidmod.cn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tonebarmidmod.cn.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = tonebarmidmod.cn;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tonos.glyph b/src/Inter-Italic.glyphspackage/glyphs/tonos.glyph
index 09126464c..47ac494b0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tonos.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tonos.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = tonos;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/twelveroman.glyph b/src/Inter-Italic.glyphspackage/glyphs/twelveroman.glyph
index dd4a4ee0a..699efc86e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/twelveroman.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/twelveroman.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = twelveroman;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tworoman.glyph b/src/Inter-Italic.glyphspackage/glyphs/tworoman.glyph
index 23ace21f1..c6b03c4c2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tworoman.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tworoman.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = tworoman;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/u.glyph b/src/Inter-Italic.glyphspackage/glyphs/u.glyph
index 104f24e7c..9a0925dd8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/u.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/u.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = u;
 kernLeft = u;
 kernRight = u;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/uacute.glyph
index 87499d662..745720dbd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uacute.glyph
@@ -5,78 +5,84 @@ kernRight = u;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = u;
 },
 {
-pos = (352,0);
-ref = acute;
+pos = (472,0);
+ref = acutecomb;
 }
 );
 width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = u;
 },
 {
-pos = (363,0);
-ref = acute;
+pos = (493,0);
+ref = acutecomb;
 }
 );
 width = 1331;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = u;
 },
 {
-pos = (370,0);
-ref = acute;
+pos = (510,0);
+ref = acutecomb;
 }
 );
 width = 1165;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = u;
 },
 {
-pos = (406,0);
-ref = acute;
+pos = (446,0);
+ref = acutecomb;
 }
 );
 width = 1141;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = u;
 },
 {
-pos = (432,0);
-ref = acute;
+pos = (456,0);
+ref = acutecomb;
 }
 );
 width = 1298;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = u;
 },
 {
-pos = (404,0);
-ref = acute;
+pos = (464,0);
+ref = acutecomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ubreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/ubreve.glyph
index 859dc2a03..a3c943e3b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ubreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ubreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (106,-186);
-ref = breve;
+pos = (213,0);
+ref = brevecomb;
 }
 );
 width = 1191;
@@ -23,8 +23,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (124,-186);
-ref = breve;
+pos = (187,0);
+ref = brevecomb;
 }
 );
 width = 1331;
@@ -36,8 +36,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (136,-186);
-ref = breve;
+pos = (231,0);
+ref = brevecomb;
 }
 );
 width = 1165;
@@ -49,8 +49,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (108,-206);
-ref = breve;
+pos = (171,0);
+ref = brevecomb;
 }
 );
 width = 1141;
@@ -62,8 +62,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (119,-206);
-ref = breve;
+pos = (169,0);
+ref = brevecomb;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (90,-206);
-ref = breve;
+pos = (182,0);
+ref = brevecomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ucaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/ucaron.glyph
index 78c647000..a946f3a66 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ucaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ucaron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (99,-186);
-ref = caron;
+pos = (180,0);
+ref = caroncomb;
 }
 );
 width = 1191;
@@ -23,8 +23,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (-10,-186);
-ref = caron;
+pos = (155,0);
+ref = caroncomb;
 }
 );
 width = 1331;
@@ -36,8 +36,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (124,-170);
-ref = caron;
+pos = (151,0);
+ref = caroncomb;
 }
 );
 width = 1165;
@@ -49,8 +49,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (102,-206);
-ref = caron;
+pos = (171,0);
+ref = caroncomb;
 }
 );
 width = 1141;
@@ -62,8 +62,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (-14,-206);
-ref = caron;
+pos = (217,0);
+ref = caroncomb;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (138,-206);
-ref = caron;
+pos = (183,0);
+ref = caroncomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ucircumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/ucircumflex.glyph
index 8d91906b1..c32879b3d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ucircumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ucircumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (101,-186);
-ref = circumflex;
+pos = (180,0);
+ref = circumflexcomb;
 }
 );
 width = 1191;
@@ -23,8 +23,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (-11,-186);
-ref = circumflex;
+pos = (155,0);
+ref = circumflexcomb;
 }
 );
 width = 1331;
@@ -36,8 +36,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (120,-186);
-ref = circumflex;
+pos = (150,0);
+ref = circumflexcomb;
 }
 );
 width = 1165;
@@ -49,8 +49,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (104,-206);
-ref = circumflex;
+pos = (170,0);
+ref = circumflexcomb;
 }
 );
 width = 1141;
@@ -62,8 +62,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (-15,-206);
-ref = circumflex;
+pos = (218,0);
+ref = circumflexcomb;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (141,-206);
-ref = circumflex;
+pos = (182,0);
+ref = circumflexcomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ucircumflexbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/ucircumflexbelow.glyph
index 46ca32dae..783f1cb20 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ucircumflexbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ucircumflexbelow.glyph
@@ -11,7 +11,7 @@ ref = u;
 },
 {
 pos = (1178,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1191;
@@ -24,7 +24,7 @@ ref = u;
 },
 {
 pos = (1416,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1331;
@@ -37,7 +37,7 @@ ref = u;
 },
 {
 pos = (1094,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1165;
@@ -50,7 +50,7 @@ ref = u;
 },
 {
 pos = (1184,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1141;
@@ -63,7 +63,7 @@ ref = u;
 },
 {
 pos = (1416,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1298;
@@ -76,7 +76,7 @@ ref = u;
 },
 {
 pos = (1102,0);
-ref = circumflexsubnosp;
+ref = circumflexsubcomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/udieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/udieresis.glyph
index 22efe952d..c0d35b024 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/udieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/udieresis.glyph
@@ -11,7 +11,7 @@ ref = u;
 },
 {
 pos = (-5,0);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1191;
@@ -24,7 +24,7 @@ ref = u;
 },
 {
 pos = (1,0);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1331;
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1165;
@@ -49,7 +49,7 @@ ref = u;
 },
 {
 pos = (1,0);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1141;
@@ -61,7 +61,7 @@ shapes = (
 ref = u;
 },
 {
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1298;
@@ -73,7 +73,7 @@ shapes = (
 ref = u;
 },
 {
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/udieresisbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/udieresisbelow.glyph
index 7a6dadad7..a5e98335f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/udieresisbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/udieresisbelow.glyph
@@ -11,7 +11,7 @@ ref = u;
 },
 {
 pos = (1290,0);
-ref = dotdblsubnosp;
+ref = dotdblsubcomb;
 }
 );
 width = 1191;
@@ -31,7 +31,7 @@ ref = u;
 },
 {
 pos = (1512,0);
-ref = dotdblsubnosp;
+ref = dotdblsubcomb;
 }
 );
 width = 1331;
@@ -44,7 +44,7 @@ ref = u;
 },
 {
 pos = (1191,0);
-ref = dotdblsubnosp;
+ref = dotdblsubcomb;
 }
 );
 width = 1165;
@@ -57,7 +57,7 @@ ref = u;
 },
 {
 pos = (1296,0);
-ref = dotdblsubnosp;
+ref = dotdblsubcomb;
 }
 );
 width = 1141;
@@ -77,7 +77,7 @@ ref = u;
 },
 {
 pos = (1511,0);
-ref = dotdblsubnosp;
+ref = dotdblsubcomb;
 }
 );
 width = 1298;
@@ -90,7 +90,7 @@ ref = u;
 },
 {
 pos = (1137,0);
-ref = dotdblsubnosp;
+ref = dotdblsubcomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/udieresismacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/udieresismacron.glyph
index 5234f8d28..ae5b0d5c3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/udieresismacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/udieresismacron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1159,-204);
+pos = (-104,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1304,-218);
+pos = (2,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1114,-232);
+pos = (-110,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1149,-266);
+pos = (-27,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1291,-280);
+pos = (1,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1121,-294);
+pos = (-94,0);
 ref = dieresismacroncomb.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ugrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/ugrave.glyph
index b04d6803e..c08609f69 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ugrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ugrave.glyph
@@ -11,7 +11,7 @@ ref = u;
 },
 {
 pos = (187,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1191;
@@ -24,7 +24,7 @@ ref = u;
 },
 {
 pos = (149,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1331;
@@ -37,7 +37,7 @@ ref = u;
 },
 {
 pos = (218,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1165;
@@ -50,7 +50,7 @@ ref = u;
 },
 {
 pos = (241,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1141;
@@ -63,7 +63,7 @@ ref = u;
 },
 {
 pos = (169,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (209,0);
-ref = grave;
+pos = (213,0);
+ref = gravecomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uhookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/uhookabove.glyph
index 1f0093cd6..b643053f1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uhookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uhookabove.glyph
@@ -11,7 +11,7 @@ ref = u;
 },
 {
 pos = (332,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1191;
@@ -24,7 +24,7 @@ ref = u;
 },
 {
 pos = (353,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1331;
@@ -37,7 +37,7 @@ ref = u;
 },
 {
 pos = (362,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1165;
@@ -50,7 +50,7 @@ ref = u;
 },
 {
 pos = (306,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1141;
@@ -63,7 +63,7 @@ ref = u;
 },
 {
 pos = (326,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (316,0);
-ref = hookabove;
+pos = (310,0);
+ref = hookabovecomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uhornacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/uhornacute.glyph
index 091527f6a..f6b932ef9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uhornacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uhornacute.glyph
@@ -5,78 +5,84 @@ kernRight = u;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = uhorn;
 },
 {
-pos = (352,0);
-ref = acute;
+pos = (472,0);
+ref = acutecomb;
 }
 );
 width = 1248;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = uhorn;
 },
 {
-pos = (363,0);
-ref = acute;
+pos = (493,0);
+ref = acutecomb;
 }
 );
 width = 1426;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = uhorn;
 },
 {
-pos = (370,0);
-ref = acute;
+pos = (510,0);
+ref = acutecomb;
 }
 );
 width = 1200;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = uhorn;
 },
 {
-pos = (406,0);
-ref = acute;
+pos = (446,0);
+ref = acutecomb;
 }
 );
 width = 1206;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = uhorn;
 },
 {
-pos = (432,0);
-ref = acute;
+pos = (456,0);
+ref = acutecomb;
 }
 );
 width = 1391;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = uhorn;
 },
 {
-pos = (404,0);
-ref = acute;
+pos = (464,0);
+ref = acutecomb;
 }
 );
 width = 1150;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uhorngrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/uhorngrave.glyph
index 9cefee96d..9ad3e6a4a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uhorngrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uhorngrave.glyph
@@ -11,7 +11,7 @@ ref = uhorn;
 },
 {
 pos = (187,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1248;
@@ -24,7 +24,7 @@ ref = uhorn;
 },
 {
 pos = (149,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1426;
@@ -37,7 +37,7 @@ ref = uhorn;
 },
 {
 pos = (218,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1200;
@@ -50,7 +50,7 @@ ref = uhorn;
 },
 {
 pos = (241,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1206;
@@ -63,7 +63,7 @@ ref = uhorn;
 },
 {
 pos = (169,0);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1391;
@@ -75,8 +75,8 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (209,0);
-ref = grave;
+pos = (213,0);
+ref = gravecomb;
 }
 );
 width = 1150;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uhornhookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/uhornhookabove.glyph
index ff136b5fd..3bb4ff2b7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uhornhookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uhornhookabove.glyph
@@ -11,7 +11,7 @@ ref = uhorn;
 },
 {
 pos = (332,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1248;
@@ -24,7 +24,7 @@ ref = uhorn;
 },
 {
 pos = (353,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1426;
@@ -37,7 +37,7 @@ ref = uhorn;
 },
 {
 pos = (362,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1200;
@@ -50,7 +50,7 @@ ref = uhorn;
 },
 {
 pos = (306,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1206;
@@ -63,7 +63,7 @@ ref = uhorn;
 },
 {
 pos = (326,0);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1391;
@@ -75,8 +75,8 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (316,0);
-ref = hookabove;
+pos = (310,0);
+ref = hookabovecomb;
 }
 );
 width = 1150;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uhorntilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/uhorntilde.glyph
index ef0713d06..f161fb6a4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uhorntilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uhorntilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (54,-186);
-ref = tilde;
+pos = (84,0);
+ref = tildecomb;
 }
 );
 width = 1248;
@@ -23,8 +23,8 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (124,-186);
-ref = tilde;
+pos = (154,0);
+ref = tildecomb;
 }
 );
 width = 1426;
@@ -36,8 +36,8 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (41,-186);
-ref = tilde;
+pos = (79,0);
+ref = tildecomb;
 }
 );
 width = 1200;
@@ -49,8 +49,8 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (57,-206);
-ref = tilde;
+pos = (90,0);
+ref = tildecomb;
 }
 );
 width = 1206;
@@ -62,8 +62,8 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (103,-206);
-ref = tilde;
+pos = (137,0);
+ref = tildecomb;
 }
 );
 width = 1391;
@@ -75,8 +75,8 @@ shapes = (
 ref = uhorn;
 },
 {
-pos = (57,-206);
-ref = tilde;
+pos = (87,0);
+ref = tildecomb;
 }
 );
 width = 1150;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uinvertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/uinvertedbreve.glyph
index c1839d2af..0c64e06ff 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uinvertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uinvertedbreve.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (1193,0);
-ref = breveinvnosp;
+pos = (180,0);
+ref = breveinvcomb;
 }
 );
 width = 1191;
@@ -23,8 +23,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (1329,0);
-ref = breveinvnosp;
+pos = (155,0);
+ref = breveinvcomb;
 }
 );
 width = 1331;
@@ -36,8 +36,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (1165,0);
-ref = breveinvnosp;
+pos = (220,0);
+ref = breveinvcomb;
 }
 );
 width = 1165;
@@ -49,8 +49,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (1133,0);
-ref = breveinvnosp;
+pos = (170,0);
+ref = breveinvcomb;
 }
 );
 width = 1141;
@@ -62,8 +62,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (1300,0);
-ref = breveinvnosp;
+pos = (218,0);
+ref = breveinvcomb;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (1063,0);
-ref = breveinvnosp;
+pos = (182,0);
+ref = breveinvcomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/umacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/umacron.glyph
index 457c0fd44..f3de948e3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/umacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/umacron.glyph
@@ -5,78 +5,84 @@ kernRight = u;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = u;
 },
 {
 pos = (109,0);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1191;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = u;
 },
 {
 pos = (250,0);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1331;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = u;
 },
 {
 pos = (182,0);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1165;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = u;
 },
 {
-pos = (155,0);
-ref = macron;
+pos = (154,0);
+ref = macroncomb;
 }
 );
 width = 1141;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = u;
 },
 {
 pos = (265,0);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1298;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = u;
 },
 {
 pos = (150,0);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/umacroncyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/umacroncyrillic.glyph
index 66a03b327..f7bbbe058 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/umacroncyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/umacroncyrillic.glyph
@@ -5,78 +5,84 @@ kernRight = v;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
 pos = (114,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1140;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
 pos = (231,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1240;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
 pos = (167,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1070;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
-pos = (150,206);
-ref = macron;
+pos = (149,206);
+ref = macroncomb;
 }
 );
 width = 1064;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
 pos = (248,248);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1192;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
 pos = (137,206);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 976;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/umacrondieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/umacrondieresis.glyph
index bb7b0155a..a6708bfd7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/umacrondieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/umacrondieresis.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1161,-164);
+pos = (-14,0);
 ref = macrondieresiscomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1341,-182);
+pos = (250,0);
 ref = macrondieresiscomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1079,-156);
+pos = (72,0);
 ref = macrondieresiscomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1162,-226);
+pos = (104,0);
 ref = macrondieresiscomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1335,-244);
+pos = (274,0);
 ref = macrondieresiscomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (1090,-218);
+pos = (55,0);
 ref = macrondieresiscomb.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/underscorenosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/underscorecomb.glyph
index 8026661a2..a0fe15947 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/underscorenosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/underscorecomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = underscorenosp;
+glyphname = underscorecomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -75,5 +74,4 @@ ref = underscore;
 width = 0;
 }
 );
-unicode = 818;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/underscoredblnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/underscoredblcomb.glyph
index d89a14b11..d99d7e5a9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/underscoredblnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/underscoredblcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = underscoredblnosp;
+glyphname = underscoredblcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -147,5 +146,4 @@ nodes = (
 width = 0;
 }
 );
-unicode = 819;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni012F_.ccmp.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni012F_.ccmp.glyph
index faaf18922..54bb7cf4b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni012F_.ccmp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni012F_.ccmp.glyph
@@ -23,7 +23,7 @@ ref = idotless;
 },
 {
 pos = (-107,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 487;
@@ -43,7 +43,7 @@ ref = idotless;
 {
 alignment = 1;
 pos = (-25,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 607;
@@ -62,7 +62,7 @@ ref = idotless;
 },
 {
 pos = (-28,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 443;
@@ -87,7 +87,7 @@ ref = idotless;
 },
 {
 pos = (-106,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 427;
@@ -107,7 +107,7 @@ ref = idotless;
 {
 alignment = 1;
 pos = (-80,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 573;
@@ -125,8 +125,8 @@ shapes = (
 ref = idotless;
 },
 {
-pos = (-90,0);
-ref = ogonek;
+pos = (-95,0);
+ref = ogonekcomb;
 }
 );
 width = 315;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni01F_8.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni01F_8.glyph
index 200e5ca45..39fb8d3b3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni01F_8.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni01F_8.glyph
@@ -11,7 +11,7 @@ ref = N;
 },
 {
 pos = (452,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1544;
@@ -24,7 +24,7 @@ ref = N;
 },
 {
 pos = (316,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1480;
@@ -37,7 +37,7 @@ ref = N;
 },
 {
 pos = (517,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1580;
@@ -50,7 +50,7 @@ ref = N;
 },
 {
 pos = (516,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1473;
@@ -63,7 +63,7 @@ ref = N;
 },
 {
 pos = (381,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1513;
@@ -75,8 +75,8 @@ shapes = (
 ref = N;
 },
 {
-pos = (497,620);
-ref = grave;
+pos = (501,620);
+ref = gravecomb;
 }
 );
 width = 1452;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni01F_9.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni01F_9.glyph
index a847bc85d..b5c8cddd0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni01F_9.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni01F_9.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (222,186);
-ref = grave;
+pos = (191,0);
+ref = gravecomb;
 }
 );
 width = 1201;
@@ -23,8 +23,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (178,186);
-ref = grave;
+pos = (147,0);
+ref = gravecomb;
 }
 );
 width = 1331;
@@ -36,8 +36,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (251,186);
-ref = grave;
+pos = (220,0);
+ref = gravecomb;
 }
 );
 width = 1165;
@@ -49,8 +49,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (273,206);
-ref = grave;
+pos = (239,0);
+ref = gravecomb;
 }
 );
 width = 1137;
@@ -62,8 +62,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (202,206);
-ref = grave;
+pos = (168,0);
+ref = gravecomb;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = n;
 },
 {
-pos = (245,206);
-ref = grave;
+pos = (215,0);
+ref = gravecomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni021E_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni021E_.glyph
index c6503ff45..60d36c3eb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni021E_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni021E_.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (350,372);
-ref = caron;
+pos = (431,558);
+ref = caroncomb;
 }
 );
 width = 1514;
@@ -23,8 +23,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (183,372);
-ref = caron;
+pos = (348,558);
+ref = caroncomb;
 }
 );
 width = 1536;
@@ -36,8 +36,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (387,388);
-ref = caron;
+pos = (414,558);
+ref = caroncomb;
 }
 );
 width = 1506;
@@ -49,8 +49,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (369,416);
-ref = caron;
+pos = (438,622);
+ref = caroncomb;
 }
 );
 width = 1451;
@@ -62,8 +62,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (184,414);
-ref = caron;
+pos = (415,620);
+ref = caroncomb;
 }
 );
 width = 1489;
@@ -75,8 +75,8 @@ shapes = (
 ref = H;
 },
 {
-pos = (390,414);
-ref = caron;
+pos = (435,620);
+ref = caroncomb;
 }
 );
 width = 1378;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni021F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni021F_.glyph
index b8775927f..8972c773d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni021F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni021F_.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (-162,372);
-ref = caron;
+pos = (-81,558);
+ref = caroncomb;
 }
 );
 width = 1212;
@@ -23,8 +23,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (-289,372);
-ref = caron;
+pos = (-124,558);
+ref = caroncomb;
 }
 );
 width = 1330;
@@ -36,8 +36,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (-145,388);
-ref = caron;
+pos = (-118,558);
+ref = caroncomb;
 }
 );
 width = 1164;
@@ -49,8 +49,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (-152,414);
-ref = caron;
+pos = (-83,620);
+ref = caroncomb;
 }
 );
 width = 1139;
@@ -62,8 +62,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (-275,414);
-ref = caron;
+pos = (-44,620);
+ref = caroncomb;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = h;
 },
 {
-pos = (-135,414);
-ref = caron;
+pos = (-90,620);
+ref = caroncomb;
 }
 );
 width = 1036;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0226.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0226.glyph
index f2f3c4a94..73e4d25cc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0226.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0226.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (510,372);
-ref = dotaccent;
+pos = (541,558);
+ref = dotaccentcomb;
 }
 );
 width = 1386;
@@ -25,8 +25,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (542,372);
-ref = dotaccent;
+pos = (573,558);
+ref = dotaccentcomb;
 }
 );
 width = 1630;
@@ -39,8 +39,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (508,372);
-ref = dotaccent;
+pos = (539,558);
+ref = dotaccentcomb;
 }
 );
 width = 1262;
@@ -53,8 +53,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (524,414);
-ref = dotaccent;
+pos = (558,620);
+ref = dotaccentcomb;
 }
 );
 width = 1338;
@@ -67,8 +67,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (516,414);
-ref = dotaccent;
+pos = (550,620);
+ref = dotaccentcomb;
 }
 );
 width = 1536;
@@ -81,8 +81,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (520,414);
-ref = dotaccent;
+pos = (548,620);
+ref = dotaccentcomb;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0227.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0227.1.glyph
index d091906fc..3772536b3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0227.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0227.1.glyph
@@ -13,8 +13,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (396,0);
-ref = dotaccent;
+pos = (427,186);
+ref = dotaccentcomb;
 }
 );
 width = 1191;
@@ -28,8 +28,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (382,0);
-ref = dotaccent;
+pos = (413,186);
+ref = dotaccentcomb;
 }
 );
 width = 1249;
@@ -43,8 +43,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (336,0);
-ref = dotaccent;
+pos = (367,186);
+ref = dotaccentcomb;
 }
 );
 width = 1323;
@@ -58,8 +58,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (356,0);
-ref = dotaccent;
+pos = (390,206);
+ref = dotaccentcomb;
 }
 );
 width = 1161;
@@ -73,8 +73,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (333,0);
-ref = dotaccent;
+pos = (367,206);
+ref = dotaccentcomb;
 }
 );
 width = 1274;
@@ -88,8 +88,8 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (414,0);
-ref = dotaccent;
+pos = (442,206);
+ref = dotaccentcomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0227.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0227.glyph
index e19f7a6d7..857c6cb90 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0227.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0227.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (382,0);
-ref = dotaccent;
+pos = (413,186);
+ref = dotaccentcomb;
 }
 );
 width = 1249;
@@ -25,8 +25,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (336,0);
-ref = dotaccent;
+pos = (367,186);
+ref = dotaccentcomb;
 }
 );
 width = 1323;
@@ -39,8 +39,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (396,0);
-ref = dotaccent;
+pos = (427,186);
+ref = dotaccentcomb;
 }
 );
 width = 1191;
@@ -53,8 +53,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (356,0);
-ref = dotaccent;
+pos = (390,206);
+ref = dotaccentcomb;
 }
 );
 width = 1161;
@@ -67,8 +67,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (333,0);
-ref = dotaccent;
+pos = (367,206);
+ref = dotaccentcomb;
 }
 );
 width = 1274;
@@ -81,8 +81,8 @@ shapes = (
 ref = a;
 },
 {
-pos = (414,0);
-ref = dotaccent;
+pos = (442,206);
+ref = dotaccentcomb;
 }
 );
 width = 1119;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0228.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0228.glyph
index 64d4034ef..eb56638c9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0228.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0228.glyph
@@ -11,7 +11,7 @@ ref = E;
 },
 {
 pos = (338,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1224;
@@ -24,7 +24,7 @@ ref = E;
 },
 {
 pos = (183,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1275;
@@ -37,7 +37,7 @@ ref = E;
 },
 {
 pos = (388,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1196;
@@ -50,7 +50,7 @@ ref = E;
 },
 {
 pos = (343,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1160;
@@ -63,7 +63,7 @@ ref = E;
 },
 {
 pos = (197,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1260;
@@ -76,7 +76,7 @@ ref = E;
 },
 {
 pos = (387,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0229.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0229.glyph
index ddbc2e5cd..32fe97577 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0229.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0229.glyph
@@ -11,7 +11,7 @@ ref = e;
 },
 {
 pos = (326,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1173;
@@ -24,7 +24,7 @@ ref = e;
 },
 {
 pos = (172,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1239;
@@ -37,7 +37,7 @@ ref = e;
 },
 {
 pos = (382,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1129;
@@ -50,7 +50,7 @@ ref = e;
 },
 {
 pos = (336,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1082;
@@ -63,7 +63,7 @@ ref = e;
 },
 {
 pos = (173,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1202;
@@ -76,7 +76,7 @@ ref = e;
 },
 {
 pos = (385,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni022B_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni022B_.glyph
index a7995b59a..f64211a61 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni022B_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni022B_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1173,-204);
+pos = (-90,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1278,-218);
+pos = (-24,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1126,-232);
+pos = (-98,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1141,-266);
+pos = (-35,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1264,-280);
+pos = (-26,0);
 ref = dieresismacroncomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1117,-294);
+pos = (-98,0);
 ref = dieresismacroncomb.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni022C_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni022C_.glyph
index 9996283e4..1aa118652 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni022C_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni022C_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1438,414);
+pos = (362,558);
 ref = tildemacroncomb.cn;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1581,428);
+pos = (395,558);
 ref = tildemacroncomb.cn;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1355,404);
+pos = (355,558);
 ref = tildemacroncomb.cn;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1462,414);
+pos = (390,620);
 ref = tildemacroncomb.cn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1553,428);
+pos = (356,620);
 ref = tildemacroncomb.cn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = O;
 },
 {
-pos = (1355,404);
+pos = (351,620);
 ref = tildemacroncomb.cn;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni022D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni022D_.glyph
index e3fba6fd4..a0decae0c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni022D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni022D_.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1171,-170);
+pos = (99,0);
 ref = tildemacroncomb.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1311,-180);
+pos = (129,0);
 ref = tildemacroncomb.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1089,-164);
+pos = (91,0);
 ref = tildemacroncomb.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1150,-232);
+pos = (82,0);
 ref = tildemacroncomb.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1304,-242);
+pos = (111,0);
 ref = tildemacroncomb.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1084,-226);
+pos = (82,0);
 ref = tildemacroncomb.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni022E_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni022E_.glyph
index b8e1e41a1..bed90add2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni022E_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni022E_.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (598,372);
-ref = dotaccent;
+pos = (629,558);
+ref = dotaccentcomb;
 }
 );
 width = 1560;
@@ -25,8 +25,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (541,372);
-ref = dotaccent;
+pos = (572,558);
+ref = dotaccentcomb;
 }
 );
 width = 1628;
@@ -39,8 +39,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (641,372);
-ref = dotaccent;
+pos = (672,558);
+ref = dotaccentcomb;
 }
 );
 width = 1530;
@@ -53,8 +53,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (624,414);
-ref = dotaccent;
+pos = (658,620);
+ref = dotaccentcomb;
 }
 );
 width = 1534;
@@ -67,8 +67,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (513,414);
-ref = dotaccent;
+pos = (547,620);
+ref = dotaccentcomb;
 }
 );
 width = 1528;
@@ -81,8 +81,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (649,414);
-ref = dotaccent;
+pos = (677,620);
+ref = dotaccentcomb;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni022F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni022F_.glyph
index 9b3dbd3df..e7bd7e3bd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni022F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni022F_.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (335,-186);
-ref = dotaccent;
+pos = (366,0);
+ref = dotaccentcomb;
 }
 );
 width = 1222;
@@ -25,8 +25,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (275,-186);
-ref = dotaccent;
+pos = (306,0);
+ref = dotaccentcomb;
 }
 );
 width = 1280;
@@ -39,8 +39,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (377,-186);
-ref = dotaccent;
+pos = (408,0);
+ref = dotaccentcomb;
 }
 );
 width = 1186;
@@ -53,8 +53,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (316,-206);
-ref = dotaccent;
+pos = (350,0);
+ref = dotaccentcomb;
 }
 );
 width = 1124;
@@ -67,8 +67,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (268,-206);
-ref = dotaccent;
+pos = (302,0);
+ref = dotaccentcomb;
 }
 );
 width = 1244;
@@ -81,8 +81,8 @@ shapes = (
 ref = o;
 },
 {
-pos = (380,-206);
-ref = dotaccent;
+pos = (408,0);
+ref = dotaccentcomb;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0231.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0231.glyph
index 23b94c6c1..da83cc4fd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0231.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0231.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1169,-186);
+pos = (217,0);
 ref = dotmacron.lc;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1314,-186);
+pos = (274,0);
 ref = dotmacron.lc;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1216,-186);
+pos = (282,0);
 ref = dotmacron.lc;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1150,-206);
+pos = (272,0);
 ref = dotmacron.lc;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1308,-206);
+pos = (279,0);
 ref = dotmacron.lc;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (1217,-206);
+pos = (297,0);
 ref = dotmacron.lc;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0232.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0232.glyph
index e08b1aca6..96ccf4912 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0232.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0232.glyph
@@ -5,78 +5,84 @@ kernRight = Y;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
 pos = (286,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1362;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
 pos = (459,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1566;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
 pos = (321,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1256;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
-pos = (335,620);
-ref = macron;
+pos = (334,620);
+ref = macroncomb;
 }
 );
 width = 1298;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
 pos = (484,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1534;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
 pos = (282,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1128;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0233.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0233.glyph
index 876a9d234..414f3acb8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0233.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0233.glyph
@@ -5,78 +5,84 @@ kernRight = v;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
 pos = (114,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1140;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
 pos = (231,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1240;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
 pos = (167,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1070;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
-pos = (150,206);
-ref = macron;
+pos = (149,206);
+ref = macroncomb;
 }
 );
 width = 1064;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
 pos = (248,248);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1192;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
 pos = (137,206);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 976;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0249.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0249.glyph
index e767eee99..79c532db2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0249.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0249.glyph
@@ -12,8 +12,8 @@ pos = (1,0);
 ref = uni0249.ccmp;
 },
 {
-pos = (-3,0);
-ref = dotaccent;
+pos = (28,186);
+ref = dotaccentcomb;
 }
 );
 width = 486;
@@ -26,8 +26,8 @@ shapes = (
 ref = uni0249.ccmp;
 },
 {
-pos = (-33,0);
-ref = dotaccent;
+pos = (-2,186);
+ref = dotaccentcomb;
 }
 );
 width = 606;
@@ -41,8 +41,8 @@ pos = (-1,0);
 ref = uni0249.ccmp;
 },
 {
-pos = (39,0);
-ref = dotaccent;
+pos = (70,186);
+ref = dotaccentcomb;
 }
 );
 width = 455;
@@ -55,8 +55,8 @@ shapes = (
 ref = uni0249.ccmp;
 },
 {
-pos = (-1,0);
-ref = dotaccent;
+pos = (33,206);
+ref = dotaccentcomb;
 }
 );
 width = 422;
@@ -70,8 +70,8 @@ pos = (2,0);
 ref = uni0249.ccmp;
 },
 {
-pos = (-31,0);
-ref = dotaccent;
+pos = (3,206);
+ref = dotaccentcomb;
 }
 );
 width = 574;
@@ -85,8 +85,8 @@ pos = (-6,0);
 ref = uni0249.ccmp;
 },
 {
-pos = (46,42);
-ref = dotaccent;
+pos = (74,248);
+ref = dotaccentcomb;
 }
 );
 width = 327;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02E_A_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02E_A_.glyph
index 03177eabc..eb90448e5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02E_A_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02E_A_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02EA;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02E_B_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02E_B_.glyph
index a0c3cbe9a..832b73b8d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02E_B_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02E_B_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02EB;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02E_D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02E_D_.glyph
index c7794464c..4b5f5545d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02E_D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02E_D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02ED;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02F_0.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02F_0.glyph
index efe5ddb38..6019f6118 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02F_0.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02F_0.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02F0;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02F_1.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02F_1.glyph
index 4f8187628..c7a39ae11 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02F_1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02F_1.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02F1;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02F_2.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02F_2.glyph
index a02eb1480..9f64d970d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02F_2.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02F_2.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02F2;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02F_3.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02F_3.glyph
index 6b41d7b06..196e8ac14 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02F_3.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02F_3.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02F3;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02F_4.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02F_4.glyph
index bf257d237..13009c3fb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02F_4.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02F_4.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02F4;
 layers = (
 {
@@ -8,7 +7,7 @@ shapes = (
 {
 alignment = -1;
 pos = (96,-1018);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 734;
@@ -19,7 +18,7 @@ shapes = (
 {
 alignment = -1;
 pos = (0,-1022);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 838;
@@ -30,7 +29,7 @@ shapes = (
 {
 alignment = -1;
 pos = (154,-1018);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 670;
@@ -41,7 +40,7 @@ shapes = (
 {
 alignment = -1;
 pos = (96,-1018);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 670;
@@ -52,7 +51,7 @@ shapes = (
 {
 alignment = -1;
 pos = (0,-1022);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 806;
@@ -63,7 +62,7 @@ shapes = (
 {
 alignment = -1;
 pos = (154,-1018);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 542;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02F_5.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02F_5.glyph
index dd105d1ce..bf9abd3fd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02F_5.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02F_5.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02F5;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02F_6.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02F_6.glyph
index 4dd33bd2c..225ce433f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02F_6.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02F_6.glyph
@@ -1,66 +1,59 @@
 {
-color = (204,240,242,1);
 glyphname = uni02F6;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (1531,0);
-ref = acutedblnosp;
+ref = acutedblcomb;
 }
 );
-width = 1052;
+width = 0;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (1564,0);
-ref = acutedblnosp;
+ref = acutedblcomb;
 }
 );
-width = 1303;
+width = 0;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (913,0);
-ref = acutedblnosp;
+ref = acutedblcomb;
 }
 );
-width = 882;
+width = 0;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (1577,0);
-ref = acutedblnosp;
+ref = acutedblcomb;
 }
 );
-width = 984;
+width = 0;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (1662,0);
-ref = acutedblnosp;
+ref = acutedblcomb;
 }
 );
-width = 1278;
+width = 0;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (953,0);
-ref = acutedblnosp;
+ref = acutedblcomb;
 }
 );
-width = 841;
+width = 0;
 }
 );
 metricLeft = quotedbl;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02F_7.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02F_7.glyph
index 2b3c8beba..cb3ee55a7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02F_7.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02F_7.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02F7;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02F_8.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02F_8.glyph
index fa0600a1e..4a8d04df0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02F_8.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02F_8.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02F8;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02F_9.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02F_9.glyph
index 65cd94afd..8a17ddce8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02F_9.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02F_9.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02F9;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02F_A_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02F_A_.glyph
index e18039882..1aeb6575b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02F_A_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02F_A_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02FA;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02F_B_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02F_B_.glyph
index 447b183a2..97d737e27 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02F_B_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02F_B_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02FB;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02F_C_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02F_C_.glyph
index 0e531d0fb..beb24672c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02F_C_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02F_C_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02FC;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02F_D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02F_D_.glyph
index 638564369..3894fcc5c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02F_D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02F_D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02FD;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02F_E_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02F_E_.glyph
index c52a49721..8994c2cb6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02F_E_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02F_E_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02FE;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni02F_F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni02F_F_.glyph
index 35cb1b026..dc5d97917 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni02F_F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni02F_F_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni02FF;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0346.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0346.glyph
index 8fa64f20c..036706fde 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0346.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0346.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0346;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0348.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0348.glyph
index d1427aeba..992c68058 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0348.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0348.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0348;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0349.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0349.glyph
index f0d1af98a..2563ab358 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0349.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0349.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0349;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni034A_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni034A_.glyph
index b95e61f8d..0e8e0963e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni034A_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni034A_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni034A;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni034B_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni034B_.glyph
index 7c096c38b..9a5907ce6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni034B_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni034B_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni034B;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni034C_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni034C_.glyph
index c051cd910..d30e38518 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni034C_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni034C_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni034C;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni034D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni034D_.glyph
index a7ceb29de..21e132136 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni034D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni034D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni034D;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni034E_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni034E_.glyph
index 157e82a0b..f138bbbe6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni034E_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni034E_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni034E;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni034F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni034F_.glyph
index a318b8395..ab5d9845a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni034F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni034F_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni034F;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0351.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0351.glyph
index f8ae87513..97980bec2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0351.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0351.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0351;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0352.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0352.glyph
index 50f183e27..61fae60c4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0352.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0352.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0352;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0353.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0353.glyph
index 96ba4ff8a..d48ceea6b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0353.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0353.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0353;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0354.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0354.glyph
index 7cb3ec6f8..9c858a7cd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0354.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0354.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0354;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0355.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0355.glyph
index 2c80329b1..4a8bc96d1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0355.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0355.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0355;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0356.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0356.glyph
index d313fb403..62cd44ddd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0356.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0356.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0356;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0357.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0357.glyph
index f3287a62f..4edd44188 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0357.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0357.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0357;
 layers = (
 {
@@ -7,7 +6,7 @@ layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
 pos = (-730,0);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 0;
@@ -17,7 +16,7 @@ layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
 pos = (-882,0);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 56;
@@ -28,7 +27,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-640,0);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 0;
@@ -38,7 +37,7 @@ layerId = m008;
 shapes = (
 {
 pos = (-730,0);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 0;
@@ -48,7 +47,7 @@ layerId = m010;
 shapes = (
 {
 pos = (-882,0);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 24;
@@ -59,7 +58,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-640,0);
-ref = ringhalfright;
+ref = righthalfringabovecomb;
 }
 );
 width = 0;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0358.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0358.glyph
index 13209cc19..b7ae2346d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0358.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0358.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0358;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0359.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0359.glyph
index 2b6ea04e1..06ff8a07c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0359.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0359.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0359;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni035A_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni035A_.glyph
index 96d4e4642..44a2a8bda 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni035A_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni035A_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni035A;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni035B_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni035B_.glyph
index 381baeb3c..4b64a8700 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni035B_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni035B_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni035B;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni035C_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni035C_.glyph
index 75b475b12..f9e115e7d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni035C_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni035C_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni035C;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni035D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni035D_.glyph
index ef97ec26d..002a5730a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni035D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni035D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni035D;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni035E_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni035E_.glyph
index cae0f5938..d48a75484 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni035E_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni035E_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni035E;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni035F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni035F_.glyph
index 86fdfda30..7a9073973 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni035F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni035F_.glyph
@@ -1,6 +1,5 @@
 {
 case = minor;
-color = (250,227,227,1);
 glyphname = uni035F;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0362.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0362.glyph
index e239a9e4a..9a10748a3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0362.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0362.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0362;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0363.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0363.glyph
index d7c1ff8e2..167e83d86 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0363.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0363.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0363;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0364.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0364.glyph
index d7602acd3..c62dd5db4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0364.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0364.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0364;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0365.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0365.glyph
index f888de950..e375022c2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0365.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0365.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0365;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0366.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0366.glyph
index e7e3fdc7c..b74b009ce 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0366.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0366.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0366;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0367.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0367.glyph
index 77e03e40c..0d195d30b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0367.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0367.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0367;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0368.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0368.glyph
index 1eeca3467..48803b5d8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0368.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0368.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0368;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0369.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0369.glyph
index 60afe3b70..c2720f6b4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0369.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0369.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0369;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni036A_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni036A_.glyph
index 78c4fb07b..6a7efa9d9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni036A_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni036A_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni036A;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni036B_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni036B_.glyph
index c67848b62..cc0b49a13 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni036B_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni036B_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni036B;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni036C_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni036C_.glyph
index b1b11f183..3318c45b4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni036C_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni036C_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni036C;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni036D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni036D_.glyph
index 4c426dd94..1477c319e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni036D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni036D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni036D;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni036E_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni036E_.glyph
index 504557c93..abe897638 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni036E_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni036E_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni036E;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni036F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni036F_.glyph
index 36b4790e7..884e74339 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni036F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni036F_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni036F;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni03F_6.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni03F_6.glyph
index 7fd7482dd..0e607c8cb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni03F_6.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni03F_6.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni03F6;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0400.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0400.glyph
index 5fe884b4d..25e36c1b2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0400.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0400.glyph
@@ -11,7 +11,7 @@ ref = E;
 },
 {
 pos = (312,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1224;
@@ -24,7 +24,7 @@ ref = E;
 },
 {
 pos = (215,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1275;
@@ -37,7 +37,7 @@ ref = E;
 },
 {
 pos = (361,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1196;
@@ -50,7 +50,7 @@ ref = E;
 },
 {
 pos = (369,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1160;
@@ -63,7 +63,7 @@ ref = E;
 },
 {
 pos = (252,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1260;
@@ -75,8 +75,8 @@ shapes = (
 ref = E;
 },
 {
-pos = (341,620);
-ref = grave;
+pos = (345,620);
+ref = gravecomb;
 }
 );
 width = 1062;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni040D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni040D_.glyph
index 256239fe5..86c74c276 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni040D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni040D_.glyph
@@ -12,7 +12,7 @@ ref = "Ii-cy";
 },
 {
 pos = (456,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1544;
@@ -26,7 +26,7 @@ ref = "Ii-cy";
 },
 {
 pos = (312,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1480;
@@ -40,7 +40,7 @@ ref = "Ii-cy";
 },
 {
 pos = (517,558);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1580;
@@ -54,7 +54,7 @@ ref = "Ii-cy";
 },
 {
 pos = (504,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1473;
@@ -68,7 +68,7 @@ ref = "Ii-cy";
 },
 {
 pos = (377,620);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1513;
@@ -81,8 +81,8 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (497,620);
-ref = grave;
+pos = (501,620);
+ref = gravecomb;
 }
 );
 width = 1452;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0450.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0450.glyph
index 5b04d2bc9..a603e35ae 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0450.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0450.glyph
@@ -11,7 +11,7 @@ ref = e;
 },
 {
 pos = (224,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1173;
@@ -24,7 +24,7 @@ ref = e;
 },
 {
 pos = (136,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1239;
@@ -37,7 +37,7 @@ ref = e;
 },
 {
 pos = (259,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1129;
@@ -50,7 +50,7 @@ ref = e;
 },
 {
 pos = (276,206);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1082;
@@ -63,7 +63,7 @@ ref = e;
 },
 {
 pos = (153,206);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1202;
@@ -75,8 +75,8 @@ shapes = (
 ref = e;
 },
 {
-pos = (242,248);
-ref = grave;
+pos = (246,248);
+ref = gravecomb;
 }
 );
 width = 1005;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni045D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni045D_.glyph
index cbc5c9174..b4ac14fd2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni045D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni045D_.glyph
@@ -12,7 +12,7 @@ ref = iicyrillic;
 },
 {
 pos = (222,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1201;
@@ -26,7 +26,7 @@ ref = iicyrillic;
 },
 {
 pos = (179,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1331;
@@ -40,7 +40,7 @@ ref = iicyrillic;
 },
 {
 pos = (249,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1165;
@@ -54,7 +54,7 @@ ref = iicyrillic;
 },
 {
 pos = (273,206);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1137;
@@ -68,7 +68,7 @@ ref = iicyrillic;
 },
 {
 pos = (203,206);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1299;
@@ -81,8 +81,8 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (227,206);
-ref = grave;
+pos = (231,206);
+ref = gravecomb;
 }
 );
 width = 1036;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0487.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0487.glyph
index 98afe085d..9f6ef648f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0487.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0487.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0487;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0488.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0488.glyph
index bbdad0780..cdca6b40a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0488.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0488.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0488;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0489.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0489.glyph
index dc68234c6..3a710cb08 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0489.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0489.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni0489;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni048A_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni048A_.glyph
index 2ebb38c69..6f9d1ed55 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni048A_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni048A_.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (375,372);
-ref = breve;
+pos = (482,558);
+ref = brevecomb;
 },
 {
 alignment = 1;
@@ -30,8 +30,8 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (287,372);
-ref = breve;
+pos = (350,558);
+ref = brevecomb;
 },
 {
 pos = (952,0);
@@ -48,8 +48,8 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (435,372);
-ref = breve;
+pos = (530,558);
+ref = brevecomb;
 },
 {
 pos = (1252,0);
@@ -66,8 +66,8 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (371,414);
-ref = breve;
+pos = (434,620);
+ref = brevecomb;
 },
 {
 alignment = 1;
@@ -85,8 +85,8 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (327,414);
-ref = breve;
+pos = (377,620);
+ref = brevecomb;
 },
 {
 pos = (1000,0);
@@ -103,8 +103,8 @@ shapes = (
 ref = "Ii-cy";
 },
 {
-pos = (378,414);
-ref = breve;
+pos = (470,620);
+ref = brevecomb;
 },
 {
 pos = (1188,0);
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni048B_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni048B_.glyph
index 2bd81866e..d52133a12 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni048B_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni048B_.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (141,0);
-ref = breve;
+pos = (248,186);
+ref = brevecomb;
 },
 {
 pos = (763,0);
@@ -29,8 +29,8 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (154,0);
-ref = breve;
+pos = (217,186);
+ref = brevecomb;
 },
 {
 pos = (797,0);
@@ -47,8 +47,8 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (167,0);
-ref = breve;
+pos = (262,186);
+ref = brevecomb;
 },
 {
 pos = (871,0);
@@ -65,8 +65,8 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (140,0);
-ref = breve;
+pos = (203,206);
+ref = brevecomb;
 },
 {
 pos = (730,0);
@@ -83,8 +83,8 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (153,0);
-ref = breve;
+pos = (203,206);
+ref = brevecomb;
 },
 {
 pos = (780,0);
@@ -101,8 +101,8 @@ shapes = (
 ref = iicyrillic;
 },
 {
-pos = (108,0);
-ref = breve;
+pos = (200,206);
+ref = brevecomb;
 },
 {
 pos = (812,0);
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni04E_C_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni04E_C_.glyph
index 63139fc49..67e3769b4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni04E_C_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni04E_C_.glyph
@@ -9,7 +9,7 @@ ref = afii10047;
 },
 {
 pos = (178,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1374;
@@ -22,7 +22,7 @@ ref = afii10047;
 },
 {
 pos = (162,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1473;
@@ -35,7 +35,7 @@ ref = afii10047;
 },
 {
 pos = (174,558);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1318;
@@ -48,7 +48,7 @@ ref = afii10047;
 },
 {
 pos = (187,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1308;
@@ -61,7 +61,7 @@ ref = afii10047;
 },
 {
 pos = (139,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1374;
@@ -74,7 +74,7 @@ ref = afii10047;
 },
 {
 pos = (159,620);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1188;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_0.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_0.glyph
index e5d84d142..2ac27072e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_0.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_0.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DC0;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_1.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_1.glyph
index d4bdae7e8..dbfda698f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_1.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DC1;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_2.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_2.glyph
index b312887fd..5a0b7d8d7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_2.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_2.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DC2;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_3.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_3.glyph
index dfcf75785..c91c4e408 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_3.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_3.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DC3;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_4.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_4.glyph
deleted file mode 100644
index 86d9f45fa..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_4.glyph
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-color = (250,227,227,1);
-glyphname = uni1DC4;
-layers = (
-{
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-216,1240,l),
-(50,1536,l),
-(-172,1536,l),
-(-262,1390,l),
-(-654,1390,l),
-(-678,1240,l)
-);
-}
-);
-width = 0;
-},
-{
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-238,1216,l),
-(128,1536,l),
-(-270,1536,l),
-(-392,1396,l),
-(-824,1396,l),
-(-856,1216,l)
-);
-}
-);
-width = 2;
-},
-{
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-closed = 1;
-nodes = (
-(-204,1254,l),
-(2,1536,l),
-(-56,1536,l),
-(-222,1300,l),
-(-566,1300,l),
-(-574,1254,l)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m008;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-248,1240,l),
-(18,1536,l),
-(-204,1536,l),
-(-294,1390,l),
-(-686,1390,l),
-(-710,1240,l)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m010;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-254,1216,l),
-(112,1536,l),
-(-286,1536,l),
-(-408,1396,l),
-(-840,1396,l),
-(-872,1216,l)
-);
-}
-);
-width = 0;
-},
-{
-layerId = m012;
-shapes = (
-{
-closed = 1;
-nodes = (
-(-268,1254,l),
-(-62,1536,l),
-(-120,1536,l),
-(-286,1300,l),
-(-630,1300,l),
-(-638,1254,l)
-);
-}
-);
-width = 0;
-}
-);
-unicode = 7620;
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_5.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_5.glyph
index d2761d2b0..63d1eb612 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_5.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_5.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DC5;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_6.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_6.glyph
index f822b4fb8..700f4987e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_6.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_6.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DC6;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_7.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_7.glyph
index 75fd14809..a920d5e77 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_7.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_7.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DC7;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_8.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_8.glyph
index 11ac2d1e4..6b34b564f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_8.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_8.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DC8;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_9.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_9.glyph
index 074234e86..fe5865117 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_9.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_9.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DC9;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_A_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_A_.glyph
index f346621df..3924cc03b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_A_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_A_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DCA;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_B_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_B_.glyph
index abec37813..0297efa6c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_B_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_B_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DCB;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_C_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_C_.glyph
index 279282394..cd786d6e3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_C_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_C_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DCC;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_D_.glyph
index 0f130cc0e..cc1850e71 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DCD;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_E_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_E_.glyph
index 9c5ad73f8..387bbabea 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_E_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_E_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DCE;
 layers = (
 {
@@ -9,7 +8,7 @@ shapes = (
 alignment = -1;
 angle = 180;
 pos = (-280,1068);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 0;
@@ -21,7 +20,7 @@ shapes = (
 alignment = -1;
 angle = 180;
 pos = (-480,1036);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 56;
@@ -33,7 +32,7 @@ shapes = (
 alignment = -1;
 angle = 180;
 pos = (-160,1088);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 0;
@@ -45,7 +44,7 @@ shapes = (
 alignment = -1;
 angle = 180;
 pos = (-344,1068);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 0;
@@ -57,7 +56,7 @@ shapes = (
 alignment = -1;
 angle = 180;
 pos = (-512,1036);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 24;
@@ -69,7 +68,7 @@ shapes = (
 alignment = -1;
 angle = 180;
 pos = (-288,1088);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 0;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_F_.glyph
index 21caa1f6e..6307994eb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_C_F_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DCF;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_0.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_0.glyph
index a9135eab4..5b83f8308 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_0.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_0.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DD0;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_1.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_1.glyph
index df6f5d0e6..daa7e8c8d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_1.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DD1;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_2.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_2.glyph
index 0387b41dd..3a2b6b243 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_2.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_2.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DD2;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_3.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_3.glyph
index 8dfc28121..8d056067e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_3.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_3.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DD3;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_4.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_4.glyph
index 221785433..3b954429f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_4.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_4.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DD4;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_5.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_5.glyph
index 6d64eeb07..1147ea898 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_5.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_5.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DD5;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_6.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_6.glyph
index 48f5f080f..2b7f2fd00 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_6.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_6.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DD6;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_7.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_7.glyph
index c5cfad9d4..0d0053af6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_7.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_7.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DD7;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_8.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_8.glyph
index a0eddc3b7..8b07d704d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_8.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_8.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DD8;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_9.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_9.glyph
index 8d26c1c60..2d111cd11 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_9.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_9.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DD9;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_A_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_A_.glyph
index a938caf44..d61b4b52d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_A_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_A_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DDA;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_B_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_B_.glyph
index f60267c73..02ea097f2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_B_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_B_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DDB;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_C_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_C_.glyph
index e0a9be001..60e79f7fc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_C_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_C_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DDC;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_D_.glyph
index 997042203..8386d9b26 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DDD;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_E_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_E_.glyph
index ddcd7d1e0..2207a7ccd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_E_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_E_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DDE;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_F_.glyph
index 3e97548b2..a513c7a8f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_D_F_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DDF;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_0.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_0.glyph
index e10adbc4b..670a2e8c7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_0.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_0.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DE0;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_1.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_1.glyph
index 7a2f42203..4011bc3c4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_1.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DE1;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_2.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_2.glyph
index ddf3f4f9e..d0c97b92e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_2.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_2.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DE2;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_3.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_3.glyph
index 855f1f2be..b1eea8356 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_3.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_3.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DE3;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_4.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_4.glyph
index bf833ee70..e200bea0f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_4.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_4.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DE4;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_5.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_5.glyph
index 88ea2d329..0407ae244 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_5.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_5.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DE5;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_6.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_6.glyph
index c5bdcb486..ff841d536 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_6.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_6.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DE6;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_7.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_7.glyph
index c7d4177f7..cf5fc3cb2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_7.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_7.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DE7;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_8.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_8.glyph
index 7937a2551..1939df6dd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_8.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_8.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DE8;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_9.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_9.glyph
index ffc9963f6..6505f52b9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_9.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_9.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DE9;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_A_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_A_.glyph
index 88d7d506a..a7c6d724f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_A_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_A_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DEA;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_B_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_B_.glyph
index d18aaaf17..e93af7a4a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_B_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_B_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DEB;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_C_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_C_.glyph
index aff91a424..48c497f25 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_C_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_C_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DEC;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_D_.glyph
index 8725ecc68..63f917806 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DED;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_E_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_E_.glyph
index bc82d5baf..4e00d087a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_E_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_E_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DEE;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_F_.glyph
index a6a8826a2..e348b9abc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_E_F_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DEF;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_0.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_0.glyph
index 91d7ffe68..036b63fe8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_0.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_0.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DF0;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_1.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_1.glyph
index 5af97d8f9..76e6cd8a7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_1.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DF1;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_2.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_2.glyph
index 001fd89e8..cd14d8f2c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_2.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_2.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DF2;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_3.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_3.glyph
index 043d0473a..efe724724 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_3.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_3.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DF3;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_4.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_4.glyph
index c86e44bf3..87fb8e573 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_4.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_4.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DF4;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_5.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_5.glyph
index c54303064..dfd5a626d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_5.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_5.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DF5;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_C_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_C_.glyph
index 6d1c242ec..61e3c63de 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_C_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_C_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DFC;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_D_.glyph
index 6f199746b..c6740ac53 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DFD;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_E_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_E_.glyph
index 7c9d8a886..391206ea5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_E_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_E_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DFE;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_F_.glyph
index 274f5871c..729c45990 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1D_F_F_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni1DFF;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1E_2D_.ccmp.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1E_2D_.ccmp.glyph
index f6439ca5a..ece281f3a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1E_2D_.ccmp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1E_2D_.ccmp.glyph
@@ -11,7 +11,7 @@ ref = idotless;
 },
 {
 pos = (868,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 487;
@@ -24,7 +24,7 @@ ref = idotless;
 },
 {
 pos = (1026,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 607;
@@ -37,7 +37,7 @@ ref = idotless;
 },
 {
 pos = (707,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 443;
@@ -50,7 +50,7 @@ ref = idotless;
 },
 {
 pos = (869,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 427;
@@ -63,7 +63,7 @@ ref = idotless;
 },
 {
 pos = (1007,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 573;
@@ -76,7 +76,7 @@ ref = idotless;
 },
 {
 pos = (704,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 315;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_0.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_0.glyph
index d0b9e35cc..245638d0e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_0.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_0.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (151,0);
-ref = breve;
+pos = (258,186);
+ref = brevecomb;
 }
 );
 width = 1288;
@@ -23,8 +23,8 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (119,0);
-ref = breve;
+pos = (182,186);
+ref = brevecomb;
 }
 );
 width = 1330;
@@ -36,8 +36,8 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (187,0);
-ref = breve;
+pos = (282,186);
+ref = brevecomb;
 }
 );
 width = 1266;
@@ -49,8 +49,8 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (126,0);
-ref = breve;
+pos = (189,206);
+ref = brevecomb;
 }
 );
 width = 1247;
@@ -62,8 +62,8 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (138,0);
-ref = breve;
+pos = (188,206);
+ref = brevecomb;
 }
 );
 width = 1385;
@@ -75,8 +75,8 @@ shapes = (
 ref = alpha;
 },
 {
-pos = (120,0);
-ref = breve;
+pos = (212,206);
+ref = brevecomb;
 }
 );
 width = 1170;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_1.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_1.glyph
index 19f82090f..02e480405 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_1.glyph
@@ -5,78 +5,84 @@ kernRight = alphagreek;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = alpha;
 },
 {
 pos = (154,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1288;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = alpha;
 },
 {
 pos = (245,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1330;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = alpha;
 },
 {
 pos = (233,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1266;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = alpha;
 },
 {
-pos = (173,206);
-ref = macron;
+pos = (172,206);
+ref = macroncomb;
 }
 );
 width = 1247;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = alpha;
 },
 {
 pos = (284,206);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1385;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = alpha;
 },
 {
 pos = (180,206);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1170;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_8.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_8.glyph
index b12bee9af..f31ef58b1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_8.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_8.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (295,372);
-ref = breve;
+pos = (402,558);
+ref = brevecomb;
 }
 );
 width = 1386;
@@ -23,8 +23,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (365,372);
-ref = breve;
+pos = (428,558);
+ref = brevecomb;
 }
 );
 width = 1630;
@@ -36,8 +36,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (279,372);
-ref = breve;
+pos = (374,558);
+ref = brevecomb;
 }
 );
 width = 1262;
@@ -49,8 +49,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (308,414);
-ref = breve;
+pos = (371,620);
+ref = brevecomb;
 }
 );
 width = 1338;
@@ -62,8 +62,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (340,414);
-ref = breve;
+pos = (390,620);
+ref = brevecomb;
 }
 );
 width = 1536;
@@ -75,8 +75,8 @@ shapes = (
 ref = A;
 },
 {
-pos = (226,414);
-ref = breve;
+pos = (318,620);
+ref = brevecomb;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_9.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_9.glyph
index b286a015b..25e44b4f7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_9.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_9.glyph
@@ -5,78 +5,84 @@ kernRight = A;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
 pos = (298,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1386;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
 pos = (491,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1630;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
 pos = (325,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1262;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
-pos = (355,620);
-ref = macron;
+pos = (354,620);
+ref = macroncomb;
 }
 );
 width = 1338;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
 pos = (486,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1536;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = A;
 },
 {
 pos = (286,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1134;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_D_.glyph
index 81e6abb04..efe17e8d1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FBD;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_F_.glyph
index a672813d9..0a3ed865b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_B_F_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FBF;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_0.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_0.glyph
index 48bca1eb8..0434e1206 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_0.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_0.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FC0;
 layers = (
 {
@@ -20,7 +19,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-38,122);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 920;
@@ -37,7 +36,7 @@ shapes = (
 {
 alignment = -1;
 pos = (26,122);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 1032;
@@ -54,7 +53,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-62,122);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 856;
@@ -77,7 +76,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-38,122);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 856;
@@ -94,7 +93,7 @@ shapes = (
 {
 alignment = -1;
 pos = (26,122);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 1000;
@@ -111,7 +110,7 @@ shapes = (
 {
 alignment = -1;
 pos = (-62,122);
-ref = tilde;
+ref = tildecomb;
 }
 );
 width = 728;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_D_.glyph
index 5f3f24c78..2d8851096 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FCD;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_D_.tonos.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_D_.tonos.glyph
index e519936dc..a14ddffd1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_D_.tonos.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_D_.tonos.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FCD.tonos;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_E_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_E_.glyph
index e1cd31953..9b432cfb7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_E_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_E_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FCE;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_E_.tonos.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_E_.tonos.glyph
index 21c5e952a..092eeb8aa 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_E_.tonos.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_E_.tonos.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FCE.tonos;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_F_.glyph
index f7b646316..8f513350e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_F_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FCF;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_F_.tonos.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_F_.tonos.glyph
index 0cc8fcfb1..896cc8d2e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_F_.tonos.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_C_F_.tonos.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FCF.tonos;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_0.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_0.glyph
index a18b0e389..42202b19d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_0.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_0.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-225,0);
-ref = breve;
+pos = (-118,186);
+ref = brevecomb;
 }
 );
 width = 544;
@@ -23,8 +23,8 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-179,0);
-ref = breve;
+pos = (-116,186);
+ref = brevecomb;
 }
 );
 width = 736;
@@ -36,8 +36,8 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-195,0);
-ref = breve;
+pos = (-100,186);
+ref = brevecomb;
 }
 );
 width = 442;
@@ -49,8 +49,8 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-218,42);
-ref = breve;
+pos = (-155,248);
+ref = brevecomb;
 }
 );
 width = 480;
@@ -62,8 +62,8 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-172,42);
-ref = breve;
+pos = (-122,248);
+ref = brevecomb;
 }
 );
 width = 702;
@@ -75,8 +75,8 @@ shapes = (
 ref = iota;
 },
 {
-pos = (-246,42);
-ref = breve;
+pos = (-154,248);
+ref = brevecomb;
 }
 );
 width = 314;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_1.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_1.glyph
index 2d1ef1529..e697f64e8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_1.glyph
@@ -5,78 +5,84 @@ kernRight = iotadieresisgreek;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = iota;
 },
 {
 pos = (-222,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 544;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = iota;
 },
 {
 pos = (-53,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 736;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = iota;
 },
 {
 pos = (-149,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 442;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = iota;
 },
 {
-pos = (-171,248);
-ref = macron;
+pos = (-172,248);
+ref = macroncomb;
 }
 );
 width = 480;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = iota;
 },
 {
 pos = (-26,248);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 702;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = iota;
 },
 {
 pos = (-186,248);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 314;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_8.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_8.1.glyph
index 7fbfc5694..cd1658635 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_8.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_8.1.glyph
@@ -9,8 +9,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (55,372);
-ref = breve;
+pos = (162,558);
+ref = brevecomb;
 }
 );
 width = 908;
@@ -22,8 +22,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (72,372);
-ref = breve;
+pos = (135,558);
+ref = brevecomb;
 }
 );
 width = 1032;
@@ -36,7 +36,7 @@ ref = I.1;
 },
 {
 pos = (8,372);
-ref = breve;
+ref = brevecomb;
 }
 );
 width = 716;
@@ -48,8 +48,8 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (62,414);
-ref = breve;
+pos = (125,620);
+ref = brevecomb;
 }
 );
 width = 844;
@@ -62,7 +62,7 @@ ref = I.1;
 },
 {
 pos = (78,414);
-ref = breve;
+ref = brevecomb;
 }
 );
 width = 1000;
@@ -75,7 +75,7 @@ ref = I.1;
 },
 {
 pos = (-61,414);
-ref = breve;
+ref = brevecomb;
 }
 );
 width = 588;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_8.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_8.glyph
index 526fe6c0b..8456dce30 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_8.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_8.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-129,372);
-ref = breve;
+pos = (-22,558);
+ref = brevecomb;
 }
 );
 width = 541;
@@ -23,8 +23,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-148,372);
-ref = breve;
+pos = (-85,558);
+ref = brevecomb;
 }
 );
 width = 598;
@@ -36,8 +36,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-97,372);
-ref = breve;
+pos = (-2,558);
+ref = brevecomb;
 }
 );
 width = 512;
@@ -49,8 +49,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-122,414);
-ref = breve;
+pos = (-59,620);
+ref = brevecomb;
 }
 );
 width = 476;
@@ -62,8 +62,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-140,414);
-ref = breve;
+pos = (-90,620);
+ref = brevecomb;
 }
 );
 width = 576;
@@ -75,8 +75,8 @@ shapes = (
 ref = I;
 },
 {
-pos = (-156,414);
-ref = breve;
+pos = (-64,620);
+ref = brevecomb;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_9.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_9.1.glyph
index befb4c89c..1f4d336c3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_9.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_9.1.glyph
@@ -4,81 +4,93 @@ glyphname = uni1FD9.1;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
 pos = (58,558);
-ref = macron;
+ref = macroncomb;
 }
 );
-width = 908;
+width = 907;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
 pos = (198,558);
-ref = macron;
+ref = macroncomb;
 }
 );
-width = 1032;
+width = 1037;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
 pos = (54,558);
-ref = macron;
+ref = macroncomb;
 }
 );
-width = 716;
+width = 723;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
-pos = (109,620);
-ref = macron;
+pos = (108,620);
+ref = macroncomb;
 }
 );
-width = 844;
+width = 842;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
 pos = (224,620);
-ref = macron;
+ref = macroncomb;
 }
 );
-width = 1000;
+width = 1002;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
+alignment = 1;
 ref = I.1;
 },
 {
 pos = (-1,620);
-ref = macron;
+ref = macroncomb;
 }
 );
-width = 588;
+width = 584;
 }
 );
 unicode = 57383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_9.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_9.glyph
index 8895fc4ac..c9d7865c6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_9.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_9.glyph
@@ -5,78 +5,84 @@ kernRight = Idieresis;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
 pos = (-126,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 541;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
 pos = (-22,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 598;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
 pos = (-51,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 512;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
-pos = (-75,620);
-ref = macron;
+pos = (-76,620);
+ref = macroncomb;
 }
 );
 width = 476;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
 pos = (6,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 576;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = I;
 },
 {
 pos = (-96,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 383;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_D_.glyph
index 6169db761..4d054ce6e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FDD;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_D_.tonos.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_D_.tonos.glyph
index 274f59752..d9e8fadf3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_D_.tonos.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_D_.tonos.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FDD.tonos;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_E_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_E_.glyph
index d9d3c0bfe..7e33b0ee7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_E_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_E_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FDE;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_E_.tonos.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_E_.tonos.glyph
index c4e744146..56da01f7d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_E_.tonos.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_E_.tonos.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FDE.tonos;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_F_.glyph
index 2daa84c20..bb14eb4bf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_F_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FDF;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_F_.tonos.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_F_.tonos.glyph
index d64903ccf..cea1be870 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_F_.tonos.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_D_F_.tonos.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FDF.tonos;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_0.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_0.glyph
index 98f871c8a..09f7b8376 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_0.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_0.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (122,0);
-ref = breve;
+pos = (229,186);
+ref = brevecomb;
 }
 );
 width = 1202;
@@ -23,8 +23,8 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (72,0);
-ref = breve;
+pos = (135,186);
+ref = brevecomb;
 }
 );
 width = 1210;
@@ -36,8 +36,8 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (160,0);
-ref = breve;
+pos = (255,186);
+ref = brevecomb;
 }
 );
 width = 1205;
@@ -49,8 +49,8 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (122,42);
-ref = breve;
+pos = (185,248);
+ref = brevecomb;
 }
 );
 width = 1140;
@@ -62,8 +62,8 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (82,42);
-ref = breve;
+pos = (132,248);
+ref = brevecomb;
 }
 );
 width = 1178;
@@ -75,8 +75,8 @@ shapes = (
 ref = upsilon;
 },
 {
-pos = (110,42);
-ref = breve;
+pos = (202,248);
+ref = brevecomb;
 }
 );
 width = 1078;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_1.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_1.glyph
index 4ccf7b935..650e4da8b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_1.glyph
@@ -5,78 +5,84 @@ kernRight = u;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = upsilon;
 },
 {
 pos = (125,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1202;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = upsilon;
 },
 {
 pos = (198,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1210;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = upsilon;
 },
 {
 pos = (206,186);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1205;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = upsilon;
 },
 {
-pos = (169,248);
-ref = macron;
+pos = (168,248);
+ref = macroncomb;
 }
 );
 width = 1140;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = upsilon;
 },
 {
 pos = (228,248);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1178;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = upsilon;
 },
 {
 pos = (170,248);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1078;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_8.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_8.glyph
index 0c7f72c54..82347115e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_8.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_8.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (283,372);
-ref = breve;
+pos = (390,558);
+ref = brevecomb;
 }
 );
 width = 1362;
@@ -23,8 +23,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (333,372);
-ref = breve;
+pos = (396,558);
+ref = brevecomb;
 }
 );
 width = 1566;
@@ -36,8 +36,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (275,372);
-ref = breve;
+pos = (370,558);
+ref = brevecomb;
 }
 );
 width = 1256;
@@ -49,8 +49,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (288,414);
-ref = breve;
+pos = (351,620);
+ref = brevecomb;
 }
 );
 width = 1298;
@@ -62,8 +62,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (338,414);
-ref = breve;
+pos = (388,620);
+ref = brevecomb;
 }
 );
 width = 1534;
@@ -75,8 +75,8 @@ shapes = (
 ref = Y;
 },
 {
-pos = (222,414);
-ref = breve;
+pos = (314,620);
+ref = brevecomb;
 }
 );
 width = 1128;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_9.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_9.glyph
index 14340fe28..57db6b0fd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_9.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_9.glyph
@@ -5,78 +5,84 @@ kernRight = Y;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
 pos = (286,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1362;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
 pos = (459,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1566;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
 pos = (321,558);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1256;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
-pos = (335,620);
-ref = macron;
+pos = (334,620);
+ref = macroncomb;
 }
 );
 width = 1298;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
 pos = (484,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1534;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = Y;
 },
 {
 pos = (282,620);
-ref = macron;
+ref = macroncomb;
 }
 );
 width = 1128;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_D_.glyph
index 409024cde..6f3844f51 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FED;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_E_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_E_.glyph
index 8e318e60f..7feec4e61 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_E_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_E_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FEE;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_F_.glyph
index b13ce4510..f2495f58e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_F_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FEF;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_F_.tonos.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_F_.tonos.glyph
index 2d90cae58..4fa0ad27e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_F_.tonos.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_E_F_.tonos.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FEF.tonos;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_D_.glyph
index 382157e82..d9d2eff76 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FFD;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_D_.tonos.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_D_.tonos.glyph
index 79e49d290..a701eeff5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_D_.tonos.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_D_.tonos.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FFD.tonos;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_E_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_E_.glyph
index c4189028d..559272957 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_E_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_E_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FFE;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_E_.tonos.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_E_.tonos.glyph
index 2f8ec2331..f664d4757 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_E_.tonos.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_E_.tonos.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni1FFE.tonos;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni20B_0.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni20B_0.glyph
index 6da3498ec..25539757c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni20B_0.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni20B_0.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni20B0;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni20B_6.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni20B_6.glyph
index af60a245b..7fcde792e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni20B_6.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni20B_6.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni20B6;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni20B_7.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni20B_7.glyph
index 2b5ae3bb5..25f2e19eb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni20B_7.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni20B_7.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni20B7;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni20B_B_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni20B_B_.glyph
index 14535cf45..31e8150ce 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni20B_B_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni20B_B_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni20BB;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni20D_B_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni20D_B_.glyph
index 5995e981a..bfdf952a3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni20D_B_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni20D_B_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni20DB;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni20D_C_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni20D_C_.glyph
index 528922faf..0fb3bf076 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni20D_C_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni20D_C_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni20DC;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni20E_8.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni20E_8.glyph
index b07013078..73b304992 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni20E_8.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni20E_8.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni20E8;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni20F_0.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni20F_0.glyph
index 573efee6c..2147134f3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni20F_0.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni20F_0.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni20F0;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni214D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni214D_.glyph
index cc5bd69dd..6364d9fd5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni214D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni214D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni214D;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni214F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni214F_.glyph
index e811fe711..9ff963da6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni214F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni214F_.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uni214F;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni217C_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni217C_.glyph
index 3045f159a..d1dea35b1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni217C_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni217C_.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = uni217C;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni217D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni217D_.glyph
index 096283726..1e3d8c4e7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni217D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni217D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = uni217D;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni217E_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni217E_.glyph
index 2002e634c..06a07767b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni217E_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni217E_.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = uni217E;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni217F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni217F_.glyph
index 0224653c6..8c1b4be39 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni217F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni217F_.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = uni217F;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni2180.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni2180.glyph
index 143a9c528..a948567e3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni2180.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni2180.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = uni2180;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni2181.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni2181.glyph
index 964cdd902..89395dc94 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni2181.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni2181.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = uni2181;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni2182.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni2182.glyph
index 5b880d69d..1a446295f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni2182.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni2182.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = uni2182;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni2185.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni2185.glyph
index 12d2a1b60..36e8a5d07 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni2185.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni2185.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = uni2185;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni2186.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni2186.glyph
index f0171735f..f6628bfc0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni2186.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni2186.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = uni2186;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni2187.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni2187.glyph
index b3892435b..2e06676b8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni2187.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni2187.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = uni2187;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni2188.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni2188.glyph
index 03a5258b5..e9a164c50 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni2188.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni2188.glyph
@@ -1,5 +1,4 @@
 {
-color = (227,245,235,1);
 glyphname = uni2188;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni2D_F_F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni2D_F_F_.glyph
index d8a43d82e..415695121 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni2D_F_F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni2D_F_F_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uni2DFF;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uniA_69F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uniA_69F_.glyph
index c198a4a32..1798d1bf6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uniA_69F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uniA_69F_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uniA69F;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_20.glyph b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_20.glyph
index e409e38b6..c93a79d99 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_20.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_20.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uniFE20;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_21.glyph b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_21.glyph
index 2beb4e621..f7afd3a29 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_21.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_21.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uniFE21;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_22.glyph b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_22.glyph
index ec4eaf4e9..28c5462c9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_22.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_22.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uniFE22;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_23.glyph b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_23.glyph
index 7a2b6e635..97c398beb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_23.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_23.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uniFE23;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_24.glyph b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_24.glyph
index f48bf377a..68e2120d8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_24.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_24.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uniFE24;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_25.glyph b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_25.glyph
index 20c4736ee..9db74564a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_25.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_25.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uniFE25;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_26.glyph b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_26.glyph
index b4ec29941..45aea312d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_26.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_26.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uniFE26;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_27.glyph b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_27.glyph
index fc32c3753..b9b4761f5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_27.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_27.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uniFE27;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_28.glyph b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_28.glyph
index e27e1fa50..01f0a92d6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_28.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_28.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uniFE28;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_29.glyph b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_29.glyph
index 72b80fecd..3722de8df 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_29.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_29.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uniFE29;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_2A_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_2A_.glyph
index 8085b3ae8..85f60a9c8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_2A_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_2A_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uniFE2A;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_2B_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_2B_.glyph
index 0770b7e84..1d2529740 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_2B_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_2B_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uniFE2B;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_2C_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_2C_.glyph
index 42fde0e59..184fc6fd9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_2C_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_2C_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uniFE2C;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_2D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_2D_.glyph
index 7b27de3e9..a3bf9b92c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uniF_E_2D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uniF_E_2D_.glyph
@@ -1,5 +1,4 @@
 {
-color = (250,227,227,1);
 glyphname = uniFE2D;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uogonek.glyph b/src/Inter-Italic.glyphspackage/glyphs/uogonek.glyph
index ef0136e89..4ad10c7f0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uogonek.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uogonek.glyph
@@ -11,7 +11,7 @@ ref = u;
 },
 {
 pos = (597,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1191;
@@ -24,7 +24,7 @@ ref = u;
 },
 {
 pos = (699,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1331;
@@ -37,7 +37,7 @@ ref = u;
 },
 {
 pos = (694,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1165;
@@ -50,7 +50,7 @@ ref = u;
 },
 {
 pos = (608,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1141;
@@ -63,7 +63,7 @@ ref = u;
 },
 {
 pos = (645,0);
-ref = ogonek;
+ref = ogonekcomb;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (664,0);
-ref = ogonek;
+pos = (659,0);
+ref = ogonekcomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/upsilondieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/upsilondieresis.glyph
index f69054f00..ca742ffe6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/upsilondieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/upsilondieresis.glyph
@@ -11,7 +11,7 @@ ref = upsilon;
 },
 {
 pos = (11,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1202;
@@ -24,7 +24,7 @@ ref = upsilon;
 },
 {
 pos = (-51,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1210;
@@ -37,7 +37,7 @@ ref = upsilon;
 },
 {
 pos = (24,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1205;
@@ -50,7 +50,7 @@ ref = upsilon;
 },
 {
 pos = (15,248);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1140;
@@ -63,7 +63,7 @@ ref = upsilon;
 },
 {
 pos = (-37,248);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1178;
@@ -76,7 +76,7 @@ ref = upsilon;
 },
 {
 pos = (20,248);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1078;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uptackmod.glyph b/src/Inter-Italic.glyphspackage/glyphs/uptackmod.glyph
index f20cda93f..42d92cff7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uptackmod.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uptackmod.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = uptackmod;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uring.glyph b/src/Inter-Italic.glyphspackage/glyphs/uring.glyph
index 16690f874..af52d2008 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uring.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uring.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (247,-186);
-ref = ring;
+pos = (292,0);
+ref = ringcomb;
 }
 );
 width = 1191;
@@ -23,8 +23,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (195,-186);
-ref = ring;
+pos = (235,0);
+ref = ringcomb;
 }
 );
 width = 1331;
@@ -36,8 +36,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (305,-186);
-ref = ring;
+pos = (342,0);
+ref = ringcomb;
 }
 );
 width = 1165;
@@ -49,8 +49,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (248,-248);
-ref = ring;
+pos = (282,0);
+ref = ringcomb;
 }
 );
 width = 1141;
@@ -62,8 +62,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (189,-248);
-ref = ring;
+pos = (217,0);
+ref = ringcomb;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (316,-248);
-ref = ring;
+pos = (246,0);
+ref = ringcomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ushortcyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/ushortcyrillic.glyph
index 9e4486717..d256fe50d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ushortcyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ushortcyrillic.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (111,0);
-ref = breve;
+pos = (218,186);
+ref = brevecomb;
 }
 );
 width = 1140;
@@ -23,8 +23,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (105,0);
-ref = breve;
+pos = (168,186);
+ref = brevecomb;
 }
 );
 width = 1240;
@@ -36,8 +36,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (121,0);
-ref = breve;
+pos = (216,186);
+ref = brevecomb;
 }
 );
 width = 1070;
@@ -49,8 +49,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (103,0);
-ref = breve;
+pos = (166,206);
+ref = brevecomb;
 }
 );
 width = 1064;
@@ -62,8 +62,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (102,42);
-ref = breve;
+pos = (152,248);
+ref = brevecomb;
 }
 );
 width = 1192;
@@ -75,8 +75,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (77,0);
-ref = breve;
+pos = (169,206);
+ref = brevecomb;
 }
 );
 width = 976;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/utilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/utilde.glyph
index 645b36432..eca89f129 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/utilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/utilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (54,-186);
-ref = tilde;
+pos = (84,0);
+ref = tildecomb;
 }
 );
 width = 1191;
@@ -23,8 +23,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (124,-186);
-ref = tilde;
+pos = (154,0);
+ref = tildecomb;
 }
 );
 width = 1331;
@@ -36,8 +36,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (41,-186);
-ref = tilde;
+pos = (79,0);
+ref = tildecomb;
 }
 );
 width = 1165;
@@ -49,8 +49,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (57,-206);
-ref = tilde;
+pos = (90,0);
+ref = tildecomb;
 }
 );
 width = 1141;
@@ -62,8 +62,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (103,-206);
-ref = tilde;
+pos = (137,0);
+ref = tildecomb;
 }
 );
 width = 1298;
@@ -75,8 +75,8 @@ shapes = (
 ref = u;
 },
 {
-pos = (57,-206);
-ref = tilde;
+pos = (87,0);
+ref = tildecomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/utildebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/utildebelow.glyph
index 762b112ac..2ba8ee50b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/utildebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/utildebelow.glyph
@@ -11,7 +11,7 @@ ref = u;
 },
 {
 pos = (1220,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1191;
@@ -24,7 +24,7 @@ ref = u;
 },
 {
 pos = (1462,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1331;
@@ -37,7 +37,7 @@ ref = u;
 },
 {
 pos = (1069,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1165;
@@ -50,7 +50,7 @@ ref = u;
 },
 {
 pos = (1226,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1141;
@@ -63,7 +63,7 @@ ref = u;
 },
 {
 pos = (1446,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1298;
@@ -76,7 +76,7 @@ ref = u;
 },
 {
 pos = (1075,0);
-ref = tildesubnosp;
+ref = tildesubcomb;
 }
 );
 width = 1069;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/v.glyph b/src/Inter-Italic.glyphspackage/glyphs/v.glyph
index bdd883848..3ff6a281d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/v.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/v.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = v;
 kernLeft = v;
 kernRight = v;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/versicle.glyph b/src/Inter-Italic.glyphspackage/glyphs/versicle.glyph
index 1b7e3e8a6..b3faee88c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/versicle.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/versicle.glyph
@@ -1,5 +1,4 @@
 {
-color = (204,240,242,1);
 glyphname = versicle;
 layers = (
 {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/vtilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/vtilde.glyph
index 4bc8a0078..eec578764 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/vtilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/vtilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = v;
 },
 {
-pos = (59,0);
-ref = tilde;
+pos = (89,186);
+ref = tildecomb;
 }
 );
 width = 1140;
@@ -23,8 +23,8 @@ shapes = (
 ref = v;
 },
 {
-pos = (109,0);
-ref = tilde;
+pos = (139,186);
+ref = tildecomb;
 }
 );
 width = 1240;
@@ -36,8 +36,8 @@ shapes = (
 ref = v;
 },
 {
-pos = (26,0);
-ref = tilde;
+pos = (64,186);
+ref = tildecomb;
 }
 );
 width = 1068;
@@ -49,8 +49,8 @@ shapes = (
 ref = v;
 },
 {
-pos = (52,0);
-ref = tilde;
+pos = (85,206);
+ref = tildecomb;
 }
 );
 width = 1064;
@@ -62,8 +62,8 @@ shapes = (
 ref = v;
 },
 {
-pos = (83,0);
-ref = tilde;
+pos = (117,206);
+ref = tildecomb;
 }
 );
 width = 1192;
@@ -75,8 +75,8 @@ shapes = (
 ref = v;
 },
 {
-pos = (45,0);
-ref = tilde;
+pos = (75,206);
+ref = tildecomb;
 }
 );
 width = 977;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/w.glyph b/src/Inter-Italic.glyphspackage/glyphs/w.glyph
index e44bd822c..a776b8531 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/w.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/w.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = w;
 kernLeft = w;
 kernRight = w;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/wacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/wacute.glyph
index 593a14031..fc3b5e21c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/wacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/wacute.glyph
@@ -5,78 +5,84 @@ kernRight = w;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = w;
 },
 {
-pos = (617,186);
-ref = acute;
+pos = (737,186);
+ref = acutecomb;
 }
 );
 width = 1664;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = w;
 },
 {
-pos = (622,186);
-ref = acute;
+pos = (752,186);
+ref = acutecomb;
 }
 );
 width = 1792;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = w;
 },
 {
-pos = (625,186);
-ref = acute;
+pos = (765,186);
+ref = acutecomb;
 }
 );
 width = 1618;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = w;
 },
 {
-pos = (632,206);
-ref = acute;
+pos = (672,206);
+ref = acutecomb;
 }
 );
 width = 1524;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = w;
 },
 {
-pos = (689,206);
-ref = acute;
+pos = (713,206);
+ref = acutecomb;
 }
 );
 width = 1744;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = w;
 },
 {
-pos = (647,206);
-ref = acute;
+pos = (707,206);
+ref = acutecomb;
 }
 );
 width = 1488;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/wcircumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/wcircumflex.glyph
index b07483cf6..ab78e0f36 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/wcircumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/wcircumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (366,0);
-ref = circumflex;
+pos = (445,186);
+ref = circumflexcomb;
 }
 );
 width = 1664;
@@ -23,8 +23,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (248,0);
-ref = circumflex;
+pos = (414,186);
+ref = circumflexcomb;
 }
 );
 width = 1792;
@@ -36,8 +36,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (375,0);
-ref = circumflex;
+pos = (405,186);
+ref = circumflexcomb;
 }
 );
 width = 1618;
@@ -49,8 +49,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (330,0);
-ref = circumflex;
+pos = (396,206);
+ref = circumflexcomb;
 }
 );
 width = 1524;
@@ -62,8 +62,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (242,0);
-ref = circumflex;
+pos = (475,206);
+ref = circumflexcomb;
 }
 );
 width = 1744;
@@ -75,8 +75,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (384,0);
-ref = circumflex;
+pos = (425,206);
+ref = circumflexcomb;
 }
 );
 width = 1488;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/wdieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/wdieresis.glyph
index 28884a2d8..4b19f6023 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/wdieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/wdieresis.glyph
@@ -11,7 +11,7 @@ ref = w;
 },
 {
 pos = (260,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1664;
@@ -25,7 +25,7 @@ ref = w;
 {
 alignment = 1;
 pos = (260,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1792;
@@ -39,7 +39,7 @@ ref = w;
 {
 alignment = 1;
 pos = (255,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1618;
@@ -52,7 +52,7 @@ ref = w;
 },
 {
 pos = (227,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1524;
@@ -66,7 +66,7 @@ ref = w;
 {
 alignment = 1;
 pos = (257,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1744;
@@ -80,7 +80,7 @@ ref = w;
 {
 alignment = 1;
 pos = (243,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1488;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/wdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/wdotaccent.glyph
index 0ad2c50a8..b93056b2c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/wdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/wdotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (586,0);
-ref = dotaccent;
+pos = (617,186);
+ref = dotaccentcomb;
 }
 );
 width = 1664;
@@ -25,8 +25,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (560,0);
-ref = dotaccent;
+pos = (591,186);
+ref = dotaccentcomb;
 }
 );
 width = 1792;
@@ -39,8 +39,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (620,0);
-ref = dotaccent;
+pos = (651,186);
+ref = dotaccentcomb;
 }
 );
 width = 1618;
@@ -53,8 +53,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (550,0);
-ref = dotaccent;
+pos = (584,206);
+ref = dotaccentcomb;
 }
 );
 width = 1524;
@@ -67,8 +67,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (552,0);
-ref = dotaccent;
+pos = (586,206);
+ref = dotaccentcomb;
 }
 );
 width = 1744;
@@ -81,8 +81,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (627,0);
-ref = dotaccent;
+pos = (655,206);
+ref = dotaccentcomb;
 }
 );
 width = 1488;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/wgrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/wgrave.glyph
index 2e3682f7d..1f2ad9fa5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/wgrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/wgrave.glyph
@@ -11,7 +11,7 @@ ref = w;
 },
 {
 pos = (452,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1664;
@@ -24,7 +24,7 @@ ref = w;
 },
 {
 pos = (408,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1792;
@@ -37,7 +37,7 @@ ref = w;
 },
 {
 pos = (473,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1618;
@@ -50,7 +50,7 @@ ref = w;
 },
 {
 pos = (467,206);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1524;
@@ -63,7 +63,7 @@ ref = w;
 },
 {
 pos = (426,206);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1744;
@@ -75,8 +75,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (452,206);
-ref = grave;
+pos = (456,206);
+ref = gravecomb;
 }
 );
 width = 1488;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/wring.glyph b/src/Inter-Italic.glyphspackage/glyphs/wring.glyph
index 4796663c2..3805fbb1a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/wring.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/wring.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (512,0);
-ref = ring;
+pos = (557,186);
+ref = ringcomb;
 }
 );
 width = 1664;
@@ -23,8 +23,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (454,0);
-ref = ring;
+pos = (494,186);
+ref = ringcomb;
 }
 );
 width = 1792;
@@ -36,8 +36,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (560,0);
-ref = ring;
+pos = (597,186);
+ref = ringcomb;
 }
 );
 width = 1618;
@@ -49,8 +49,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (474,-42);
-ref = ring;
+pos = (508,206);
+ref = ringcomb;
 }
 );
 width = 1524;
@@ -62,8 +62,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (446,-42);
-ref = ring;
+pos = (474,206);
+ref = ringcomb;
 }
 );
 width = 1744;
@@ -75,8 +75,8 @@ shapes = (
 ref = w;
 },
 {
-pos = (559,-42);
-ref = ring;
+pos = (489,206);
+ref = ringcomb;
 }
 );
 width = 1488;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/x.glyph b/src/Inter-Italic.glyphspackage/glyphs/x.glyph
index 34fc777c6..325368415 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/x.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/x.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = x;
 kernLeft = x;
 kernRight = x;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/xdieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/xdieresis.glyph
index 4218ab994..483f3bc21 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/xdieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/xdieresis.glyph
@@ -11,7 +11,7 @@ ref = x;
 },
 {
 pos = (-18,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1107;
@@ -24,7 +24,7 @@ ref = x;
 },
 {
 pos = (-25,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1222;
@@ -37,7 +37,7 @@ ref = x;
 },
 {
 pos = (-39,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1025;
@@ -50,7 +50,7 @@ ref = x;
 },
 {
 pos = (-15,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1043;
@@ -63,7 +63,7 @@ ref = x;
 },
 {
 pos = (-27,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1176;
@@ -76,7 +76,7 @@ ref = x;
 },
 {
 pos = (-50,248);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 897;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/xdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/xdotaccent.glyph
index 4918549df..02cf53a55 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/xdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/xdotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = x;
 },
 {
-pos = (308,0);
-ref = dotaccent;
+pos = (339,186);
+ref = dotaccentcomb;
 }
 );
 width = 1107;
@@ -25,8 +25,8 @@ shapes = (
 ref = x;
 },
 {
-pos = (275,0);
-ref = dotaccent;
+pos = (306,186);
+ref = dotaccentcomb;
 }
 );
 width = 1222;
@@ -39,8 +39,8 @@ shapes = (
 ref = x;
 },
 {
-pos = (326,0);
-ref = dotaccent;
+pos = (357,186);
+ref = dotaccentcomb;
 }
 );
 width = 1025;
@@ -53,8 +53,8 @@ shapes = (
 ref = x;
 },
 {
-pos = (308,0);
-ref = dotaccent;
+pos = (342,206);
+ref = dotaccentcomb;
 }
 );
 width = 1043;
@@ -67,8 +67,8 @@ shapes = (
 ref = x;
 },
 {
-pos = (268,0);
-ref = dotaccent;
+pos = (302,206);
+ref = dotaccentcomb;
 }
 );
 width = 1176;
@@ -81,8 +81,8 @@ shapes = (
 ref = x;
 },
 {
-pos = (334,42);
-ref = dotaccent;
+pos = (362,248);
+ref = dotaccentcomb;
 }
 );
 width = 897;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/xsupnosp.glyph b/src/Inter-Italic.glyphspackage/glyphs/xsupcomb.glyph
index 2bdc6f9ff..eb75bd578 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/xsupnosp.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/xsupcomb.glyph
@@ -1,6 +1,5 @@
 {
-color = (250,227,227,1);
-glyphname = xsupnosp;
+glyphname = xsupcomb;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -147,5 +146,4 @@ nodes = (
 width = 0;
 }
 );
-unicode = 829;
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/y.glyph b/src/Inter-Italic.glyphspackage/glyphs/y.glyph
index eb043abc5..3f7208be0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/y.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/y.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = y;
 kernLeft = v;
 kernRight = v;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/yacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/yacute.glyph
index 87f68f243..d59b5cfbd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/yacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/yacute.glyph
@@ -5,78 +5,84 @@ kernRight = v;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
-pos = (357,186);
-ref = acute;
+pos = (477,186);
+ref = acutecomb;
 }
 );
 width = 1140;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
-pos = (344,186);
-ref = acute;
+pos = (474,186);
+ref = acutecomb;
 }
 );
 width = 1240;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
-pos = (355,186);
-ref = acute;
+pos = (495,186);
+ref = acutecomb;
 }
 );
 width = 1070;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
-pos = (401,206);
-ref = acute;
+pos = (441,206);
+ref = acutecomb;
 }
 );
 width = 1064;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
-pos = (415,248);
-ref = acute;
+pos = (439,248);
+ref = acutecomb;
 }
 );
 width = 1192;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = y;
 },
 {
-pos = (391,206);
-ref = acute;
+pos = (451,206);
+ref = acutecomb;
 }
 );
 width = 976;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ycircumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/ycircumflex.glyph
index 8080c02f2..035254db7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ycircumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ycircumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (106,0);
-ref = circumflex;
+pos = (185,186);
+ref = circumflexcomb;
 }
 );
 width = 1140;
@@ -23,8 +23,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (-30,0);
-ref = circumflex;
+pos = (136,186);
+ref = circumflexcomb;
 }
 );
 width = 1240;
@@ -36,8 +36,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (105,0);
-ref = circumflex;
+pos = (135,186);
+ref = circumflexcomb;
 }
 );
 width = 1070;
@@ -49,8 +49,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (99,0);
-ref = circumflex;
+pos = (165,206);
+ref = circumflexcomb;
 }
 );
 width = 1064;
@@ -62,8 +62,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (-32,42);
-ref = circumflex;
+pos = (201,248);
+ref = circumflexcomb;
 }
 );
 width = 1192;
@@ -75,8 +75,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (128,0);
-ref = circumflex;
+pos = (169,206);
+ref = circumflexcomb;
 }
 );
 width = 976;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ydieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/ydieresis.glyph
index 3edc15f9d..3cfb643d3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ydieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ydieresis.glyph
@@ -11,7 +11,7 @@ ref = y;
 },
 {
 pos = (0,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1140;
@@ -24,7 +24,7 @@ ref = y;
 },
 {
 pos = (-18,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1240;
@@ -37,7 +37,7 @@ ref = y;
 },
 {
 pos = (-15,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1070;
@@ -50,7 +50,7 @@ ref = y;
 },
 {
 pos = (-4,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1064;
@@ -63,7 +63,7 @@ ref = y;
 },
 {
 pos = (-17,248);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1192;
@@ -76,7 +76,7 @@ ref = y;
 },
 {
 pos = (-13,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 976;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ydotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/ydotaccent.glyph
index fe77a3b25..5a75f1d1a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ydotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ydotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (326,0);
-ref = dotaccent;
+pos = (357,186);
+ref = dotaccentcomb;
 }
 );
 width = 1140;
@@ -25,8 +25,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (282,0);
-ref = dotaccent;
+pos = (313,186);
+ref = dotaccentcomb;
 }
 );
 width = 1240;
@@ -39,8 +39,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (350,0);
-ref = dotaccent;
+pos = (381,186);
+ref = dotaccentcomb;
 }
 );
 width = 1070;
@@ -53,8 +53,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (319,0);
-ref = dotaccent;
+pos = (353,206);
+ref = dotaccentcomb;
 }
 );
 width = 1064;
@@ -67,8 +67,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (278,42);
-ref = dotaccent;
+pos = (312,248);
+ref = dotaccentcomb;
 }
 );
 width = 1192;
@@ -81,8 +81,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (371,0);
-ref = dotaccent;
+pos = (399,206);
+ref = dotaccentcomb;
 }
 );
 width = 976;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/yerudieresiscyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/yerudieresiscyrillic.glyph
index 62c599828..c29a93e32 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/yerudieresiscyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/yerudieresiscyrillic.glyph
@@ -12,7 +12,7 @@ ref = yericyrillic;
 },
 {
 pos = (178,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1499;
@@ -26,7 +26,7 @@ ref = yericyrillic;
 },
 {
 pos = (252,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1775;
@@ -40,7 +40,7 @@ ref = yericyrillic;
 },
 {
 pos = (87,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1279;
@@ -54,7 +54,7 @@ ref = yericyrillic;
 },
 {
 pos = (163,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1399;
@@ -68,7 +68,7 @@ ref = yericyrillic;
 },
 {
 pos = (193,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1619;
@@ -82,7 +82,7 @@ ref = yericyrillic;
 },
 {
 pos = (47,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1107;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ygrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/ygrave.glyph
index 15115e49b..72e26aecd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ygrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ygrave.glyph
@@ -11,7 +11,7 @@ ref = y;
 },
 {
 pos = (192,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1140;
@@ -24,7 +24,7 @@ ref = y;
 },
 {
 pos = (130,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1240;
@@ -37,7 +37,7 @@ ref = y;
 },
 {
 pos = (203,186);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1070;
@@ -50,7 +50,7 @@ ref = y;
 },
 {
 pos = (236,206);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1064;
@@ -63,7 +63,7 @@ ref = y;
 },
 {
 pos = (152,248);
-ref = grave;
+ref = gravecomb;
 }
 );
 width = 1192;
@@ -75,8 +75,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (196,206);
-ref = grave;
+pos = (200,206);
+ref = gravecomb;
 }
 );
 width = 976;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/yhookabove.glyph b/src/Inter-Italic.glyphspackage/glyphs/yhookabove.glyph
index 38e5e7d52..fcc899f9d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/yhookabove.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/yhookabove.glyph
@@ -11,7 +11,7 @@ ref = y;
 },
 {
 pos = (337,186);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1140;
@@ -24,7 +24,7 @@ ref = y;
 },
 {
 pos = (334,186);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1240;
@@ -37,7 +37,7 @@ ref = y;
 },
 {
 pos = (347,186);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1070;
@@ -50,7 +50,7 @@ ref = y;
 },
 {
 pos = (301,206);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1064;
@@ -63,7 +63,7 @@ ref = y;
 },
 {
 pos = (309,248);
-ref = hookabove;
+ref = hookabovecomb;
 }
 );
 width = 1192;
@@ -75,8 +75,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (303,206);
-ref = hookabove;
+pos = (297,206);
+ref = hookabovecomb;
 }
 );
 width = 976;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/yring.glyph b/src/Inter-Italic.glyphspackage/glyphs/yring.glyph
index 7ecc17f85..2cc33bd1c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/yring.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/yring.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (252,0);
-ref = ring;
+pos = (297,186);
+ref = ringcomb;
 }
 );
 width = 1140;
@@ -23,8 +23,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (176,0);
-ref = ring;
+pos = (216,186);
+ref = ringcomb;
 }
 );
 width = 1240;
@@ -36,8 +36,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (290,0);
-ref = ring;
+pos = (327,186);
+ref = ringcomb;
 }
 );
 width = 1070;
@@ -49,8 +49,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (243,-42);
-ref = ring;
+pos = (277,206);
+ref = ringcomb;
 }
 );
 width = 1064;
@@ -62,8 +62,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (172,0);
-ref = ring;
+pos = (200,248);
+ref = ringcomb;
 }
 );
 width = 1192;
@@ -75,8 +75,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (303,-42);
-ref = ring;
+pos = (233,206);
+ref = ringcomb;
 }
 );
 width = 976;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ytilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/ytilde.glyph
index 2487da3d5..b4b63245c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ytilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ytilde.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (59,0);
-ref = tilde;
+pos = (89,186);
+ref = tildecomb;
 }
 );
 width = 1140;
@@ -23,8 +23,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (105,0);
-ref = tilde;
+pos = (135,186);
+ref = tildecomb;
 }
 );
 width = 1240;
@@ -36,8 +36,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (26,0);
-ref = tilde;
+pos = (64,186);
+ref = tildecomb;
 }
 );
 width = 1070;
@@ -49,8 +49,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (52,0);
-ref = tilde;
+pos = (85,206);
+ref = tildecomb;
 }
 );
 width = 1064;
@@ -62,8 +62,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (86,42);
-ref = tilde;
+pos = (120,248);
+ref = tildecomb;
 }
 );
 width = 1192;
@@ -75,8 +75,8 @@ shapes = (
 ref = y;
 },
 {
-pos = (44,0);
-ref = tilde;
+pos = (74,206);
+ref = tildecomb;
 }
 );
 width = 976;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/z.glyph b/src/Inter-Italic.glyphspackage/glyphs/z.glyph
index c74beeec2..11c9a22d5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/z.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/z.glyph
@@ -1,5 +1,4 @@
 {
-color = (219,235,247,1);
 glyphname = z;
 kernLeft = z;
 kernRight = z;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/zacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/zacute.glyph
index 717e4fa31..2bf650d5c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/zacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/zacute.glyph
@@ -5,78 +5,84 @@ kernRight = z;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = z;
 },
 {
-pos = (338,186);
-ref = acute;
+pos = (458,186);
+ref = acutecomb;
 }
 );
 width = 1126;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = z;
 },
 {
-pos = (333,186);
-ref = acute;
+pos = (463,186);
+ref = acutecomb;
 }
 );
 width = 1208;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = z;
 },
 {
-pos = (338,186);
-ref = acute;
+pos = (478,186);
+ref = acutecomb;
 }
 );
 width = 1072;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = z;
 },
 {
-pos = (358,206);
-ref = acute;
+pos = (398,206);
+ref = acutecomb;
 }
 );
 width = 980;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = z;
 },
 {
-pos = (389,206);
-ref = acute;
+pos = (413,206);
+ref = acutecomb;
 }
 );
 width = 1148;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = z;
 },
 {
-pos = (363,206);
-ref = acute;
+pos = (423,206);
+ref = acutecomb;
 }
 );
 width = 915;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/zcaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/zcaron.glyph
index 31b63bed4..5b7ee191c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/zcaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/zcaron.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (85,0);
-ref = caron;
+pos = (166,186);
+ref = caroncomb;
 }
 );
 width = 1126;
@@ -23,8 +23,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (-40,0);
-ref = caron;
+pos = (125,186);
+ref = caroncomb;
 }
 );
 width = 1208;
@@ -36,8 +36,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (92,16);
-ref = caron;
+pos = (119,186);
+ref = caroncomb;
 }
 );
 width = 1072;
@@ -49,8 +49,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (54,0);
-ref = caron;
+pos = (123,206);
+ref = caroncomb;
 }
 );
 width = 980;
@@ -62,8 +62,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (-57,0);
-ref = caron;
+pos = (174,206);
+ref = caroncomb;
 }
 );
 width = 1148;
@@ -75,8 +75,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (97,0);
-ref = caron;
+pos = (142,206);
+ref = caroncomb;
 }
 );
 width = 915;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/zcircumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/zcircumflex.glyph
index 61819dfa7..b55a39124 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/zcircumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/zcircumflex.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (87,0);
-ref = circumflex;
+pos = (166,186);
+ref = circumflexcomb;
 }
 );
 width = 1126;
@@ -23,8 +23,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (-41,0);
-ref = circumflex;
+pos = (125,186);
+ref = circumflexcomb;
 }
 );
 width = 1208;
@@ -36,8 +36,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (88,0);
-ref = circumflex;
+pos = (118,186);
+ref = circumflexcomb;
 }
 );
 width = 1072;
@@ -49,8 +49,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (56,0);
-ref = circumflex;
+pos = (122,206);
+ref = circumflexcomb;
 }
 );
 width = 980;
@@ -62,8 +62,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (-58,0);
-ref = circumflex;
+pos = (175,206);
+ref = circumflexcomb;
 }
 );
 width = 1148;
@@ -75,8 +75,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (100,0);
-ref = circumflex;
+pos = (141,206);
+ref = circumflexcomb;
 }
 );
 width = 915;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/zdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/zdotaccent.glyph
index 271b3080b..ec2da409a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/zdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/zdotaccent.glyph
@@ -11,8 +11,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (307,0);
-ref = dotaccent;
+pos = (338,186);
+ref = dotaccentcomb;
 }
 );
 width = 1126;
@@ -25,8 +25,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (271,0);
-ref = dotaccent;
+pos = (302,186);
+ref = dotaccentcomb;
 }
 );
 width = 1208;
@@ -39,8 +39,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (333,0);
-ref = dotaccent;
+pos = (364,186);
+ref = dotaccentcomb;
 }
 );
 width = 1072;
@@ -53,8 +53,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (276,0);
-ref = dotaccent;
+pos = (310,206);
+ref = dotaccentcomb;
 }
 );
 width = 980;
@@ -67,8 +67,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (252,0);
-ref = dotaccent;
+pos = (286,206);
+ref = dotaccentcomb;
 }
 );
 width = 1148;
@@ -81,8 +81,8 @@ shapes = (
 ref = z;
 },
 {
-pos = (343,0);
-ref = dotaccent;
+pos = (371,206);
+ref = dotaccentcomb;
 }
 );
 width = 915;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/zedescendercyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/zedescendercyrillic.glyph
index ae5f89851..13ef2fadd 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/zedescendercyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/zedescendercyrillic.glyph
@@ -9,7 +9,7 @@ ref = zecyrillic;
 },
 {
 pos = (242,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1040;
@@ -22,7 +22,7 @@ ref = zecyrillic;
 },
 {
 pos = (101,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1116;
@@ -35,7 +35,7 @@ ref = zecyrillic;
 },
 {
 pos = (282,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 996;
@@ -48,7 +48,7 @@ ref = zecyrillic;
 },
 {
 pos = (236,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 957;
@@ -61,7 +61,7 @@ ref = zecyrillic;
 },
 {
 pos = (112,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 1091;
@@ -74,7 +74,7 @@ ref = zecyrillic;
 },
 {
 pos = (299,0);
-ref = cedilla;
+ref = cedillacomb;
 }
 );
 width = 900;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/zedieresiscyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/zedieresiscyrillic.glyph
index f652974ac..09062dd6e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/zedieresiscyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/zedieresiscyrillic.glyph
@@ -9,7 +9,7 @@ ref = zecyrillic;
 },
 {
 pos = (-50,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1040;
@@ -22,7 +22,7 @@ ref = zecyrillic;
 },
 {
 pos = (-77,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1116;
@@ -35,7 +35,7 @@ ref = zecyrillic;
 },
 {
 pos = (-55,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 996;
@@ -48,7 +48,7 @@ ref = zecyrillic;
 },
 {
 pos = (-58,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 957;
@@ -61,7 +61,7 @@ ref = zecyrillic;
 },
 {
 pos = (-68,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1091;
@@ -74,7 +74,7 @@ ref = zecyrillic;
 },
 {
 pos = (-56,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 900;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/zhebrevecyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/zhebrevecyrillic.glyph
index 1ba15aec2..56d0afda0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/zhebrevecyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/zhebrevecyrillic.glyph
@@ -9,8 +9,8 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (386,0);
-ref = breve;
+pos = (493,186);
+ref = brevecomb;
 }
 );
 width = 1692;
@@ -23,8 +23,8 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (424,0);
-ref = breve;
+pos = (487,186);
+ref = brevecomb;
 }
 );
 width = 1871;
@@ -37,8 +37,8 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (389,0);
-ref = breve;
+pos = (484,186);
+ref = brevecomb;
 }
 );
 width = 1610;
@@ -51,8 +51,8 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (390,0);
-ref = breve;
+pos = (453,206);
+ref = brevecomb;
 }
 );
 width = 1638;
@@ -65,8 +65,8 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (422,0);
-ref = breve;
+pos = (472,206);
+ref = brevecomb;
 }
 );
 width = 1837;
@@ -79,8 +79,8 @@ shapes = (
 ref = zhecyrillic;
 },
 {
-pos = (333,42);
-ref = breve;
+pos = (425,248);
+ref = brevecomb;
 }
 );
 width = 1483;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/zhedieresiscyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/zhedieresiscyrillic.glyph
index 515d1d192..b93180fee 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/zhedieresiscyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/zhedieresiscyrillic.glyph
@@ -10,7 +10,7 @@ ref = zhecyrillic;
 },
 {
 pos = (275,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1692;
@@ -24,7 +24,7 @@ ref = zhecyrillic;
 },
 {
 pos = (301,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1871;
@@ -38,7 +38,7 @@ ref = zhecyrillic;
 },
 {
 pos = (253,186);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1610;
@@ -52,7 +52,7 @@ ref = zhecyrillic;
 },
 {
 pos = (283,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1638;
@@ -66,7 +66,7 @@ ref = zhecyrillic;
 },
 {
 pos = (303,206);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1837;
@@ -80,7 +80,7 @@ ref = zhecyrillic;
 },
 {
 pos = (243,248);
-ref = dieresis;
+ref = dieresiscomb;
 }
 );
 width = 1483;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/zlinebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/zlinebelow.glyph
index 5c161b21c..c2d94d83b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/zlinebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/zlinebelow.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (73,0);
+pos = (74,0);
 ref = macronsub;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (191,0);
+pos = (190,0);
 ref = macronsub;
 }
 );