improvements to rtophorn glyphs like /ohorn /uhorn /Ohorn

32 files changed, 612 insertions, 635 deletions

diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_.glyph
index 6cd68eb36..df15ab04f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_.glyph
@@ -28,7 +28,7 @@ pos = (951,1676);
 },
 {
 name = tophorn;
-pos = (1297,1295);
+pos = (924,1510);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -95,7 +95,7 @@ pos = (887,1676);
 },
 {
 name = tophorn;
-pos = (1233,1295);
+pos = (860,1510);
 }
 );
 layerId = m012;
@@ -162,7 +162,7 @@ pos = (966,1676);
 },
 {
 name = tophorn;
-pos = (1270,1186);
+pos = (939,1510);
 }
 );
 guides = (
@@ -313,7 +313,7 @@ pos = (958,1676);
 },
 {
 name = tophorn;
-pos = (1278,1186);
+pos = (931,1514);
 }
 );
 guides = (
@@ -464,7 +464,7 @@ pos = (999,1676);
 },
 {
 name = tophorn;
-pos = (1396,1056);
+pos = (972,1510);
 }
 );
 guides = (
@@ -616,7 +616,7 @@ pos = (955,1676);
 },
 {
 name = tophorn;
-pos = (1351,1056);
+pos = (928,1514);
 }
 );
 guides = (
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_horn.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_horn.glyph
index aa75e18ca..019a28384 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_horn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_horn.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (954,68);
-ref = _part.otophorn;
+pos = (234,378);
+ref = _part.rtophorn.o;
 }
 );
 width = 1560;
@@ -29,8 +29,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1092,0);
-ref = _part.otophorn;
+pos = (238,378);
+ref = _part.rtophorn.o;
 }
 );
 width = 1628;
@@ -42,8 +42,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (951,239);
-ref = _part.otophorn;
+pos = (234,376);
+ref = _part.rtophorn.o;
 }
 );
 width = 1530;
@@ -55,8 +55,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (968,130);
-ref = _part.otophorn;
+pos = (277,434);
+ref = _part.rtophorn.o;
 }
 );
 width = 1534;
@@ -74,8 +74,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1042,0);
-ref = _part.otophorn;
+pos = (214,434);
+ref = _part.rtophorn.o;
 }
 );
 width = 1528;
@@ -87,8 +87,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (887,239);
-ref = _part.otophorn;
+pos = (234,376);
+ref = _part.rtophorn.o;
 }
 );
 width = 1402;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/U_horn.glyph b/src/Inter-Italic.glyphspackage/glyphs/U_horn.glyph
index 02fbec55b..2905328bc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/U_horn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/U_horn.glyph
@@ -61,7 +61,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (998,0);
+pos = (997,0);
 ref = _part.rtophorn;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (876,0);
+pos = (875,0);
 ref = _part.rtophorn;
 }
 );
@@ -88,7 +88,7 @@ shapes = (
 ref = U;
 },
 {
-pos = (1059,0);
+pos = (1058,0);
 ref = _part.rtophorn;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.otophorn.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.otophorn.glyph
deleted file mode 100644
index 931e4aa22..000000000
--- a/src/Inter-Italic.glyphspackage/glyphs/_part.otophorn.glyph
+++ /dev/null
@@ -1,174 +0,0 @@
-{
-export = 0;
-glyphname = _part.otophorn;
-layers = (
-{
-anchors = (
-{
-name = _tophorn;
-pos = (346,1056);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(523,1099,o),
-(596,1180,o),
-(625,1356,c),
-(580,1363,l),
-(554,1205,o),
-(494,1139,o),
-(335,1101,c),
-(346,1056,l)
-);
-}
-);
-};
-layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
-shapes = (
-{
-closed = 1;
-nodes = (
-(526,1101,o),
-(598,1180,o),
-(626,1363,c),
-(580,1363,l),
-(554,1205,o),
-(494,1139,o),
-(335,1101,c),
-(346,1056,l)
-);
-}
-);
-width = 718;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (346,1056);
-}
-);
-layerId = m012;
-shapes = (
-{
-closed = 1;
-nodes = (
-(526,1101,o),
-(598,1180,o),
-(626,1363,c),
-(580,1363,l),
-(554,1205,o),
-(494,1139,o),
-(335,1101,c),
-(346,1056,l)
-);
-}
-);
-width = 718;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (316,1118);
-}
-);
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
-shapes = (
-{
-closed = 1;
-nodes = (
-(575,1118,o),
-(730,1267,o),
-(774,1530,c),
-(602,1530,l),
-(574,1360,o),
-(491,1262,o),
-(339,1262,c),
-(316,1118,l)
-);
-}
-);
-width = 832;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (310,1056);
-}
-);
-layerId = m008;
-shapes = (
-{
-closed = 1;
-nodes = (
-(569,1056,o),
-(725,1205,o),
-(769,1468,c),
-(597,1468,l),
-(568,1298,o),
-(486,1200,o),
-(334,1200,c),
-(310,1056,l)
-);
-}
-);
-width = 832;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (304,1056);
-}
-);
-layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
-shapes = (
-{
-closed = 1;
-nodes = (
-(575,1056,o),
-(715,1230,o),
-(764,1526,c),
-(546,1526,l),
-(515,1338,o),
-(468,1228,o),
-(333,1228,c),
-(304,1056,l)
-);
-}
-);
-width = 864;
-},
-{
-anchors = (
-{
-name = _tophorn;
-pos = (309,1056);
-}
-);
-layerId = m010;
-shapes = (
-{
-closed = 1;
-nodes = (
-(580,1056,o),
-(720,1230,o),
-(769,1526,c),
-(551,1526,l),
-(520,1338,o),
-(473,1228,o),
-(338,1228,c),
-(309,1056,l)
-);
-}
-);
-width = 864;
-}
-);
-note = "Custom italic design";
-}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.rtophorn.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.rtophorn.glyph
index ce38c6f3a..831d58ca9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/_part.rtophorn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/_part.rtophorn.glyph
@@ -10,22 +10,23 @@ pos = (352,1490);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(542,1444,o),
-(638,1541,o),
-(675,1764,c),
-(630,1772,l),
+(539,1446,o),
+(638,1546,o),
+(673,1756,c),
+(627,1756,l),
 (596,1569,o),
 (518,1490,o),
 (352,1490,c),
-(352,1444,l)
+(345,1446,l)
 );
 }
 );
-width = 664;
+width = 666;
 },
 {
 anchors = (
@@ -35,47 +36,49 @@ pos = (282,1490);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(564,1368,o),
-(731,1521,o),
-(773,1776,c),
-(605,1776,l),
-(573,1582,o),
-(472,1490,o),
+(538,1395,o),
+(686,1538,o),
+(725,1776,c),
+(565,1776,l),
+(532,1579,o),
+(445,1490,o),
 (282,1490,c),
-(327,1368,l)
+(331,1395,l)
 );
 }
 );
-width = 778;
+width = 720;
 },
 {
 anchors = (
 {
 name = _rtophorn;
-pos = (287,1490);
+pos = (288,1490);
 }
 );
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(569,1368,o),
-(736,1521,o),
-(779,1776,c),
-(611,1776,l),
-(578,1582,o),
-(477,1490,o),
-(287,1490,c),
-(332,1368,l)
+(525,1367,o),
+(693,1502,o),
+(738,1776,c),
+(571,1776,l),
+(538,1579,o),
+(451,1490,o),
+(288,1490,c),
+(267,1367,l)
 );
 }
 );
-width = 713;
+width = 720;
 },
 {
 anchors = (
@@ -85,72 +88,75 @@ pos = (256,1490);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
 (635,1304,o),
-(846,1471,o),
-(904,1776,c),
-(605,1776,l),
-(563,1570,o),
+(842,1451,o),
+(901,1756,c),
+(602,1756,l),
+(560,1550,o),
 (473,1490,o),
 (256,1490,c),
 (316,1304,l)
 );
 }
 );
-width = 808;
+width = 809;
 },
 {
 anchors = (
 {
 name = _rtophorn;
-pos = (245,1490);
+pos = (246,1490);
 }
 );
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(624,1304,o),
-(835,1471,o),
-(894,1776,c),
-(595,1776,l),
-(553,1570,o),
-(462,1490,o),
-(245,1490,c),
-(305,1304,l)
+(571,1288,o),
+(871,1393,o),
+(934,1778,c),
+(595,1778,l),
+(561,1572,o),
+(463,1490,o),
+(246,1490,c),
+(212,1288,l)
 );
 }
 );
-width = 774;
+width = 777;
 },
 {
 anchors = (
 {
 name = _rtophorn;
-pos = (288,1490);
+pos = (289,1490);
 }
 );
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(478,1444,o),
-(574,1541,o),
-(611,1764,c),
-(566,1772,l),
-(532,1569,o),
-(454,1490,o),
-(288,1490,c),
-(288,1444,l)
+(475,1446,o),
+(575,1546,o),
+(610,1756,c),
+(564,1756,l),
+(533,1569,o),
+(455,1490,o),
+(289,1490,c),
+(281,1446,l)
 );
 }
 );
-width = 536;
+width = 539;
 }
 );
 }
diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.rtophorn.o.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.rtophorn.o.glyph
new file mode 100644
index 000000000..3aeae8011
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/_part.rtophorn.o.glyph
@@ -0,0 +1,215 @@
+{
+export = 0;
+glyphname = _part.rtophorn.o;
+layers = (
+{
+anchors = (
+{
+name = _tophorn;
+pos = (690,1134);
+}
+);
+background = {
+shapes = (
+{
+pos = (1,0);
+ref = o;
+}
+);
+};
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(980,1090,o),
+(1158,1171,o),
+(1196,1400,c),
+(1150,1400,l),
+(1116,1197,o),
+(960,1134,o),
+(690,1134,c),
+(682,1090,l)
+);
+}
+);
+width = 1187;
+},
+{
+anchors = (
+{
+name = _tophorn;
+pos = (626,1134);
+}
+);
+background = {
+shapes = (
+{
+pos = (1,0);
+ref = o;
+}
+);
+};
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(916,1090,o),
+(1094,1171,o),
+(1132,1400,c),
+(1086,1400,l),
+(1052,1197,o),
+(896,1134,o),
+(626,1134,c),
+(618,1090,l)
+);
+}
+);
+width = 1059;
+},
+{
+anchors = (
+{
+name = _tophorn;
+pos = (705,1132);
+}
+);
+background = {
+shapes = (
+{
+pos = (1,0);
+ref = o;
+}
+);
+};
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(997,1013,o),
+(1195,1142,o),
+(1238,1404,c),
+(1073,1404,l),
+(1046,1236,o),
+(909,1132,o),
+(705,1132,c),
+(686,1013,l)
+);
+}
+);
+width = 1222;
+},
+{
+anchors = (
+{
+name = _tophorn;
+pos = (654,1080);
+}
+);
+background = {
+shapes = (
+{
+pos = (1,0);
+ref = o;
+}
+);
+};
+guides = (
+{
+pos = (915,1342);
+}
+);
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(944,957,o),
+(1142,1068,o),
+(1187,1342,c),
+(1020,1342,l),
+(990,1162,o),
+(866,1080,o),
+(654,1080,c),
+(633,957,l)
+);
+}
+);
+width = 1124;
+},
+{
+anchors = (
+{
+name = _tophorn;
+pos = (734,1132);
+}
+);
+background = {
+shapes = (
+{
+ref = o;
+}
+);
+};
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1035,946,o),
+(1299,1063,o),
+(1358,1384,c),
+(1059,1384,l),
+(1017,1178,o),
+(952,1132,o),
+(735,1132,c),
+(704,946,l)
+);
+}
+);
+width = 1279;
+},
+{
+anchors = (
+{
+name = _tophorn;
+pos = (714,1080);
+}
+);
+background = {
+shapes = (
+{
+pos = (1,0);
+ref = o;
+}
+);
+};
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1039,878,o),
+(1280,959,o),
+(1344,1344,c),
+(1005,1344,l),
+(970,1138,o),
+(923,1080,o),
+(714,1080,c),
+(680,878,l)
+);
+}
+);
+width = 1245;
+}
+);
+note = "Custom italic design";
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.t_base.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.t_base.glyph
index 25adcf183..ec53244f8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/_part.t_base.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/_part.t_base.glyph
@@ -110,7 +110,7 @@ pos = (699,18);
 },
 {
 name = top;
-pos = (540,1542);
+pos = (539,1542);
 }
 );
 guides = (
@@ -165,56 +165,31 @@ pos = (497,0);
 },
 {
 name = top;
-pos = (447,1490);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(232,238,ls),
-(232,92,o),
-(339,0,o),
-(510,0,cs),
-(556,0,o),
-(604,0,o),
-(616,0,c),
-(616,160,l),
-(604,160,o),
-(526,160,o),
-(526,160,cs),
-(433,160,o),
-(402,190,o),
-(402,278,cs),
-(402,1384,l),
-(232,1384,l)
-);
+pos = (445,1490);
 }
 );
-};
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(153.725,246,ls),
-(128.727,95,o),
+(154,246,ls),
+(129,95,o),
 (220,0,o),
 (391,0,cs),
 (426,0,o),
-(461.667,0,o),
+(462,0,o),
 (497,0,c),
-(521.17,146,l),
-(491.17,146,o),
-(461.17,146,o),
-(431.17,146,cs),
-(341.17,146,o),
-(312.964,181,o),
-(328.029,272,cs),
-(512.12,1384,l),
-(342.12,1384,l)
+(521,146,l),
+(491,146,o),
+(461,146,o),
+(431,146,cs),
+(341,146,o),
+(313,181,o),
+(328,272,cs),
+(505,1344,l),
+(335,1344,l)
 );
 }
 );
@@ -236,16 +211,7 @@ pos = (689,0);
 },
 {
 name = top;
-pos = (528,1542);
-}
-);
-guides = (
-{
-angle = 80.6;
-pos = (420,1844);
-},
-{
-pos = (408,2016);
+pos = (526,1542);
 }
 );
 layerId = m010;
@@ -254,22 +220,22 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(127.287,340,ls),
-(88.217,104,o),
+(127,340,ls),
+(88,104,o),
 (193,0,o),
 (469,0,cs),
 (559,0,o),
 (653,0,o),
 (689,0,c),
-(739.327,304,l),
-(717.327,304,o),
-(665.327,304,o),
-(629.327,304,cs),
-(550.327,304,o),
-(526.128,333,o),
-(538.875,410,cs),
-(700.12,1384,l),
-(300.12,1384,l)
+(739,304,l),
+(717,304,o),
+(665,304,o),
+(629,304,cs),
+(550,304,o),
+(526,333,o),
+(539,410,cs),
+(693,1344,l),
+(293,1344,l)
 );
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/o.glyph b/src/Inter-Italic.glyphspackage/glyphs/o.glyph
index d9bf13d51..22cf086a4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/o.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/o.glyph
@@ -20,7 +20,7 @@ pos = (718,1304);
 },
 {
 name = tophorn;
-pos = (974,915);
+pos = (690,1134);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -79,7 +79,7 @@ pos = (734,1304);
 },
 {
 name = tophorn;
-pos = (939,830);
+pos = (705,1132);
 }
 );
 guides = (
@@ -261,7 +261,7 @@ pos = (684,1262);
 },
 {
 name = tophorn;
-pos = (885,774);
+pos = (654,1080);
 }
 );
 guides = (
@@ -331,7 +331,7 @@ pos = (764,1304);
 },
 {
 name = tophorn;
-pos = (1069,732);
+pos = (735,1132);
 }
 );
 guides = (
@@ -395,7 +395,7 @@ pos = (744,1262);
 },
 {
 name = tophorn;
-pos = (1057,698);
+pos = (714,1080);
 }
 );
 background = {
@@ -425,7 +425,7 @@ pos = (-161,2860);
 },
 {
 angle = 80.6;
-pos = (623,1088);
+pos = (623,1155);
 }
 );
 layerId = m010;
@@ -484,7 +484,7 @@ pos = (654,1304);
 },
 {
 name = tophorn;
-pos = (910,915);
+pos = (626,1134);
 }
 );
 layerId = m012;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ohorn.glyph b/src/Inter-Italic.glyphspackage/glyphs/ohorn.glyph
index 44904787b..e66f2cb5e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ohorn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ohorn.glyph
@@ -5,78 +5,79 @@ kernRight = ohorn;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
-pos = (623,-288);
-ref = _part.otophorn;
+ref = _part.rtophorn.o;
 }
 );
 width = 1222;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
-pos = (765,-324);
-ref = _part.otophorn;
+pos = (1,0);
+ref = _part.rtophorn.o;
 }
 );
 width = 1280;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
-pos = (628,-141);
-ref = _part.otophorn;
+ref = _part.rtophorn.o;
 }
 );
 width = 1186;
 },
 {
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
-pos = (575,-282);
-ref = _part.otophorn;
+ref = _part.rtophorn.o;
 }
 );
 width = 1124;
 },
 {
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
-pos = (748,-358);
-ref = _part.otophorn;
+ref = _part.rtophorn.o;
 }
 );
 width = 1244;
 },
 {
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 ref = o;
 },
 {
-pos = (564,-141);
-ref = _part.otophorn;
+ref = _part.rtophorn.o;
 }
 );
 width = 1058;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/space.glyph b/src/Inter-Italic.glyphspackage/glyphs/space.glyph
index 566183f51..591a4e2bb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/space.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/space.glyph
@@ -27,14 +27,6 @@ layerId = m008;
 width = 512;
 },
 {
-guides = (
-{
-pos = (-32,1239);
-},
-{
-pos = (-32,763);
-}
-);
 layerId = m010;
 width = 376;
 },
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tdieresis.glyph b/src/Inter-Italic.glyphspackage/glyphs/tdieresis.glyph
index 42ce18a73..76c779dd0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tdieresis.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tdieresis.glyph
@@ -23,7 +23,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (-91,238);
+pos = (-92,238);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/tdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/tdotaccent.glyph
index ae9902684..d17720105 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/tdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/tdotaccent.glyph
@@ -23,7 +23,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (83,238);
+pos = (82,238);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uhorn.glyph b/src/Inter-Italic.glyphspackage/glyphs/uhorn.glyph
index ff112cafd..8abd4231b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uhorn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uhorn.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (642,-434);
+pos = (641,-434);
 ref = _part.rtophorn;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (654,-434);
+pos = (653,-434);
 ref = _part.rtophorn;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = u;
 },
 {
-pos = (667,-372);
+pos = (666,-372);
 ref = _part.rtophorn;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_48.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_48.glyph
index 612b98a09..051418339 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_48.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_48.glyph
@@ -73,7 +73,7 @@ pos = (140,0);
 ref = O;
 },
 {
-pos = (-129,-6);
+pos = (-128,-6);
 ref = koronisaccentleft.cn;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_49.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_49.glyph
index 8dad56e2e..494b50660 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_49.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_49.glyph
@@ -73,7 +73,7 @@ pos = (212,0);
 ref = O;
 },
 {
-pos = (-161,0);
+pos = (-160,0);
 ref = uni1FFE.tonos;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_4A_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_4A_.glyph
index e3add403a..4db931941 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_4A_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_4A_.glyph
@@ -73,7 +73,7 @@ pos = (482,0);
 ref = O;
 },
 {
-pos = (-227,0);
+pos = (-226,0);
 ref = uni1FCD.tonos;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_4B_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_4B_.glyph
index 67e23ab1f..ac9def012 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_4B_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_4B_.glyph
@@ -73,7 +73,7 @@ pos = (428,0);
 ref = O;
 },
 {
-pos = (-139,0);
+pos = (-138,0);
 ref = uni1FDD.tonos;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_8.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_8.glyph
index 58df0a43c..54d168801 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_8.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni1F_F_8.glyph
@@ -73,7 +73,7 @@ pos = (180,0);
 ref = O;
 },
 {
-pos = (-209,0);
+pos = (-208,0);
 ref = uni1FEF.tonos;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/order.plist b/src/Inter-Italic.glyphspackage/order.plist
index 29508f9bc..ac8c06d5d 100644
--- a/src/Inter-Italic.glyphspackage/order.plist
+++ b/src/Inter-Italic.glyphspackage/order.plist
@@ -2573,7 +2573,6 @@ _part.bottom_srthook,
 _part.brackquill_left,
 _part.brackquill_right,
 _part.divfrac,
-_part.otophorn,
 _part.q_big,
 _part.rtopbar,
 _part.rtophorn,
@@ -2584,5 +2583,6 @@ _part.top_r_hook_G,
 _part.top_r_hook_c,
 _part.top_r_hook_g_sc,
 _part.topbar,
-_part.zeroslash
+_part.zeroslash,
+_part.rtophorn.o
 )
\ No newline at end of file
diff --git a/src/Inter-Roman.glyphspackage/fontinfo.plist b/src/Inter-Roman.glyphspackage/fontinfo.plist
index ae8eb35e7..a081de688 100644
--- a/src/Inter-Roman.glyphspackage/fontinfo.plist
+++ b/src/Inter-Roman.glyphspackage/fontinfo.plist
@@ -4714,6 +4714,7 @@ seven.sups = -26;
 "@MMK_R_v" = -40;
 "@MMK_R_w" = -37;
 "@MMK_R_x" = -46;
+"@MMK_R_z" = -30;
 Yhook = -104;
 jcrosstail = -93;
 };
@@ -5064,7 +5065,7 @@ uni023E = -128;
 };
 "@MMK_L_z" = {
 "@MMK_R_T" = -69;
-"@MMK_R_o" = -32;
+"@MMK_R_o" = -30;
 Trthook = -81;
 uni023E = -81;
 };
@@ -5580,6 +5581,9 @@ zeta = {
 Psi = -93;
 underscore = 139;
 };
+oacute = {
+"@MMK_R_B" = 20;
+};
 };
 m011 = {
 "@MMK_L_A" = {
@@ -6457,7 +6461,7 @@ seven.sups = -26;
 };
 "@MMK_L_o" = {
 "@MMK_R_A" = -69;
-"@MMK_R_B" = 69;
+"@MMK_R_B" = 0;
 "@MMK_R_T" = -160;
 "@MMK_R_T.sc" = -81;
 "@MMK_R_V" = -104;
@@ -6473,6 +6477,7 @@ seven.sups = -26;
 "@MMK_R_v" = -40;
 "@MMK_R_w" = -37;
 "@MMK_R_x" = -46;
+"@MMK_R_z" = -30;
 Yhook = -104;
 idblgrave = 81;
 jcrosstail = -93;
@@ -6851,7 +6856,7 @@ uni023E = -128;
 };
 "@MMK_L_z" = {
 "@MMK_R_T" = -69;
-"@MMK_R_o" = -32;
+"@MMK_R_o" = -30;
 Trthook = -81;
 uni023E = -81;
 };
@@ -7421,6 +7426,9 @@ zeta = {
 Psi = -93;
 underscore = 139;
 };
+oacute = {
+"@MMK_R_B" = 20;
+};
 };
 "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265" = {
 "@MMK_L_A" = {
@@ -8261,6 +8269,7 @@ seven.sups = -26;
 "@MMK_R_v" = -40;
 "@MMK_R_w" = -37;
 "@MMK_R_x" = -46;
+"@MMK_R_z" = -30;
 Yhook = -104;
 jcrosstail = -93;
 };
@@ -8611,7 +8620,7 @@ uni023E = -128;
 };
 "@MMK_L_z" = {
 "@MMK_R_T" = -69;
-"@MMK_R_o" = -32;
+"@MMK_R_o" = -30;
 Trthook = -81;
 uni023E = -81;
 };
@@ -9127,6 +9136,9 @@ zeta = {
 Psi = -93;
 underscore = 139;
 };
+oacute = {
+"@MMK_R_B" = 50;
+};
 };
 m007 = {
 "@MMK_L_A" = {
@@ -9967,6 +9979,7 @@ seven.sups = -26;
 "@MMK_R_v" = -40;
 "@MMK_R_w" = -37;
 "@MMK_R_x" = -46;
+"@MMK_R_z" = -30;
 Trthook = -162;
 Yhook = -104;
 jcrosstail = -93;
@@ -10329,7 +10342,7 @@ uni023E = -128;
 };
 "@MMK_L_z" = {
 "@MMK_R_T" = -69;
-"@MMK_R_o" = -32;
+"@MMK_R_o" = -30;
 Trthook = -81;
 uni023E = -81;
 };
@@ -10862,6 +10875,9 @@ zeta = {
 Psi = -93;
 underscore = 139;
 };
+oacute = {
+"@MMK_R_B" = 60;
+};
 };
 "5C20EF92-B63D-42A8-8878-93C2863E0093" = {
 "@MMK_L_A" = {
@@ -10997,6 +11013,7 @@ underscore = -69;
 "@MMK_R_idieresis" = 151;
 "@MMK_R_idotless" = 81;
 "@MMK_R_jdotless" = 81;
+"@MMK_R_o" = 10;
 "@MMK_R_parenright" = 69;
 Dcroat = 81;
 Idieresisacute = 93;
@@ -11720,6 +11737,7 @@ seven.sups = -26;
 "@MMK_R_v" = -34;
 "@MMK_R_w" = -20;
 "@MMK_R_x" = -37;
+"@MMK_R_z" = -50;
 Yhook = -104;
 jcrosstail = -93;
 };
@@ -12070,7 +12088,7 @@ uni023E = -128;
 };
 "@MMK_L_z" = {
 "@MMK_R_T" = -69;
-"@MMK_R_o" = -32;
+"@MMK_R_o" = -50;
 Trthook = -81;
 uni023E = -81;
 };
@@ -12605,6 +12623,9 @@ zeta = {
 Psi = -93;
 underscore = 139;
 };
+oacute = {
+"@MMK_R_B" = 70;
+};
 };
 m009 = {
 "@MMK_L_A" = {
@@ -13451,6 +13472,7 @@ seven.sups = -26;
 "@MMK_R_v" = -34;
 "@MMK_R_w" = -20;
 "@MMK_R_x" = -37;
+"@MMK_R_z" = -60;
 Trthook = -162;
 Yhook = -104;
 jcrosstail = -93;
@@ -13804,7 +13826,7 @@ uni023E = -128;
 };
 "@MMK_L_z" = {
 "@MMK_R_T" = -69;
-"@MMK_R_o" = -32;
+"@MMK_R_o" = -60;
 Trthook = -81;
 uni023E = -81;
 };
@@ -14299,6 +14321,9 @@ zeta = {
 Psi = -93;
 underscore = 139;
 };
+oacute = {
+"@MMK_R_B" = 70;
+};
 };
 };
 metrics = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_.glyph
index 4d942cd57..c8ce0138a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_.glyph
@@ -28,7 +28,7 @@ pos = (766,1676);
 },
 {
 name = tophorn;
-pos = (1175,1295);
+pos = (766,1510);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -94,7 +94,7 @@ pos = (702,1676);
 },
 {
 name = tophorn;
-pos = (1111,1295);
+pos = (702,1510);
 }
 );
 layerId = m011;
@@ -160,7 +160,7 @@ pos = (781,1676);
 },
 {
 name = tophorn;
-pos = (1166,1186);
+pos = (781,1510);
 }
 );
 guides = (
@@ -232,7 +232,7 @@ pos = (767,1676);
 },
 {
 name = tophorn;
-pos = (1169,1186);
+pos = (767,1514);
 }
 );
 guides = (
@@ -436,7 +436,7 @@ pos = (814,1676);
 },
 {
 name = tophorn;
-pos = (1313,1056);
+pos = (814,1510);
 }
 );
 guides = (
@@ -509,7 +509,7 @@ pos = (764,1676);
 },
 {
 name = tophorn;
-pos = (1263,1056);
+pos = (764,1514);
 }
 );
 guides = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/O_horn.glyph b/src/Inter-Roman.glyphspackage/glyphs/O_horn.glyph
index 3a2f8932f..c2db722aa 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/O_horn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/O_horn.glyph
@@ -10,8 +10,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (943,68);
-ref = _part.otophorn;
+pos = (171,378);
+ref = _part.rtophorn.o;
 }
 );
 width = 1560;
@@ -23,8 +23,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (919,161);
-ref = _part.otophorn;
+pos = (172,376);
+ref = _part.rtophorn.o;
 }
 );
 width = 1530;
@@ -36,27 +36,21 @@ shapes = (
 ref = O;
 },
 {
-pos = (946,130);
-ref = _part.otophorn;
+pos = (205,434);
+ref = _part.rtophorn.o;
 }
 );
 width = 1534;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (928,1568);
-}
-);
 layerId = m009;
 shapes = (
 {
 ref = O;
 },
 {
-pos = (1041,0);
-ref = _part.otophorn;
+pos = (142,434);
+ref = _part.rtophorn.o;
 }
 );
 width = 1528;
@@ -119,8 +113,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (855,239);
-ref = _part.otophorn;
+pos = (172,376);
+ref = _part.rtophorn.o;
 }
 );
 width = 1402;
@@ -266,8 +260,8 @@ shapes = (
 ref = O;
 },
 {
-pos = (1091,0);
-ref = _part.otophorn;
+pos = (174,378);
+ref = _part.rtophorn.o;
 }
 );
 width = 1628;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/U_horn.glyph b/src/Inter-Roman.glyphspackage/glyphs/U_horn.glyph
index 647ce5715..5d2d3eab6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/U_horn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/U_horn.glyph
@@ -89,11 +89,6 @@ ref = _part.rtophorn;
 width = 1446;
 },
 {
-guides = (
-{
-pos = (2047,1776);
-}
-);
 layerId = m011;
 name = "Thin Display";
 shapes = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/_part.rtophorn.glyph b/src/Inter-Roman.glyphspackage/glyphs/_part.rtophorn.glyph
index 359ea7459..188fca691 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/_part.rtophorn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/_part.rtophorn.glyph
@@ -16,8 +16,8 @@ closed = 1;
 nodes = (
 (392,1446,o),
 (475,1546,o),
-(475,1772,c),
-(429,1772,l),
+(475,1756,c),
+(429,1756,l),
 (429,1569,o),
 (364,1490,o),
 (198,1490,c),
@@ -59,53 +59,16 @@ name = _rtophorn;
 pos = (102,1490);
 }
 );
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(219,1288,ls),
-(341,1292,o),
-(437,1314,o),
-(508,1349,cs),
-(651,1420,o),
-(707,1546,o),
-(707,1776,c),
-(411,1776,l),
-(411,1700,o),
-(405,1642,o),
-(388,1599,cs),
-(355,1512,o),
-(270,1499,o),
-(102,1490,c),
-(102,1284,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(411,1588,o),
-(382,1478,o),
-(247,1478,c),
-(247,1306,l),
-(518,1306,o),
-(629,1480,o),
-(629,1776,c),
-(411,1776,l)
-);
-}
-);
-};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 closed = 1;
 nodes = (
 (512,1304,o),
-(695,1471,o),
-(703,1776,c),
-(404,1776,l),
-(396,1570,o),
+(695,1451,o),
+(703,1756,c),
+(404,1756,l),
+(396,1550,o),
 (319,1490,o),
 (102,1490,c),
 (193,1304,l)
@@ -126,14 +89,14 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(496,1304,o),
-(679,1471,o),
-(687,1776,c),
-(388,1776,l),
-(380,1570,o),
+(445,1288,o),
+(727,1393,o),
+(727,1778,c),
+(388,1778,l),
+(388,1572,o),
 (303,1490,o),
 (86,1490,c),
-(177,1304,l)
+(86,1288,l)
 );
 }
 );
@@ -153,8 +116,8 @@ closed = 1;
 nodes = (
 (328,1446,o),
 (411,1546,o),
-(411,1772,c),
-(365,1772,l),
+(411,1756,c),
+(365,1756,l),
 (365,1569,o),
 (300,1490,o),
 (134,1490,c),
@@ -245,14 +208,14 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(400,1395,o),
-(524,1538,o),
-(524,1776,c),
+(386,1367,o),
+(531,1502,o),
+(531,1776,c),
 (364,1776,l),
 (364,1579,o),
 (291,1490,o),
 (128,1490,c),
-(193,1395,l)
+(128,1367,l)
 );
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/_part.otophorn.glyph b/src/Inter-Roman.glyphspackage/glyphs/_part.rtophorn.o.glyph
index 61b67f623..275f680d0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/_part.otophorn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/_part.rtophorn.o.glyph
@@ -1,148 +1,171 @@
 {
 export = 0;
-glyphname = _part.otophorn;
+glyphname = _part.rtophorn.o;
 layers = (
 {
 anchors = (
 {
 name = _tophorn;
-pos = (256,1134);
+pos = (594,1134);
 }
 );
+background = {
+shapes = (
+{
+ref = o;
+}
+);
+};
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 closed = 1;
 nodes = (
-(431,1178,o),
-(493,1262,o),
-(493,1441,c),
-(447,1441,l),
-(447,1283,o),
-(398,1217,o),
-(245,1179,c),
-(256,1134,l)
+(892,1090,o),
+(1056,1171,o),
+(1056,1400,c),
+(1010,1400,l),
+(1010,1197,o),
+(864,1134,o),
+(594,1134,c),
+(594,1090,l)
 );
 }
 );
-width = 718;
+width = 1186;
 },
 {
 anchors = (
 {
 name = _tophorn;
-pos = (256,1056);
+pos = (530,1134);
 }
 );
+background = {
+shapes = (
+{
+ref = o;
+}
+);
+};
 layerId = m011;
 shapes = (
 {
 closed = 1;
 nodes = (
-(431,1100,o),
-(493,1184,o),
-(493,1363,c),
-(447,1363,l),
-(447,1205,o),
-(398,1139,o),
-(245,1101,c),
-(256,1056,l)
+(828,1090,o),
+(992,1171,o),
+(992,1400,c),
+(946,1400,l),
+(946,1197,o),
+(800,1134,o),
+(530,1134,c),
+(530,1090,l)
 );
 }
 );
-width = 718;
+width = 1058;
 },
 {
 anchors = (
 {
 name = _tophorn;
-pos = (223,1056);
+pos = (562,1080);
 }
 );
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(441,1298,o),
-(375,1200,o),
-(223,1200,c),
-(223,1056,l),
-(482,1056,o),
-(613,1205,o),
-(613,1468,c),
-(441,1468,l)
-);
+ref = o;
 }
 );
 };
+guides = (
+{
+pos = (914,1342);
+}
+);
 layerId = m007;
 shapes = (
 {
 closed = 1;
 nodes = (
-(447,1079,o),
-(563,1184,o),
-(563,1428,c),
-(403,1428,l),
-(403,1256,o),
-(347,1178,o),
-(223,1178,c),
-(280,1056,l)
+(873,957,o),
+(1052,1068,o),
+(1052,1342,c),
+(885,1342,l),
+(885,1162,o),
+(774,1080,o),
+(562,1080,c),
+(562,957,l)
 );
 }
 );
-width = 840;
+width = 1124;
 },
 {
 anchors = (
 {
 name = _tophorn;
-pos = (222,1056);
+pos = (640,1132);
 }
 );
+background = {
+shapes = (
+{
+ref = o;
+}
+);
+};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 closed = 1;
 nodes = (
-(493,1056,o),
-(604,1230,o),
-(604,1526,c),
-(386,1526,l),
-(386,1338,o),
-(357,1228,o),
-(222,1228,c),
-(222,1056,l)
+(972,946,o),
+(1216,1063,o),
+(1222,1384,c),
+(923,1384,l),
+(915,1178,o),
+(857,1132,o),
+(640,1132,c),
+(640,946,l)
 );
 }
 );
-width = 936;
+width = 1280;
 },
 {
 anchors = (
 {
 name = _tophorn;
-pos = (222,1056);
+pos = (622,1080);
 }
 );
+background = {
+shapes = (
+{
+ref = o;
+}
+);
+};
 layerId = m009;
 shapes = (
 {
 closed = 1;
 nodes = (
-(493,1056,o),
-(604,1230,o),
-(604,1526,c),
-(386,1526,l),
-(386,1338,o),
-(357,1228,o),
-(222,1228,c),
-(222,1056,l)
+(981,878,o),
+(1208,959,o),
+(1208,1344,c),
+(869,1344,l),
+(869,1138,o),
+(831,1080,o),
+(622,1080,c),
+(622,878,l)
 );
 }
 );
-width = 936;
+width = 1244;
 },
 {
 anchors = (
@@ -264,23 +287,13 @@ width = 832;
 anchors = (
 {
 name = _tophorn;
-pos = (223,1118);
+pos = (610,1132);
 }
 );
 background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(403,1318,o),
-(347,1240,o),
-(223,1240,c),
-(223,1118,l),
-(446,1118,o),
-(563,1246,o),
-(563,1490,c),
-(403,1490,l)
-);
+ref = o;
 }
 );
 };
@@ -290,18 +303,18 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(447,1141,o),
-(563,1246,o),
-(563,1490,c),
-(403,1490,l),
-(403,1318,o),
-(347,1240,o),
-(223,1240,c),
-(280,1118,l)
+(921,1013,o),
+(1098,1142,o),
+(1098,1404,c),
+(933,1404,l),
+(933,1236,o),
+(814,1132,o),
+(610,1132,c),
+(610,1013,l)
 );
 }
 );
-width = 832;
+width = 1222;
 },
 {
 anchors = (
@@ -331,5 +344,6 @@ nodes = (
 width = 840;
 }
 );
-note = "Custom italic design";
+metricWidth = o;
+note = "Based on /_part.rtophorn";
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/_part.t_base.glyph b/src/Inter-Roman.glyphspackage/glyphs/_part.t_base.glyph
index bd6bb6249..eaa729ccc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/_part.t_base.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/_part.t_base.glyph
@@ -162,34 +162,9 @@ pos = (584,0);
 },
 {
 name = top;
-pos = (288,1490);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(232,238,ls),
-(232,92,o),
-(339,0,o),
-(510,0,cs),
-(556,0,o),
-(604,0,o),
-(616,0,c),
-(616,160,l),
-(604,160,o),
-(526,160,o),
-(526,160,cs),
-(433,160,o),
-(402,190,o),
-(402,278,cs),
-(402,1384,l),
-(232,1384,l)
-);
+pos = (285,1490);
 }
 );
-};
 layerId = m007;
 shapes = (
 {
@@ -209,8 +184,8 @@ nodes = (
 (404,146,o),
 (370,181,o),
 (370,272,cs),
-(370,1384,l),
-(200,1384,l)
+(370,1344,l),
+(200,1344,l)
 );
 }
 );
@@ -318,15 +293,11 @@ pos = (776,0);
 },
 {
 name = top;
-pos = (360,1542);
+pos = (358,1542);
 }
 );
 guides = (
 {
-angle = 90;
-pos = (420,1844);
-},
-{
 pos = (408,2016);
 }
 );
@@ -350,8 +321,8 @@ nodes = (
 (587,304,o),
 (558,333,o),
 (558,410,cs),
-(558,1384,l),
-(158,1384,l)
+(558,1344,l),
+(158,1344,l)
 );
 }
 );
@@ -401,6 +372,78 @@ nodes = (
 }
 );
 width = 584;
+},
+{
+anchors = (
+{
+name = bottom;
+pos = (384,0);
+},
+{
+name = cedilla;
+pos = (468,0);
+},
+{
+name = lfthook;
+pos = (584,0);
+},
+{
+name = top;
+pos = (288,1490);
+}
+);
+associatedMasterId = m007;
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(232,238,ls),
+(232,92,o),
+(339,0,o),
+(510,0,cs),
+(556,0,o),
+(604,0,o),
+(616,0,c),
+(616,160,l),
+(604,160,o),
+(526,160,o),
+(526,160,cs),
+(433,160,o),
+(402,190,o),
+(402,278,cs),
+(402,1384,l),
+(232,1384,l)
+);
+}
+);
+};
+layerId = "9CAE7009-74F1-493B-8BBD-0ED08DB33E70";
+name = "Oct 3, 22, 12:23";
+shapes = (
+{
+closed = 1;
+nodes = (
+(200,246,ls),
+(200,95,o),
+(307,0,o),
+(478,0,cs),
+(513,0,o),
+(549,0,o),
+(584,0,c),
+(584,146,l),
+(554,146,o),
+(524,146,o),
+(494,146,cs),
+(404,146,o),
+(370,181,o),
+(370,272,cs),
+(370,1384,l),
+(200,1384,l)
+);
+}
+);
+width = 682;
 }
 );
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/o.glyph b/src/Inter-Roman.glyphspackage/glyphs/o.glyph
index dc341ac54..bd41419e5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/o.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/o.glyph
@@ -20,7 +20,7 @@ pos = (594,1304);
 },
 {
 name = tophorn;
-pos = (915,915);
+pos = (594,1134);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -78,7 +78,7 @@ pos = (610,1304);
 },
 {
 name = tophorn;
-pos = (894,830);
+pos = (610,1132);
 }
 );
 guides = (
@@ -143,7 +143,7 @@ pos = (640,1304);
 },
 {
 name = tophorn;
-pos = (1040,732);
+pos = (640,1132);
 }
 );
 guides = (
@@ -206,7 +206,7 @@ pos = (622,1262);
 },
 {
 name = tophorn;
-pos = (1028,698);
+pos = (622,1080);
 }
 );
 background = {
@@ -236,7 +236,7 @@ pos = (-162,2860);
 },
 {
 angle = 90;
-pos = (622,1088);
+pos = (622,1155);
 }
 );
 layerId = m009;
@@ -432,7 +432,7 @@ pos = (530,1304);
 },
 {
 name = tophorn;
-pos = (851,915);
+pos = (530,1134);
 }
 );
 layerId = m011;
@@ -561,7 +561,7 @@ pos = (562,1262);
 },
 {
 name = tophorn;
-pos = (844,774);
+pos = (562,1080);
 }
 );
 guides = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ohorn.glyph b/src/Inter-Roman.glyphspackage/glyphs/ohorn.glyph
index 7d3864645..4e4ba2b86 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ohorn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ohorn.glyph
@@ -4,31 +4,13 @@ kernLeft = o;
 kernRight = ohorn;
 layers = (
 {
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(1065,1059,o),
-(1044,963,o),
-(898,962,c),
-(898,840,l),
-(1140,841,o),
-(1225,980,o),
-(1224,1202,c),
-(1064,1202,l)
-);
-}
-);
-};
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
 ref = o;
 },
 {
-pos = (671,-288);
-ref = _part.otophorn;
+ref = _part.rtophorn.o;
 }
 );
 width = 1222;
@@ -40,68 +22,31 @@ shapes = (
 ref = o;
 },
 {
-pos = (818,-324);
-ref = _part.otophorn;
+ref = _part.rtophorn.o;
 }
 );
 width = 1280;
 },
 {
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(1069,1069,o),
-(1027,999,o),
-(898,988,c),
-(898,942,l),
-(1055,953,o),
-(1116,1047,o),
-(1116,1220,c),
-(1070,1220,l)
-);
-}
-);
-};
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 ref = o;
 },
 {
-pos = (659,-219);
-ref = _part.otophorn;
+ref = _part.rtophorn.o;
 }
 );
 width = 1186;
 },
 {
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(1013,1009,o),
-(993,918,o),
-(853,917,c),
-(853,800,l),
-(1084,801,o),
-(1165,934,o),
-(1164,1146,c),
-(1012,1146,l)
-);
-}
-);
-};
 layerId = m007;
 shapes = (
 {
 ref = o;
 },
 {
-pos = (621,-282);
-ref = _part.otophorn;
+ref = _part.rtophorn.o;
 }
 );
 width = 1124;
@@ -113,8 +58,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (806,-358);
-ref = _part.otophorn;
+ref = _part.rtophorn.o;
 }
 );
 width = 1244;
@@ -126,8 +70,7 @@ shapes = (
 ref = o;
 },
 {
-pos = (595,-141);
-ref = _part.otophorn;
+ref = _part.rtophorn.o;
 }
 );
 width = 1058;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/t.glyph b/src/Inter-Roman.glyphspackage/glyphs/t.glyph
index 54158fb55..d4fc79996 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/t.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/t.glyph
@@ -105,12 +105,6 @@ name = raccent;
 pos = (482,1490);
 }
 );
-guides = (
-{
-angle = 90;
-pos = (310,858);
-}
-);
 layerId = m007;
 shapes = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tdieresis.glyph b/src/Inter-Roman.glyphspackage/glyphs/tdieresis.glyph
index 7f82c34cb..c6c0bb1b3 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tdieresis.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tdieresis.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (-300,186);
+pos = (-303,186);
 ref = dieresis;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (-106,280);
+pos = (-108,280);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tdotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/tdotaccent.glyph
index 9ad4c2dcf..51fe1b6ee 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tdotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tdotaccent.glyph
@@ -49,7 +49,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (62,186);
+pos = (59,186);
 ref = dotaccent;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = t;
 },
 {
-pos = (70,280);
+pos = (68,280);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/order.plist b/src/Inter-Roman.glyphspackage/order.plist
index 3744070a0..591bd6e11 100644
--- a/src/Inter-Roman.glyphspackage/order.plist
+++ b/src/Inter-Roman.glyphspackage/order.plist
@@ -2573,7 +2573,6 @@ _part.bottom_srthook,
 _part.brackquill_left,
 _part.brackquill_right,
 _part.divfrac,
-_part.otophorn,
 _part.q_big,
 _part.rtopbar,
 _part.rtophorn,
@@ -2584,5 +2583,6 @@ _part.top_r_hook_G,
 _part.top_r_hook_c,
 _part.top_r_hook_g_sc,
 _part.topbar,
-_part.zeroslash
+_part.zeroslash,
+_part.rtophorn.o
 )
\ No newline at end of file