New design of rthook glyphs

268 files changed, 6459 insertions, 7017 deletions

diff --git a/src/Inter-Italic.glyphspackage/fontinfo.plist b/src/Inter-Italic.glyphspackage/fontinfo.plist
index c87d814a0..fd9fd8c4d 100644
--- a/src/Inter-Italic.glyphspackage/fontinfo.plist
+++ b/src/Inter-Italic.glyphspackage/fontinfo.plist
@@ -2763,7 +2763,7 @@ pos = 1490;
 },
 {
 over = 16;
-pos = 1056;
+pos = 1118;
 },
 {
 over = -16;
@@ -9334,7 +9334,6 @@ underscore = -69;
 "@MMK_R_idieresis" = 69;
 };
 "@MMK_L_H" = {
-"@MMK_R_B" = 93;
 "@MMK_R_Dcroat" = 81;
 "@MMK_R_Idieresis" = 162;
 "@MMK_R_dagger" = 81;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/B_hook.glyph b/src/Inter-Italic.glyphspackage/glyphs/B_hook.glyph
index 1f0164ad7..4cc5df918 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/B_hook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/B_hook.glyph
@@ -29,7 +29,7 @@ pos = (480,0);
 ref = B;
 },
 {
-pos = (67,0);
+pos = (-88,0);
 ref = _part.top_left_hook;
 }
 );
@@ -77,7 +77,7 @@ pos = (480,0);
 ref = B;
 },
 {
-pos = (58,0);
+pos = (-65,0);
 ref = _part.top_left_hook;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_hook.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_hook.glyph
index 8f9d25c6e..1be236de4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_hook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_hook.glyph
@@ -29,7 +29,7 @@ pos = (480,0);
 ref = D;
 },
 {
-pos = (68,0);
+pos = (-87,0);
 ref = _part.top_left_hook;
 }
 );
@@ -77,7 +77,7 @@ pos = (480,0);
 ref = D;
 },
 {
-pos = (57,0);
+pos = (-66,0);
 ref = _part.top_left_hook;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/D_z.glyph b/src/Inter-Italic.glyphspackage/glyphs/D_z.glyph
index 08b067a3c..13cba0b92 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/D_z.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/D_z.glyph
@@ -27,7 +27,7 @@ pos = (1501,0);
 ref = z;
 }
 );
-width = 2719;
+width = 2715;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/O_open.glyph b/src/Inter-Italic.glyphspackage/glyphs/O_open.glyph
index e33b76c89..1a3864b1f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/O_open.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/O_open.glyph
@@ -121,7 +121,7 @@ metricRight = "=|C";
 shapes = (
 {
 angle = 180;
-pos = (1424,1490);
+pos = (1414,1490);
 ref = C;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/P_hook.glyph b/src/Inter-Italic.glyphspackage/glyphs/P_hook.glyph
index e299f0bc1..0f6189e31 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/P_hook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/P_hook.glyph
@@ -77,7 +77,7 @@ pos = (480,0);
 ref = P;
 },
 {
-pos = (57,0);
+pos = (-66,0);
 ref = _part.top_left_hook;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/Q__rthook.glyph b/src/Inter-Italic.glyphspackage/glyphs/Q__rthook.glyph
index fc025db60..aa788487b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/Q__rthook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/Q__rthook.glyph
@@ -5,258 +5,83 @@ kernRight = rthook;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1368,1490,l),
-(1330,1260,l),
-(1312,1260,l),
-(1264,1417,o),
-(1114,1510,o),
-(910,1510,cs),
-(535,1510,o),
-(226,1193,o),
-(154,750,cs),
-(78,294,o),
-(284,-23,o),
-(658,-24,cs),
-(857,-23,o),
-(1039,70,o),
-(1140,236,c),
-(1152,236,l),
-(1094,-120,ls),
-(1063,-311,o),
-(1173,-419,o),
-(1336,-418,cs),
-(1371,-419,o),
-(1409,-419,o),
-(1438,-410,c),
-(1460,-264,l),
-(1445,-268,o),
-(1424,-271,o),
-(1406,-270,cs),
-(1311,-271,o),
-(1247,-236,o),
-(1266,-120,cs),
-(1534,1490,l)
-);
+ref = _part.q_big;
 },
 {
-closed = 1;
-nodes = (
-(420,148,o),
-(269,378,o),
-(332,748,cs),
-(388,1094,o),
-(609,1347,o),
-(888,1346,cs),
-(1203,1347,o),
-(1284,1082,o),
-(1242,748,cs),
-(1176,412,o),
-(1022,148,o),
-(684,148,cs)
-);
+pos = (1080,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1598;
+width = 1559;
 },
 {
+background = {
+shapes = (
+{
+pos = (-210,0);
+ref = O;
+}
+);
+};
 guides = (
 {
-pos = (277,1024);
+pos = (-130,1024);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1279,1490,l),
-(1243,1280,l),
-(1231,1280,l),
-(1179,1401,o),
-(1069,1510,o),
-(867,1510,cs),
-(520,1510,o),
-(192,1169,o),
-(121,744,cs),
-(51,323,o),
-(258,-20,o),
-(615,-20,cs),
-(814,-20,o),
-(962,87,o),
-(1055,210,c),
-(1065,210,l),
-(1025,-34,ls),
-(970,-364,o),
-(1160,-419,o),
-(1403,-418,cs),
-(1497,-419,o),
-(1562,-410,o),
-(1607,-408,c),
-(1657,-110,l),
-(1623,-113,o),
-(1593,-116,o),
-(1563,-116,cs),
-(1491,-116,o),
-(1416,-102,o),
-(1427,-34,cs),
-(1679,1490,l)
-);
+ref = _part.q_big;
 },
 {
-closed = 1;
-nodes = (
-(576,332,o),
-(493,477,o),
-(537,744,cs),
-(581,1012,o),
-(713,1158,o),
-(915,1158,cs),
-(1114,1158,o),
-(1198,1012,o),
-(1153,744,cs),
-(1109,477,o),
-(978,332,o),
-(777,332,cs)
-);
+pos = (994,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1767;
+width = 1621;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1401,1490,l),
-(1333,1080,l),
-(1329,1080,l),
-(1294,1356,o),
-(1149,1510,o),
-(909,1510,cs),
-(557,1510,o),
-(256,1200,o),
-(179,744,cs),
-(105,285,o),
-(301,-20,o),
-(655,-20,cs),
-(893,-20,o),
-(1088,129,o),
-(1213,396,c),
-(1219,396,l),
-(1119,-206,l),
-(1094,-345,o),
-(1147,-416,o),
-(1273,-416,cs),
-(1297,-416,o),
-(1317,-414,o),
-(1341,-408,c),
-(1347,-362,l),
-(1328,-367,o),
-(1308,-369,o),
-(1283,-370,cs),
-(1173,-369,o),
-(1145,-327,o),
-(1167,-198,c),
-(1447,1490,l)
-);
+ref = _part.q_big;
 },
 {
-closed = 1;
-nodes = (
-(328,26,o),
-(153,311,o),
-(225,744,cs),
-(299,1170,o),
-(581,1463,o),
-(899,1464,cs),
-(1210,1463,o),
-(1351,1185,o),
-(1279,744,cs),
-(1207,313,o),
-(962,26,o),
-(653,26,cs)
-);
+pos = (1183,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1531;
+width = 1525;
 },
 {
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1341.258,1490,l),
-(1303.182,1260,l),
-(1285.182,1260,l),
-(1238.173,1417,o),
-(1087.569,1510,o),
-(884.569,1510,cs),
-(508.569,1510,o),
-(200.09,1193,o),
-(126.752,750,cs),
-(51.262,294,o),
-(257.783,-23,o),
-(630.617,-24,cs),
-(830.783,-23,o),
-(1012.179,70,o),
-(1115.66,236,c),
-(1127.66,236,l),
-(1068.724,-120,ls),
-(1036.104,-311,o),
-(1146.225,-419,o),
-(1309.391,-418,cs),
-(1344.225,-419,o),
-(1382.225,-419,o),
-(1410.715,-410,c),
-(1434.885,-264,l),
-(1419.223,-268,o),
-(1397.726,-271,o),
-(1377.892,-270,cs),
-(1284.726,-271,o),
-(1220.521,-236,o),
-(1238.724,-120,cs),
-(1505.258,1490,l)
-);
+ref = _part.q_big;
 },
 {
-closed = 1;
-nodes = (
-(394.091,148,o),
-(243.168,378,o),
-(304.421,748,cs),
-(361.701,1094,o),
-(583.585,1347,o),
-(859.419,1346,cs),
-(1169.585,1347,o),
-(1268.721,1076,o),
-(1214.421,748,cs),
-(1158.796,412,o),
-(986.091,148,o),
-(659.091,148,cs)
-);
+pos = (1088,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1534;
+width = 1535;
 },
 {
 background = {
 shapes = (
 {
-pos = (-34,0);
 ref = O;
 }
 );
 };
 guides = (
 {
-angle = -9.4;
 pos = (-50,1024);
 }
 );
@@ -264,120 +89,28 @@ layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1231.258,1490,l),
-(1196.493,1280,l),
-(1186.493,1280,l),
-(1133.524,1401,o),
-(1023.569,1510,o),
-(822.569,1510,cs),
-(474.569,1510,o),
-(146.117,1169,o),
-(75.759,744,cs),
-(6.062,323,o),
-(212.279,-20,o),
-(569.279,-20,cs),
-(769.279,-20,o),
-(916.993,87,o),
-(1009.355,210,c),
-(1019.355,210,l),
-(978.962,-34,ls),
-(925.33,-364,o),
-(1114.225,-419,o),
-(1359.391,-418,cs),
-(1451.225,-419,o),
-(1516.715,-410,o),
-(1561.046,-408,c),
-(1610.38,-110,l),
-(1577.883,-113,o),
-(1548.386,-116,o),
-(1519.386,-116,cs),
-(1446.386,-116,o),
-(1369.704,-102,o),
-(1380.962,-34,cs),
-(1633.258,1490,l)
-);
+ref = _part.q_big;
 },
 {
-closed = 1;
-nodes = (
-(531.552,332,o),
-(447.557,477,o),
-(491.759,744,cs),
-(536.126,1012,o),
-(668.296,1158,o),
-(868.296,1158,cs),
-(1069.296,1158,o),
-(1153.126,1012,o),
-(1107.759,744,cs),
-(1064.557,477,o),
-(932.552,332,o),
-(731.552,332,cs)
-);
+pos = (938,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1700;
+width = 1547;
 },
 {
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1341.258,1490,l),
-(1277.687,1106,l),
-(1271.687,1106,l),
-(1232.054,1374,o),
-(1092.569,1510,o),
-(864.569,1510,cs),
-(497.569,1510,o),
-(195.249,1200,o),
-(119.759,744,cs),
-(44.93,292,o),
-(242.279,-20,o),
-(603.279,-20,cs),
-(834.279,-20,o),
-(1023.125,118,o),
-(1151.83,382,c),
-(1157.83,382,l),
-(1061.48,-200,ls),
-(1035.482,-351,o),
-(1080.722,-416,o),
-(1209.722,-416,cs),
-(1232.722,-416,o),
-(1258.887,-415,o),
-(1282.384,-412,c),
-(1290,-366,l),
-(1267.668,-368,o),
-(1240.503,-369,o),
-(1217.337,-370,cs),
-(1115.503,-369,o),
-(1086.952,-324,o),
-(1107.48,-200,cs),
-(1387.258,1490,l)
-);
+ref = _part.q_big;
 },
 {
-closed = 1;
-nodes = (
-(277.894,26,o),
-(95.904,316,o),
-(165.759,744,cs),
-(237.614,1172,o),
-(515.788,1463,o),
-(856.954,1464,cs),
-(1154.788,1463,o),
-(1294.593,1190,o),
-(1221.759,744,cs),
-(1147.427,295,o),
-(920.894,26,o),
-(618.894,26,cs)
-);
+pos = (1118,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1402;
+width = 1397;
 }
 );
 metricLeft = O;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.bottom_rrthook.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.bottom_rrthook.glyph
new file mode 100644
index 000000000..487e31072
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/_part.bottom_rrthook.glyph
@@ -0,0 +1,210 @@
+{
+export = 0;
+glyphname = _part.bottom_rrthook;
+layers = (
+{
+anchors = (
+{
+name = _bottomr;
+pos = (136,0);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(224,-426,o),
+(263,-422,o),
+(281,-418,c),
+(305,-274,l),
+(285,-277,o),
+(264,-278,o),
+(248,-278,cs),
+(135,-278,o),
+(95,-246,o),
+(107,-176,cs),
+(162,160,l),
+(-2,160,l),
+(-57,-176,ls),
+(-84,-338,o),
+(-6,-426,o),
+(179,-426,cs)
+);
+}
+);
+width = 507;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (139,0);
+}
+);
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(228.801,-418,o),
+(255.801,-418,o),
+(283.801,-418,c),
+(308.302,-270,l),
+(287.302,-270,o),
+(228.302,-270,o),
+(208.302,-270,cs),
+(123.302,-270,o),
+(99.103,-241,o),
+(110.857,-170,cs),
+(164.163,152,l),
+(2.163,152,l),
+(-51.143,-170,ls),
+(-77.962,-332,o),
+(-1.199,-418,o),
+(183.801,-418,cs)
+);
+}
+);
+width = 505;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (362,0);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(382,-441,o),
+(449,-433,o),
+(511,-417,c),
+(556,-144,l),
+(515,-149,o),
+(479,-153,o),
+(440,-153,cs),
+(362,-153,o),
+(340,-133,o),
+(350,-73,cs),
+(399,224,l),
+(9,224,l),
+(-40,-73,ls),
+(-81,-318,o),
+(28,-441,o),
+(309,-441,cs)
+);
+}
+);
+width = 737;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (17,0);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(103.801,-418,o),
+(134.801,-418,o),
+(157.801,-418,c),
+(165.416,-372,l),
+(140.416,-372,o),
+(110.416,-372,o),
+(93.416,-372,cs),
+(-2.584,-372,o),
+(-37.466,-329,o),
+(-19.421,-220,cs),
+(17,0,l),
+(-29,0,l),
+(-65.421,-220,ls),
+(-87.935,-356,o),
+(-37.199,-418,o),
+(85.801,-418,cs)
+);
+}
+);
+width = 384;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (365,0);
+}
+);
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(312.801,-418,o),
+(471.801,-418,o),
+(515.801,-418,c),
+(566.127,-114,l),
+(542.127,-114,o),
+(471.127,-114,o),
+(410.127,-114,cs),
+(368.127,-114,o),
+(350.101,-90,o),
+(357.054,-48,cs),
+(398.11,200,l),
+(10.11,200,l),
+(-39.886,-102,ls),
+(-73.492,-305,o),
+(20.801,-418,o),
+(221.801,-418,cs)
+);
+}
+);
+width = 737;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (23,0);
+}
+);
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(110,-418,o),
+(141,-418,o),
+(164,-418,c),
+(171,-372,l),
+(146,-372,o),
+(116,-372,o),
+(99,-372,cs),
+(3,-372,o),
+(-31,-329,o),
+(-13,-220,cs),
+(23,0,l),
+(-23,0,l),
+(-59,-220,ls),
+(-82,-356,o),
+(-31,-418,o),
+(92,-418,cs)
+);
+}
+);
+width = 385;
+}
+);
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.bottom_rthook.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.bottom_rthook.glyph
new file mode 100644
index 000000000..401788967
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/_part.bottom_rthook.glyph
@@ -0,0 +1,210 @@
+{
+export = 0;
+glyphname = _part.bottom_rthook;
+layers = (
+{
+anchors = (
+{
+name = _bottomr;
+pos = (206,0);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(294,-426,o),
+(333,-422,o),
+(351,-418,c),
+(375,-274,l),
+(355,-277,o),
+(334,-278,o),
+(318,-278,cs),
+(205,-278,o),
+(165,-246,o),
+(177,-176,cs),
+(232,160,l),
+(62,160,l),
+(7,-176,ls),
+(-20,-338,o),
+(64,-426,o),
+(249,-426,cs)
+);
+}
+);
+width = 641;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (211,0);
+}
+);
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(300.801,-418,o),
+(327.801,-418,o),
+(355.801,-418,c),
+(380.302,-270,l),
+(359.302,-270,o),
+(300.302,-270,o),
+(280.302,-270,cs),
+(195.302,-270,o),
+(171.103,-241,o),
+(182.857,-170,cs),
+(236.163,152,l),
+(66.163,152,l),
+(12.857,-170,ls),
+(-13.962,-332,o),
+(70.801,-418,o),
+(255.801,-418,cs)
+);
+}
+);
+width = 641;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (438,0);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(458,-441,o),
+(525,-433,o),
+(587,-417,c),
+(632,-144,l),
+(591,-149,o),
+(555,-153,o),
+(516,-153,cs),
+(438,-153,o),
+(416,-133,o),
+(426,-73,cs),
+(475,224,l),
+(73,224,l),
+(24,-73,ls),
+(-17,-318,o),
+(104,-441,o),
+(385,-441,cs)
+);
+}
+);
+width = 877;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (17,0);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(103.801,-418,o),
+(134.801,-418,o),
+(157.801,-418,c),
+(165.416,-372,l),
+(140.416,-372,o),
+(110.416,-372,o),
+(93.416,-372,cs),
+(-2.584,-372,o),
+(-37.466,-329,o),
+(-19.421,-220,cs),
+(17,0,l),
+(-29,0,l),
+(-65.421,-220,ls),
+(-87.935,-356,o),
+(-37.199,-418,o),
+(85.801,-418,cs)
+);
+}
+);
+width = 384;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (441,0);
+}
+);
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(376.801,-418,o),
+(547.801,-418,o),
+(591.801,-418,c),
+(642.127,-114,l),
+(618.127,-114,o),
+(547.127,-114,o),
+(486.127,-114,cs),
+(444.127,-114,o),
+(426.101,-90,o),
+(433.054,-48,cs),
+(474.11,200,l),
+(74.11,200,l),
+(24.114,-102,ls),
+(-9.492,-305,o),
+(84.801,-418,o),
+(285.801,-418,cs)
+);
+}
+);
+width = 877;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (23,0);
+}
+);
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(110,-418,o),
+(141,-418,o),
+(164,-418,c),
+(171,-372,l),
+(146,-372,o),
+(116,-372,o),
+(99,-372,cs),
+(3,-372,o),
+(-31,-329,o),
+(-13,-220,cs),
+(23,0,l),
+(-23,0,l),
+(-59,-220,ls),
+(-82,-356,o),
+(-31,-418,o),
+(92,-418,cs)
+);
+}
+);
+width = 385;
+}
+);
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.bottom_srthook.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.bottom_srthook.glyph
new file mode 100644
index 000000000..34cdd8efd
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/_part.bottom_srthook.glyph
@@ -0,0 +1,210 @@
+{
+export = 0;
+glyphname = _part.bottom_srthook;
+layers = (
+{
+anchors = (
+{
+name = _rthook;
+pos = (17,268);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(230,-426,o),
+(269,-422,o),
+(287,-418,c),
+(311,-274,l),
+(291,-277,o),
+(270,-278,o),
+(254,-278,cs),
+(141,-278,o),
+(91,-246,o),
+(103,-176,cs),
+(176,268,l),
+(16,268,l),
+(-57,-176,ls),
+(-84,-338,o),
+(0,-426,o),
+(185,-426,cs)
+);
+}
+);
+width = 513;
+},
+{
+anchors = (
+{
+name = _rthook;
+pos = (29,316);
+}
+);
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(234.801,-418,o),
+(261.801,-418,o),
+(289.801,-418,c),
+(314.302,-270,l),
+(293.302,-270,o),
+(234.302,-270,o),
+(214.302,-270,cs),
+(129.302,-270,o),
+(99.103,-241,o),
+(110.857,-170,cs),
+(191.313,316,l),
+(29.313,316,l),
+(-51.143,-170,ls),
+(-77.962,-332,o),
+(4.801,-418,o),
+(189.801,-418,cs)
+);
+}
+);
+width = 511;
+},
+{
+anchors = (
+{
+name = _rthook;
+pos = (31,360);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(392.993,-441,o),
+(460.317,-433,o),
+(521.966,-417,c),
+(567.161,-144,l),
+(526.333,-149,o),
+(473.671,-153,o),
+(434.671,-153,cs),
+(337.085,-153,o),
+(303.313,-131,o),
+(312.915,-73,cs),
+(384.598,360,l),
+(30.598,360,l),
+(-41.085,-73,ls),
+(-81.645,-318,o),
+(38.993,-441,o),
+(319.993,-441,cs)
+);
+}
+);
+width = 748;
+},
+{
+anchors = (
+{
+name = _rthook;
+pos = (15,256);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(105,-418,o),
+(136,-418,o),
+(159,-418,c),
+(166,-372,l),
+(141,-372,o),
+(111,-372,o),
+(94,-372,cs),
+(-2,-372,o),
+(-36,-329,o),
+(-18,-220,cs),
+(60,256,l),
+(14,256,l),
+(-64,-220,ls),
+(-87,-356,o),
+(-36,-418,o),
+(87,-418,cs)
+);
+}
+);
+width = 385;
+},
+{
+anchors = (
+{
+name = _rthook;
+pos = (34,345);
+}
+);
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(312.801,-418,o),
+(483.801,-418,o),
+(527.801,-418,c),
+(578.127,-114,l),
+(554.127,-114,o),
+(435.127,-114,o),
+(374.127,-114,cs),
+(332.127,-114,o),
+(314.101,-90,o),
+(321.054,-48,cs),
+(386.114,345,l),
+(34.114,345,l),
+(-39.886,-102,ls),
+(-73.492,-305,o),
+(20.801,-418,o),
+(221.801,-418,cs)
+);
+}
+);
+width = 749;
+},
+{
+anchors = (
+{
+name = _rthook;
+pos = (20,256);
+}
+);
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(110,-418,o),
+(141,-418,o),
+(164,-418,c),
+(171,-372,l),
+(146,-372,o),
+(116,-372,o),
+(99,-372,cs),
+(3,-372,o),
+(-31,-329,o),
+(-13,-220,cs),
+(65,256,l),
+(19,256,l),
+(-59,-220,ls),
+(-82,-356,o),
+(-31,-418,o),
+(92,-418,cs)
+);
+}
+);
+width = 385;
+}
+);
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.q_big.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.q_big.glyph
new file mode 100644
index 000000000..a6c6bb45d
--- /dev/null
+++ b/src/Inter-Italic.glyphspackage/glyphs/_part.q_big.glyph
@@ -0,0 +1,524 @@
+{
+export = 0;
+glyphname = _part.q_big;
+layers = (
+{
+anchors = (
+{
+name = bottomr;
+pos = (1386,0);
+}
+);
+associatedMasterId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+layerId = "F22D811B-6DE8-4FFC-A463-7CB102E75E2F";
+name = "Sep 28, 22, 12:02";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1146,-20,o),
+(1358,273,o),
+(1358,744,cs),
+(1358,1216,o),
+(1146,1510,o),
+(765,1510,cs),
+(384,1510,o),
+(106,1216,o),
+(106,744,cs),
+(106,273,o),
+(384,-20,o),
+(765,-20,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(494,148,o),
+(280,358,o),
+(280,744,cs),
+(280,1132,o),
+(494,1342,o),
+(765,1342,cs),
+(1035,1342,o),
+(1208,1132,o),
+(1208,744,cs),
+(1208,358,o),
+(1035,148,o),
+(765,148,cs)
+);
+},
+{
+closed = 0;
+nodes = (
+(1196,236,l),
+(1216,236,l),
+(1216,0,l),
+(1386,0,l),
+(1386,1490,l),
+(1216,1490,l),
+(1216,1345,l),
+(1196,1345,l)
+);
+}
+);
+width = 1558;
+},
+{
+anchors = (
+{
+name = bottomr;
+pos = (1378,0);
+}
+);
+associatedMasterId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+name = Regular;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1208,1490,l),
+(1208,1260,l),
+(1196,1260,l),
+(1123,1417,o),
+(957,1510,o),
+(754,1510,cs),
+(378,1510,o),
+(122,1193,o),
+(122,750,cs),
+(122,294,o),
+(381,-24,o),
+(754,-24,cs),
+(954,-24,o),
+(1120,70,o),
+(1196,236,c),
+(1208,236,l),
+(1208,0,l),
+(1378,0,l),
+(1378,1490,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(489,148,o),
+(300,378,o),
+(300,748,cs),
+(300,1094,o),
+(480,1346,o),
+(756,1346,cs),
+(1066,1346,o),
+(1210,1076,o),
+(1210,748,cs),
+(1210,412,o),
+(1081,148,o),
+(754,148,cs)
+);
+}
+);
+width = 1558;
+},
+{
+anchors = (
+{
+name = bottomr;
+pos = (1506,0);
+}
+);
+associatedMasterId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+background = {
+shapes = (
+{
+ref = O;
+}
+);
+};
+layerId = "AE33CE71-6DA7-43CC-B167-D8650DB5DE68";
+name = "Sep 28, 22, 12:09";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1106,1490,l),
+(1106,1288,l),
+(1104,1288,l),
+(1019,1428,o),
+(862,1510,o),
+(676,1510,cs),
+(315,1510,o),
+(40,1179,o),
+(40,744,cs),
+(40,299,o),
+(305,-20,o),
+(676,-20,cs),
+(866,-20,o),
+(1022,61,o),
+(1104,202,c),
+(1106,202,l),
+(1106,0,l),
+(1506,0,l),
+(1506,1490,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(580,332,o),
+(456,486,o),
+(456,744,cs),
+(456,1003,o),
+(581,1158,o),
+(788,1158,cs),
+(991,1158,o),
+(1104,1009,o),
+(1104,744,cs),
+(1104,480,o),
+(991,332,o),
+(788,332,cs)
+);
+}
+);
+width = 1586;
+},
+{
+anchors = (
+{
+name = bottomr;
+pos = (1200,0);
+}
+);
+layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1401,1490,l),
+(1337,1106,l),
+(1331,1106,l),
+(1291,1374,o),
+(1152,1510,o),
+(924,1510,cs),
+(557,1510,o),
+(255,1200,o),
+(179,744,cs),
+(104,292,o),
+(302,-20,o),
+(663,-20,cs),
+(894,-20,o),
+(1083,118,o),
+(1211,382,c),
+(1217,382,l),
+(1154,0,l),
+(1200,0,l),
+(1447,1490,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(337,26,o),
+(154,316,o),
+(225,744,cs),
+(296,1172,o),
+(575,1464,o),
+(916,1464,cs),
+(1214,1464,o),
+(1355,1190,o),
+(1281,744,cs),
+(1207,295,o),
+(980,26,o),
+(678,26,cs)
+);
+}
+);
+width = 1525;
+},
+{
+anchors = (
+{
+name = bottomr;
+pos = (1141,0);
+}
+);
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1342,1490,l),
+(1278,1106,l),
+(1272,1106,l),
+(1232,1374,o),
+(1093,1510,o),
+(865,1510,cs),
+(498,1510,o),
+(196,1200,o),
+(120,744,cs),
+(45,292,o),
+(243,-20,o),
+(604,-20,cs),
+(835,-20,o),
+(1024,118,o),
+(1152,382,c),
+(1158,382,l),
+(1095,0,l),
+(1141,0,l),
+(1388,1490,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(278,26,o),
+(95,316,o),
+(166,744,cs),
+(237,1172,o),
+(516,1464,o),
+(857,1464,cs),
+(1155,1464,o),
+(1296,1190,o),
+(1222,744,cs),
+(1148,295,o),
+(921,26,o),
+(619,26,cs)
+);
+}
+);
+width = 1397;
+},
+{
+anchors = (
+{
+name = bottomr;
+pos = (1286,0);
+}
+);
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1363,1490,l),
+(1325,1260,l),
+(1313,1260,l),
+(1266,1417,o),
+(1115,1510,o),
+(912,1510,cs),
+(536,1510,o),
+(227,1193,o),
+(154,750,cs),
+(79,294,o),
+(285,-24,o),
+(658,-24,cs),
+(858,-24,o),
+(1040,70,o),
+(1143,236,c),
+(1155,236,l),
+(1116,0,l),
+(1286,0,l),
+(1533,1490,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(422,148,o),
+(271,378,o),
+(332,748,cs),
+(389,1094,o),
+(611,1346,o),
+(887,1346,cs),
+(1197,1346,o),
+(1296,1076,o),
+(1242,748,cs),
+(1186,412,o),
+(1014,148,o),
+(687,148,cs)
+);
+}
+);
+width = 1559;
+},
+{
+anchors = (
+{
+name = bottomr;
+pos = (1432,0);
+}
+);
+layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1277,1490,l),
+(1242,1280,l),
+(1232,1280,l),
+(1179,1401,o),
+(1069,1510,o),
+(868,1510,cs),
+(520,1510,o),
+(192,1169,o),
+(121,744,cs),
+(51,323,o),
+(258,-20,o),
+(615,-20,cs),
+(815,-20,o),
+(962,87,o),
+(1055,210,c),
+(1065,210,l),
+(1030,0,l),
+(1432,0,l),
+(1679,1490,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(577,332,o),
+(493,477,o),
+(537,744,cs),
+(582,1012,o),
+(714,1158,o),
+(914,1158,cs),
+(1115,1158,o),
+(1198,1012,o),
+(1153,744,cs),
+(1109,477,o),
+(978,332,o),
+(777,332,cs)
+);
+}
+);
+width = 1621;
+},
+{
+anchors = (
+{
+name = bottomr;
+pos = (1299,0);
+}
+);
+background = {
+shapes = (
+{
+ref = O;
+}
+);
+};
+layerId = m008;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1375.668,1490,l),
+(1337.592,1260,l),
+(1335.348,1260,l),
+(1289.997,1412.744,o),
+(1120.991,1514,o),
+(911.641,1514,cs),
+(532.257,1514,o),
+(199.736,1188.383,o),
+(126.334,745,cs),
+(52.987,301.948,o),
+(277.927,-24,o),
+(657.027,-24,cs),
+(869.119,-24,o),
+(1067.491,77.321,o),
+(1166.563,236.432,c),
+(1168.07,236,l),
+(1129,0,l),
+(1299,0,l),
+(1545.668,1490,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(400.669,144,o),
+(245.431,389.196,o),
+(304.334,745,cs),
+(362.617,1097.058,o),
+(603.479,1346,o),
+(885.829,1346,cs),
+(1171.393,1346,o),
+(1315.044,1111.718,o),
+(1254.334,745,cs),
+(1194.498,383.561,o),
+(967.495,144,o),
+(684.839,144,cs)
+);
+}
+);
+width = 1535;
+},
+{
+anchors = (
+{
+name = bottomr;
+pos = (1379,0);
+}
+);
+background = {
+shapes = (
+{
+ref = O;
+}
+);
+};
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1225.668,1490,l),
+(1192.227,1288,l),
+(1190.227,1288,l),
+(1126.38,1433.142,o),
+(999.236,1510,o),
+(822.979,1510,cs),
+(461.173,1510,o),
+(150.17,1191.005,o),
+(76.168,744,cs),
+(1.779,294.648,o),
+(205.032,-20,o),
+(569.689,-20,cs),
+(749.946,-20,o),
+(900.869,56.018,o),
+(1010.441,202,c),
+(1012.441,202,l),
+(979,0,l),
+(1379,0,l),
+(1625.668,1490,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(530.346,332,o),
+(448.149,478.1,o),
+(492.168,744,cs),
+(536.378,1011.05,o),
+(667.191,1158,o),
+(860.706,1158,cs),
+(1057.524,1158,o),
+(1143.965,1008.555,o),
+(1100.168,744,cs),
+(1056.807,482.078,o),
+(919.768,332,o),
+(723.962,332,cs)
+);
+}
+);
+width = 1547;
+}
+);
+metricLeft = C;
+metricRight = H;
+}
diff --git a/src/Inter-Italic.glyphspackage/glyphs/_part.top_r_hook.glyph b/src/Inter-Italic.glyphspackage/glyphs/_part.top_r_hook.glyph
index 685468bd0..f350341a8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/_part.top_r_hook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/_part.top_r_hook.glyph
@@ -6,207 +6,205 @@ layers = (
 anchors = (
 {
 name = _topr;
-pos = (336,1118);
+pos = (338,1118);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(336,1118,l),
-(364,1292,ls),
-(382,1401,o),
-(432,1448,o),
-(528,1448,cs),
-(547,1448,o),
-(574,1447,o),
-(600,1444,c),
-(607,1490,l),
-(583,1493,o),
-(556,1494,o),
-(536,1494,cs),
-(413,1495,o),
-(341,1428,o),
-(318,1292,cs),
-(290,1118,l)
+(337,1118,l),
+(366,1292,ls),
+(384,1401,o),
+(433,1444,o),
+(529,1444,cs),
+(546,1444,o),
+(576,1444,o),
+(601,1444,c),
+(609,1490,l),
+(586,1490,o),
+(555,1490,o),
+(537,1490,cs),
+(414,1490,o),
+(342,1428,o),
+(320,1292,cs),
+(291,1118,l)
 );
 }
 );
-width = 650;
+width = 653;
 },
 {
 anchors = (
 {
 name = _topr;
-pos = (414,1118);
+pos = (416,1118);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(414,1118,l),
-(436,1254,l),
+(415,1118,l),
+(438,1254,ls),
 (449,1324,o),
-(504,1355,o),
-(617,1356,cs),
-(633,1356,o),
-(654,1355,o),
-(672,1352,c),
-(696,1496,l),
-(680,1500,o),
-(642,1504,o),
-(597,1504,cs),
-(412,1504,o),
-(298,1416,o),
-(272,1254,c),
-(250,1118,l)
+(505,1356,o),
+(618,1356,cs),
+(634,1356,o),
+(655,1355,o),
+(674,1352,c),
+(698,1496,l),
+(681,1500,o),
+(644,1504,o),
+(599,1504,cs),
+(414,1504,o),
+(300,1416,o),
+(274,1254,cs),
+(251,1118,l)
 );
 }
 );
-width = 698;
+width = 701;
 },
 {
 anchors = (
 {
 name = _topr;
-pos = (370,1056);
+pos = (378,1056);
 }
 );
-background = {
-anchors = (
-{
-name = _topr;
-pos = (402,1056);
-}
-);
-};
 layerId = m008;
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(372,1056,l),
-(403,1242,ls),
-(415,1313,o),
-(453,1341,o),
-(538,1342,cs),
-(558,1342,o),
-(617,1342,o),
-(638,1342,c),
-(662,1490,l),
-(634,1490,o),
-(607,1490,o),
-(562,1490,cs),
-(377,1490,o),
-(264,1404,o),
-(237,1242,cs),
-(206,1056,l)
+(379,1056,l),
+(410,1242,ls),
+(421,1313,o),
+(459,1342,o),
+(544,1342,cs),
+(564,1342,o),
+(623,1342,o),
+(644,1342,c),
+(669,1490,l),
+(641,1490,o),
+(614,1490,o),
+(569,1490,cs),
+(384,1490,o),
+(270,1404,o),
+(244,1242,cs),
+(213,1056,l)
 );
 }
 );
-width = 634;
+width = 636;
 },
 {
 anchors = (
 {
 name = _topr;
-pos = (592,1118);
+pos = (594,1118);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(592,1118,l),
-(595,1136,ls),
-(604,1196,o),
-(637,1218,o),
-(715,1216,cs),
-(754,1216,o),
-(789,1212,o),
-(828,1207,c),
-(873,1480,l),
-(817,1496,o),
-(752,1504,o),
-(679,1504,cs),
-(398,1504,o),
-(237,1381,o),
-(197,1136,cs),
-(194,1118,l)
+(593,1118,l),
+(596,1136,ls),
+(606,1196,o),
+(638,1216,o),
+(716,1216,cs),
+(755,1216,o),
+(791,1212,o),
+(830,1207,c),
+(875,1480,l),
+(819,1496,o),
+(754,1504,o),
+(681,1504,cs),
+(400,1504,o),
+(239,1381,o),
+(198,1136,cs),
+(195,1118,l)
 );
 }
 );
-width = 823;
+width = 825;
 },
 {
 anchors = (
 {
 name = _topr;
-pos = (564,1056);
+pos = (571,1056);
 }
 );
 layerId = m010;
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(564,1056,l),
-(575,1120,ls),
-(582,1162,o),
-(610,1186,o),
-(652,1186,cs),
-(713,1186,o),
-(784,1186,o),
-(808,1186,c),
-(858,1490,l),
-(814,1490,o),
-(643,1490,o),
-(552,1490,cs),
-(351,1490,o),
-(220,1377,o),
-(186,1174,cs),
-(166,1056,l)
+(571.82,1056,l),
+(582.415,1120,ls),
+(589.368,1162,o),
+(617.341,1186,o),
+(659.341,1186,cs),
+(720.341,1186,o),
+(791.341,1186,o),
+(815.341,1186,c),
+(865.668,1490,l),
+(821.668,1490,o),
+(650.668,1490,o),
+(559.668,1490,cs),
+(358.668,1490,o),
+(226.961,1377,o),
+(193.354,1174,cs),
+(173.82,1056,l)
 );
 }
 );
-width = 790;
+width = 793;
 },
 {
 anchors = (
 {
 name = _topr;
-pos = (272,1118);
+pos = (279,1118);
 }
 );
 layerId = m012;
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(272,1118,l),
-(300,1292,ls),
-(318,1401,o),
-(368,1448,o),
-(464,1448,cs),
-(483,1448,o),
-(510,1447,o),
-(536,1444,c),
-(543,1490,l),
-(519,1493,o),
-(492,1494,o),
-(472,1494,cs),
-(349,1495,o),
-(277,1428,o),
-(254,1292,cs),
-(226,1118,l)
+(278,1118,l),
+(307,1292,ls),
+(325,1401,o),
+(374,1444,o),
+(470,1444,cs),
+(487,1444,o),
+(517,1444,o),
+(542,1444,c),
+(550,1490,l),
+(527,1490,o),
+(496,1490,o),
+(478,1490,cs),
+(355,1490,o),
+(283,1428,o),
+(261,1292,cs),
+(232,1118,l)
 );
 }
 );
-width = 522;
+width = 525;
 }
 );
 tags = (
diff --git a/src/Inter-Italic.glyphspackage/glyphs/a.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/a.1.glyph
index e42be5e09..1f4bb5add 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/a.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/a.1.glyph
@@ -8,127 +8,137 @@ layers = (
 anchors = (
 {
 name = bottom;
-pos = (506,0);
+pos = (508,0);
+},
+{
+name = bottomr;
+pos = (900,0);
 },
 {
 name = ogonek;
-pos = (898,0);
+pos = (900,0);
 },
 {
 name = rhalfring;
-pos = (706,1304);
+pos = (708,1304);
 },
 {
 name = top;
-pos = (704,1304);
+pos = (706,1304);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(644,-23,o),
-(801,95,o),
+(644,-24,o),
+(803,95,o),
 (894,280,c),
-(898,280,l),
-(852,0,l),
-(898,0,l),
-(1086,1118,l),
-(1038,1118,l),
-(990,832,l),
-(984,832,l),
-(957,1018,o),
-(835,1135,o),
-(656,1134,cs),
-(396,1135,o),
-(185,884,o),
+(900,280,l),
+(854,0,l),
+(900,0,l),
+(1085,1118,l),
+(1039,1118,l),
+(992,832,l),
+(986,832,l),
+(958,1018,o),
+(835,1134,o),
+(658,1134,cs),
+(396,1134,o),
+(184,884,o),
 (130,556,cs),
-(76,225,o),
-(201,-23,o),
+(75,225,o),
+(201,-24,o),
 (466,-24,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(228,23,o),
-(127,253,o),
+(236,22,o),
+(126,253,o),
 (176,556,cs),
-(227,858,o),
-(420,1088,o),
-(656,1088,cs),
-(892,1088,o),
-(995,858,o),
-(944,556,cs),
-(895,253,o),
-(703,23,o),
-(466,24,cs)
+(226,858,o),
+(414,1088,o),
+(650,1088,cs),
+(885,1088,o),
+(996,858,o),
+(946,556,cs),
+(896,253,o),
+(711,22,o),
+(474,22,cs)
 );
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (523,0);
+pos = (524,0);
+},
+{
+name = bottomr;
+pos = (998,0);
 },
 {
 name = ogonek;
-pos = (999,0);
+pos = (998,0);
 },
 {
 name = rhalfring;
-pos = (735,1304);
+pos = (738,1304);
 },
 {
 name = top;
-pos = (747,1304);
+pos = (750,1304);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(700,-23,o),
-(795,111,o),
-(843,172,c),
-(863,172,l),
-(833,0,l),
-(999,0,l),
-(1185,1118,l),
+(698,-24,o),
+(793,111,o),
+(840,172,c),
+(862,172,l),
+(834,0,l),
+(998,0,l),
+(1183,1118,l),
 (1013,1118,l),
-(983,940,l),
-(969,940,l),
-(942,998,o),
-(896,1132,o),
-(679,1132,cs),
-(396,1132,o),
-(165,908,o),
-(105,556,cs),
-(47,201,o),
-(206,-23,o),
-(485,-24,cs)
+(984,940,l),
+(968,940,l),
+(940,998,o),
+(895,1132,o),
+(677,1132,cs),
+(395,1132,o),
+(162,908,o),
+(104,556,cs),
+(45,201,o),
+(204,-24,o),
+(482,-24,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(312,131,o),
-(239,320,o),
-(279,558,cs),
-(318,794,o),
-(450,977,o),
-(667,978,cs),
-(878,977,o),
-(966,809,o),
-(925,558,cs),
-(882,305,o),
-(734,131,o),
-(527,130,cs)
+(317,130,o),
+(237,320,o),
+(276,558,cs),
+(315,794,o),
+(454,978,o),
+(672,978,cs),
+(882,978,o),
+(964,809,o),
+(922,558,cs),
+(880,305,o),
+(739,130,o),
+(532,130,cs)
 );
 }
 );
@@ -141,12 +151,16 @@ name = bottom;
 pos = (564,0);
 },
 {
+name = bottomr;
+pos = (1128,0);
+},
+{
 name = ogonek;
 pos = (1128,0);
 },
 {
 name = rhalfring;
-pos = (802,1304);
+pos = (804,1304);
 },
 {
 name = top;
@@ -154,68 +168,73 @@ pos = (794,1304);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(565,-15,o),
-(685,70,o),
-(750,184,c),
+(565,-14,o),
+(687,70,o),
+(752,184,c),
 (760,184,l),
 (730,0,l),
 (1128,0,l),
-(1314,1118,l),
-(910,1118,l),
-(878,922,l),
-(874,922,l),
-(848,1036,o),
+(1313,1118,l),
+(913,1118,l),
+(881,922,l),
+(875,922,l),
+(850,1036,o),
 (760,1132,o),
-(594,1132,cs),
+(595,1132,cs),
 (373,1132,o),
-(130,963,o),
-(62,558,c),
-(-1,172,o),
-(169,-15,o),
+(129,963,o),
+(62,558,cs),
+(-2,172,o),
+(170,-14,o),
 (408,-14,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(496,294,o),
-(448,393,o),
+(497,294,o),
+(449,393,o),
 (476,558,cs),
 (504,724,o),
-(584,823,o),
+(584,824,o),
 (694,824,cs),
-(805,823,o),
+(805,824,o),
 (856,724,o),
 (828,558,c),
 (802,396,o),
-(717,294,o),
-(606,294,cs)
+(718,294,o),
+(607,294,cs)
 );
 }
 );
-width = 1322;
+width = 1323;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (472.59,0);
+pos = (473,0);
+},
+{
+name = bottomr;
+pos = (945,0);
 },
 {
 name = ogonek;
-pos = (944.59,0);
+pos = (945,0);
 },
 {
 name = rhalfring;
-pos = (686.513,1262);
+pos = (687,1262);
 },
 {
 name = top;
-pos = (689.513,1262);
+pos = (690,1262);
 }
 );
 guides = (
@@ -230,64 +249,68 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(576.279,-20,o),
-(706.881,38,o),
-(803.078,160,c),
-(805.078,160,l),
-(778.59,0,l),
-(944.59,0,l),
-(1119.41,1056,l),
-(953.41,1056,l),
-(927.584,900,l),
-(925.584,900,l),
-(877.119,1018,o),
-(757.721,1076,o),
-(620.721,1076,cs),
-(345.721,1076,o),
-(125.969,854,o),
-(72,528,cs),
-(18.197,203,o),
-(164.279,-20,o),
-(439.279,-20,cs)
+(576.689,-20,o),
+(707.291,38,o),
+(803.488,160,c),
+(805.488,160,l),
+(779,0,l),
+(945,0,l),
+(1119.82,1056,l),
+(953.82,1056,l),
+(927.994,900,l),
+(925.994,900,l),
+(877.529,1018,o),
+(758.131,1076,o),
+(621.131,1076,cs),
+(346.131,1076,o),
+(126.379,854,o),
+(72.41,528,cs),
+(18.606,203,o),
+(164.689,-20,o),
+(439.689,-20,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(307.608,133,o),
-(201.123,269,o),
-(244,528,cs),
-(286.877,787,o),
-(438.557,924,o),
-(621.557,924,cs),
-(817.557,924,o),
-(915.566,767,o),
-(876,528,cs),
-(836.434,289,o),
-(686.608,133,o),
-(490.608,133,cs)
+(308.018,133,o),
+(201.533,269,o),
+(244.41,528,cs),
+(287.287,787,o),
+(438.967,924,o),
+(621.967,924,cs),
+(817.967,924,o),
+(915.976,767,o),
+(876.41,528,cs),
+(836.844,289,o),
+(687.018,133,o),
+(491.018,133,cs)
 );
 }
 );
-width = 1160;
+width = 1161;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (552.59,0);
+pos = (552,0);
+},
+{
+name = bottomr;
+pos = (1108,0);
 },
 {
 name = ogonek;
-pos = (1116.59,0);
+pos = (1108,0);
 },
 {
 name = rhalfring;
-pos = (785.513,1262);
+pos = (785,1262);
 },
 {
 name = top;
-pos = (775.513,1262);
+pos = (775,1262);
 }
 );
 layerId = m010;
@@ -296,42 +319,42 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(550.617,-24,o),
-(665.212,40,o),
-(732.416,156,c),
-(736.416,156,l),
-(710.59,0,l),
-(1108.59,0,l),
-(1283.41,1056,l),
-(885.41,1056,l),
-(863.557,924,l),
-(858.557,924,l),
-(813.609,1027,o),
-(726.383,1080,o),
-(589.383,1080,cs),
-(324.383,1080,o),
-(99.803,853,o),
-(46.331,530,cs),
-(-9.293,194,o),
-(133.617,-24,o),
-(410.617,-24,cs)
+(550,-24,o),
+(665,40,o),
+(732,156,c),
+(736,156,l),
+(710,0,l),
+(1108,0,l),
+(1283,1056,l),
+(885,1056,l),
+(863,924,l),
+(858,924,l),
+(813,1027,o),
+(726,1080,o),
+(589,1080,cs),
+(324,1080,o),
+(99,853,o),
+(46,530,cs),
+(-10,194,o),
+(133,-24,o),
+(410,-24,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(472.599,290,o),
-(426.161,384,o),
-(450.331,530,cs),
-(474.336,675,o),
-(551.732,768,o),
-(660.732,768,cs),
-(769.732,768,o),
-(832.336,675,o),
-(808.331,530,cs),
-(784.161,384,o),
-(690.599,290,o),
-(581.599,290,cs)
+(472,290,o),
+(426,384,o),
+(450,530,cs),
+(474,675,o),
+(551,768,o),
+(660,768,cs),
+(769,768,o),
+(832,675,o),
+(808,530,cs),
+(784,384,o),
+(690,290,o),
+(581,290,cs)
 );
 }
 );
@@ -341,19 +364,23 @@ width = 1282;
 anchors = (
 {
 name = bottom;
-pos = (448.59,0);
+pos = (449,0);
+},
+{
+name = bottomr;
+pos = (841,0);
 },
 {
 name = ogonek;
-pos = (840.59,0);
+pos = (841,0);
 },
 {
 name = rhalfring;
-pos = (648.466,1304);
+pos = (649,1304);
 },
 {
 name = top;
-pos = (646.466,1304);
+pos = (647,1304);
 }
 );
 layerId = m012;
@@ -362,42 +389,42 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(584.617,-24,o),
-(743.317,95,o),
-(834.944,280,c),
-(840.944,280,l),
-(794.59,0,l),
-(840.59,0,l),
-(1025.674,1118,l),
-(979.674,1118,l),
-(932.327,832,l),
-(926.327,832,l),
-(898.119,1018,o),
-(775.323,1134,o),
-(598.323,1134,cs),
-(336.323,1134,o),
-(124.935,884,o),
-(70.635,556,cs),
-(15.839,225,o),
-(141.617,-24,o),
-(406.617,-24,cs)
+(585,-24,o),
+(744,95,o),
+(835,280,c),
+(841,280,l),
+(795,0,l),
+(841,0,l),
+(1026,1118,l),
+(980,1118,l),
+(933,832,l),
+(927,832,l),
+(899,1018,o),
+(776,1134,o),
+(599,1134,cs),
+(337,1134,o),
+(125,884,o),
+(71,556,cs),
+(16,225,o),
+(142,-24,o),
+(407,-24,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(176.232,22,o),
-(66.474,253,o),
-(116.635,556,cs),
-(166.631,858,o),
-(354.707,1088,o),
-(590.707,1088,cs),
-(825.707,1088,o),
-(936.631,858,o),
-(886.635,556,cs),
-(836.474,253,o),
-(651.232,22,o),
-(414.232,22,cs)
+(177,22,o),
+(67,253,o),
+(117,556,cs),
+(167,858,o),
+(355,1088,o),
+(591,1088,cs),
+(826,1088,o),
+(937,858,o),
+(887,556,cs),
+(837,253,o),
+(652,22,o),
+(415,22,cs)
 );
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/aacute.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/aacute.1.glyph
index 56918ac57..16362e76c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/aacute.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/aacute.1.glyph
@@ -12,11 +12,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (297,0);
+pos = (299,0);
 ref = acute;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/abreve.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/abreve.1.glyph
index deec8d04d..41f1a8b4a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/abreve.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/abreve.1.glyph
@@ -12,11 +12,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (165,0);
+pos = (167,0);
 ref = breve;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/abreveacute.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/abreveacute.1.glyph
index 4cce22452..f62b64d40 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/abreveacute.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/abreveacute.1.glyph
@@ -13,11 +13,11 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (166,-14);
+pos = (168,-14);
 ref = breveacutecomb.cn;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/abrevedotbelow.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/abrevedotbelow.1.glyph
index d425f8105..474279a81 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/abrevedotbelow.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/abrevedotbelow.1.glyph
@@ -12,15 +12,15 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (165,0);
+pos = (167,0);
 ref = breve;
 },
 {
-pos = (1158,0);
+pos = (1160,0);
 ref = dotbelow;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -30,11 +30,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (164,0);
+pos = (167,0);
 ref = breve;
 },
 {
-pos = (1219,0);
+pos = (1220,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/abrevegrave.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/abrevegrave.1.glyph
index 11cdccf90..9fa8bd975 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/abrevegrave.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/abrevegrave.1.glyph
@@ -13,11 +13,11 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (328,-14);
+pos = (330,-14);
 ref = brevegravecomb.cn;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/abrevehookabove.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/abrevehookabove.1.glyph
index 0cb756aa2..a743c90bf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/abrevehookabove.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/abrevehookabove.1.glyph
@@ -13,11 +13,11 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (226,38);
+pos = (228,38);
 ref = brevehookcomb.cn;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (157,22);
+pos = (160,22);
 ref = brevehookcomb.cn;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/abrevetilde.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/abrevetilde.1.glyph
index c44e29e2c..086ef5c6c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/abrevetilde.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/abrevetilde.1.glyph
@@ -13,11 +13,11 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (196,54);
+pos = (198,54);
 ref = brevetildecomb.cn;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acaron.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/acaron.1.glyph
index 687e3e38e..8a9fcb795 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acaron.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acaron.1.glyph
@@ -12,11 +12,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (152,16);
+pos = (154,16);
 ref = caron;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acircumflex.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/acircumflex.1.glyph
index 6e8953f15..ade060fed 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acircumflex.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acircumflex.1.glyph
@@ -12,11 +12,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (148,0);
+pos = (150,0);
 ref = circumflex;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (22,-42);
+pos = (21,-42);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acircumflexacute.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/acircumflexacute.1.glyph
index d9e2c210c..abf1cebe8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acircumflexacute.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acircumflexacute.1.glyph
@@ -13,11 +13,11 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (278,32);
+pos = (280,32);
 ref = circumflexacutecomb.cn;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acircumflexdotbelow.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/acircumflexdotbelow.1.glyph
index 1b2b06545..ba4725ef5 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acircumflexdotbelow.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acircumflexdotbelow.1.glyph
@@ -12,15 +12,15 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (148,0);
+pos = (150,0);
 ref = circumflex;
 },
 {
-pos = (1158,0);
+pos = (1160,0);
 ref = dotbelow;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -30,11 +30,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (157,0);
+pos = (160,0);
 ref = circumflex;
 },
 {
-pos = (1219,0);
+pos = (1220,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acircumflexgrave.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/acircumflexgrave.1.glyph
index 62e634a64..3d3f4f0b8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acircumflexgrave.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acircumflexgrave.1.glyph
@@ -13,11 +13,11 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (128,64);
+pos = (130,64);
 ref = circumflexgravecomb.cn;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acircumflexhookabove.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/acircumflexhookabove.1.glyph
index 87f8e98e6..4480834e1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acircumflexhookabove.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acircumflexhookabove.1.glyph
@@ -13,11 +13,11 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (226,-6);
+pos = (228,-6);
 ref = circumflexhookcomb.cn;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -28,7 +28,7 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (147,-16);
+pos = (150,-16);
 ref = circumflexhookcomb.cn;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/acircumflextilde.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/acircumflextilde.1.glyph
index 8db27d2ca..2bcc4bb00 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/acircumflextilde.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/acircumflextilde.1.glyph
@@ -13,11 +13,11 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (146,-42);
+pos = (148,-42);
 ref = circumflextildecomb.cn;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/adblgrave.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/adblgrave.1.glyph
index b12522990..2dea25087 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/adblgrave.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/adblgrave.1.glyph
@@ -12,11 +12,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1138,0);
+pos = (1140,0);
 ref = dblgravecmb;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/adieresis.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/adieresis.1.glyph
index 8987001f4..128d5ae6e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/adieresis.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/adieresis.1.glyph
@@ -12,11 +12,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (-94,0);
+pos = (-92,0);
 ref = dieresis;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/adieresismacron.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/adieresismacron.1.glyph
index 44f311438..8bb7a613f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/adieresismacron.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/adieresismacron.1.glyph
@@ -13,11 +13,11 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1146,-46);
+pos = (1148,-46);
 ref = dieresismacroncomb.lc;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/adotbelow.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/adotbelow.1.glyph
index 5116537f7..61fa08b5c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/adotbelow.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/adotbelow.1.glyph
@@ -12,11 +12,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1158,0);
+pos = (1160,0);
 ref = dotbelow;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1219,0);
+pos = (1220,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/adotmacron.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/adotmacron.1.glyph
index 798509fd6..5d1b4771c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/adotmacron.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/adotmacron.1.glyph
@@ -13,11 +13,11 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (1228,0);
+pos = (1230,0);
 ref = dotmacroncomb.lc;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/agrave.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/agrave.1.glyph
index 1fb5eaccb..5c885cd58 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/agrave.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/agrave.1.glyph
@@ -12,11 +12,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (91,0);
+pos = (93,0);
 ref = grave;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ahookabove.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/ahookabove.1.glyph
index 44a228835..f52264f43 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ahookabove.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ahookabove.1.glyph
@@ -12,11 +12,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1084,44);
+pos = (1086,44);
 ref = hookabovecmb;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
@@ -26,7 +26,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1221,26);
+pos = (1224,26);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.1.glyph
index 3c88f32e6..130d480fa 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ainvertedbreve.1.glyph
@@ -12,11 +12,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (1173,0);
+pos = (1175,0);
 ref = breveinvnosp;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/amacron.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/amacron.1.glyph
index 2c421e3a3..e84bd59fb 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/amacron.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/amacron.1.glyph
@@ -12,11 +12,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (280,0);
+pos = (282,0);
 ref = macron;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/aogonek.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/aogonek.1.glyph
index c1950bb6c..8eea501cf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/aogonek.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/aogonek.1.glyph
@@ -12,11 +12,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (720,0);
+pos = (722,0);
 ref = ogonek;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.1.glyph
index 5ea4e6d71..3c33d3a12 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/arighthalfring.1.glyph
@@ -12,11 +12,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (476,118);
+pos = (478,118);
 ref = ringhalfright;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/aring.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/aring.1.glyph
index 0ee9e9106..480a89adc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/aring.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/aring.1.glyph
@@ -12,11 +12,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (334,0);
+pos = (336,0);
 ref = ring;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/aringacute.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/aringacute.1.glyph
index e05cc2c14..cc412ef1c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/aringacute.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/aringacute.1.glyph
@@ -13,11 +13,11 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (326,152);
+pos = (328,152);
 ref = ringacute.cn;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/aringbelow.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/aringbelow.1.glyph
index 0c862529b..fc3d3fde6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/aringbelow.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/aringbelow.1.glyph
@@ -13,11 +13,11 @@ ref = a.1;
 },
 {
 alignment = 1;
-pos = (432,0);
+pos = (434,0);
 ref = uni02F3;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/atilde.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/atilde.1.glyph
index a45695aa6..99d5f4552 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/atilde.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/atilde.1.glyph
@@ -12,11 +12,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (72,0);
+pos = (74,0);
 ref = tilde;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/d.glyph b/src/Inter-Italic.glyphspackage/glyphs/d.glyph
index 7df71dfbb..938d7cd4e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/d.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/d.glyph
@@ -11,6 +11,10 @@ name = bottom;
 pos = (521,0);
 },
 {
+name = bottomr;
+pos = (1001,0);
+},
+{
 name = cross;
 pos = (1053,1280);
 },
@@ -71,7 +75,7 @@ nodes = (
 );
 }
 );
-width = 1251;
+width = 1252;
 },
 {
 anchors = (
@@ -80,6 +84,10 @@ name = bottom;
 pos = (564,0);
 },
 {
+name = bottomr;
+pos = (1128,0);
+},
+{
 name = cross;
 pos = (1054,1280);
 },
@@ -140,7 +148,7 @@ nodes = (
 );
 }
 );
-width = 1322;
+width = 1323;
 },
 {
 anchors = (
@@ -149,6 +157,10 @@ name = bottom;
 pos = (504,0);
 },
 {
+name = bottomr;
+pos = (898,0);
+},
+{
 name = cross;
 pos = (1030,1280);
 },
@@ -209,7 +221,7 @@ nodes = (
 );
 }
 );
-width = 1189;
+width = 1190;
 },
 {
 anchors = (
@@ -218,6 +230,10 @@ name = bottom;
 pos = (470.59,0);
 },
 {
+name = bottomr;
+pos = (945,0);
+},
+{
 name = cross;
 pos = (996.493,1280);
 },
@@ -288,6 +304,10 @@ name = bottom;
 pos = (544.59,0);
 },
 {
+name = bottomr;
+pos = (1109,0);
+},
+{
 name = cross;
 pos = (1036.493,1280);
 },
@@ -358,6 +378,10 @@ name = bottom;
 pos = (444.59,0);
 },
 {
+name = bottomr;
+pos = (841,0);
+},
+{
 name = cross;
 pos = (970.493,1280);
 },
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dcedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/dcedilla.glyph
index ef5625f98..f3f6242bf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dcedilla.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dcedilla.glyph
@@ -14,7 +14,7 @@ pos = (335,0);
 ref = commaaccent;
 }
 );
-width = 1251;
+width = 1252;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dcircumflexbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/dcircumflexbelow.glyph
index a02a4f839..070d41034 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dcircumflexbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dcircumflexbelow.glyph
@@ -14,7 +14,7 @@ pos = (1205,0);
 ref = circumflexsubnosp;
 }
 );
-width = 1251;
+width = 1252;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dcroat.glyph b/src/Inter-Italic.glyphspackage/glyphs/dcroat.glyph
index 6e7dc8fac..b0c9808b8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dcroat.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dcroat.glyph
@@ -14,7 +14,7 @@ pos = (566,559);
 ref = crossbar;
 }
 );
-width = 1251;
+width = 1252;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ddotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/ddotaccent.glyph
index f5d0b70c8..0616bf5da 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ddotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ddotaccent.glyph
@@ -14,7 +14,7 @@ pos = (381,186);
 ref = dotaccent;
 }
 );
-width = 1251;
+width = 1252;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ddotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/ddotbelow.glyph
index 30f247d74..af5fa44ea 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ddotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ddotbelow.glyph
@@ -14,7 +14,7 @@ pos = (1217,0);
 ref = dotbelow;
 }
 );
-width = 1251;
+width = 1252;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -27,7 +27,7 @@ pos = (1194,0);
 ref = dotbelow;
 }
 );
-width = 1322;
+width = 1323;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dlinebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/dlinebelow.glyph
index edbb918e2..6d0a39a99 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dlinebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dlinebelow.glyph
@@ -14,7 +14,7 @@ pos = (1219,0);
 ref = macronsubnosp;
 }
 );
-width = 1251;
+width = 1252;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -28,7 +28,7 @@ pos = (1292,0);
 ref = macronsubnosp;
 }
 );
-width = 1322;
+width = 1323;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dong.glyph b/src/Inter-Italic.glyphspackage/glyphs/dong.glyph
index 91dc192b6..697523b10 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dong.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dong.glyph
@@ -19,7 +19,7 @@ pos = (119,-158);
 ref = underscore;
 }
 );
-width = 1251;
+width = 1252;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -38,7 +38,7 @@ pos = (130,-126);
 ref = underscore;
 }
 );
-width = 1322;
+width = 1323;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -57,7 +57,7 @@ pos = (120,-178);
 ref = underscore;
 }
 );
-width = 1189;
+width = 1190;
 },
 {
 layerId = m008;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/drthook.glyph b/src/Inter-Italic.glyphspackage/glyphs/drthook.glyph
index 1e6e67e6f..e0742b460 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/drthook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/drthook.glyph
@@ -5,190 +5,87 @@ kernRight = rthook;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1082,-419,o),
-(1120,-419,o),
-(1150,-410,c),
-(1172,-264,l),
-(1158,-268,o),
-(1137,-271,o),
-(1118,-270,cs),
-(1024,-271,o),
-(956,-259,o),
-(980,-108,cs),
-(1032,212,l),
-(862,212,l),
-(806,-120,ls),
-(777,-311,o),
-(884,-419,o),
-(1048,-418,cs)
-);
+ref = d;
 },
 {
-ref = d;
+pos = (795,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1248;
+width = 1252;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1187,-419,o),
-(1260,-410,o),
-(1300,-408,c),
-(1350,-114,l),
-(1318,-116,o),
-(1289,-119,o),
-(1260,-120,cs),
-(1190,-119,o),
-(1109,-105,o),
-(1120,-38,cs),
-(1166,256,l),
-(770,256,l),
-(722,-34,ls),
-(665,-364,o),
-(852,-419,o),
-(1096,-418,cs)
-);
+ref = d;
 },
 {
-ref = d;
+pos = (690,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1326;
+width = 1323;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(999,-416,o),
-(1020,-413,o),
-(1040,-408,c),
-(1048,-362,l),
-(1030,-367,o),
-(1011,-369,o),
-(982,-370,c),
-(868,-369,o),
-(844,-321,o),
-(866,-198,cs),
-(898,0,l),
-(852,0,l),
-(818,-206,ls),
-(795,-341,o),
-(844,-416,o),
-(974,-416,c)
-);
+ref = d;
 },
 {
-alignment = -1;
-ref = d;
+pos = (881,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1200;
+width = 1190;
 },
 {
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1056.225,-419,o),
-(1094.225,-419,o),
-(1122.715,-410,c),
-(1146.885,-264,l),
-(1131.223,-268,o),
-(1109.726,-271,o),
-(1089.892,-270,cs),
-(996.726,-271,o),
-(932.521,-236,o),
-(950.724,-120,cs),
-(1005.687,212,l),
-(835.687,212,l),
-(780.724,-120,ls),
-(748.104,-311,o),
-(858.225,-419,o),
-(1021.391,-418,cs)
-);
+ref = d;
 },
 {
-ref = d;
+pos = (734,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1184;
+width = 1160;
 },
 {
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1183.225,-419,o),
-(1254.715,-410,o),
-(1295.046,-408,c),
-(1344.38,-110,l),
-(1312.883,-113,o),
-(1283.386,-116,o),
-(1253.386,-116,cs),
-(1184.386,-116,o),
-(1104.704,-102,o),
-(1114.962,-34,cs),
-(1161.646,248,l),
-(763.646,248,l),
-(716.962,-34,ls),
-(662.33,-364,o),
-(849.225,-419,o),
-(1093.391,-418,cs)
-);
+ref = d;
 },
 {
-ref = d;
+pos = (668,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1294;
+width = 1282;
 },
 {
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(929.722,-416,o),
-(956.887,-415,o),
-(982.384,-412,c),
-(990,-366,l),
-(963.668,-368,o),
-(936.503,-369,o),
-(917.337,-370,cs),
-(815.503,-369,o),
-(786.952,-324,o),
-(807.48,-200,cs),
-(842.908,14,l,{
-name = hr00;
-}),
-(796.908,14,l),
-(761.48,-200,ls),
-(735.482,-351,o),
-(781.722,-416,o),
-(909.722,-416,cs)
-);
+ref = d;
 },
 {
-alignment = -1;
-ref = d;
+pos = (818,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1072;
+width = 1062;
 }
 );
 metricLeft = d;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dtopbar.glyph b/src/Inter-Italic.glyphspackage/glyphs/dtopbar.glyph
index bf264d745..24071159e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dtopbar.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dtopbar.glyph
@@ -14,7 +14,7 @@ pos = (131,0);
 ref = _part.rtopbar;
 }
 );
-width = 1251;
+width = 1252;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -27,7 +27,7 @@ pos = (200,0);
 ref = _part.rtopbar;
 }
 );
-width = 1322;
+width = 1323;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -40,7 +40,7 @@ pos = (177,0);
 ref = _part.rtopbar;
 }
 );
-width = 1189;
+width = 1190;
 },
 {
 layerId = m008;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/dzecyrillic.glyph b/src/Inter-Italic.glyphspackage/glyphs/dzecyrillic.glyph
index d0a3d52ee..355a5d9f2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/dzecyrillic.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/dzecyrillic.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = s;
 }
 );
-width = 1070;
+width = 1071;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ghook.glyph b/src/Inter-Italic.glyphspackage/glyphs/ghook.glyph
index 7a597b49b..76e25adda 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ghook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ghook.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (768,0);
+pos = (766,0);
 ref = _part.top_r_hook;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (724,0);
+pos = (722,0);
 ref = _part.top_r_hook;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (750,0);
+pos = (748,0);
 ref = _part.top_r_hook;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (727,0);
+pos = (719,0);
 ref = _part.top_r_hook;
 }
 );
@@ -62,7 +62,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (689,0);
+pos = (682,0);
 ref = _part.top_r_hook;
 }
 );
@@ -75,7 +75,7 @@ shapes = (
 ref = g;
 },
 {
-pos = (754,0);
+pos = (747,0);
 ref = _part.top_r_hook;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hhook.glyph b/src/Inter-Italic.glyphspackage/glyphs/hhook.glyph
index debbd5d9e..e69aa1c69 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hhook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/hhook.glyph
@@ -10,11 +10,10 @@ shapes = (
 ref = n;
 },
 {
-pos = (2,0);
 ref = _part.top_r_hook;
 }
 );
-width = 1200;
+width = 1201;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -26,7 +25,7 @@ ref = n;
 ref = _part.top_r_hook;
 }
 );
-width = 1329;
+width = 1331;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -35,11 +34,10 @@ shapes = (
 ref = n;
 },
 {
-pos = (2,0);
 ref = _part.top_r_hook;
 }
 );
-width = 1163;
+width = 1165;
 },
 {
 layerId = m008;
@@ -48,11 +46,11 @@ shapes = (
 ref = n;
 },
 {
-pos = (9,0);
+pos = (1,0);
 ref = _part.top_r_hook;
 }
 );
-width = 1136;
+width = 1137;
 },
 {
 layerId = m010;
@@ -61,7 +59,6 @@ shapes = (
 ref = n;
 },
 {
-pos = (7,0);
 ref = _part.top_r_hook;
 }
 );
@@ -74,7 +71,6 @@ shapes = (
 ref = n;
 },
 {
-pos = (6,0);
 ref = _part.top_r_hook;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hturn.glyph b/src/Inter-Italic.glyphspackage/glyphs/hturn.glyph
index f52afeae9..ff240182f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hturn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/hturn.glyph
@@ -159,7 +159,7 @@ layerId = m012;
 shapes = (
 {
 angle = 180;
-pos = (1036,1056);
+pos = (1036,1118);
 ref = h;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hturnhook2.glyph b/src/Inter-Italic.glyphspackage/glyphs/hturnhook2.glyph
index 31c07d676..604917522 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hturnhook2.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/hturnhook2.glyph
@@ -5,171 +5,174 @@ kernRight = rthook;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(172,980,o),
-(192,983,o),
-(212,984,cs),
-(305,983,o),
-(369,948,o),
-(352,832,cs),
-(280,408,ls),
-(233,119,o),
-(361,-15,o),
-(590,-14,cs),
-(765,-15,o),
-(881,58,o),
-(952,174,c),
-(966,174,l),
-(916,-120,ls),
-(887,-311,o),
-(995,-419,o),
-(1158,-418,cs),
-(1193,-419,o),
-(1231,-419,o),
-(1260,-410,c),
-(1282,-264,l),
-(1268,-268,o),
-(1248,-271,o),
-(1228,-270,cs),
-(1135,-271,o),
-(1071,-236,o),
-(1088,-120,cs),
-(1294,1118,l),
-(1122,1118,l),
+(1196,-426,o),
+(1235,-422,o),
+(1253,-418,c),
+(1277,-274,l),
+(1257,-277,o),
+(1236,-278,o),
+(1220,-278,cs),
+(1107,-278,o),
+(1067,-246,o),
+(1079,-176,cs),
+(1293,1118,l),
+(1123,1118,l),
 (1012,446,ls),
-(977,250,o),
-(835,140,o),
-(666,140,cs),
-(503,140,o),
-(425,241,o),
-(454,418,cs),
-(524,832,ls),
-(553,1024,o),
-(445,1132,o),
-(282,1132,cs),
-(247,1132,o),
-(209,1132,o),
+(980,251,o),
+(836,140,o),
+(667,140,cs),
+(505,140,o),
+(424,242,o),
+(454,420,cs),
+(522,832,ls),
+(554,1024,o),
+(442,1132,o),
+(279,1132,cs),
+(244,1132,o),
+(206,1132,o),
 (180,1122,c),
-(158,978,l)
+(156,978,l),
+(169,981,o),
+(191,984,o),
+(211,984,cs),
+(305,984,o),
+(369,948,o),
+(350,832,cs),
+(280,408,ls),
+(232,121,o),
+(364,-14,o),
+(592,-14,cs),
+(768,-14,o),
+(880,60,o),
+(951,176,c),
+(967,176,l),
+(909,-176,ls),
+(882,-338,o),
+(966,-426,o),
+(1151,-426,cs)
 );
 }
 );
-width = 1394;
+width = 1359;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(103,826,o),
-(132,829,o),
-(161,830,cs),
-(231,829,o),
+(1331,-441,o),
+(1398,-433,o),
+(1460,-417,c),
+(1505,-144,l),
+(1464,-149,o),
+(1424,-153,o),
+(1385,-153,cs),
+(1307,-153,o),
+(1281,-133,o),
+(1291,-73,cs),
+(1488,1118,l),
+(1086,1118,l),
+(982,490,ls),
+(964,379,o),
+(889,312,o),
+(791,312,cs),
+(688,312,o),
+(642,379,o),
+(660,490,cs),
+(703,748,ls),
+(757,1076,o),
+(564,1132,o),
+(320,1132,cs),
+(224,1132,o),
+(168,1126,o),
+(120,1120,c),
+(71,824,l),
+(104,827,o),
+(133,830,o),
+(162,830,cs),
+(232,830,o),
 (312,815,o),
 (301,748,cs),
-(243,404,ls),
-(202,160,o),
-(327,-15,o),
-(563,-14,cs),
-(728,-15,o),
-(865,70,o),
-(937,212,c),
-(949,212,l),
-(909,-34,ls),
-(856,-364,o),
-(1037,-419,o),
-(1281,-418,cs),
-(1380,-419,o),
-(1435,-410,o),
-(1485,-408,c),
-(1535,-110,l),
-(1505,-113,o),
-(1470,-116,o),
-(1443,-116,cs),
-(1371,-116,o),
-(1284,-102,o),
-(1295,-34,cs),
-(1487,1118,l),
-(1087,1118,l),
-(981,488,ls),
-(964,378,o),
-(888,311,o),
-(789,312,cs),
-(688,311,o),
-(641,378,o),
-(659,488,cs),
-(703,748,ls),
-(754,1076,o),
-(565,1132,o),
-(321,1132,cs),
-(225,1132,o),
-(167,1123,o),
-(121,1120,c),
-(71,824,l)
+(244,406,ls),
+(204,161,o),
+(329,-14,o),
+(565,-14,cs),
+(730,-14,o),
+(866,71,o),
+(940,214,c),
+(944,214,l),
+(897,-73,ls),
+(856,-318,o),
+(977,-441,o),
+(1258,-441,cs)
 );
 }
 );
-width = 1519;
+width = 1506;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(231,1091,o),
-(250,1094,o),
-(278,1094,cs),
-(393,1094,o),
-(416,1046,o),
-(394,922,cs),
-(302,366,ls),
-(263,143,o),
-(394,-15,o),
-(618,-14,cs),
-(772,-15,o),
-(915,61,o),
-(984,178,c),
-(990,178,l),
-(926,-206,ls),
-(902,-342,o),
-(951,-416,o),
-(1080,-416,cs),
-(1107,-416,o),
-(1127,-413,o),
-(1148,-408,c),
-(1154,-362,l),
-(1137,-367,o),
-(1119,-369,o),
-(1090,-370,cs),
-(976,-369,o),
-(953,-321,o),
-(974,-198,cs),
+(1096,-418,o),
+(1127,-418,o),
+(1150,-418,c),
+(1157,-372,l),
+(1132,-372,o),
+(1102,-372,o),
+(1085,-372,cs),
+(989,-372,o),
+(955,-329,o),
+(973,-220,cs),
 (1194,1118,l),
 (1148,1118,l),
-(1022,366,ls),
+(1024,366,ls),
 (991,172,o),
-(825,32,o),
-(626,32,cs),
-(429,32,o),
-(314,169,o),
-(348,366,cs),
-(442,930,ls),
-(465,1066,o),
-(417,1140,o),
-(286,1140,cs),
-(262,1140,o),
-(241,1137,o),
-(220,1134,c),
-(212,1086,l)
+(826,32,o),
+(628,32,cs),
+(431,32,o),
+(317,169,o),
+(350,366,cs),
+(442,926,ls),
+(467,1076,o),
+(421,1140,o),
+(294,1140,cs),
+(274,1140,o),
+(247,1139,o),
+(221,1136,c),
+(213,1090,l),
+(240,1092,o),
+(266,1094,o),
+(286,1094,cs),
+(389,1094,o),
+(417,1049,o),
+(396,926,cs),
+(304,366,ls),
+(267,143,o),
+(398,-14,o),
+(621,-14,cs),
+(776,-14,o),
+(916,61,o),
+(988,178,c),
+(992,178,l),
+(927,-220,ls),
+(904,-356,o),
+(955,-418,o),
+(1078,-418,cs)
 );
 }
 );
-width = 1318;
+width = 1300;
 },
 {
 layerId = m008;
@@ -178,55 +181,55 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(148.828,980,o),
-(169.325,983,o),
-(189.49,984,cs),
-(283.325,983,o),
-(346.531,948,o),
-(328.327,832,cs),
-(258.134,408,ls),
-(209.29,119,o),
-(339.107,-15,o),
-(568.272,-14,cs),
-(743.107,-15,o),
-(857.192,58,o),
-(929.396,174,c),
-(943.396,174,l),
-(894.724,-120,ls),
-(863.104,-311,o),
-(973.225,-419,o),
-(1135.391,-418,cs),
-(1171.225,-419,o),
-(1208.225,-419,o),
-(1236.715,-410,c),
-(1260.885,-264,l),
-(1245.223,-268,o),
-(1224.726,-271,o),
-(1203.892,-270,cs),
-(1110.726,-271,o),
-(1046.521,-236,o),
-(1066.724,-120,cs),
-(1271.674,1118,l),
-(1099.674,1118,l),
-(988.425,446,ls),
-(955.977,250,o),
-(812.767,140,o),
-(643.767,140,cs),
-(480.767,140,o),
-(401.487,241,o),
-(431.79,418,cs),
-(500.327,832,ls),
-(531.112,1024,o),
-(420.992,1132,o),
-(257.992,1132,cs),
-(222.992,1132,o),
-(184.992,1132,o),
-(158.336,1122,c),
-(134.497,978,l)
+(1166,-418,o),
+(1193,-418,o),
+(1221,-418,c),
+(1245,-270,l),
+(1224,-270,o),
+(1165,-270,o),
+(1145,-270,cs),
+(1060,-270,o),
+(1036,-241,o),
+(1048,-170,cs),
+(1251,1056,l),
+(1081,1056,l),
+(979,438,ls),
+(943,225,o),
+(799,136,o),
+(645,136,cs),
+(487,136,o),
+(400,229,o),
+(430,412,cs),
+(491,778,ls),
+(521,961,o),
+(426,1056,o),
+(229,1056,cs),
+(202,1056,o),
+(172,1056,o),
+(147,1056,c),
+(123,910,l),
+(141,910,o),
+(159,910,o),
+(177,910,cs),
+(299,910,o),
+(338,879,o),
+(319,770,cs),
+(258,400,ls),
+(212,119,o),
+(371,-20,o),
+(584,-20,cs),
+(751,-20,o),
+(867,68,o),
+(930,170,c),
+(934,170,l),
+(878,-170,ls),
+(851,-332,o),
+(936,-418,o),
+(1121,-418,cs)
 );
 }
 );
-width = 1334;
+width = 1290;
 },
 {
 layerId = m010;
@@ -235,55 +238,55 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(91.334,826,o),
-(120.83,829,o),
-(149.996,830,cs),
-(219.83,829,o),
-(299.513,815,o),
-(288.421,748,cs),
-(231.472,404,ls),
-(191.078,160,o),
-(316.107,-15,o),
-(552.272,-14,cs),
-(717.107,-15,o),
-(853.179,70,o),
-(925.687,212,c),
-(937.687,212,l),
-(896.962,-34,ls),
-(843.33,-364,o),
-(1026.225,-419,o),
-(1269.391,-418,cs),
-(1369.225,-419,o),
-(1422.715,-410,o),
-(1473.046,-408,c),
-(1522.38,-110,l),
-(1492.883,-113,o),
-(1457.386,-116,o),
-(1431.386,-116,cs),
-(1358.386,-116,o),
-(1272.704,-102,o),
-(1284.962,-34,cs),
-(1475.674,1118,l),
-(1073.674,1118,l),
-(969.378,488,ls),
-(951.168,378,o),
-(876.076,311,o),
-(778.241,312,cs),
-(675.076,311,o),
-(628.168,378,o),
-(647.378,488,cs),
-(690.421,748,ls),
-(743.721,1076,o),
-(551.992,1132,o),
-(307.992,1132,cs),
-(211.992,1132,o),
-(155.502,1123,o),
-(108.005,1120,c),
-(59.002,824,l)
+(1227,-418,o),
+(1398,-418,o),
+(1442,-418,c),
+(1492,-114,l),
+(1468,-114,o),
+(1397,-114,o),
+(1336,-114,cs),
+(1294,-114,o),
+(1276,-90,o),
+(1283,-48,cs),
+(1466,1056,l),
+(1066,1056,l),
+(969,472,ls),
+(951,364,o),
+(874,298,o),
+(777,298,cs),
+(676,298,o),
+(625,364,o),
+(643,472,cs),
+(681,702,ls),
+(722,948,o),
+(605,1056,o),
+(296,1056,cs),
+(230,1056,o),
+(164,1056,o),
+(98,1056,c),
+(47,752,l),
+(77,752,o),
+(173,752,o),
+(203,752,cs),
+(263,752,o),
+(286,729,o),
+(277,678,cs),
+(230,390,ls),
+(190,150,o),
+(319,-24,o),
+(554,-24,cs),
+(715,-24,o),
+(849,60,o),
+(922,200,c),
+(924,200,l),
+(874,-102,ls),
+(841,-305,o),
+(935,-418,o),
+(1136,-418,cs)
 );
 }
 );
-width = 1486;
+width = 1465;
 },
 {
 layerId = m012;
@@ -292,55 +295,55 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(183.37,1092,o),
-(209.701,1094,o),
-(229.701,1094,cs),
-(332.701,1094,o),
-(359.251,1049,o),
-(339.888,926,cs),
-(247.181,366,ls),
-(209.264,143,o),
-(341.107,-15,o),
-(564.272,-14,cs),
-(719.107,-15,o),
-(859.689,61,o),
-(932.058,178,c),
-(936.058,178,l),
-(873.48,-200,ls),
-(849.317,-352,o),
-(895.722,-416,o),
-(1023.722,-416,cs),
-(1043.722,-416,o),
-(1069.887,-415,o),
-(1094.384,-412,c),
-(1102,-366,l),
-(1077.668,-368,o),
-(1050.503,-369,o),
-(1031.337,-370,cs),
-(929.503,-369,o),
-(899.952,-324,o),
-(921.48,-200,cs),
-(1139.674,1118,l),
-(1091.674,1118,l),
-(967.181,366,ls),
-(936.065,172,o),
-(769.888,32,o),
-(571.888,32,cs),
-(374.888,32,o),
-(260.568,169,o),
-(293.181,366,cs),
-(385.888,926,ls),
-(410.721,1076,o),
-(364.316,1140,o),
-(237.316,1140,cs),
-(217.316,1140,o),
-(190.15,1139,o),
-(164.654,1136,c),
-(157.038,1090,l)
+(1035,-418,o),
+(1066,-418,o),
+(1089,-418,c),
+(1096,-372,l),
+(1071,-372,o),
+(1041,-372,o),
+(1024,-372,cs),
+(928,-372,o),
+(893,-329,o),
+(912,-220,cs),
+(1133,1118,l),
+(1087,1118,l),
+(963,366,ls),
+(930,172,o),
+(765,32,o),
+(567,32,cs),
+(370,32,o),
+(256,169,o),
+(289,366,cs),
+(379,912,ls),
+(404,1062,o),
+(356,1118,o),
+(229,1118,cs),
+(205,1118,o),
+(181,1118,o),
+(157,1118,c),
+(149,1072,l),
+(173,1072,o),
+(197,1072,o),
+(221,1072,cs),
+(324,1072,o),
+(353,1035,o),
+(333,912,cs),
+(243,366,ls),
+(206,143,o),
+(337,-14,o),
+(560,-14,cs),
+(715,-14,o),
+(855,61,o),
+(927,178,c),
+(931,178,l),
+(866,-220,ls),
+(843,-356,o),
+(894,-418,o),
+(1017,-418,cs)
 );
 }
 );
-width = 1190;
+width = 1175;
 }
 );
 metricLeft = x;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/hturnlthook.glyph b/src/Inter-Italic.glyphspackage/glyphs/hturnlthook.glyph
index 8a004439f..27e7fa52d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/hturnlthook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/hturnlthook.glyph
@@ -5,135 +5,180 @@ kernRight = g;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(171,980,o),
-(191,983,o),
-(212,984,cs),
-(305,983,o),
-(369,948,o),
-(350,832,cs),
-(280,408,ls),
-(232,119,o),
-(360,-15,o),
-(590,-14,cs),
-(764,-15,o),
-(878,58,o),
-(952,174,c),
-(966,174,l),
-(866,-418,l),
-(1038,-418,l),
-(1294,1118,l),
-(1122,1118,l),
-(1010,446,ls),
-(977,250,o),
-(834,140,o),
-(666,140,cs),
-(503,140,o),
-(424,241,o),
-(454,418,cs),
-(520,832,ls),
-(552,1024,o),
-(441,1132,o),
-(280,1132,cs),
+(1039,-418,l),
+(1293,1118,l),
+(1123,1118,l),
+(1012,446,ls),
+(980,251,o),
+(836,140,o),
+(667,140,cs),
+(505,140,o),
+(424,242,o),
+(454,420,cs),
+(522,832,ls),
+(554,1024,o),
+(442,1132,o),
+(279,1132,cs),
 (244,1132,o),
 (206,1132,o),
 (180,1122,c),
-(158,978,l)
+(156,978,l),
+(169,981,o),
+(191,984,o),
+(211,984,cs),
+(305,984,o),
+(369,948,o),
+(350,832,cs),
+(280,408,ls),
+(232,121,o),
+(364,-14,o),
+(592,-14,cs),
+(768,-14,o),
+(880,60,o),
+(951,176,c),
+(967,176,l),
+(869,-418,l)
 );
 }
 );
 width = 1358;
 },
 {
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(1396,-418,l),
+(1396,1118,l),
+(994,1118,l),
+(994,488,ls),
+(994,378,o),
+(930,311,o),
+(832,312,cs),
+(729,311,o),
+(672,378,o),
+(672,488,cs),
+(672,748,ls),
+(672,1076,o),
+(470,1132,o),
+(226,1132,cs),
+(130,1132,o),
+(75,1123,o),
+(28,1120,c),
+(28,824,l),
+(60,826,o),
+(89,829,o),
+(118,830,cs),
+(188,829,o),
+(270,815,o),
+(270,748,cs),
+(270,404,ls),
+(270,160,o),
+(424,-15,o),
+(660,-14,cs),
+(825,-15,o),
+(947,70,o),
+(996,212,c),
+(1008,212,l),
+(1008,-418,l)
+);
+}
+);
+};
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(103,826,o),
-(132,829,o),
-(161,830,cs),
-(231,829,o),
-(309,815,o),
-(301,748,cs),
-(243,404,ls),
-(202,160,o),
-(327,-15,o),
-(563,-14,cs),
-(728,-15,o),
-(865,70,o),
-(937,212,c),
-(949,212,l),
-(845,-418,l),
-(1231,-418,l),
-(1487,1118,l),
-(1087,1118,l),
-(981,488,ls),
-(964,378,o),
-(888,311,o),
-(789,312,cs),
-(688,311,o),
-(641,378,o),
-(659,488,cs),
+(1234,-418,l),
+(1488,1118,l),
+(1086,1118,l),
+(982,490,ls),
+(964,379,o),
+(889,312,o),
+(791,312,cs),
+(688,312,o),
+(642,379,o),
+(660,490,cs),
 (703,748,ls),
-(754,1076,o),
-(562,1132,o),
-(319,1132,cs),
-(222,1132,o),
-(167,1123,o),
-(121,1120,c),
-(71,824,l)
+(757,1076,o),
+(564,1132,o),
+(320,1132,cs),
+(224,1132,o),
+(168,1126,o),
+(120,1120,c),
+(71,824,l),
+(104,827,o),
+(133,830,o),
+(162,830,cs),
+(232,830,o),
+(312,815,o),
+(301,748,cs),
+(244,406,ls),
+(204,161,o),
+(329,-14,o),
+(565,-14,cs),
+(730,-14,o),
+(866,71,o),
+(940,214,c),
+(952,214,l),
+(848,-418,l)
 );
 }
 );
-width = 1495;
+width = 1497;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(231,1091,o),
-(250,1094,o),
-(278,1094,cs),
-(393,1094,o),
-(416,1046,o),
-(394,922,cs),
-(302,366,ls),
-(263,143,o),
-(394,-15,o),
-(618,-14,cs),
-(772,-15,o),
-(915,61,o),
-(984,178,c),
-(990,178,l),
-(890,-418,l),
-(936,-418,l),
+(940,-418,l),
 (1194,1118,l),
 (1148,1118,l),
-(1022,366,ls),
+(1024,366,ls),
 (991,172,o),
-(825,32,o),
-(626,32,cs),
-(429,32,o),
-(314,169,o),
-(348,366,cs),
-(442,930,ls),
-(465,1066,o),
-(417,1140,o),
-(286,1140,cs),
-(262,1140,o),
-(241,1137,o),
-(220,1134,c),
-(212,1086,l)
+(826,32,o),
+(628,32,cs),
+(431,32,o),
+(317,169,o),
+(350,366,cs),
+(440,912,ls),
+(465,1062,o),
+(418,1126,o),
+(291,1126,cs),
+(271,1126,o),
+(244,1125,o),
+(219,1122,c),
+(211,1076,l),
+(237,1078,o),
+(264,1080,o),
+(284,1080,cs),
+(387,1080,o),
+(414,1035,o),
+(394,912,cs),
+(304,366,ls),
+(267,143,o),
+(398,-14,o),
+(621,-14,cs),
+(776,-14,o),
+(916,61,o),
+(988,178,c),
+(992,178,l),
+(894,-418,l)
 );
 }
 );
-width = 1298;
+width = 1299;
 },
 {
 layerId = m008;
@@ -142,43 +187,43 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(148.828,980,o),
-(169.325,983,o),
-(189.49,984,cs),
-(283.325,983,o),
-(346.531,948,o),
-(328.327,832,cs),
-(258.134,408,ls),
-(209.29,119,o),
-(339.107,-15,o),
-(568.272,-14,cs),
-(743.107,-15,o),
-(857.192,58,o),
-(929.396,174,c),
-(943.396,174,l),
-(845.391,-418,l),
-(1017.391,-418,l),
-(1271.674,1118,l),
-(1099.674,1118,l),
-(988.425,446,ls),
-(955.977,250,o),
-(812.767,140,o),
-(643.767,140,cs),
-(480.767,140,o),
-(401.487,241,o),
-(431.79,418,cs),
-(500.327,832,ls),
-(531.112,1024,o),
-(420.992,1132,o),
-(257.992,1132,cs),
-(222.992,1132,o),
-(184.992,1132,o),
-(158.336,1122,c),
-(134.497,978,l)
+(1007,-418,l),
+(1251,1056,l),
+(1081,1056,l),
+(979,438,ls),
+(943,225,o),
+(799,136,o),
+(645,136,cs),
+(487,136,o),
+(400,229,o),
+(430,412,cs),
+(491,778,ls),
+(521,961,o),
+(426,1056,o),
+(229,1056,cs),
+(202,1056,o),
+(172,1056,o),
+(147,1056,c),
+(123,910,l),
+(141,910,o),
+(159,910,o),
+(177,910,cs),
+(299,910,o),
+(338,879,o),
+(319,770,cs),
+(258,400,ls),
+(212,119,o),
+(371,-20,o),
+(584,-20,cs),
+(751,-20,o),
+(867,68,o),
+(930,170,c),
+(934,170,l),
+(837,-418,l)
 );
 }
 );
-width = 1302;
+width = 1292;
 },
 {
 layerId = m010;
@@ -187,43 +232,43 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(91.334,826,o),
-(120.83,829,o),
-(149.996,830,cs),
-(219.83,829,o),
-(299.513,815,o),
-(288.421,748,cs),
-(231.472,404,ls),
-(191.078,160,o),
-(316.107,-15,o),
-(552.272,-14,cs),
-(717.107,-15,o),
-(853.179,70,o),
-(925.687,212,c),
-(937.687,212,l),
-(833.391,-418,l),
-(1221.391,-418,l),
-(1475.674,1118,l),
-(1073.674,1118,l),
-(969.378,488,ls),
-(951.168,378,o),
-(876.076,311,o),
-(778.241,312,cs),
-(675.076,311,o),
-(628.168,378,o),
-(647.378,488,cs),
-(690.421,748,ls),
-(743.721,1076,o),
-(551.992,1132,o),
-(307.992,1132,cs),
-(211.992,1132,o),
-(155.502,1123,o),
-(108.005,1120,c),
-(59.002,824,l)
+(1222,-418,l),
+(1466,1056,l),
+(1066,1056,l),
+(969,472,ls),
+(951,364,o),
+(874,298,o),
+(777,298,cs),
+(676,298,o),
+(625,364,o),
+(643,472,cs),
+(681,702,ls),
+(722,948,o),
+(605,1056,o),
+(296,1056,cs),
+(230,1056,o),
+(164,1056,o),
+(98,1056,c),
+(47,752,l),
+(77,752,o),
+(173,752,o),
+(203,752,cs),
+(263,752,o),
+(286,729,o),
+(277,678,cs),
+(230,390,ls),
+(190,150,o),
+(319,-24,o),
+(554,-24,cs),
+(715,-24,o),
+(849,60,o),
+(922,200,c),
+(924,200,l),
+(822,-418,l)
 );
 }
 );
-width = 1464;
+width = 1465;
 },
 {
 layerId = m012;
@@ -232,43 +277,43 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(183.37,1092,o),
-(209.701,1094,o),
-(229.701,1094,cs),
-(332.701,1094,o),
-(359.251,1049,o),
-(339.888,926,cs),
-(247.181,366,ls),
-(209.264,143,o),
-(341.107,-15,o),
-(564.272,-14,cs),
-(719.107,-15,o),
-(859.689,61,o),
-(932.058,178,c),
-(936.058,178,l),
-(837.391,-418,l),
-(885.391,-418,l),
-(1139.674,1118,l),
-(1091.674,1118,l),
-(967.181,366,ls),
-(936.065,172,o),
-(769.888,32,o),
-(571.888,32,cs),
-(374.888,32,o),
-(260.568,169,o),
-(293.181,366,cs),
-(385.888,926,ls),
-(410.721,1076,o),
-(364.316,1140,o),
-(237.316,1140,cs),
-(217.316,1140,o),
-(190.15,1139,o),
-(164.654,1136,c),
-(157.038,1090,l)
+(879,-418,l),
+(1133,1118,l),
+(1087,1118,l),
+(963,366,ls),
+(930,172,o),
+(765,32,o),
+(567,32,cs),
+(370,32,o),
+(256,169,o),
+(289,366,cs),
+(379,912,ls),
+(404,1062,o),
+(356,1118,o),
+(229,1118,cs),
+(205,1118,o),
+(181,1118,o),
+(157,1118,c),
+(149,1072,l),
+(173,1072,o),
+(197,1072,o),
+(221,1072,cs),
+(324,1072,o),
+(353,1035,o),
+(333,912,cs),
+(243,366,ls),
+(206,143,o),
+(337,-14,o),
+(560,-14,cs),
+(715,-14,o),
+(855,61,o),
+(927,178,c),
+(931,178,l),
+(833,-418,l)
 );
 }
 );
-width = 1176;
+width = 1175;
 }
 );
 metricLeft = x;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/l.glyph b/src/Inter-Italic.glyphspackage/glyphs/l.glyph
index ad93c2dae..5a8332d69 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/l.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/l.glyph
@@ -8,11 +8,15 @@ layers = (
 anchors = (
 {
 name = bottom;
-pos = (150,0);
+pos = (149,0);
+},
+{
+name = bottomr;
+pos = (235,0);
 },
 {
 name = cross;
-pos = (280,768);
+pos = (277,768);
 },
 {
 name = raccent;
@@ -20,18 +24,19 @@ pos = (626,1490);
 },
 {
 name = top;
-pos = (428,1676);
+pos = (427,1676);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(312,1490,l),
-(64,0,l),
-(236,0,l),
-(482,1490,l)
+(311.668,1490,l),
+(65,0,l),
+(235,0,l),
+(481.668,1490,l)
 );
 }
 );
@@ -41,11 +46,15 @@ width = 486;
 anchors = (
 {
 name = bottom;
-pos = (212,0);
+pos = (209,0);
+},
+{
+name = bottomr;
+pos = (411,0);
 },
 {
 name = cross;
-pos = (338,768);
+pos = (337,768);
 },
 {
 name = raccent;
@@ -53,51 +62,57 @@ pos = (774,1490);
 },
 {
 name = top;
-pos = (488,1676);
+pos = (487,1676);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(256,1490,l),
-(8,0,l),
-(410,0,l),
-(658,1490,l)
+(255.668,1490,l),
+(9,0,l),
+(411,0,l),
+(657.668,1490,l)
 );
 }
 );
-width = 605;
+width = 606;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (128,0);
+pos = (129,0);
+},
+{
+name = bottomr;
+pos = (151,0);
 },
 {
 name = cross;
-pos = (256,768);
+pos = (257,768);
 },
 {
 name = raccent;
-pos = (538,1490);
+pos = (536,1490);
 },
 {
 name = top;
-pos = (408,1676);
+pos = (407,1676);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(352,1490,l),
-(104,0,l),
-(152,0,l),
-(398,1490,l)
+(351.668,1490,l),
+(105,0,l),
+(151,0,l),
+(397.668,1490,l)
 );
 }
 );
@@ -107,19 +122,23 @@ width = 442;
 anchors = (
 {
 name = bottom;
-pos = (124.59,0);
+pos = (125,0);
+},
+{
+name = bottomr;
+pos = (211,0);
 },
 {
 name = cross;
-pos = (251.732,768);
+pos = (252,768);
 },
 {
 name = raccent;
-pos = (601.258,1490);
+pos = (601,1490);
 },
 {
 name = top;
-pos = (402.05,1676);
+pos = (402,1676);
 }
 );
 layerId = m008;
@@ -130,32 +149,36 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(287.258,1490,l),
-(40.59,0,l),
-(210.59,0,l),
-(457.258,1490,l)
+(287.668,1490,l),
+(41,0,l),
+(211,0,l),
+(457.668,1490,l)
 );
 }
 );
-width = 426;
+width = 427;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (198.59,0);
+pos = (198,0);
+},
+{
+name = bottomr;
+pos = (399,0);
 },
 {
 name = cross;
-pos = (325.732,768);
+pos = (326,768);
 },
 {
 name = raccent;
-pos = (763.258,1490);
+pos = (761,1490);
 },
 {
 name = top;
-pos = (476.05,1676);
+pos = (476,1676);
 }
 );
 layerId = m010;
@@ -164,32 +187,36 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(245.258,1490,l),
-(-1.41,0,l),
-(400.59,0,l),
-(647.258,1490,l)
+(245.668,1490,l),
+(-1,0,l),
+(399,0,l),
+(645.668,1490,l)
 );
 }
 );
-width = 574;
+width = 573;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (70.59,0);
+pos = (71,0);
+},
+{
+name = bottomr;
+pos = (93,0);
 },
 {
 name = cross;
-pos = (197.732,768);
+pos = (199,768);
 },
 {
 name = raccent;
-pos = (477.258,1490);
+pos = (478,1490);
 },
 {
 name = top;
-pos = (348.05,1676);
+pos = (349,1676);
 }
 );
 layerId = m012;
@@ -198,14 +225,14 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(293.258,1490,l),
-(46.59,0,l),
-(92.59,0,l),
-(339.258,1490,l)
+(294,1490,l),
+(47,0,l),
+(93,0,l),
+(340,1490,l)
 );
 }
 );
-width = 314;
+width = 315;
 }
 );
 metricRight = "=|l";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/lacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/lacute.glyph
index 1d0412c55..936638016 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/lacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/lacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-29,372);
+pos = (-30,372);
 ref = acute;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/lbar.glyph b/src/Inter-Italic.glyphspackage/glyphs/lbar.glyph
index 2fa82609b..e103b1914 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/lbar.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/lbar.glyph
@@ -11,7 +11,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-207,47);
+pos = (-210,47);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/lcaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/lcaron.glyph
index 595740d86..f609d187f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/lcaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/lcaron.glyph
@@ -38,7 +38,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (122,0);
+pos = (120,0);
 ref = commaaccentright.cn;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/lcircumflexbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/lcircumflexbelow.glyph
index 3d7d7eab7..fa4d7825a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/lcircumflexbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/lcircumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (834,0);
+pos = (833,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,11 +62,11 @@ shapes = (
 ref = l;
 },
 {
-pos = (999,0);
+pos = (998,0);
 ref = circumflexsubnosp;
 }
 );
-width = 574;
+width = 573;
 },
 {
 layerId = m012;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/lcommaaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/lcommaaccent.glyph
index 41b51d672..5f74f9f31 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/lcommaaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/lcommaaccent.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-36,0);
+pos = (-37,0);
 ref = commaaccent;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ldotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/ldotbelow.glyph
index caafd7ad9..4ab27af46 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ldotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ldotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (846,0);
+pos = (845,0);
 ref = dotbelow;
 }
 );
@@ -23,11 +23,11 @@ shapes = (
 ref = l;
 },
 {
-pos = (842,0);
+pos = (839,0);
 ref = dotbelow;
 }
 );
-width = 605;
+width = 606;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ldotbelowmacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/ldotbelowmacron.glyph
index 2b6af5f25..5020921f0 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ldotbelowmacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ldotbelowmacron.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = l;
 },
 {
-pos = (846,0);
+pos = (845,0);
 ref = dotbelow;
 },
 {
-pos = (-154,372);
+pos = (-155,372);
 ref = macron;
 }
 );
@@ -27,15 +27,15 @@ shapes = (
 ref = l;
 },
 {
-pos = (842,0);
+pos = (839,0);
 ref = dotbelow;
 },
 {
-pos = (-294,372);
+pos = (-295,372);
 ref = macron;
 }
 );
-width = 605;
+width = 606;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/llinebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/llinebelow.glyph
index 56f35c953..6e70d709a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/llinebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/llinebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (848,0);
+pos = (847,0);
 ref = macronsubnosp;
 }
 );
@@ -23,11 +23,11 @@ shapes = (
 ref = l;
 },
 {
-pos = (932,0);
+pos = (929,0);
 ref = macronsubnosp;
 }
 );
-width = 605;
+width = 606;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/lmidtilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/lmidtilde.glyph
index d4a234bfe..906798fcf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/lmidtilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/lmidtilde.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-112,0);
+pos = (-115,0);
 ref = _tildecross.cn;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/lrthook.glyph b/src/Inter-Italic.glyphspackage/glyphs/lrthook.glyph
index 457c1ccc8..caa94723b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/lrthook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/lrthook.glyph
@@ -5,193 +5,86 @@ kernRight = rthook;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(65,0,l),
-(45,-120,ls),
-(13,-311,o),
-(124,-419,o),
-(287,-418,cs),
-(322,-419,o),
-(360,-419,o),
-(387,-410,c),
-(411,-264,l),
-(397,-268,o),
-(377,-271,o),
-(355,-270,cs),
-(264,-271,o),
-(197,-236,o),
-(217,-120,cs),
-(237,0,l)
-);
+ref = l;
 },
 {
-pos = (1,0);
-ref = l;
+pos = (29,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 547;
+width = 486;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(9,0,l),
-(3,-34,ls),
-(-48,-364,o),
-(141,-419,o),
-(385,-418,cs),
-(484,-419,o),
-(539,-410,o),
-(585,-408,c),
-(635,-110,l),
-(603,-113,o),
-(574,-116,o),
-(545,-116,cs),
-(475,-116,o),
-(394,-102,o),
-(405,-34,cs),
-(411,0,l)
-);
+ref = l;
 },
 {
-pos = (1,0);
-ref = l;
+pos = (-27,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 745;
+width = 606;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(104,0,l),
-(70,-206,ls),
-(47,-341,o),
-(96,-416,o),
-(226,-416,c),
-(252,-416,o),
-(272,-413,o),
-(292,-408,c),
-(300,-362,l),
-(282,-367,o),
-(263,-369,o),
-(234,-370,c),
-(120,-369,o),
-(97,-321,o),
-(118,-198,cs),
-(152,0,l)
-);
+ref = l;
 },
 {
-alignment = -1;
-ref = l;
+pos = (134,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 428;
+width = 442;
 },
 {
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(40.59,0,l),
-(20.724,-120,ls),
-(-11.896,-311,o),
-(98.225,-419,o),
-(261.391,-418,cs),
-(296.225,-419,o),
-(334.225,-419,o),
-(360.715,-410,c),
-(384.885,-264,l),
-(370.223,-268,o),
-(349.726,-271,o),
-(329.892,-270,cs),
-(236.726,-271,o),
-(172.521,-236,o),
-(190.724,-120,cs),
-(210.59,0,l)
-);
+ref = l;
 },
 {
-pos = (2,0);
-ref = l;
+ref = _part.bottom_rthook;
 }
 );
-width = 484;
+width = 427;
 },
 {
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-1.41,0,l),
-(-7.038,-34,ls),
-(-61.67,-364,o),
-(127.225,-419,o),
-(373.391,-418,cs),
-(471.225,-419,o),
-(527.715,-410,o),
-(573.046,-408,c),
-(622.38,-110,l),
-(590.883,-113,o),
-(561.386,-116,o),
-(531.386,-116,cs),
-(462.386,-116,o),
-(382.704,-102,o),
-(394.962,-34,cs),
-(400.59,0,l)
-);
+ref = l;
 },
 {
-ref = l;
+pos = (-42,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 712;
+width = 573;
 },
 {
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(48.908,14,l),
-(13.48,-200,ls),
-(-11.518,-351,o),
-(34.722,-416,o),
-(161.722,-416,cs),
-(181.722,-416,o),
-(208.887,-415,o),
-(234.384,-412,c),
-(242,-366,l),
-(215.668,-368,o),
-(188.503,-369,o),
-(169.337,-370,cs),
-(67.503,-369,o),
-(38.952,-324,o),
-(59.48,-200,cs),
-(94.908,14,l,{
-name = hr00;
-})
-);
+ref = l;
 },
 {
-alignment = -1;
-ref = l;
+pos = (70,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 300;
+width = 315;
 }
 );
 metricLeft = l;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/lslash.glyph b/src/Inter-Italic.glyphspackage/glyphs/lslash.glyph
index ec8aa887a..e61ab8511 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/lslash.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/lslash.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (-11,0);
+pos = (-14,0);
 ref = slashshortcomb;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/n.glyph b/src/Inter-Italic.glyphspackage/glyphs/n.glyph
index f168111d9..e5033077f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/n.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/n.glyph
@@ -8,110 +8,132 @@ layers = (
 anchors = (
 {
 name = bottom;
-pos = (506,0);
+pos = (508,0);
+},
+{
+name = bottomr;
+pos = (950,0);
 },
 {
 name = top;
-pos = (722,1304);
+pos = (724,1304);
 },
 {
 name = topr;
 pos = (416,1118);
 }
 );
+background = {
+shapes = (
+{
+pos = (1,0);
+ref = m;
+}
+);
+};
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(378,868,o),
-(518,977,o),
-(684,978,cs),
-(844,977,o),
-(924,873,o),
-(894,698,cs),
-(776,0,l),
-(948,0,l),
+(380,867,o),
+(520,978,o),
+(685,978,cs),
+(844,978,o),
+(925,873,o),
+(896,698,cs),
+(780,0,l),
+(950,0,l),
 (1068,710,ls),
-(1116,995,o),
-(983,1132,o),
-(760,1132,cs),
-(591,1132,o),
-(471,1056,o),
+(1115,995,o),
+(984,1132,o),
+(759,1132,cs),
+(590,1132,o),
+(473,1056,o),
 (402,942,c),
 (386,942,l),
-(416,1118,l),
-(250,1118,l),
-(64,0,l),
+(415,1118,l),
+(251,1118,l),
+(66,0,l),
 (236,0,l),
-(346,672,ls)
+(347,672,ls)
 );
 }
 );
-width = 1200;
+width = 1201;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (570,0);
+pos = (572,0);
+},
+{
+name = bottomr;
+pos = (1136,0);
 },
 {
 name = top;
-pos = (784,1304);
+pos = (788,1304);
 },
 {
 name = topr;
-pos = (592,1118);
+pos = (594,1118);
 }
 );
 guides = (
 {
 orientation = center;
-angle = 90;
-pos = (-450,-164);
+angle = 80.6;
+pos = (164,-164);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(532,739,o),
+(534,739,o),
 (608,806,o),
-(706,806,cs),
+(707,806,cs),
 (808,806,o),
-(854,739,o),
-(836,628,cs),
-(732,0,l),
-(1134,0,l),
-(1252,712,ls),
-(1293,957,o),
-(1169,1132,o),
-(932,1132,cs),
+(856,739,o),
+(838,628,cs),
+(734,0,l),
+(1136,0,l),
+(1254,712,ls),
+(1294,956,o),
+(1170,1132,o),
+(933,1132,cs),
 (768,1132,o),
-(634,1047,o),
-(564,904,c),
+(638,1046,o),
+(566,904,c),
 (558,904,l),
-(592,1118,l),
-(194,1118,l),
-(8,0,l),
-(410,0,l),
-(514,628,ls)
+(593,1118,l),
+(195,1118,l),
+(10,0,l),
+(412,0,l),
+(516,628,ls)
 );
 }
 );
-width = 1329;
+width = 1331;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (488,0);
+pos = (490,0);
+},
+{
+name = bottomr;
+pos = (874,0);
 },
 {
 name = top;
-pos = (706,1304);
+pos = (708,1304);
 },
 {
 name = topr;
@@ -119,49 +141,54 @@ pos = (338,1118);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
 (308,945,o),
-(480,1085,o),
-(678,1086,cs),
-(876,1085,o),
+(475,1086,o),
+(672,1086,cs),
+(871,1086,o),
 (985,948,o),
 (952,750,cs),
-(826,0,l),
-(872,0,l),
+(828,0,l),
+(874,0,l),
 (998,750,ls),
-(1036,975,o),
-(905,1132,o),
-(680,1132,cs),
-(527,1132,o),
-(384,1056,o),
+(1035,975,o),
+(904,1132,o),
+(679,1132,cs),
+(526,1132,o),
+(386,1056,o),
 (314,940,c),
 (308,940,l),
-(338,1118,l),
-(290,1118,l),
-(104,0,l),
+(337,1118,l),
+(291,1118,l),
+(106,0,l),
 (152,0,l),
 (276,750,ls)
 );
 }
 );
-width = 1163;
+width = 1165;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (480.59,0);
+pos = (481,0);
+},
+{
+name = bottomr;
+pos = (923,0);
 },
 {
 name = top;
-pos = (689.513,1262);
+pos = (690,1262);
 },
 {
 name = topr;
-pos = (379.41,1056);
+pos = (379,1056);
 }
 );
 guides = (
@@ -176,52 +203,56 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(346.161,831,o),
-(488.895,920,o),
-(642.895,920,cs),
-(800.895,920,o),
-(889.499,827,o),
-(859.204,644,cs),
-(752.59,0,l),
-(922.59,0,l),
-(1031.19,656,ls),
-(1077.71,937,o),
-(913.721,1076,o),
-(700.721,1076,cs),
-(533.721,1076,o),
-(418.153,988,o),
-(355.267,886,c),
-(351.267,886,l),
-(379.41,1056,l),
-(213.41,1056,l),
-(38.59,0,l),
-(208.59,0,l),
-(310.899,618,ls)
+(346.571,831,o),
+(489.305,920,o),
+(643.305,920,cs),
+(801.305,920,o),
+(889.909,827,o),
+(859.614,644,cs),
+(753,0,l),
+(923,0,l),
+(1031.6,656,ls),
+(1078.119,937,o),
+(914.131,1076,o),
+(701.131,1076,cs),
+(534.131,1076,o),
+(418.562,988,o),
+(355.676,886,c),
+(351.676,886,l),
+(379.82,1056,l),
+(213.82,1056,l),
+(39,0,l),
+(209,0,l),
+(311.309,618,ls)
 );
 }
 );
-width = 1136;
+width = 1137;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (560.59,0);
+pos = (561,0);
+},
+{
+name = bottomr;
+pos = (1125,0);
 },
 {
 name = top;
-pos = (769.513,1262);
+pos = (770,1262);
 },
 {
 name = topr;
-pos = (571.41,1056);
+pos = (571,1056);
 }
 );
 guides = (
 {
 orientation = center;
 angle = 80.6;
-pos = (-2537,-164);
+pos = (-3186,-164);
 }
 );
 layerId = m010;
@@ -230,27 +261,27 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(513.15,692,o),
-(590.076,758,o),
-(687.076,758,cs),
-(788.076,758,o),
-(839.15,692,o),
-(821.271,584,cs),
-(724.59,0,l),
-(1124.59,0,l),
-(1234.846,666,ls),
-(1274.577,906,o),
-(1145.383,1080,o),
-(910.383,1080,cs),
-(749.383,1080,o),
-(613.477,996,o),
-(540.3,856,c),
-(536.976,848,l),
-(571.41,1056,l),
-(173.41,1056,l),
-(-1.41,0,l),
-(398.59,0,l),
-(495.271,584,ls)
+(513.56,692,o),
+(590.486,758,o),
+(687.486,758,cs),
+(788.486,758,o),
+(839.56,692,o),
+(821.681,584,cs),
+(725,0,l),
+(1125,0,l),
+(1235.256,666,ls),
+(1274.987,906,o),
+(1145.793,1080,o),
+(910.793,1080,cs),
+(749.793,1080,o),
+(613.887,996,o),
+(540.71,856,c),
+(537.385,848,l),
+(571.82,1056,l),
+(173.82,1056,l),
+(-1,0,l),
+(399,0,l),
+(495.681,584,ls)
 );
 }
 );
@@ -260,15 +291,19 @@ width = 1298;
 anchors = (
 {
 name = bottom;
-pos = (430.59,0);
+pos = (431,0);
+},
+{
+name = bottomr;
+pos = (815,0);
 },
 {
 name = top;
-pos = (648.466,1304);
+pos = (649,1304);
 },
 {
 name = topr;
-pos = (277.674,1118);
+pos = (279,1118);
 }
 );
 layerId = m012;
@@ -277,27 +312,27 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(249.034,945,o),
-(415.376,1086,o),
-(612.376,1086,cs),
-(811.376,1086,o),
-(925.531,948,o),
-(892.752,750,cs),
-(768.59,0,l),
-(814.59,0,l),
-(938.752,750,ls),
+(249,945,o),
+(416,1086,o),
+(613,1086,cs),
+(812,1086,o),
+(926,948,o),
+(893,750,cs),
+(769,0,l),
+(815,0,l),
+(939,750,ls),
 (976,975,o),
-(844.992,1132,o),
-(619.992,1132,cs),
-(466.992,1132,o),
-(326.41,1056,o),
-(254.206,940,c),
-(248.206,940,l),
-(277.674,1118,l),
-(231.674,1118,l),
-(46.59,0,l),
-(92.59,0,l),
-(216.752,750,ls)
+(845,1132,o),
+(620,1132,cs),
+(467,1132,o),
+(327,1056,o),
+(255,940,c),
+(249,940,l),
+(278,1118,l),
+(232,1118,l),
+(47,0,l),
+(93,0,l),
+(217,750,ls)
 );
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/nacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/nacute.glyph
index ae8b1acbf..245e4eeb7 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/nacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/nacute.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = n;
 },
 {
-pos = (265,0);
+pos = (267,0);
 ref = acute;
 }
 );
-width = 1200;
+width = 1201;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ncaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/ncaron.glyph
index d5617aa23..81771e216 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ncaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ncaron.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = n;
 },
 {
-pos = (132,0);
+pos = (134,0);
 ref = caron;
 }
 );
-width = 1200;
+width = 1201;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ncircumflexbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/ncircumflexbelow.glyph
index 946ec9b77..3855b83de 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ncircumflexbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ncircumflexbelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = n;
 },
 {
-pos = (1190,0);
+pos = (1192,0);
 ref = circumflexsubnosp;
 }
 );
-width = 1200;
+width = 1201;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ncommaaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/ncommaaccent.glyph
index 0b276963b..62e33d4fa 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ncommaaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ncommaaccent.glyph
@@ -11,11 +11,11 @@ ref = n;
 },
 {
 alignment = 1;
-pos = (320,0);
+pos = (322,0);
 ref = commaaccent;
 }
 );
-width = 1200;
+width = 1201;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ndotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/ndotaccent.glyph
index e7c9f48d8..64127a1f4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ndotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ndotaccent.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = n;
 },
 {
-pos = (354,0);
+pos = (356,0);
 ref = dotaccent;
 }
 );
-width = 1200;
+width = 1201;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ndotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/ndotbelow.glyph
index ad2aabe96..4894c4bc2 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ndotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ndotbelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = n;
 },
 {
-pos = (1202,0);
+pos = (1204,0);
 ref = dotbelow;
 }
 );
-width = 1200;
+width = 1201;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -23,11 +23,11 @@ shapes = (
 ref = n;
 },
 {
-pos = (1200,0);
+pos = (1202,0);
 ref = dotbelow;
 }
 );
-width = 1329;
+width = 1331;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/nj.glyph b/src/Inter-Italic.glyphspackage/glyphs/nj.glyph
index 96456f053..7d0bd7197 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/nj.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/nj.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = n;
 },
 {
-pos = (1200,0);
+pos = (1201,0);
 ref = j;
 }
 );
-width = 1687;
+width = 1688;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -23,11 +23,11 @@ shapes = (
 ref = n;
 },
 {
-pos = (1329,0);
+pos = (1331,0);
 ref = j;
 }
 );
-width = 1934;
+width = 1936;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -36,11 +36,11 @@ shapes = (
 ref = n;
 },
 {
-pos = (1163,0);
+pos = (1165,0);
 ref = j;
 }
 );
-width = 1611;
+width = 1613;
 },
 {
 layerId = m008;
@@ -49,11 +49,11 @@ shapes = (
 ref = n;
 },
 {
-pos = (1136,0);
+pos = (1137,0);
 ref = j;
 }
 );
-width = 1560;
+width = 1561;
 },
 {
 layerId = m010;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/nlfthook.glyph b/src/Inter-Italic.glyphspackage/glyphs/nlfthook.glyph
index afec25569..132a20fb9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/nlfthook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/nlfthook.glyph
@@ -32,7 +32,7 @@ pos = (36,0);
 ref = n;
 }
 );
-width = 1236;
+width = 1237;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -94,7 +94,7 @@ pos = (-1,0);
 ref = n;
 }
 );
-width = 1162;
+width = 1164;
 },
 {
 layerId = m008;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/nlinebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/nlinebelow.glyph
index be0e40bd5..e426bab37 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/nlinebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/nlinebelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = n;
 },
 {
-pos = (1204,0);
+pos = (1206,0);
 ref = macronsubnosp;
 }
 );
-width = 1200;
+width = 1201;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -23,11 +23,11 @@ shapes = (
 ref = n;
 },
 {
-pos = (1290,0);
+pos = (1292,0);
 ref = macronsubnosp;
 }
 );
-width = 1329;
+width = 1331;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/nrthook.glyph b/src/Inter-Italic.glyphspackage/glyphs/nrthook.glyph
index fbb331b72..ff2ebc95a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/nrthook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/nrthook.glyph
@@ -5,188 +5,87 @@ kernRight = rthook;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(776,0,l),
-(756,-120,ls),
-(724,-311,o),
-(835,-419,o),
-(998,-418,cs),
-(1033,-419,o),
-(1071,-419,o),
-(1100,-410,c),
-(1122,-264,l),
-(1108,-268,o),
-(1088,-271,o),
-(1068,-270,cs),
-(975,-271,o),
-(908,-236,o),
-(928,-120,cs),
-(948,0,l)
-);
+ref = n;
 },
 {
-ref = n;
+pos = (744,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1190;
+width = 1201;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(736,0,l),
-(730,-34,ls),
-(676,-363,o),
-(865,-419,o),
-(1108,-418,cs),
-(1208,-419,o),
-(1263,-410,o),
-(1312,-408,c),
-(1362,-110,l),
-(1295,-116,o),
-(1301,-116,o),
-(1272,-116,cs),
-(1199,-116,o),
-(1121,-101,o),
-(1132,-34,cs),
-(1138,0,l)
-);
+ref = n;
 },
 {
-ref = n;
+pos = (698,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1414;
+width = 1331;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(826,0,l),
-(792,-206,ls),
-(768,-341,o),
-(817,-416,o),
-(946,-416,c),
-(973,-416,o),
-(993,-413,o),
-(1014,-408,c),
-(1022,-362,l),
-(1004,-367,o),
-(985,-369,o),
-(956,-370,c),
-(841,-369,o),
-(818,-321,o),
-(840,-198,cs),
-(872,0,l)
-);
+ref = n;
 },
 {
-ref = n;
+pos = (857,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1058;
+width = 1165;
 },
 {
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(750.59,0,l),
-(730.724,-120,ls),
-(699.104,-311,o),
-(809.225,-419,o),
-(971.391,-418,cs),
-(1007.225,-419,o),
-(1044.225,-419,o),
-(1072.715,-410,c),
-(1096.885,-264,l),
-(1081.223,-268,o),
-(1060.726,-271,o),
-(1039.892,-270,cs),
-(946.726,-271,o),
-(882.521,-236,o),
-(902.724,-120,cs),
-(922.59,0,l)
-);
+ref = n;
 },
 {
-ref = n;
+pos = (712,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1126;
+width = 1137;
 },
 {
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(722.59,0,l),
-(716.962,-34,ls),
-(662.33,-364,o),
-(852.225,-419,o),
-(1095.391,-418,cs),
-(1195.225,-419,o),
-(1248.715,-410,o),
-(1299.046,-408,c),
-(1348.38,-110,l),
-(1280.386,-116,o),
-(1286.386,-116,o),
-(1255.386,-116,cs),
-(1184.386,-116,o),
-(1107.704,-102,o),
-(1118.962,-34,cs),
-(1124.59,0,l)
-);
+ref = n;
 },
 {
-ref = n;
+pos = (684,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1378;
+width = 1298;
 },
 {
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(770.908,14,l),
-(735.48,-200,ls),
-(709.482,-351,o),
-(755.722,-416,o),
-(883.722,-416,cs),
-(903.722,-416,o),
-(930.887,-415,o),
-(956.384,-412,c),
-(964,-366,l),
-(937.668,-368,o),
-(910.503,-369,o),
-(891.337,-370,cs),
-(788.503,-369,o),
-(760.952,-324,o),
-(781.48,-200,cs),
-(816.908,14,l,{
-name = hr00;
-})
-);
+ref = n;
 },
 {
-ref = n;
+pos = (792,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 930;
+width = 1036;
 }
 );
 metricLeft = n;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/ntilde.glyph b/src/Inter-Italic.glyphspackage/glyphs/ntilde.glyph
index 141b873e9..fda744d66 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/ntilde.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/ntilde.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = n;
 },
 {
-pos = (87,0);
+pos = (89,0);
 ref = tilde;
 }
 );
-width = 1200;
+width = 1201;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/phook.glyph b/src/Inter-Italic.glyphspackage/glyphs/phook.glyph
index ad9f9e426..a7a9f49e6 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/phook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/phook.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = p;
 },
 {
-pos = (5,0);
+pos = (3,0);
 ref = _part.top_r_hook;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/qhook.glyph b/src/Inter-Italic.glyphspackage/glyphs/qhook.glyph
index 30feaaab3..ca401cd7e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/qhook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/qhook.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = q;
 },
 {
-pos = (769,0);
+pos = (767,0);
 ref = _part.top_r_hook;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/qrthook.glyph b/src/Inter-Italic.glyphspackage/glyphs/qrthook.glyph
index ba25e8832..ae639c92f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/qrthook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/qrthook.glyph
@@ -4,480 +4,102 @@ kernLeft = m;
 kernRight = rthook;
 layers = (
 {
-layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+background = {
 shapes = (
 {
-closed = 1;
-nodes = (
-(1083,-419,o),
-(1121,-419,o),
-(1151,-410,c),
-(1173,-264,l),
-(1159,-268,o),
-(1138,-271,o),
-(1119,-270,cs),
-(1025,-271,o),
-(961,-236,o),
-(979,-120,cs),
-(993,-46,l),
-(821,-46,l),
-(807,-120,ls),
-(778,-311,o),
-(885,-419,o),
-(1049,-418,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(699,-23,o),
-(795,111,o),
-(841,172,c),
-(927,172,l),
-(1055,940,l),
-(969,940,l),
-(941,998,o),
-(897,1132,o),
-(679,1132,cs),
-(397,1132,o),
-(164,908,o),
-(105,556,cs),
-(48,201,o),
-(205,-23,o),
-(483,-24,cs)
+pos = (-185,0);
+ref = q;
+}
 );
-},
+};
+layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
+shapes = (
 {
-closed = 1;
-nodes = (
-(1185,1118,l),
-(1019,1118,l),
-(985,908,l),
-(975,546,l),
-(871,264,l),
-(821,-46,l),
-(993,-46,l)
-);
+alignment = 1;
+ref = a.1;
 },
 {
-closed = 1;
-nodes = (
-(318,131,o),
-(237,320,o),
-(277,558,cs),
-(315,794,o),
-(455,977,o),
-(673,978,cs),
-(882,977,o),
-(964,809,o),
-(923,558,cs),
-(882,305,o),
-(740,131,o),
-(533,130,cs)
-);
+pos = (792,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1311;
+width = 1249;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1189,-419,o),
-(1261,-410,o),
-(1302,-408,c),
-(1352,-110,l),
-(1320,-113,o),
-(1291,-116,o),
-(1262,-116,cs),
-(1192,-116,o),
-(1110,-102,o),
-(1122,-34,cs),
-(1136,46,l),
-(734,46,l),
-(720,-34,ls),
-(668,-364,o),
-(854,-419,o),
-(1098,-418,cs)
-);
+alignment = 1;
+ref = a.1;
 },
 {
-closed = 1;
-nodes = (
-(563,-15,o),
-(685,70,o),
-(752,184,c),
-(918,184,l),
-(1040,922,l),
-(874,922,l),
-(848,1036,o),
-(761,1132,o),
-(596,1132,cs),
-(374,1132,o),
-(130,963,o),
-(62,558,cs),
-(-1,172,o),
-(168,-15,o),
-(406,-14,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(1314,1118,l),
-(916,1118,l),
-(872,862,l),
-(910,558,l),
-(766,250,l),
-(734,46,l),
-(1136,46,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(496,294,o),
-(450,393,o),
-(476,558,cs),
-(502,724,o),
-(584,823,o),
-(694,824,cs),
-(805,823,o),
-(854,724,o),
-(828,558,cs),
-(802,396,o),
-(717,294,o),
-(606,294,cs)
-);
+pos = (690,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1462;
+width = 1323;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1000,-416,o),
-(1021,-413,o),
-(1042,-408,c),
-(1048,-362,l),
-(1031,-367,o),
-(1012,-369,o),
-(984,-370,c),
-(869,-369,o),
-(845,-321,o),
-(868,-198,cs),
-(900,0,l),
-(854,0,l),
-(820,-206,ls),
-(795,-341,o),
-(845,-416,o),
-(974,-416,c)
-);
+alignment = 1;
+ref = a.1;
 },
 {
-closed = 1;
-nodes = (
-(642,-23,o),
-(802,93,o),
-(894,280,c),
-(910,280,l),
-(1002,832,l),
-(984,832,l),
-(955,1018,o),
-(836,1135,o),
-(656,1134,cs),
-(391,1135,o),
-(184,887,o),
-(130,556,cs),
-(77,227,o),
-(203,-23,o),
-(466,-24,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(1084,1118,l),
-(1038,1118,l),
-(990,832,l),
-(952,558,l),
-(900,280,l),
-(848,-34,l),
-(894,-34,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(245,23,o),
-(125,253,o),
-(176,556,cs),
-(227,858,o),
-(402,1088,o),
-(640,1088,cs),
-(876,1088,o),
-(995,858,o),
-(944,556,cs),
-(893,253,o),
-(717,23,o),
-(480,24,cs)
-);
+pos = (883,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1180;
+width = 1191;
 },
 {
-background = {
-shapes = (
-{
-ref = q;
-}
-);
-};
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1056.225,-419,o),
-(1094.225,-419,o),
-(1122.715,-410,c),
-(1146.885,-264,l),
-(1131.223,-268,o),
-(1109.726,-271,o),
-(1089.892,-270,cs),
-(996.726,-271,o),
-(932.521,-236,o),
-(950.724,-120,cs),
-(962.975,-46,l),
-(792.975,-46,l),
-(780.724,-120,ls),
-(748.104,-311,o),
-(858.225,-419,o),
-(1021.391,-418,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(670.783,-23,o),
-(765.966,111,o),
-(813.065,172,c),
-(899.065,172,l),
-(1026.206,940,l),
-(940.206,940,l),
-(912.808,998,o),
-(867.992,1132,o),
-(649.992,1132,cs),
-(367.992,1132,o),
-(135.909,908,o),
-(76.635,556,cs),
-(18.866,201,o),
-(176.783,-23,o),
-(454.617,-24,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(1155.674,1118,l),
-(991.674,1118,l),
-(956.909,908,l),
-(948.98,546,l),
-(844.295,264,l),
-(792.975,-46,l),
-(962.975,-46,l)
-);
+alignment = 1;
+ref = a.1;
 },
 {
-closed = 1;
-nodes = (
-(289.277,131,o),
-(209.566,320,o),
-(248.966,558,cs),
-(288.036,794,o),
-(426.331,977,o),
-(644.497,978,cs),
-(854.331,977,o),
-(936.519,809,o),
-(894.966,558,cs),
-(853.083,305,o),
-(711.277,131,o),
-(504.112,130,cs)
-);
+pos = (734,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1246;
+width = 1161;
 },
 {
-background = {
-shapes = (
-{
-pos = (-4,0);
-ref = q;
-}
-);
-};
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1179.225,-419,o),
-(1249.715,-410,o),
-(1291.046,-408,c),
-(1340.38,-110,l),
-(1307.883,-113,o),
-(1278.386,-116,o),
-(1249.386,-116,cs),
-(1179.386,-116,o),
-(1100.704,-102,o),
-(1110.962,-34,cs),
-(1124.205,46,l),
-(724.205,46,l),
-(710.962,-34,ls),
-(655.33,-364,o),
-(844.225,-419,o),
-(1089.391,-418,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(553.107,-15,o),
-(675.179,70,o),
-(741.051,184,c),
-(907.051,184,l),
-(1029.226,922,l),
-(863.226,922,l),
-(838.099,1036,o),
-(748.992,1132,o),
-(583.992,1132,cs),
-(361.992,1132,o),
-(119.014,963,o),
-(50.966,558,cs),
-(-11.935,172,o),
-(158.107,-15,o),
-(396.272,-14,cs)
-);
+alignment = 1;
+ref = a.1;
 },
 {
-closed = 1;
-nodes = (
-(1301.674,1118,l),
-(903.674,1118,l),
-(861.293,862,l),
-(898.966,558,l),
-(757.977,250,l),
-(724.205,46,l),
-(1124.205,46,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(485.262,294,o),
-(437.651,393,o),
-(464.966,558,cs),
-(492.448,724,o),
-(572.837,823,o),
-(683.002,824,cs),
-(793.837,823,o),
-(844.448,724,o),
-(816.966,558,cs),
-(790.148,396,o),
-(706.262,294,o),
-(595.262,294,cs)
-);
+pos = (667,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1430;
+width = 1282;
 },
 {
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(930.722,-416,o),
-(956.887,-415,o),
-(982.384,-412,c),
-(990,-366,l),
-(963.668,-368,o),
-(936.503,-369,o),
-(917.337,-370,cs),
-(815.503,-369,o),
-(786.952,-324,o),
-(807.48,-200,cs),
-(842.908,14,l,{
-name = hr00;
-}),
-(796.908,14,l),
-(761.48,-200,ls),
-(735.482,-351,o),
-(781.722,-416,o),
-(909.722,-416,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(583.783,-23,o),
-(744.986,93,o),
-(834.944,280,c),
-(868.944,280,l),
-(954.327,832,l),
-(926.327,832,l),
-(897.119,1018,o),
-(778.488,1135,o),
-(598.323,1134,cs),
-(334.488,1135,o),
-(126.267,886,o),
-(70.635,556,cs),
-(17.17,227,o),
-(144.783,-23,o),
-(406.617,-24,cs)
-);
+alignment = 1;
+ref = a.1;
 },
 {
-closed = 1;
-nodes = (
-(1025.674,1118,l),
-(979.674,1118,l),
-(932.327,832,l),
-(900.966,558,l),
-(840.944,280,l),
-(773.4,-128,l),
-(819.4,-128,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(178.398,23,o),
-(67.474,253,o),
-(118.635,556,cs),
-(167.631,858,o),
-(352.707,1088,o),
-(590.707,1088,cs),
-(827.707,1088,o),
-(935.631,858,o),
-(886.635,556,cs),
-(835.474,253,o),
-(649.398,23,o),
-(414.563,24,cs)
-);
+pos = (818,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1078;
+width = 1062;
 }
 );
 metricLeft = q;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/r.glyph b/src/Inter-Italic.glyphspackage/glyphs/r.glyph
index 64909a499..c78c7d196 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/r.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/r.glyph
@@ -7,106 +7,121 @@ layers = (
 anchors = (
 {
 name = bottom;
-pos = (148,0);
+pos = (150,0);
+},
+{
+name = bottomr;
+pos = (236,0);
 },
 {
 name = cross;
-pos = (242,536);
+pos = (241,536);
 },
 {
 name = top;
-pos = (544,1304);
+pos = (546,1304);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
 (236,0,l),
-(352,706,ls),
+(353,706,ls),
 (378,858,o),
-(515,969,o),
+(516,968,o),
 (678,968,cs),
-(724,969,o),
+(725,968,o),
 (771,960,o),
-(782,958,c),
-(812,1132,l),
-(791,1135,o),
-(748,1135,o),
+(783,958,c),
+(811,1132,l),
+(792,1133,o),
+(747,1134,o),
 (722,1134,cs),
-(588,1135,o),
-(457,1059,o),
-(398,948,c),
-(386,948,l),
-(416,1118,l),
-(250,1118,l),
-(64,0,l)
+(588,1134,o),
+(458,1059,o),
+(399,948,c),
+(387,948,l),
+(415,1118,l),
+(251,1118,l),
+(66,0,l)
 );
 }
 );
-width = 766;
+width = 763;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (212,0);
+pos = (214,0);
+},
+{
+name = bottomr;
+pos = (412,0);
 },
 {
 name = cross;
-pos = (300,536);
+pos = (299,536);
 },
 {
 name = top;
-pos = (608,1304);
+pos = (606,1304);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(410,0,l),
-(506,582,ls),
-(529,710,o),
-(631,794,o),
-(748,794,cs),
-(791,794,o),
-(855,788,o),
+(412,0,l),
+(508,582,ls),
+(530,710,o),
+(630,794,o),
+(749,794,cs),
+(790,794,o),
+(856,788,o),
 (894,774,c),
-(952,1118,l),
-(919,1126,o),
-(887,1132,o),
-(852,1132,c),
-(733,1132,o),
+(951,1116,l),
+(920,1126,o),
+(886,1132,o),
+(851,1132,c),
+(732,1132,o),
 (628,1062,o),
 (562,904,c),
 (550,904,l),
-(584,1118,l),
-(194,1118,l),
-(8,0,l)
+(585,1118,l),
+(195,1118,l),
+(10,0,l)
 );
 }
 );
-width = 888;
+width = 889;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (128,0);
+pos = (130,0);
+},
+{
+name = bottomr;
+pos = (152,0);
 },
 {
 name = cross;
-pos = (218,536);
+pos = (219,536);
 },
 {
 name = top;
-pos = (550,1304);
+pos = (552,1304);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
@@ -114,40 +129,44 @@ nodes = (
 (152,0,l),
 (276,750,ls),
 (308,945,o),
-(474,1085,o),
+(475,1086,o),
 (672,1086,cs),
-(684,1085,o),
-(684,1085,o),
+(684,1086,o),
+(689,1086,o),
 (696,1086,c),
-(704,1132,l),
-(692,1132,o),
-(692,1132,o),
-(680,1132,cs),
-(527,1132,o),
-(384,1056,o),
+(703,1132,l),
+(691,1132,o),
+(691,1132,o),
+(679,1132,cs),
+(526,1132,o),
+(386,1056,o),
 (314,940,c),
 (308,940,l),
-(338,1118,l),
-(290,1118,l),
-(104,0,l)
+(337,1118,l),
+(291,1118,l),
+(106,0,l)
 );
 }
 );
-width = 666;
+width = 667;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (122.59,0);
+pos = (123,0);
+},
+{
+name = bottomr;
+pos = (209,0);
 },
 {
 name = cross;
-pos = (213.324,536);
+pos = (213,536);
 },
 {
 name = top;
-pos = (488.513,1262);
+pos = (489,1262);
 }
 );
 layerId = m008;
@@ -156,25 +175,25 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(208.59,0,l),
-(316.197,650,ls),
-(345.83,829,o),
-(459.909,908,o),
-(576.909,908,cs),
-(625.909,908,o),
-(665.584,900,o),
-(678.922,896,c),
-(707.065,1066,l),
-(693.396,1068,o),
-(667.059,1072,o),
-(636.059,1072,cs),
-(504.059,1072,o),
-(408.974,999,o),
-(351.929,890,c),
-(347.929,890,l),
-(375.41,1056,l),
-(213.41,1056,l),
-(38.59,0,l)
+(209,0,l),
+(316.607,650,ls),
+(346.24,829,o),
+(460.318,908,o),
+(577.318,908,cs),
+(626.318,908,o),
+(665.994,900,o),
+(679.332,896,c),
+(707.475,1066,l),
+(693.806,1068,o),
+(667.468,1072,o),
+(636.468,1072,cs),
+(504.468,1072,o),
+(409.383,999,o),
+(352.339,890,c),
+(348.339,890,l),
+(375.82,1056,l),
+(213.82,1056,l),
+(39,0,l)
 );
 }
 );
@@ -184,7 +203,11 @@ width = 660;
 anchors = (
 {
 name = bottom;
-pos = (198.59,0);
+pos = (199,0);
+},
+{
+name = bottomr;
+pos = (399,0);
 },
 {
 name = cross;
@@ -192,7 +215,7 @@ pos = (286,528);
 },
 {
 name = top;
-pos = (594.466,1304);
+pos = (594,1304);
 }
 );
 guides = (
@@ -207,43 +230,47 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(398.59,0,l),
-(482.358,506,ls),
-(505.7,647,o),
-(599.434,736,o),
-(724.434,736,cs),
-(774.434,736,o),
-(842.434,736,o),
-(870.434,736,c),
-(923.41,1056,l),
-(891.41,1056,o),
-(861.41,1056,o),
-(823.41,1056,cs),
-(678.41,1056,o),
-(593.132,1006,o),
-(531.624,864,c),
-(529.624,864,l),
-(561.41,1056,l),
-(173.41,1056,l),
-(-1.41,0,l)
+(399,0,l),
+(482.768,506,ls),
+(506.11,647,o),
+(599.844,736,o),
+(724.844,736,cs),
+(774.844,736,o),
+(842.844,736,o),
+(870.844,736,c),
+(923.82,1056,l),
+(891.82,1056,o),
+(861.82,1056,o),
+(823.82,1056,cs),
+(678.82,1056,o),
+(593.542,1006,o),
+(532.034,864,c),
+(530.034,864,l),
+(561.82,1056,l),
+(173.82,1056,l),
+(-1,0,l)
 );
 }
 );
-width = 852;
+width = 853;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (70.59,0);
+pos = (71,0);
+},
+{
+name = bottomr;
+pos = (93,0);
 },
 {
 name = cross;
-pos = (159.324,536);
+pos = (160,536);
 },
 {
 name = top;
-pos = (492.466,1304);
+pos = (493,1304);
 }
 );
 layerId = m012;
@@ -252,29 +279,29 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(92.59,0,l),
-(216.752,750,ls),
-(249.034,945,o),
-(415.376,1086,o),
-(612.376,1086,cs),
-(624.376,1086,o),
-(628.376,1086,o),
-(636.376,1086,c),
-(643.992,1132,l),
-(631.992,1132,o),
-(631.992,1132,o),
-(619.992,1132,cs),
-(466.992,1132,o),
-(326.41,1056,o),
-(254.206,940,c),
-(248.206,940,l),
-(277.674,1118,l),
-(231.674,1118,l),
-(46.59,0,l)
+(93,0,l),
+(217,750,ls),
+(249,945,o),
+(416,1086,o),
+(613,1086,cs),
+(625,1086,o),
+(629,1086,o),
+(637,1086,c),
+(644,1132,l),
+(632,1132,o),
+(632,1132,o),
+(620,1132,cs),
+(467,1132,o),
+(327,1056,o),
+(255,940,c),
+(249,940,l),
+(278,1118,l),
+(232,1118,l),
+(47,0,l)
 );
 }
 );
-width = 538;
+width = 539;
 }
 );
 metricLeft = n;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/racute.glyph b/src/Inter-Italic.glyphspackage/glyphs/racute.glyph
index 83acd5600..b6463914a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/racute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/racute.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = r;
 },
 {
-pos = (87,0);
+pos = (89,0);
 ref = acute;
 }
 );
-width = 766;
+width = 763;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rcaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/rcaron.glyph
index 55a123ce3..0ee5e3f3c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rcaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rcaron.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = r;
 },
 {
-pos = (-46,0);
+pos = (-44,0);
 ref = caron;
 }
 );
-width = 766;
+width = 763;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rcommaaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/rcommaaccent.glyph
index f551ddb30..f8e4217da 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rcommaaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rcommaaccent.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = r;
 },
 {
-pos = (-38,0);
+pos = (-36,0);
 ref = commaaccent;
 }
 );
-width = 766;
+width = 763;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rdblgrave.glyph b/src/Inter-Italic.glyphspackage/glyphs/rdblgrave.glyph
index 49562ece7..2266b4535 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rdblgrave.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rdblgrave.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = r;
 },
 {
-pos = (892,0);
+pos = (894,0);
 ref = dblgravecmb;
 }
 );
-width = 766;
+width = 763;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/rdotaccent.glyph
index 151eeb3e7..07152f63b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rdotaccent.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = r;
 },
 {
-pos = (176,0);
+pos = (178,0);
 ref = dotaccent;
 }
 );
-width = 766;
+width = 763;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rdotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/rdotbelow.glyph
index 761084d6c..376b80945 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rdotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rdotbelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = r;
 },
 {
-pos = (844,0);
+pos = (846,0);
 ref = dotbelow;
 }
 );
-width = 766;
+width = 763;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -23,11 +23,11 @@ shapes = (
 ref = r;
 },
 {
-pos = (842,0);
+pos = (844,0);
 ref = dotbelow;
 }
 );
-width = 888;
+width = 889;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rdotbelowmacron.glyph b/src/Inter-Italic.glyphspackage/glyphs/rdotbelowmacron.glyph
index c87807891..e2f3985a9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rdotbelowmacron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rdotbelowmacron.glyph
@@ -10,15 +10,15 @@ shapes = (
 ref = r;
 },
 {
-pos = (844,0);
+pos = (846,0);
 ref = dotbelow;
 },
 {
-pos = (-38,0);
+pos = (-36,0);
 ref = macron;
 }
 );
-width = 766;
+width = 763;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -27,15 +27,15 @@ shapes = (
 ref = r;
 },
 {
-pos = (842,0);
+pos = (844,0);
 ref = dotbelow;
 },
 {
-pos = (-174,0);
+pos = (-176,0);
 ref = macron;
 }
 );
-width = 888;
+width = 889;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rfishhook.glyph b/src/Inter-Italic.glyphspackage/glyphs/rfishhook.glyph
index b09a91043..cf5b39385 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rfishhook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rfishhook.glyph
@@ -7,6 +7,7 @@ layers = (
 background = {
 shapes = (
 {
+pos = (1,0);
 ref = r;
 }
 );
@@ -17,32 +18,31 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(235,0,l),
-(359,750,ls),
-(389,929,o),
-(496,965,o),
-(613,965,cs),
-(662,965,o),
-(694,963,o),
-(716,961,c),
-(743,1123,l),
-(729,1125,o),
-(688,1129,o),
-(626,1129,cs),
-(448,1129,o),
-(237,1038,o),
-(189,750,cs),
-(65,0,l)
+(236,0,l),
+(360,750,ls),
+(390,929,o),
+(497,965,o),
+(614,965,cs),
+(663,965,o),
+(695,963,o),
+(717,961,c),
+(744,1123,l),
+(730,1125,o),
+(689,1129,o),
+(627,1129,cs),
+(449,1129,o),
+(238,1038,o),
+(190,750,cs),
+(66,0,l)
 );
 }
 );
-width = 699;
+width = 697;
 },
 {
 background = {
 shapes = (
 {
-pos = (-1,0);
 ref = r;
 }
 );
@@ -53,26 +53,26 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(410,0,l),
-(514,628,ls),
-(532,739,o),
-(602,806,o),
-(703,806,cs),
-(742,806,o),
-(782,804,o),
-(820,796,c),
-(873,1119,l),
-(837,1126,o),
-(794,1132,o),
-(730,1132,cs),
-(396,1132,o),
-(173,996,o),
-(126,712,cs),
-(8,0,l)
+(411,0,l),
+(515,628,ls),
+(533,739,o),
+(603,806,o),
+(704,806,cs),
+(743,806,o),
+(783,804,o),
+(821,796,c),
+(874,1119,l),
+(838,1126,o),
+(795,1132,o),
+(731,1132,cs),
+(397,1132,o),
+(174,996,o),
+(127,712,cs),
+(9,0,l)
 );
 }
 );
-width = 810;
+width = 812;
 },
 {
 background = {
@@ -80,22 +80,22 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(244,750,ls),
-(244,954,o),
-(372,1086,o),
-(584,1086,cs),
-(595,1086,o),
+(245,750,ls),
+(245,954,o),
+(373,1086,o),
+(585,1086,cs),
 (596,1086,o),
-(608,1086,c),
-(608,1132,l),
+(597,1086,o),
+(609,1086,c),
+(609,1132,l),
+(597,1132,o),
 (596,1132,o),
-(595,1132,o),
-(584,1132,cs),
-(347,1132,o),
-(198,979,o),
-(198,750,cs),
-(198,0,l),
-(244,0,l)
+(585,1132,cs),
+(348,1132,o),
+(199,979,o),
+(199,750,cs),
+(199,0,l),
+(245,0,l)
 );
 }
 );
@@ -106,26 +106,26 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(151,0,l),
-(279,774,ls),
-(316,994,o),
-(467,1086,o),
-(671,1086,cs),
-(682,1086,o),
+(152,0,l),
+(280,774,ls),
+(317,994,o),
+(468,1086,o),
+(672,1086,cs),
 (683,1086,o),
-(695,1086,c),
-(702,1132,l),
+(684,1086,o),
+(696,1086,c),
+(703,1132,l),
+(691,1132,o),
 (690,1132,o),
-(689,1132,o),
-(678,1132,cs),
-(449,1132,o),
-(274,1019,o),
-(233,774,cs),
-(105,0,l)
+(679,1132,cs),
+(450,1132,o),
+(275,1019,o),
+(234,774,cs),
+(106,0,l)
 );
 }
 );
-width = 665;
+width = 667;
 },
 {
 background = {
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rfishhookrev.glyph b/src/Inter-Italic.glyphspackage/glyphs/rfishhookrev.glyph
index 93e1952c0..4d34378b3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rfishhookrev.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rfishhookrev.glyph
@@ -9,26 +9,26 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(449,0,l),
-(573,750,ls),
-(621,1038,o),
-(440,1129,o),
-(262,1129,cs),
-(200,1129,o),
-(158,1125,o),
-(143,1123,c),
-(116,961,l),
-(139,963,o),
-(172,965,o),
-(221,965,cs),
-(338,965,o),
-(433,929,o),
-(403,750,cs),
-(279,0,l)
+(446,0,l),
+(570,750,ls),
+(618,1038,o),
+(437,1129,o),
+(259,1129,cs),
+(197,1129,o),
+(155,1125,o),
+(140,1123,c),
+(113,961,l),
+(136,963,o),
+(169,965,o),
+(218,965,cs),
+(335,965,o),
+(430,929,o),
+(400,750,cs),
+(276,0,l)
 );
 }
 );
-width = 699;
+width = 697;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -37,26 +37,26 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(616,0,l),
-(734,712,ls),
-(781,996,o),
-(603,1132,o),
-(269,1132,cs),
-(205,1132,o),
-(160,1126,o),
-(122,1119,c),
-(68,796,l),
-(108,804,o),
-(149,806,o),
-(188,806,cs),
-(289,806,o),
-(337,739,o),
-(318,628,cs),
-(214,0,l)
+(617,0,l),
+(735,712,ls),
+(782,996,o),
+(604,1132,o),
+(270,1132,cs),
+(206,1132,o),
+(161,1126,o),
+(123,1119,c),
+(69,796,l),
+(109,804,o),
+(150,806,o),
+(189,806,cs),
+(290,806,o),
+(338,739,o),
+(319,628,cs),
+(215,0,l)
 );
 }
 );
-width = 810;
+width = 812;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -65,26 +65,26 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(383,0,l),
-(509,766,ls),
-(551,1020,o),
-(402,1132,o),
-(176,1132,cs),
+(384,0,l),
+(510,766,ls),
+(552,1020,o),
+(403,1132,o),
+(177,1132,cs),
+(166,1132,o),
 (165,1132,o),
-(164,1132,o),
-(152,1132,c),
-(145,1086,l),
-(157,1086,o),
-(165,1086,o),
-(176,1086,cs),
-(380,1086,o),
-(500,994,o),
-(464,774,cs),
-(336,0,l)
+(153,1132,c),
+(146,1086,l),
+(158,1086,o),
+(166,1086,o),
+(177,1086,cs),
+(381,1086,o),
+(501,994,o),
+(465,774,cs),
+(337,0,l)
 );
 }
 );
-width = 673;
+width = 675;
 },
 {
 layerId = m008;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rinvertedbreve.glyph b/src/Inter-Italic.glyphspackage/glyphs/rinvertedbreve.glyph
index c664f2f21..82856a67e 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rinvertedbreve.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rinvertedbreve.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = r;
 },
 {
-pos = (1077,0);
+pos = (1079,0);
 ref = breveinvnosp;
 }
 );
-width = 766;
+width = 763;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rlinebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/rlinebelow.glyph
index 3a2331851..e8a463932 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rlinebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rlinebelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = r;
 },
 {
-pos = (846,0);
+pos = (848,0);
 ref = macronsubnosp;
 }
 );
-width = 766;
+width = 763;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
@@ -23,11 +23,11 @@ shapes = (
 ref = r;
 },
 {
-pos = (932,0);
+pos = (934,0);
 ref = macronsubnosp;
 }
 );
-width = 888;
+width = 889;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -66,7 +66,7 @@ pos = (935,0);
 ref = macronsubnosp;
 }
 );
-width = 852;
+width = 853;
 },
 {
 layerId = m012;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/romaneight.glyph b/src/Inter-Italic.glyphspackage/glyphs/romaneight.glyph
index b88cc5280..ca63a54e3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/romaneight.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/romaneight.glyph
@@ -78,15 +78,15 @@ pos = (1338,0);
 ref = I;
 },
 {
-pos = (1907,0);
+pos = (1814,0);
 ref = I;
 },
 {
-pos = (2476,0);
+pos = (2290,0);
 ref = I;
 }
 );
-width = 2952;
+width = 2766;
 },
 {
 layerId = m010;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rrthook.glyph b/src/Inter-Italic.glyphspackage/glyphs/rrthook.glyph
index 8ea1d7965..c1e56c2e1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rrthook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rrthook.glyph
@@ -5,124 +5,56 @@ kernRight = r;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(322,-419,o),
-(360,-419,o),
-(387,-410,c),
-(411,-264,l),
-(397,-268,o),
-(377,-271,o),
-(355,-270,cs),
-(264,-271,o),
-(200,-236,o),
-(217,-120,cs),
-(237,0,l),
-(65,0,l),
-(45,-120,ls),
-(13,-311,o),
-(124,-419,o),
-(287,-418,cs)
-);
+ref = r;
 },
 {
-pos = (1,0);
-ref = r;
+pos = (30,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 767;
+width = 763;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(481,-419,o),
-(539,-410,o),
-(585,-408,c),
-(635,-110,l),
-(603,-119,o),
-(574,-119,o),
-(545,-120,cs),
-(475,-119,o),
-(394,-111,o),
-(409,-18,cs),
-(411,0,l),
-(9,0,l),
-(3,-34,ls),
-(-51,-364,o),
-(138,-419,o),
-(385,-418,cs)
-);
+ref = r;
 },
 {
-pos = (1,0);
-ref = r;
+pos = (-26,0);
+ref = _part.bottom_rthook;
 }
 );
 width = 889;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(259,-393,o),
-(273,-393,o),
-(286,-392,c),
-(292,-346,l),
-(281,-346,o),
-(266,-346,o),
-(254,-346,cs),
-(161,-346,o),
-(106,-281,o),
-(120,-186,cs),
-(152,0,l),
-(104,0,l),
-(74,-186,ls),
-(54,-307,o),
-(127,-393,o),
-(248,-392,cs)
-);
+ref = r;
 },
 {
-alignment = -1;
-ref = r;
+pos = (135,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 666;
+width = 667;
 },
 {
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(294,-419,o),
-(332,-419,o),
-(359,-410,c),
-(383,-264,l),
-(368,-268,o),
-(348,-271,o),
-(328,-270,cs),
-(235,-271,o),
-(171,-236,o),
-(189,-120,cs),
-(209,0,l),
-(39,0,l),
-(19,-120,ls),
-(-14,-311,o),
-(96,-419,o),
-(259,-418,cs)
-);
+ref = r;
 },
 {
-ref = r;
+pos = (-2,0);
+ref = _part.bottom_rthook;
 }
 );
 width = 660;
@@ -132,63 +64,28 @@ layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(470.225,-419,o),
-(526.715,-410,o),
-(573.046,-408,c),
-(622.38,-110,l),
-(590.883,-113,o),
-(561.386,-116,o),
-(531.386,-116,cs),
-(462.386,-116,o),
-(382.704,-102,o),
-(394.962,-34,cs),
-(400.59,0,l),
-(-1.41,0,l),
-(-7.038,-34,ls),
-(-61.67,-364,o),
-(127.225,-419,o),
-(373.391,-418,cs)
-);
+ref = r;
 },
 {
-ref = r;
+pos = (-42,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 852;
+width = 853;
 },
 {
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(199.529,-393,o),
-(214.529,-393,o),
-(225.695,-392,c),
-(233.31,-346,l),
-(222.31,-346,o),
-(207.31,-346,o),
-(195.31,-346,cs),
-(102.31,-346,o),
-(46.236,-280,o),
-(61.798,-186,cs),
-(92.59,0,l),
-(46.59,0,l),
-(15.798,-186,ls),
-(-4.233,-307,o),
-(67.529,-393,o),
-(187.695,-392,cs)
-);
+ref = r;
 },
 {
-alignment = -1;
-ref = r;
+pos = (70,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 538;
+width = 539;
 }
 );
 metricLeft = n;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rturn.glyph b/src/Inter-Italic.glyphspackage/glyphs/rturn.glyph
index 72800cf84..c5723a21b 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rturn.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rturn.glyph
@@ -9,6 +9,10 @@ name = bottom;
 pos = (290,0);
 },
 {
+name = bottomr;
+pos = (512,0);
+},
+{
 name = top;
 pos = (642,1304);
 }
@@ -17,11 +21,11 @@ layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
 angle = 180;
-pos = (766,1118);
+pos = (763,1118);
 ref = r;
 }
 );
-width = 766;
+width = 763;
 },
 {
 anchors = (
@@ -30,6 +34,10 @@ name = bottom;
 pos = (360,0);
 },
 {
+name = bottomr;
+pos = (694,0);
+},
+{
 name = top;
 pos = (710,1304);
 }
@@ -38,11 +46,11 @@ layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
 angle = 180;
-pos = (888,1118);
+pos = (889,1118);
 ref = r;
 }
 );
-width = 888;
+width = 889;
 },
 {
 anchors = (
@@ -51,6 +59,10 @@ name = bottom;
 pos = (258,0);
 },
 {
+name = bottomr;
+pos = (376,0);
+},
+{
 name = top;
 pos = (564,1304);
 }
@@ -59,11 +71,11 @@ layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
 angle = 180;
-pos = (666,1118);
+pos = (667,1118);
 ref = r;
 }
 );
-width = 666;
+width = 667;
 },
 {
 anchors = (
@@ -72,6 +84,10 @@ name = bottom;
 pos = (290,0);
 },
 {
+name = bottomr;
+pos = (446,0);
+},
+{
 name = top;
 pos = (642,1304);
 }
@@ -93,6 +109,10 @@ name = bottom;
 pos = (360,0);
 },
 {
+name = bottomr;
+pos = (679,0);
+},
+{
 name = top;
 pos = (710,1304);
 }
@@ -101,32 +121,38 @@ layerId = m010;
 shapes = (
 {
 angle = 180;
-pos = (852,1056);
+pos = (853,1056);
 ref = r;
 }
 );
-width = 852;
+width = 853;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (258,0);
+pos = (238,0);
+},
+{
+name = bottomr;
+pos = (307,0);
 },
 {
 name = top;
-pos = (564,1304);
+pos = (544,1304);
 }
 );
 layerId = m012;
+metricLeft = "=|r";
+metricRight = "=|r";
 shapes = (
 {
 angle = 180;
-pos = (538,1056);
+pos = (539,1118);
 ref = r;
 }
 );
-width = 538;
+width = 539;
 }
 );
 unicode = 633;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/rturnrthook.glyph b/src/Inter-Italic.glyphspackage/glyphs/rturnrthook.glyph
index 323e50380..2274d2e85 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/rturnrthook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/rturnrthook.glyph
@@ -4,188 +4,87 @@ kernRight = rthook;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(593,-436,o),
-(637,-433,o),
-(664,-424,c),
-(686,-290,l),
-(669,-297,o),
-(643,-297,o),
-(628,-296,cs),
-(516,-297,o),
-(473,-249,o),
-(492,-140,cs),
-(514,0,l),
-(350,0,l),
-(326,-140,ls),
-(294,-331,o),
-(399,-436,o),
-(562,-436,cs)
-);
+ref = rturn;
 },
 {
-ref = rturn;
+pos = (376,0);
+ref = _part.bottom_rrthook;
 }
 );
-width = 804;
+width = 763;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(772,-436,o),
-(833,-431,o),
-(894,-422,c),
-(934,-172,l),
-(900,-175,o),
-(879,-177,o),
-(840,-178,cs),
-(716,-177,o),
-(668,-133,o),
-(686,-32,cs),
-(692,0,l),
-(302,0,l),
-(294,-56,ls),
-(241,-388,o),
-(443,-436,o),
-(690,-436,cs)
-);
+ref = rturn;
 },
 {
-ref = rturn;
+pos = (332,0);
+ref = _part.bottom_rrthook;
 }
 );
-width = 1032;
+width = 889;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(483,-393,o),
-(497,-393,o),
-(510,-392,c),
-(516,-346,l),
-(505,-346,o),
-(490,-346,o),
-(478,-346,cs),
-(385,-346,o),
-(330,-281,o),
-(344,-186,cs),
-(376,0,l),
-(328,0,l),
-(298,-186,ls),
-(278,-307,o),
-(351,-393,o),
-(472,-392,cs)
-);
+ref = rturn;
 },
 {
-alignment = -1;
-ref = rturn;
+pos = (359,0);
+ref = _part.bottom_rrthook;
 }
 );
-width = 642;
+width = 667;
 },
 {
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(528,-436,o),
-(570,-433,o),
-(598,-424,c),
-(621,-290,l),
-(604,-297,o),
-(574,-297,o),
-(560,-296,cs),
-(452,-297,o),
-(405,-243,o),
-(423,-140,cs),
-(447,0,l),
-(285,0,l),
-(261,-140,ls),
-(230,-332,o),
-(333,-436,o),
-(496,-436,cs)
-);
+ref = rturn;
 },
 {
-ref = rturn;
+pos = (307,0);
+ref = _part.bottom_rrthook;
 }
 );
-width = 736;
+width = 660;
 },
 {
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(759,-436,o),
-(818,-431,o),
-(881,-422,c),
-(922,-172,l),
-(887,-175,o),
-(864,-177,o),
-(825,-178,cs),
-(703,-177,o),
-(656,-133,o),
-(673,-32,cs),
-(679,0,l),
-(291,0,l),
-(281,-56,ls),
-(227,-387,o),
-(430,-436,o),
-(678,-436,cs)
-);
+ref = rturn;
 },
 {
-ref = rturn;
+pos = (314,0);
+ref = _part.bottom_rrthook;
 }
 );
-width = 1000;
+width = 853;
 },
 {
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(424,-393,o),
-(439,-393,o),
-(450,-392,c),
-(457,-346,l),
-(446,-346,o),
-(431,-346,o),
-(419,-346,cs),
-(326,-346,o),
-(270,-280,o),
-(286,-186,cs),
-(317,0,l),
-(271,0,l),
-(240,-186,ls),
-(220,-307,o),
-(292,-393,o),
-(412,-392,cs)
-);
+ref = rturn;
 },
 {
-alignment = -1;
-ref = rturn;
+pos = (284,0);
+ref = _part.bottom_rrthook;
 }
 );
-width = 514;
+width = 539;
 }
 );
 metricLeft = rturn;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/s.glyph b/src/Inter-Italic.glyphspackage/glyphs/s.glyph
index 0b925adba..8fa9d5159 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/s.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/s.glyph
@@ -8,146 +8,152 @@ layers = (
 anchors = (
 {
 name = bottom;
-pos = (460,0);
+pos = (454,0);
 },
 {
 name = cedilla;
-pos = (456,0);
+pos = (452,0);
+},
+{
+name = rthook;
+pos = (61,268);
 },
 {
 name = top;
-pos = (674,1304);
+pos = (676,1304);
 }
 );
 guides = (
 {
-angle = 90;
-pos = (268,328);
+angle = 80.6;
+pos = (753,328);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(972,1027,o),
-(870,1132,o),
-(648,1132,cs),
-(413,1132,o),
+(973,1025,o),
+(869,1132,o),
+(647,1132,cs),
+(412,1132,o),
 (215,998,o),
 (184,808,cs),
-(157,655,o),
+(158,655,o),
 (233,553,o),
-(430,504,cs),
-(608,460,ls),
-(719,433,o),
-(762,381,o),
-(748,302,cs),
-(733,207,o),
-(617,128,o),
-(456,128,cs),
-(317,128,o),
-(239,189,o),
-(230,308,c),
-(58,268,l),
-(67,79,o),
-(207,-23,o),
+(431,504,cs),
+(610,460,ls),
+(718,433,o),
+(763,380,o),
+(750,302,cs),
+(734,207,o),
+(618,128,o),
+(459,128,cs),
+(318,128,o),
+(240,188,o),
+(229,308,c),
+(60,268,l),
+(69,78,o),
+(208,-24,o),
 (436,-24,cs),
-(695,-23,o),
+(696,-24,o),
 (896,119,o),
 (928,312,cs),
-(954,468,o),
-(873,564,o),
-(680,614,cs),
-(520,654,ls),
-(396,687,o),
-(343,733,o),
-(358,818,cs),
-(372,913,o),
-(486,983,o),
-(622,984,cs),
-(774,983,o),
-(820,902,o),
+(953,467,o),
+(873,566,o),
+(682,614,cs),
+(522,654,ls),
+(395,686,o),
+(343,732,o),
+(357,818,cs),
+(373,913,o),
+(487,984,o),
+(623,984,cs),
+(774,984,o),
+(821,900,o),
 (838,824,c),
-(1000,866,l)
+(999,866,l)
 );
 }
 );
-width = 1070;
+width = 1071;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (512,0);
+pos = (513,0);
 },
 {
 name = cedilla;
-pos = (520,0);
+pos = (521,0);
+},
+{
+name = rthook;
+pos = (19,360);
 },
 {
 name = top;
-pos = (730,1304);
+pos = (725,1304);
 }
 );
 guides = (
 {
-pos = (1760,2280);
-},
-{
-angle = 90;
-pos = (1832,1664);
+pos = (-4,2280);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(1183,989,o),
-(1001,1132,o),
-(666,1132,cs),
-(359,1132,o),
-(153,1014,o),
-(116,792,cs),
-(85,605,o),
-(189,481,o),
-(410,442,cs),
-(602,408,ls),
-(687,391,o),
-(713,378,o),
-(710,346,cs),
-(702,289,o),
-(629,247,o),
-(544,250,cs),
-(465,252,o),
-(415,288,o),
-(414,360,c),
-(24,360,l),
-(8,134,o),
-(186,-20,o),
-(538,-20,cs),
-(838,-20,o),
-(1078,117,o),
-(1118,346,cs),
-(1145,521,o),
-(1041,628,o),
-(820,670,cs),
-(600,710,ls),
-(517,726,o),
-(507,745,o),
-(512,768,cs),
-(520,825,o),
-(595,864,o),
-(674,864,cs),
-(743,864,o),
-(796,823,o),
-(792,754,c),
-(1152,754,l)
+(1183.893,990,o),
+(1010.401,1132,o),
+(688.401,1132,cs),
+(368.401,1132,o),
+(150.714,1001,o),
+(112.142,768,cs),
+(83.005,592,o),
+(177.721,481.264,o),
+(397.842,440,cs),
+(589.882,404,ls),
+(675.233,388,o),
+(711.425,365,o),
+(704.307,322,cs),
+(696.692,276,o),
+(638.387,250,o),
+(564.387,250,cs),
+(474.387,250,o),
+(416.844,289,o),
+(416.598,360,c),
+(18.598,360,l),
+(2.852,132,o),
+(175.689,-20,o),
+(517.689,-20,cs),
+(826.689,-20,o),
+(1080.521,130,o),
+(1120.253,370,cs),
+(1147.569,535,o),
+(1051.627,632,o),
+(830.249,672,cs),
+(608.871,712,ls),
+(527.267,726.745,o),
+(510.652,759,o),
+(516.115,792,cs),
+(523.73,838,o),
+(583.034,864,o),
+(652.034,864,cs),
+(731.034,864,o),
+(791.081,822,o),
+(785.824,754,c),
+(1153.824,754,l)
 );
 }
 );
-width = 1204;
+width = 1203;
 },
 {
 anchors = (
@@ -157,76 +163,91 @@ pos = (422,0);
 },
 {
 name = cedilla;
-pos = (418,0);
+pos = (420,0);
+},
+{
+name = rthook;
+pos = (87,256);
 },
 {
 name = top;
-pos = (640,1304);
+pos = (642,1304);
+}
+);
+guides = (
+{
+angle = 80.6;
+pos = (713,1620);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(893,1047,o),
-(789,1135,o),
-(614,1134,cs),
-(411,1135,o),
-(253,1020,o),
-(224,846,cs),
-(201,705,o),
-(276,602,o),
-(442,558,cs),
-(608,514,ls),
-(745,480,o),
-(804,402,o),
-(786,288,cs),
-(760,132,o),
-(608,23,o),
-(410,24,cs),
-(236,23,o),
-(140,108,o),
-(134,264,c),
-(88,258,l),
-(96,79,o),
-(210,-23,o),
-(410,-24,cs),
-(629,-23,o),
-(799,95,o),
-(830,276,cs),
-(852,415,o),
-(783,521,o),
-(626,562,cs),
-(456,606,ls),
-(311,643,o),
-(252,719,o),
-(270,834,cs),
-(295,984,o),
-(434,1088,o),
-(616,1088,cs),
-(766,1088,o),
-(849,1018,o),
-(872,872,c),
+(894,1049,o),
+(792,1134,o),
+(620,1134,cs),
+(416,1134,o),
+(254,1016,o),
+(225,840,cs),
+(202,701,o),
+(276,601,o),
+(440,558,cs),
+(607,514,ls),
+(744,478,o),
+(804,398,o),
+(785,282,cs),
+(759,127,o),
+(609,22,o),
+(416,22,cs),
+(238,22,o),
+(141,108,o),
+(134,267,c),
+(86,256,l),
+(96,78,o),
+(209,-24,o),
+(408,-24,cs),
+(626,-24,o),
+(801,100,o),
+(831,282,cs),
+(854,420,o),
+(781,518,o),
+(625,559,cs),
+(456,603,ls),
+(311,641,o),
+(252,724,o),
+(271,840,cs),
+(296,989,o),
+(433,1088,o),
+(612,1088,cs),
+(765,1088,o),
+(851,1015,o),
+(872,870,c),
 (920,882,l)
 );
 }
 );
-width = 1010;
+width = 1011;
 },
 {
 anchors = (
 {
 name = bottom;
-pos = (426.59,0);
+pos = (427,0);
 },
 {
 name = cedilla;
-pos = (424.59,0);
+pos = (425,0);
+},
+{
+name = rthook;
+pos = (41,316);
 },
 {
 name = top;
-pos = (608.513,1262);
+pos = (609,1262);
 }
 );
 layerId = m008;
@@ -235,50 +256,201 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(937.862,950,o),
-(794.383,1080,o),
-(574.383,1080,cs),
-(348.383,1080,o),
-(170.193,952,o),
-(140.394,772,cs),
-(114.899,618,o),
-(200.345,518,o),
-(388.729,472,cs),
-(552.107,432,ls),
-(642.465,410,o),
-(699.85,364,o),
-(686.606,284,cs),
-(671.044,190,o),
-(568.787,122,o),
-(422.787,122,cs),
-(274.787,122,o),
-(200.044,190,o),
-(208.904,316,c),
-(40.904,316,l),
-(16.827,86,o),
-(176.617,-24,o),
-(402.617,-24,cs),
-(632.617,-24,o),
-(825.821,92,o),
-(858.268,288,cs),
-(883.432,440,o),
-(806.828,533,o),
-(612.774,581,cs),
-(449.396,621,ls),
-(351.369,645,o),
-(297.15,692,o),
-(310.394,772,cs),
-(325.293,862,o),
-(420.213,934,o),
-(550.213,934,cs),
-(686.213,934,o),
-(759.638,852,o),
-(743.096,740,c),
-(909.096,740,l)
+(938.271,950,o),
+(794.793,1080,o),
+(574.793,1080,cs),
+(348.793,1080,o),
+(170.603,952,o),
+(140.804,772,cs),
+(115.309,618,o),
+(200.799,518.111,o),
+(389.139,472,cs),
+(552.517,432,ls),
+(642.83,409.889,o),
+(700.26,364,o),
+(687.016,284,cs),
+(671.454,190,o),
+(569.197,122,o),
+(423.197,122,cs),
+(275.197,122,o),
+(200.454,190,o),
+(209.313,316,c),
+(41.313,316,l),
+(17.237,86,o),
+(177.027,-24,o),
+(403.027,-24,cs),
+(633.027,-24,o),
+(826.231,92,o),
+(858.678,288,cs),
+(883.842,440,o),
+(807.417,533.446,o),
+(613.184,581,cs),
+(449.806,621,ls),
+(351.779,645,o),
+(297.56,692,o),
+(310.804,772,cs),
+(325.703,862,o),
+(420.623,934,o),
+(550.623,934,cs),
+(686.623,934,o),
+(760.048,852,o),
+(743.506,740,c),
+(909.506,740,l)
 );
 }
 );
-width = 972;
+width = 973;
+},
+{
+anchors = (
+{
+name = bottom;
+pos = (503,0);
+},
+{
+name = cedilla;
+pos = (511,0);
+},
+{
+name = rthook;
+pos = (6,345);
+},
+{
+name = top;
+pos = (694,1262);
+}
+);
+guides = (
+{
+pos = (-100,2280);
+}
+);
+layerId = m010;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1141.623,934,o),
+(972.296,1077,o),
+(653.296,1077,cs),
+(337.296,1077,o),
+(128.782,941,o),
+(92.692,723,cs),
+(64.383,552,o),
+(160.422,443.256,o),
+(366.71,409,cs),
+(559.412,377,ls),
+(637.282,364.069,o),
+(671.452,341,o),
+(665.824,307,cs),
+(659.036,266,o),
+(609.566,239,o),
+(530.566,239,cs),
+(444.566,239,o),
+(398.685,282,o),
+(400.114,345,c),
+(6.114,345,l),
+(-9.803,122,o),
+(178.53,-27,o),
+(492.53,-27,cs),
+(808.53,-27,o),
+(1042.356,129,o),
+(1079.439,353,cs),
+(1105.596,511,o),
+(1016.554,601.682,o),
+(800.786,639,cs),
+(581.077,677,ls),
+(519.764,687.604,o),
+(488.871,712,o),
+(494.334,745,cs),
+(500.79,784,o),
+(548.591,813,o),
+(625.591,813,cs),
+(702.591,813,o),
+(753.81,766,o),
+(745.712,705,c),
+(1109.712,705,l)
+);
+}
+);
+width = 1144;
+},
+{
+anchors = (
+{
+name = bottom;
+pos = (358,0);
+},
+{
+name = cedilla;
+pos = (356,0);
+},
+{
+name = rthook;
+pos = (23,256);
+},
+{
+name = top;
+pos = (578,1304);
+}
+);
+guides = (
+{
+angle = 80.6;
+pos = (585,1620);
+}
+);
+layerId = m012;
+name = ital_gen;
+shapes = (
+{
+closed = 1;
+nodes = (
+(830,1049,o),
+(728,1134,o),
+(556,1134,cs),
+(352,1134,o),
+(190,1016,o),
+(161,840,cs),
+(138,701,o),
+(212,601,o),
+(376,558,cs),
+(543,514,ls),
+(680,478,o),
+(740,398,o),
+(721,282,cs),
+(695,127,o),
+(545,22,o),
+(352,22,cs),
+(174,22,o),
+(77,108,o),
+(70,267,c),
+(22,256,l),
+(32,78,o),
+(145,-24,o),
+(344,-24,cs),
+(562,-24,o),
+(737,100,o),
+(767,282,cs),
+(790,420,o),
+(717,518,o),
+(561,559,cs),
+(392,603,ls),
+(247,641,o),
+(188,724,o),
+(207,840,cs),
+(232,989,o),
+(369,1088,o),
+(548,1088,cs),
+(701,1088,o),
+(787,1015,o),
+(808,870,c),
+(856,882,l)
+);
+}
+);
+width = 883;
 },
 {
 anchors = (
@@ -295,14 +467,15 @@ name = top;
 pos = (693.513,1262);
 }
 );
+associatedMasterId = m010;
 guides = (
 {
 angle = -9.4;
 pos = (-100,2280);
 }
 );
-layerId = m010;
-name = ital_gen;
+layerId = "F9D196F6-C9D5-4D5C-BA42-2FDD2399AB9F";
+name = "Sep 28, 22, 15:26";
 shapes = (
 {
 closed = 1;
@@ -356,6 +529,73 @@ width = 1144;
 anchors = (
 {
 name = bottom;
+pos = (426.59,0);
+},
+{
+name = cedilla;
+pos = (424.59,0);
+},
+{
+name = top;
+pos = (608.513,1262);
+}
+);
+associatedMasterId = m008;
+layerId = "D6007655-1D8B-4789-8261-E1ADDD6E93EF";
+name = "Sep 28, 22, 15:26";
+shapes = (
+{
+closed = 1;
+nodes = (
+(937.862,950,o),
+(794.383,1080,o),
+(574.383,1080,cs),
+(348.383,1080,o),
+(170.193,952,o),
+(140.394,772,cs),
+(114.899,618,o),
+(200.345,518,o),
+(388.729,472,cs),
+(552.107,432,ls),
+(642.465,410,o),
+(699.85,364,o),
+(686.606,284,cs),
+(671.044,190,o),
+(568.787,122,o),
+(422.787,122,cs),
+(274.787,122,o),
+(200.044,190,o),
+(208.904,316,c),
+(40.904,316,l),
+(16.827,86,o),
+(176.617,-24,o),
+(402.617,-24,cs),
+(632.617,-24,o),
+(825.821,92,o),
+(858.268,288,cs),
+(883.432,440,o),
+(806.828,533,o),
+(612.774,581,cs),
+(449.396,621,ls),
+(351.369,645,o),
+(297.15,692,o),
+(310.394,772,cs),
+(325.293,862,o),
+(420.213,934,o),
+(550.213,934,cs),
+(686.213,934,o),
+(759.638,852,o),
+(743.096,740,c),
+(909.096,740,l)
+);
+}
+);
+width = 972;
+},
+{
+anchors = (
+{
+name = bottom;
 pos = (362.59,0);
 },
 {
@@ -367,14 +607,15 @@ name = top;
 pos = (582.466,1304);
 }
 );
+associatedMasterId = m012;
 guides = (
 {
 angle = 80.6;
 pos = (584,1620);
 }
 );
-layerId = m012;
-name = ital_gen;
+layerId = "ED678220-9877-43EE-8A04-73C15460C038";
+name = "Sep 28, 22, 15:26";
 shapes = (
 {
 closed = 1;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/sacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/sacute.glyph
index 5db317c96..086ac645c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/sacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/sacute.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = s;
 },
 {
-pos = (217,0);
+pos = (219,0);
 ref = acute;
 }
 );
-width = 1070;
+width = 1071;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/sacutedotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/sacutedotaccent.glyph
index 4292b9cb6..55e796822 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/sacutedotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/sacutedotaccent.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = s;
 },
 {
-pos = (1142,12);
+pos = (1144,12);
 ref = acutedotcomb.lc;
 }
 );
-width = 1070;
+width = 1071;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/scaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/scaron.glyph
index 464010924..836aaaa2a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/scaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/scaron.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = s;
 },
 {
-pos = (84,0);
+pos = (86,0);
 ref = caron;
 }
 );
-width = 1070;
+width = 1071;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/scarondotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/scarondotaccent.glyph
index 59779ec16..19c93fe36 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/scarondotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/scarondotaccent.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = s;
 },
 {
-pos = (1142,12);
+pos = (1144,12);
 ref = carondotcomb.lc;
 }
 );
-width = 1070;
+width = 1071;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/scedilla.glyph b/src/Inter-Italic.glyphspackage/glyphs/scedilla.glyph
index 0cf078a3a..50d1f8659 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/scedilla.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/scedilla.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = s;
 },
 {
-pos = (270,0);
+pos = (266,0);
 ref = cedilla;
 }
 );
-width = 1070;
+width = 1071;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/scircumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/scircumflex.glyph
index 98d2a0c05..fb074a6a4 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/scircumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/scircumflex.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = s;
 },
 {
-pos = (84,0);
+pos = (86,0);
 ref = circumflex;
 }
 );
-width = 1070;
+width = 1071;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/scommaaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/scommaaccent.glyph
index 4bd91ce05..4a9e218d8 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/scommaaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/scommaaccent.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = s;
 },
 {
-pos = (274,0);
+pos = (268,0);
 ref = commaaccent;
 }
 );
-width = 1070;
+width = 1071;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/sdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/sdotaccent.glyph
index ac3c1e764..255a9c096 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/sdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/sdotaccent.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = s;
 },
 {
-pos = (306,0);
+pos = (308,0);
 ref = dotaccent;
 }
 );
-width = 1070;
+width = 1071;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/sdotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/sdotbelow.glyph
index 64fe46216..3c548306f 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/sdotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/sdotbelow.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = s;
 },
 {
-pos = (1156,0);
+pos = (1150,0);
 ref = dotbelow;
 }
 );
-width = 1070;
+width = 1071;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/sdotbelowdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/sdotbelowdotaccent.glyph
index 3e7b0ef92..3c4bef201 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/sdotbelowdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/sdotbelowdotaccent.glyph
@@ -10,15 +10,15 @@ shapes = (
 ref = s;
 },
 {
-pos = (1156,0);
+pos = (1150,0);
 ref = dotbelow;
 },
 {
-pos = (306,0);
+pos = (308,0);
 ref = dotaccent;
 }
 );
-width = 1070;
+width = 1071;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/srthook.glyph b/src/Inter-Italic.glyphspackage/glyphs/srthook.glyph
index 975e55e1a..eec67b0bf 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/srthook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/srthook.glyph
@@ -5,154 +5,70 @@ kernRight = s;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(8,-32,ls),
-(-23,-224,o),
-(90,-329,o),
-(256,-328,cs),
-(288,-329,o),
-(329,-326,o),
-(354,-318,c),
-(382,-168,l),
-(364,-175,o),
-(337,-175,o),
-(322,-174,cs),
-(230,-175,o),
-(140,-148,o),
-(158,-32,cs),
-(206,268,l),
-(58,268,l)
-);
+ref = s;
 },
 {
-ref = s;
+pos = (44,0);
+ref = _part.bottom_srthook;
 }
 );
-width = 1070;
+width = 1071;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-48,-78,ls),
-(-86,-312,o),
-(34,-454,o),
-(270,-454,cs),
-(328,-454,o),
-(369,-451,o),
-(424,-440,c),
-(464,-198,l),
-(430,-204,o),
-(403,-204,o),
-(368,-204,cs),
-(273,-204,o),
-(230,-151,o),
-(246,-52,cs),
-(316,360,l),
-(26,360,l)
-);
+ref = s;
 },
 {
-pos = (2,0);
-ref = s;
+pos = (-12,0);
+ref = _part.bottom_srthook;
 }
 );
-width = 1206;
+width = 1203;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(38,-44,ls),
-(15,-180,o),
-(63,-255,o),
-(194,-254,c),
-(219,-255,o),
-(239,-252,o),
-(260,-248,c),
-(268,-200,l),
-(249,-205,o),
-(231,-208,o),
-(202,-208,c),
-(87,-208,o),
-(65,-160,o),
-(86,-36,cs),
-(134,258,l),
-(88,258,l)
-);
+ref = s;
 },
 {
-alignment = -1;
-ref = s;
+pos = (72,0);
+ref = _part.bottom_srthook;
 }
 );
-width = 1010;
+width = 1011;
 },
 {
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-16.707,-32,ls),
-(-48.493,-224,o),
-(62.125,-329,o),
-(228.29,-328,cs),
-(259.125,-329,o),
-(300.621,-326,o),
-(327.946,-318,c),
-(352.778,-168,l),
-(337.619,-175,o),
-(311.619,-175,o),
-(297.785,-174,cs),
-(203.619,-175,o),
-(112.089,-148,o),
-(131.293,-32,cs),
-(189.566,320,l),
-(41.566,320,l)
-);
+ref = s;
 },
 {
-ref = s;
+pos = (12,0);
+ref = _part.bottom_srthook;
 }
 );
-width = 972;
+width = 973;
 },
 {
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-64.323,-78,ls),
-(-103.061,-312,o),
-(17.431,-454,o),
-(255.431,-454,cs),
-(313.431,-454,o),
-(350.928,-451,o),
-(407.749,-440,c),
-(447.811,-198,l),
-(413.149,-202,o),
-(386.818,-204,o),
-(350.818,-204,cs),
-(255.818,-204,o),
-(214.427,-152,o),
-(231.982,-52,cs),
-(300.188,360,l),
-(8.188,360,l)
-);
+ref = s;
 },
 {
-ref = s;
+pos = (-28,0);
+ref = _part.bottom_srthook;
 }
 );
 width = 1144;
@@ -162,34 +78,14 @@ layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(-22.032,-40,ls),
-(-45.864,-190,o),
-(-0.625,-255,o),
-(128.541,-254,cs),
-(147.375,-255,o),
-(174.706,-253,o),
-(199.203,-250,c),
-(206.818,-204,l),
-(181.322,-207,o),
-(154.156,-208,o),
-(136.156,-208,cs),
-(33.156,-208,o),
-(4.771,-162,o),
-(25.968,-40,cs),
-(74.971,256,l,{
-name = hr00;
-}),
-(26.971,256,l)
-);
+ref = s;
 },
 {
-alignment = -1;
-ref = s;
+pos = (3,0);
+ref = _part.bottom_srthook;
 }
 );
-width = 882;
+width = 883;
 }
 );
 metricLeft = s;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni01F_9.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni01F_9.glyph
index 5c40014ba..af2934e3d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni01F_9.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni01F_9.glyph
@@ -10,11 +10,11 @@ shapes = (
 ref = n;
 },
 {
-pos = (45,0);
+pos = (47,0);
 ref = grave;
 }
 );
-width = 1200;
+width = 1201;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni0227.1.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni0227.1.glyph
index 0b3bd2e66..5f780df56 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni0227.1.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni0227.1.glyph
@@ -12,11 +12,11 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (394,0);
+pos = (396,0);
 ref = dotaccent;
 }
 );
-width = 1190;
+width = 1191;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni024D_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni024D_.glyph
index 3391a27fb..e65ed6efc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni024D_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni024D_.glyph
@@ -12,11 +12,11 @@ ref = r;
 },
 {
 alignment = 1;
-pos = (-245,-185);
+pos = (-246,-185);
 ref = crossbar;
 }
 );
-width = 766;
+width = 763;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni03F_F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni03F_F_.glyph
index 74d51ecc2..73bb67680 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni03F_F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni03F_F_.glyph
@@ -73,7 +73,7 @@ shapes = (
 ref = Oopen;
 },
 {
-pos = (593,705);
+pos = (583,705);
 ref = period;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni04C_F_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni04C_F_.glyph
index 87054f544..89e52cab1 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni04C_F_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni04C_F_.glyph
@@ -19,7 +19,7 @@ shapes = (
 ref = l;
 }
 );
-width = 605;
+width = 606;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/uni217C_.glyph b/src/Inter-Italic.glyphspackage/glyphs/uni217C_.glyph
index dc608d9fa..174462f6a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/uni217C_.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/uni217C_.glyph
@@ -18,7 +18,7 @@ shapes = (
 ref = l;
 }
 );
-width = 605;
+width = 606;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/z.glyph b/src/Inter-Italic.glyphspackage/glyphs/z.glyph
index e8b4e8c90..0827f96d3 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/z.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/z.glyph
@@ -8,7 +8,11 @@ layers = (
 anchors = (
 {
 name = bottom;
-pos = (454,0);
+pos = (453,0);
+},
+{
+name = bottomr;
+pos = (907,0);
 },
 {
 name = cross;
@@ -16,32 +20,37 @@ pos = (552,558);
 },
 {
 name = top;
-pos = (674,1304);
+pos = (675,1304);
 }
 );
 guides = (
 {
-angle = -99.4;
-pos = (724,700);
+angle = 80.6;
+pos = (1348,500);
+},
+{
+angle = 80.6;
+pos = (172,380);
 }
 );
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(908,0,l),
-(934,160,l),
-(296,160,l),
-(300,172,l),
-(1050,980,l),
-(1074,1118,l),
-(238,1118,l),
-(212,958,l),
-(826,958,l),
-(824,946,l),
-(56,130,l),
-(32,0,l)
+(907,0,l),
+(933.488,160,l),
+(297.488,160,l),
+(299.474,172,l),
+(1049.238,980,l),
+(1072.084,1118,l),
+(238.084,1118,l),
+(211.596,958,l),
+(825.596,958,l),
+(823.609,946,l),
+(54.521,130,l),
+(33,0,l)
 );
 }
 );
@@ -51,44 +60,61 @@ width = 1108;
 anchors = (
 {
 name = bottom;
-pos = (518,0);
+pos = (517,0);
+},
+{
+name = bottomr;
+pos = (1001,0);
 },
 {
 name = cross;
-pos = (606,558);
+pos = (602,558);
 },
 {
 name = top;
-pos = (730,1304);
+pos = (729,1304);
 }
 );
 guides = (
 {
-orientation = center;
-pos = (500,768);
+angle = 51.5719;
+pos = (1112,736);
+},
+{
+angle = 80.6;
+pos = (1504,484);
+},
+{
+angle = 51.5719;
+pos = (520,740);
+},
+{
+angle = 80.6;
+pos = (156,484);
 }
 );
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(1006,0,l),
-(1056,306,l),
-(594,306,l),
-(596,312,l),
-(1134,872,l),
-(1172,1118,l),
-(226,1118,l),
-(174,812,l),
-(646,812,l),
-(642,806,l),
-(58,222,l),
-(24,0,l)
+(1001,0,l),
+(1051.658,306,l),
+(589.658,306,l),
+(590.651,312,l),
+(1127.359,872,l),
+(1168.084,1118,l),
+(222.084,1118,l),
+(171.426,812,l),
+(643.426,812,l),
+(642.432,806,l),
+(57.752,222,l),
+(21,0,l)
 );
 }
 );
-width = 1218;
+width = 1214;
 },
 {
 anchors = (
@@ -149,7 +175,11 @@ width = 1108;
 anchors = (
 {
 name = bottom;
-pos = (410,0);
+pos = (411,0);
+},
+{
+name = bottomr;
+pos = (821,0);
 },
 {
 name = cross;
@@ -157,26 +187,37 @@ pos = (520,558);
 },
 {
 name = top;
-pos = (642,1304);
+pos = (643,1304);
+}
+);
+guides = (
+{
+angle = 80.6;
+pos = (1216,1432);
+},
+{
+angle = 80.6;
+pos = (216,-44);
 }
 );
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
 closed = 1;
 nodes = (
-(820,0,l),
-(830,46,l),
-(136,46,l),
-(136,52,l),
-(968,1070,l),
-(978,1118,l),
-(294,1118,l),
-(286,1070,l),
-(908,1070,l),
-(908,1064,l),
-(72,46,l),
-(64,0,l)
+(821,0,l),
+(828.615,46,l),
+(130.615,46,l),
+(131.609,52,l),
+(968.137,1070,l),
+(976.084,1118,l),
+(292.084,1118,l),
+(284.137,1070,l),
+(910.137,1070,l),
+(909.144,1064,l),
+(72.615,46,l),
+(65,0,l)
 );
 }
 );
@@ -186,38 +227,21 @@ width = 1042;
 anchors = (
 {
 name = bottom;
-pos = (401.59,0);
+pos = (402,0);
+},
+{
+name = bottomr;
+pos = (799,0);
 },
 {
 name = cross;
-pos = (516.966,558);
+pos = (517,558);
 },
 {
 name = top;
-pos = (609.513,1262);
-}
-);
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(972,0,l),
-(972,160,l),
-(336,160,l),
-(336,172,l),
-(952,980,l),
-(952,1118,l),
-(118,1118,l),
-(118,958,l),
-(732,958,l),
-(732,946,l),
-(98,130,l),
-(98,0,l)
-);
+pos = (610,1262);
 }
 );
-};
 guides = (
 {
 angle = 80.6;
@@ -242,18 +266,18 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(798.59,0,l),
-(823.754,152,l),
-(247.754,152,l),
-(248.416,156,l),
-(946.895,920,l),
-(969.41,1056,l),
-(181.41,1056,l),
-(156.246,904,l),
-(734.246,904,l),
-(733.584,900,l),
-(28.112,130,l),
-(6.59,0,l)
+(799,0,l),
+(824.163,152,l),
+(248.163,152,l),
+(248.826,156,l),
+(947.305,920,l),
+(969.82,1056,l),
+(181.82,1056,l),
+(156.656,904,l),
+(734.656,904,l),
+(733.994,900,l),
+(28.521,130,l),
+(7,0,l)
 );
 }
 );
@@ -318,7 +342,11 @@ width = 1108;
 anchors = (
 {
 name = bottom;
-pos = (494.59,0);
+pos = (495,0);
+},
+{
+name = bottomr;
+pos = (979,0);
 },
 {
 name = cross;
@@ -326,30 +354,9 @@ pos = (582,528);
 },
 {
 name = top;
-pos = (703.513,1262);
+pos = (704,1262);
 }
 );
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(1094,0,l),
-(1094,306,l),
-(632,306,l),
-(632,312,l),
-(1076,872,l),
-(1076,1118,l),
-(130,1118,l),
-(130,812,l),
-(602,812,l),
-(602,806,l),
-(114,222,l),
-(114,0,l)
-);
-}
-);
-};
 guides = (
 {
 angle = 80.6;
@@ -366,18 +373,18 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(978.59,0,l),
-(1028.586,302,l),
-(570.586,302,l),
-(571.248,306,l),
-(1095.678,816,l),
-(1135.41,1056,l),
-(203.41,1056,l),
-(153.083,752,l),
-(619.083,752,l),
-(618.421,748,l),
-(46.349,216,l),
-(10.59,0,l)
+(979,0,l),
+(1028.996,302,l),
+(570.996,302,l),
+(571.658,306,l),
+(1096.088,816,l),
+(1135.82,1056,l),
+(203.82,1056,l),
+(153.493,752,l),
+(619.493,752,l),
+(618.831,748,l),
+(46.759,216,l),
+(11,0,l)
 );
 }
 );
@@ -387,25 +394,29 @@ width = 1164;
 anchors = (
 {
 name = bottom;
-pos = (352.59,0);
+pos = (353,0);
+},
+{
+name = bottomr;
+pos = (763,0);
 },
 {
 name = cross;
-pos = (460.966,558);
+pos = (462,558);
 },
 {
 name = top;
-pos = (584.466,1304);
+pos = (585,1304);
 }
 );
 guides = (
 {
 angle = 80.6;
-pos = (1088,1432);
+pos = (1094,1432);
 },
 {
 angle = 80.6;
-pos = (88,-44);
+pos = (94,-44);
 }
 );
 layerId = m012;
@@ -414,22 +425,22 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(762.59,0,l),
-(770.205,46,l),
-(72.205,46,l),
-(73.199,52,l),
-(909.728,1070,l),
-(917.674,1118,l),
-(233.674,1118,l),
-(225.728,1070,l),
-(851.728,1070,l),
-(850.734,1064,l),
-(14.205,46,l),
-(6.59,0,l)
+(763,0,l),
+(771,46,l),
+(73,46,l),
+(74,52,l),
+(910,1070,l),
+(918,1118,l),
+(234,1118,l),
+(226,1070,l),
+(852,1070,l),
+(851,1064,l),
+(15,46,l),
+(7,0,l)
 );
 }
 );
-width = 914;
+width = 915;
 }
 );
 unicode = 122;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/zacute.glyph b/src/Inter-Italic.glyphspackage/glyphs/zacute.glyph
index 18cd8f405..f404a0c0d 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/zacute.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/zacute.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (217,0);
+pos = (218,0);
 ref = acute;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/zbar.glyph b/src/Inter-Italic.glyphspackage/glyphs/zbar.glyph
index 0cb4e87a3..190d39ab9 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/zbar.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/zbar.glyph
@@ -25,11 +25,11 @@ shapes = (
 ref = z;
 },
 {
-pos = (59,-163);
+pos = (55,-163);
 ref = crossbar;
 }
 );
-width = 1218;
+width = 1214;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/zcaron.glyph b/src/Inter-Italic.glyphspackage/glyphs/zcaron.glyph
index 7ce9a2057..016fa772a 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/zcaron.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/zcaron.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (84,0);
+pos = (85,0);
 ref = caron;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/zcircumflex.glyph b/src/Inter-Italic.glyphspackage/glyphs/zcircumflex.glyph
index 79aa6aeaa..8be190444 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/zcircumflex.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/zcircumflex.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (84,0);
+pos = (85,0);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/zdotaccent.glyph b/src/Inter-Italic.glyphspackage/glyphs/zdotaccent.glyph
index f4d32610e..f631400fc 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/zdotaccent.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/zdotaccent.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (306,0);
+pos = (307,0);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Italic.glyphspackage/glyphs/zdotbelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/zdotbelow.glyph
index ad758c41b..cfafc5860 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/zdotbelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/zdotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (1150,0);
+pos = (1149,0);
 ref = dotbelow;
 }
 );
@@ -23,11 +23,11 @@ shapes = (
 ref = z;
 },
 {
-pos = (1148,0);
+pos = (1147,0);
 ref = dotbelow;
 }
 );
-width = 1218;
+width = 1214;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
diff --git a/src/Inter-Italic.glyphspackage/glyphs/zlinebelow.glyph b/src/Inter-Italic.glyphspackage/glyphs/zlinebelow.glyph
index 51a53cf34..d48a63f44 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/zlinebelow.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/zlinebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = z;
 },
 {
-pos = (1152,0);
+pos = (1151,0);
 ref = macronsubnosp;
 }
 );
@@ -23,11 +23,11 @@ shapes = (
 ref = z;
 },
 {
-pos = (1238,0);
+pos = (1237,0);
 ref = macronsubnosp;
 }
 );
-width = 1218;
+width = 1214;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
@@ -79,7 +79,7 @@ pos = (1115,0);
 ref = macronsubnosp;
 }
 );
-width = 914;
+width = 915;
 }
 );
 unicode = 7829;
diff --git a/src/Inter-Italic.glyphspackage/glyphs/zrthook.glyph b/src/Inter-Italic.glyphspackage/glyphs/zrthook.glyph
index 5fa15deca..7d839df1c 100644
--- a/src/Inter-Italic.glyphspackage/glyphs/zrthook.glyph
+++ b/src/Inter-Italic.glyphspackage/glyphs/zrthook.glyph
@@ -5,197 +5,101 @@ kernRight = rthook;
 layers = (
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(712,-140,ls),
-(681,-332,o),
-(791,-436,o),
-(958,-436,cs),
-(989,-436,o),
-(1033,-433,o),
-(1058,-424,c),
-(1082,-276,l),
-(1068,-282,o),
-(1041,-282,o),
-(1026,-282,cs),
-(934,-282,o),
-(865,-256,o),
-(884,-140,cs),
-(908,0,l),
-(736,0,l)
-);
+ref = z;
 },
 {
-ref = z;
+pos = (701,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1222;
+width = 1108;
 },
 {
+guides = (
+{
+orientation = center;
+angle = 80.6;
+pos = (-525,656);
+}
+);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(750,-56,ls),
-(712,-297,o),
-(820,-436,o),
-(1058,-436,cs),
-(1111,-436,o),
-(1151,-433,o),
-(1208,-422,c),
-(1248,-178,l),
-(1212,-180,o),
-(1192,-183,o),
-(1154,-184,cs),
-(1081,-183,o),
-(982,-159,o),
-(998,-56,cs),
-(1006,0,l),
-(760,0,l)
-);
+ref = z;
 },
 {
-ref = z;
+pos = (563,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1370;
+width = 1214;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
+name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(738,-206,ls),
-(716,-341,o),
-(764,-416,o),
-(894,-416,c),
-(920,-416,o),
-(940,-413,o),
-(962,-408,c),
-(968,-362,l),
-(951,-367,o),
-(932,-369,o),
-(904,-370,c),
-(788,-369,o),
-(766,-321,o),
-(786,-198,cs),
-(820,0,l),
-(774,0,l)
-);
+ref = z;
 },
 {
-alignment = -1;
-ref = z;
+pos = (804,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1106;
+width = 1042;
 },
 {
 layerId = m008;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(625.413,-140,ls),
-(593.628,-332,o),
-(686.391,-418,o),
-(851.391,-418,cs),
-(884.391,-418,o),
-(921.391,-418,o),
-(951.391,-418,c),
-(975.561,-272,l),
-(960.561,-272,o),
-(934.561,-272,o),
-(919.561,-272,cs),
-(826.561,-272,o),
-(756.21,-256,o),
-(775.413,-140,cs),
-(798.59,0,l),
-(648.59,0,l)
-);
+ref = z;
 },
 {
-ref = z;
+pos = (588,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1076;
+width = 976;
 },
 {
 guides = (
 {
 orientation = center;
 angle = 80.6;
-pos = (-2702,656);
+pos = (-3972,656);
 }
 );
 layerId = m010;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(733.319,-56,ls),
-(694.422,-297,o),
-(804.411,-436,o),
-(1042.411,-436,cs),
-(1095.411,-436,o),
-(1133.907,-433,o),
-(1190.729,-422,c),
-(1231.122,-178,l),
-(1195.791,-180,o),
-(1175.295,-183,o),
-(1138.129,-184,cs),
-(1065.295,-183,o),
-(964.599,-157,o),
-(981.319,-56,cs),
-(990.59,0,l),
-(742.59,0,l)
-);
+ref = z;
 },
 {
-ref = z;
+pos = (538,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1332;
+width = 1164;
 },
 {
 layerId = m012;
 name = ital_gen;
 shapes = (
 {
-closed = 1;
-nodes = (
-(681.48,-200,ls),
-(657.482,-351,o),
-(703.722,-416,o),
-(831.722,-416,cs),
-(851.722,-416,o),
-(877.887,-415,o),
-(902.384,-412,c),
-(910,-366,l),
-(884.668,-368,o),
-(858.503,-369,o),
-(839.337,-370,cs),
-(736.503,-369,o),
-(707.952,-324,o),
-(729.48,-200,cs),
-(764.908,14,l,{
-name = hr00;
-}),
-(716.908,14,l)
-);
+ref = z;
 },
 {
-alignment = -1;
-ref = z;
+pos = (740,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 978;
+width = 915;
 }
 );
 metricLeft = z;
diff --git a/src/Inter-Italic.glyphspackage/order.plist b/src/Inter-Italic.glyphspackage/order.plist
index e1d7da2b7..fb8a6bc37 100644
--- a/src/Inter-Italic.glyphspackage/order.plist
+++ b/src/Inter-Italic.glyphspackage/order.plist
@@ -2560,5 +2560,9 @@ _part.rtophorn,
 _part.top_left_hook,
 _part.top_r_hook,
 _part.topbar,
-_part.zeroslash
+_part.zeroslash,
+_part.bottom_rrthook,
+_part.bottom_rthook,
+_part.bottom_srthook,
+_part.q_big
 )
\ No newline at end of file
diff --git a/src/Inter-Roman.glyphspackage/fontinfo.plist b/src/Inter-Roman.glyphspackage/fontinfo.plist
index 560f851be..5d137474c 100644
--- a/src/Inter-Roman.glyphspackage/fontinfo.plist
+++ b/src/Inter-Roman.glyphspackage/fontinfo.plist
@@ -472,6 +472,7 @@ Phook,
 Rho,
 uni1FEC,
 Q,
+Q_rthook,
 R,
 Racute,
 Rcommaaccent,
@@ -928,7 +929,6 @@ ercyrillic,
 q,
 qhook,
 qrthook,
-Q_rthook,
 r,
 rrthook,
 uni024D,
@@ -2867,7 +2867,8 @@ pos = (0,559);
 },
 {
 locked = 1;
-pos = (594,-418);
+name = "p bottom";
+pos = (0,-418);
 },
 {
 locked = 1;
@@ -3964,7 +3965,6 @@ underscore = -69;
 "@MMK_R_idblgrave" = 69;
 "@MMK_R_idieresis" = 151;
 "@MMK_R_idotless" = 93;
-"@MMK_R_m" = 93;
 Dcroat = 69;
 Istroke = 69;
 };
@@ -7831,7 +7831,6 @@ less = -128;
 periodcentered = -69;
 };
 "@MMK_L_a" = {
-"@MMK_R_B" = 69;
 "@MMK_R_T" = -93;
 "@MMK_R_T.sc" = -87;
 "@MMK_R_V" = -104;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_nghecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_nghecyrillic.glyph
index ced487800..9e62317a8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_nghecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_nghecyrillic.glyph
@@ -56,7 +56,7 @@ alignment = -1;
 ref = H;
 }
 );
-width = 1978;
+width = 1982;
 },
 {
 layerId = m007;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_zh.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_zh.glyph
index 9211155c9..b4529c2fb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_zh.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_zh.glyph
@@ -289,7 +289,7 @@ width = 1694;
 anchors = (
 {
 name = top;
-pos = (710,1676);
+pos = (712,1676);
 }
 );
 background = {
@@ -297,35 +297,35 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(125,-212,o),
-(377,-425,o),
-(692,-424,cs),
-(1055,-425,o),
-(1263,-140,o),
-(1262,154,cs),
-(1263,492,o),
-(989,751,o),
-(588,768,c),
-(588,774,l),
-(1214,1452,l),
-(1214,1490,l),
-(204,1490,l),
-(204,1442,l),
-(1166,1442,l),
-(1166,1470,l),
-(518,768,l),
-(518,722,l),
-(586,722,ls),
-(956,705,o),
-(1216,471,o),
-(1216,154,cs),
-(1216,-152,o),
-(994,-378,o),
-(692,-378,cs),
-(398,-378,o),
-(172,-182,o),
-(172,72,c),
-(126,72,l)
+(127,-212,o),
+(379,-425,o),
+(694,-424,cs),
+(1057,-425,o),
+(1265,-140,o),
+(1264,154,cs),
+(1265,492,o),
+(991,751,o),
+(590,768,c),
+(590,774,l),
+(1216,1452,l),
+(1216,1490,l),
+(206,1490,l),
+(206,1442,l),
+(1168,1442,l),
+(1168,1470,l),
+(520,768,l),
+(520,722,l),
+(588,722,ls),
+(958,705,o),
+(1218,471,o),
+(1218,154,cs),
+(1218,-152,o),
+(996,-378,o),
+(694,-378,cs),
+(400,-378,o),
+(174,-182,o),
+(174,72,c),
+(128,72,l)
 );
 }
 );
@@ -335,39 +335,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(125,-230,o),
-(377,-442,o),
-(692,-442,cs),
-(1055,-442,o),
-(1263,-157,o),
-(1262,144,cs),
-(1263,492,o),
-(989,751,o),
-(588,768,c),
-(588,774,l),
-(1214,1452,l),
-(1214,1490,l),
-(204,1490,l),
-(204,1442,l),
-(1166,1442,l),
-(1166,1470,l),
-(518,768,l),
-(518,722,l),
-(586,722,ls),
-(956,705,o),
-(1216,471,o),
-(1216,144,cs),
-(1216,-169,o),
-(994,-396,o),
-(692,-396,cs),
-(398,-396,o),
-(172,-199,o),
-(172,72,c),
-(126,72,l)
-);
-}
-);
-width = 1420;
+(127,-230,o),
+(379,-442,o),
+(694,-442,cs),
+(1057,-442,o),
+(1265,-157,o),
+(1264,144,cs),
+(1265,492,o),
+(991,751,o),
+(590,768,c),
+(590,774,l),
+(1216,1452,l),
+(1216,1490,l),
+(206,1490,l),
+(206,1442,l),
+(1168,1442,l),
+(1168,1470,l),
+(520,768,l),
+(520,722,l),
+(588,722,ls),
+(958,705,o),
+(1218,471,o),
+(1218,144,cs),
+(1218,-169,o),
+(996,-396,o),
+(694,-396,cs),
+(400,-396,o),
+(174,-199,o),
+(174,72,c),
+(128,72,l)
+);
+}
+);
+width = 1422;
 },
 {
 anchors = (
@@ -762,7 +762,7 @@ width = 1694;
 anchors = (
 {
 name = top;
-pos = (646,1676);
+pos = (644,1676);
 }
 );
 background = {
@@ -770,35 +770,35 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(125,-212,o),
-(377,-425,o),
-(692,-424,cs),
-(1055,-425,o),
-(1263,-140,o),
-(1262,154,cs),
-(1263,492,o),
-(989,751,o),
-(588,768,c),
-(588,774,l),
-(1214,1452,l),
-(1214,1490,l),
-(204,1490,l),
-(204,1442,l),
-(1166,1442,l),
-(1166,1470,l),
-(518,768,l),
-(518,722,l),
-(586,722,ls),
-(956,705,o),
-(1216,471,o),
-(1216,154,cs),
-(1216,-152,o),
-(994,-378,o),
-(692,-378,cs),
-(398,-378,o),
-(172,-182,o),
-(172,72,c),
-(126,72,l)
+(123,-212,o),
+(375,-425,o),
+(690,-424,cs),
+(1053,-425,o),
+(1261,-140,o),
+(1260,154,cs),
+(1261,492,o),
+(987,751,o),
+(586,768,c),
+(586,774,l),
+(1212,1452,l),
+(1212,1490,l),
+(202,1490,l),
+(202,1442,l),
+(1164,1442,l),
+(1164,1470,l),
+(516,768,l),
+(516,722,l),
+(584,722,ls),
+(954,705,o),
+(1214,471,o),
+(1214,154,cs),
+(1214,-152,o),
+(992,-378,o),
+(690,-378,cs),
+(396,-378,o),
+(170,-182,o),
+(170,72,c),
+(124,72,l)
 );
 }
 );
@@ -808,39 +808,39 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(61,-230,o),
-(313,-442,o),
-(628,-442,cs),
-(991,-442,o),
-(1199,-157,o),
-(1198,144,cs),
-(1199,492,o),
-(925,751,o),
-(524,768,c),
-(524,774,l),
-(1150,1452,l),
-(1150,1490,l),
-(140,1490,l),
-(140,1442,l),
-(1102,1442,l),
-(1102,1470,l),
-(454,768,l),
-(454,722,l),
-(522,722,ls),
-(892,705,o),
-(1152,471,o),
-(1152,144,cs),
-(1152,-169,o),
-(930,-396,o),
-(628,-396,cs),
-(334,-396,o),
-(108,-199,o),
-(108,72,c),
-(62,72,l)
-);
-}
-);
-width = 1292;
+(59,-230,o),
+(311,-442,o),
+(626,-442,cs),
+(989,-442,o),
+(1197,-157,o),
+(1196,144,cs),
+(1197,492,o),
+(923,751,o),
+(522,768,c),
+(522,774,l),
+(1148,1452,l),
+(1148,1490,l),
+(138,1490,l),
+(138,1442,l),
+(1100,1442,l),
+(1100,1470,l),
+(452,768,l),
+(452,722,l),
+(520,722,ls),
+(890,705,o),
+(1150,471,o),
+(1150,144,cs),
+(1150,-169,o),
+(928,-396,o),
+(626,-396,cs),
+(332,-396,o),
+(106,-199,o),
+(106,72,c),
+(60,72,l)
+);
+}
+);
+width = 1290;
 }
 );
 metricLeft = T;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_zhcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_zhcaron.glyph
index a2799eced..cf2195216 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_zhcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_zhcaron.glyph
@@ -34,11 +34,11 @@ shapes = (
 ref = Ezh;
 },
 {
-pos = (280,388);
+pos = (282,388);
 ref = caron;
 }
 );
-width = 1420;
+width = 1422;
 },
 {
 layerId = m007;
@@ -73,11 +73,11 @@ shapes = (
 ref = Ezh;
 },
 {
-pos = (280,388);
+pos = (278,388);
 ref = caron;
 }
 );
-width = 1292;
+width = 1290;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/E_zhreversed.glyph b/src/Inter-Roman.glyphspackage/glyphs/E_zhreversed.glyph
index a40233a84..b9364b50b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/E_zhreversed.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/E_zhreversed.glyph
@@ -137,7 +137,7 @@ nodes = (
 );
 }
 );
-width = 1420;
+width = 1422;
 },
 {
 anchors = (
@@ -275,7 +275,7 @@ nodes = (
 );
 }
 );
-width = 1292;
+width = 1290;
 }
 );
 metricLeft = "=|Ezh";
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_amma.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_amma.glyph
index 5ea4bfa9a..18e7a6b86 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_amma.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_amma.glyph
@@ -106,7 +106,7 @@ nodes = (
 );
 }
 );
-width = 1168;
+width = 1172;
 },
 {
 anchors = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/G_hestrokecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/G_hestrokecyrillic.glyph
index 331408086..dae314ff6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/G_hestrokecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/G_hestrokecyrillic.glyph
@@ -39,7 +39,7 @@ pos = (-166,34);
 ref = crossbar;
 }
 );
-width = 1168;
+width = 1172;
 },
 {
 layerId = m007;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/H_bar.glyph b/src/Inter-Roman.glyphspackage/glyphs/H_bar.glyph
index a06f3b62d..46cc96cf5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/H_bar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/H_bar.glyph
@@ -54,19 +54,19 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(126,1080,l),
-(126,1032,l),
-(1400,1032,l),
-(1400,1080,l)
+(128,1080,l),
+(128,1032,l),
+(1402,1032,l),
+(1402,1080,l)
 );
 },
 {
 alignment = -1;
-pos = (12,0);
+pos = (14,0);
 ref = H;
 }
 );
-width = 1524;
+width = 1530;
 },
 {
 guides = (
@@ -119,19 +119,19 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(62,1080,l),
-(62,1032,l),
-(1336,1032,l),
-(1336,1080,l)
+(60,1080,l),
+(60,1032,l),
+(1334,1032,l),
+(1334,1080,l)
 );
 },
 {
 alignment = -1;
-pos = (12,0);
+pos = (10,0);
 ref = H;
 }
 );
-width = 1396;
+width = 1394;
 }
 );
 metricLeft = T;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_.1.glyph
index 4efea8b33..e1401e31e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_.1.glyph
@@ -92,25 +92,25 @@ width = 1034;
 anchors = (
 {
 name = ogonek;
-pos = (590,0);
+pos = (592,0);
 },
 {
 name = right;
-pos = (600,0);
+pos = (602,0);
 },
 {
 name = tonos;
-pos = (126,1490);
+pos = (128,1490);
 }
 );
 guides = (
 {
 angle = 90;
-pos = (812,104);
+pos = (814,104);
 },
 {
 angle = 90;
-pos = (172,104);
+pos = (174,104);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -118,28 +118,28 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(590,1442,l),
-(590,1490,l),
-(126,1490,l),
-(126,1442,l)
+(592,1442,l),
+(592,1490,l),
+(128,1490,l),
+(128,1442,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(590,0,l),
-(590,46,l),
-(126,46,l),
-(126,0,l)
+(592,0,l),
+(592,46,l),
+(128,46,l),
+(128,0,l)
 );
 },
 {
 alignment = -1;
-pos = (102,0);
+pos = (104,0);
 ref = I;
 }
 );
-width = 714;
+width = 720;
 },
 {
 anchors = (
@@ -229,25 +229,25 @@ width = 1002;
 anchors = (
 {
 name = ogonek;
-pos = (526,0);
+pos = (524,0);
 },
 {
 name = right;
-pos = (536,0);
+pos = (534,0);
 },
 {
 name = tonos;
-pos = (62,1490);
+pos = (60,1490);
 }
 );
 guides = (
 {
 angle = 90;
-pos = (684,104);
+pos = (682,104);
 },
 {
 angle = 90;
-pos = (44,104);
+pos = (42,104);
 }
 );
 layerId = m011;
@@ -255,28 +255,28 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(526,1442,l),
-(526,1490,l),
-(62,1490,l),
-(62,1442,l)
+(524,1442,l),
+(524,1490,l),
+(60,1490,l),
+(60,1442,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(526,0,l),
-(526,46,l),
-(62,46,l),
-(62,0,l)
+(524,0,l),
+(524,46,l),
+(60,46,l),
+(60,0,l)
 );
 },
 {
 alignment = -1;
-pos = (102,0);
+pos = (100,0);
 ref = I;
 }
 );
-width = 586;
+width = 584;
 }
 );
 metricLeft = T;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_acute.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_acute.1.glyph
index 11dbf210b..69dc9672e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_acute.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_acute.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (78,372);
+pos = (80,372);
 ref = acute;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (14,372);
+pos = (12,372);
 ref = acute;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_breve.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_breve.1.glyph
index ca56734ac..29c5171f7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_breve.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_breve.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-58,372);
+pos = (-56,372);
 ref = breve;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-122,414);
+pos = (-124,414);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_caron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_caron.1.glyph
index aba361f79..89d43791d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_caron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_caron.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-72,388);
+pos = (-70,388);
 ref = caron;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-72,388);
+pos = (-74,388);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.1.glyph
index 6410f9b80..16ffbe3ba 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_circumflex.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-72,372);
+pos = (-70,372);
 ref = circumflex;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-72,372);
+pos = (-74,372);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.1.glyph
index fee4e5082..2708e63c7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dblgrave.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (916,372);
+pos = (918,372);
 ref = dblgravecmb;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (916,372);
+pos = (914,372);
 ref = dblgravecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.1.glyph
index 4549c31d0..6d21ff327 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dieresis.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-316,46);
+pos = (-314,46);
 ref = casedieresis.cn;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-316,46);
+pos = (-318,46);
 ref = casedieresis.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.1.glyph
index 33a976a0a..7c683aac1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dieresisacute.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (730,0);
+pos = (732,0);
 ref = dieresisacutecomb.cn;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (730,0);
+pos = (728,0);
 ref = dieresisacutecomb.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dotaccent.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dotaccent.1.glyph
index 1bfdaa04a..9738ed39a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dotaccent.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dotaccent.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (172,372);
+pos = (174,372);
 ref = dotaccent;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (172,372);
+pos = (170,372);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_dotbelow.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_dotbelow.1.glyph
index 3f355d821..27a8da0a6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_dotbelow.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_dotbelow.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (916,0);
+pos = (918,0);
 ref = dotbelow;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (916,0);
+pos = (914,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_grave.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_grave.1.glyph
index 086cf803c..e71a5fa57 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_grave.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_grave.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-136,372);
+pos = (-134,372);
 ref = grave;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-200,372);
+pos = (-202,372);
 ref = grave;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.1.glyph
index 3b5e7dcf8..bc3f65766 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_hookabove.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (856,416);
+pos = (858,416);
 ref = hookabovecmb;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (856,416);
+pos = (854,416);
 ref = hookabovecmb;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.1.glyph
index 5be691f97..d320b1b1e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_invertedbreve.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (950,372);
+pos = (952,372);
 ref = breveinvnosp;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (886,414);
+pos = (884,414);
 ref = breveinvnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_macron.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_macron.1.glyph
index d95b08868..e0d9e5e2e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_macron.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_macron.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (58,372);
+pos = (60,372);
 ref = macron;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (58,372);
+pos = (56,372);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_ogonek.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_ogonek.1.glyph
index 9fdfe21bf..a47a32a0e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_ogonek.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_ogonek.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (318,0);
+pos = (320,0);
 ref = ogonek;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (318,0);
+pos = (316,0);
 ref = ogonek;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_stroke.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_stroke.1.glyph
index 836d1c36e..74070a1b1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_stroke.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_stroke.1.glyph
@@ -41,11 +41,11 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (-66,46);
+pos = (-64,46);
 ref = crossbar;
 }
 );
-width = 714;
+width = 720;
 },
 {
 layerId = m007;
@@ -86,11 +86,11 @@ ref = I.1;
 },
 {
 alignment = 1;
-pos = (-66,46);
+pos = (-68,46);
 ref = crossbar;
 }
 );
-width = 586;
+width = 584;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_tilde.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_tilde.1.glyph
index 98f963375..68df460e7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_tilde.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_tilde.1.glyph
@@ -38,11 +38,11 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-66,0);
+pos = (-64,0);
 ref = casetilde.cn;
 }
 );
-width = 714;
+width = 720;
 },
 {
 layerId = m007;
@@ -80,11 +80,11 @@ alignment = 1;
 ref = I.1;
 },
 {
-pos = (-66,0);
+pos = (-68,0);
 ref = casetilde.cn;
 }
 );
-width = 586;
+width = 584;
 }
 );
 tags = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.1.glyph
index 4e7f119b5..bbb884d74 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/I_tildebelow.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (844,0);
+pos = (846,0);
 ref = tildesubnosp;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (844,0);
+pos = (842,0);
 ref = tildesubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Q_.glyph b/src/Inter-Roman.glyphspackage/glyphs/Q_.glyph
index 6896d288e..b7f041614 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Q_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Q_.glyph
@@ -130,56 +130,6 @@ name = _center;
 pos = (787,702);
 }
 );
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(1355,-136,l),
-(1540,51,l),
-(1365,225,l),
-(1478,358,o),
-(1542,536,o),
-(1542,741,cs),
-(1542,1179,o),
-(1251,1505,o),
-(796,1505,cs),
-(341,1505,o),
-(55,1179,o),
-(55,741,cs),
-(55,303,o),
-(341,-21,o),
-(796,-21,cs),
-(933,-21,o),
-(1054,8,o),
-(1159,61,c)
-);
-},
-{
-closed = 1;
-nodes = (
-(593,321,o),
-(489,501,o),
-(489,741,cs),
-(489,981,o),
-(593,1163,o),
-(798,1163,cs),
-(1003,1163,o),
-(1107,981,o),
-(1107,741,cs),
-(1107,657,o),
-(1095,583,o),
-(1071,520,c),
-(933,657,l),
-(749,471,l),
-(886,333,l),
-(860,325,o),
-(829,321,o),
-(798,321,cs)
-);
-}
-);
-};
 guides = (
 {
 angle = 90;
@@ -191,21 +141,21 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(872,268,l),
-(1014,96,l),
-(1184,-110,l),
-(1534,-110,l),
-(1276,192,l),
-(1084,410,l),
-(970,552,l),
-(656,552,l)
+(824,268,l),
+(966,96,l),
+(1136,-110,l),
+(1486,-110,l),
+(1228,192,l),
+(1036,410,l),
+(922,552,l),
+(608,552,l)
 );
 },
 {
 ref = O;
 }
 );
-width = 1574;
+width = 1528;
 },
 {
 anchors = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/Q__rthook.glyph b/src/Inter-Roman.glyphspackage/glyphs/Q__rthook.glyph
index 93056f829..1b3fe7d8d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/Q__rthook.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/Q__rthook.glyph
@@ -7,60 +7,14 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(1214,1490,l),
-(1214,1260,l),
-(1196,1260,l),
-(1123,1417,o),
-(957,1510,o),
-(754,1510,cs),
-(378,1510,o),
-(122,1193,o),
-(122,750,cs),
-(122,294,o),
-(381,-23,o),
-(754,-24,cs),
-(954,-23,o),
-(1120,70,o),
-(1196,236,c),
-(1208,236,l),
-(1208,-120,ls),
-(1207,-311,o),
-(1335,-419,o),
-(1498,-418,cs),
-(1533,-419,o),
-(1571,-419,o),
-(1598,-410,c),
-(1598,-264,l),
-(1583,-268,o),
-(1562,-271,o),
-(1542,-270,cs),
-(1449,-271,o),
-(1379,-236,o),
-(1378,-120,cs),
-(1378,1490,l)
-);
+ref = _part.q_big;
 },
 {
-closed = 1;
-nodes = (
-(489,148,o),
-(300,378,o),
-(300,748,cs),
-(300,1094,o),
-(480,1347,o),
-(756,1346,cs),
-(1066,1347,o),
-(1210,1076,o),
-(1210,748,cs),
-(1210,412,o),
-(1081,148,o),
-(754,148,cs)
-);
+pos = (1080,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1598;
+width = 1558;
 },
 {
 background = {
@@ -78,175 +32,37 @@ pos = (80,1024);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(1122,1490,l),
-(1122,1280,l),
-(1112,1280,l),
-(1039,1401,o),
-(911,1510,o),
-(710,1510,cs),
-(362,1510,o),
-(90,1169,o),
-(90,744,cs),
-(90,323,o),
-(353,-20,o),
-(710,-20,cs),
-(910,-20,o),
-(1040,87,o),
-(1112,210,c),
-(1122,210,l),
-(1122,-34,ls),
-(1123,-364,o),
-(1321,-419,o),
-(1566,-418,cs),
-(1658,-419,o),
-(1722,-410,o),
-(1766,-408,c),
-(1766,-110,l),
-(1734,-113,o),
-(1705,-116,o),
-(1676,-116,cs),
-(1603,-116,o),
-(1524,-102,o),
-(1524,-34,cs),
-(1524,1490,l)
-);
+ref = _part.q_big;
 },
 {
-closed = 1;
-nodes = (
-(614,332,o),
-(506,477,o),
-(506,744,cs),
-(506,1012,o),
-(614,1158,o),
-(814,1158,cs),
-(1015,1158,o),
-(1123,1012,o),
-(1122,744,cs),
-(1123,477,o),
-(1015,332,o),
-(814,332,cs)
-);
+pos = (994,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1766;
+width = 1620;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(1246,1490,l),
-(1246,1106,l),
-(1240,1106,l),
-(1156,1374,o),
-(994,1510,o),
-(766,1510,cs),
-(399,1510,o),
-(148,1200,o),
-(148,744,cs),
-(148,292,o),
-(397,-20,o),
-(758,-20,cs),
-(989,-20,o),
-(1155,118,o),
-(1240,382,c),
-(1246,382,l),
-(1246,-200,ls),
-(1245,-351,o),
-(1301,-416,o),
-(1430,-416,cs),
-(1453,-416,o),
-(1479,-415,o),
-(1502,-412,c),
-(1502,-366,l),
-(1480,-368,o),
-(1453,-369,o),
-(1430,-370,cs),
-(1328,-369,o),
-(1292,-324,o),
-(1292,-200,cs),
-(1292,1490,l)
-);
+ref = _part.q_big;
 },
 {
-closed = 1;
-nodes = (
-(425,26,o),
-(195,316,o),
-(194,744,cs),
-(195,1172,o),
-(425,1463,o),
-(766,1464,cs),
-(1064,1463,o),
-(1249,1190,o),
-(1250,744,cs),
-(1250,295,o),
-(1068,26,o),
-(766,26,cs)
-);
+pos = (1182,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1530;
+width = 1524;
 },
 {
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1182,1490,l),
-(1182,1260,l),
-(1164,1260,l),
-(1091,1417,o),
-(925,1510,o),
-(722,1510,cs),
-(346,1510,o),
-(90,1193,o),
-(90,750,cs),
-(90,294,o),
-(349,-23,o),
-(722,-24,cs),
-(922,-23,o),
-(1088,70,o),
-(1164,236,c),
-(1176,236,l),
-(1176,-120,ls),
-(1175,-311,o),
-(1303,-419,o),
-(1466,-418,cs),
-(1501,-419,o),
-(1539,-419,o),
-(1566,-410,c),
-(1566,-264,l),
-(1551,-268,o),
-(1530,-271,o),
-(1510,-270,cs),
-(1417,-271,o),
-(1347,-236,o),
-(1346,-120,cs),
-(1346,1490,l)
-);
+ref = _part.q_big;
 },
 {
-closed = 1;
-nodes = (
-(457,148,o),
-(268,378,o),
-(268,748,cs),
-(268,1094,o),
-(448,1347,o),
-(724,1346,cs),
-(1034,1347,o),
-(1178,1076,o),
-(1178,748,cs),
-(1178,412,o),
-(1049,148,o),
-(722,148,cs)
-);
+pos = (1088,0);
+ref = _part.bottom_rthook;
 }
 );
 width = 1534;
@@ -255,7 +71,6 @@ width = 1534;
 background = {
 shapes = (
 {
-pos = (-34,0);
 ref = O;
 }
 );
@@ -268,119 +83,27 @@ pos = (-50,1024);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1072,1490,l),
-(1072,1280,l),
-(1062,1280,l),
-(989,1401,o),
-(861,1510,o),
-(660,1510,cs),
-(312,1510,o),
-(40,1169,o),
-(40,744,cs),
-(40,323,o),
-(303,-20,o),
-(660,-20,cs),
-(860,-20,o),
-(990,87,o),
-(1062,210,c),
-(1072,210,l),
-(1072,-34,ls),
-(1073,-364,o),
-(1271,-419,o),
-(1516,-418,cs),
-(1608,-419,o),
-(1672,-410,o),
-(1716,-408,c),
-(1716,-110,l),
-(1684,-113,o),
-(1655,-116,o),
-(1626,-116,cs),
-(1553,-116,o),
-(1474,-102,o),
-(1474,-34,cs),
-(1474,1490,l)
-);
+ref = _part.q_big;
 },
 {
-closed = 1;
-nodes = (
-(564,332,o),
-(456,477,o),
-(456,744,cs),
-(456,1012,o),
-(564,1158,o),
-(764,1158,cs),
-(965,1158,o),
-(1073,1012,o),
-(1072,744,cs),
-(1073,477,o),
-(965,332,o),
-(764,332,cs)
-);
+pos = (938,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1700;
+width = 1546;
 },
 {
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1182,1490,l),
-(1182,1106,l),
-(1176,1106,l),
-(1092,1374,o),
-(930,1510,o),
-(702,1510,cs),
-(335,1510,o),
-(84,1200,o),
-(84,744,cs),
-(84,292,o),
-(333,-20,o),
-(694,-20,cs),
-(925,-20,o),
-(1091,118,o),
-(1176,382,c),
-(1182,382,l),
-(1182,-200,ls),
-(1181,-351,o),
-(1237,-416,o),
-(1366,-416,cs),
-(1389,-416,o),
-(1415,-415,o),
-(1438,-412,c),
-(1438,-366,l),
-(1416,-368,o),
-(1389,-369,o),
-(1366,-370,cs),
-(1264,-369,o),
-(1228,-324,o),
-(1228,-200,cs),
-(1228,1490,l)
-);
+ref = _part.q_big;
 },
 {
-closed = 1;
-nodes = (
-(361,26,o),
-(131,316,o),
-(130,744,cs),
-(131,1172,o),
-(361,1463,o),
-(702,1464,cs),
-(1000,1463,o),
-(1185,1190,o),
-(1186,744,cs),
-(1186,295,o),
-(1004,26,o),
-(702,26,cs)
-);
+pos = (1118,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1402;
+width = 1396;
 }
 );
 metricLeft = O;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/T_etsecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/T_etsecyrillic.glyph
index c42927672..0f284eacb 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/T_etsecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/T_etsecyrillic.glyph
@@ -46,19 +46,19 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(126,1490,l),
-(126,1442,l),
-(1044,1442,l),
-(1044,1490,l)
+(128,1490,l),
+(128,1442,l),
+(1046,1442,l),
+(1046,1490,l)
 );
 },
 {
 alignment = -1;
-pos = (328,0);
+pos = (330,0);
 ref = afii10040;
 }
 );
-width = 1730;
+width = 1732;
 },
 {
 layerId = m007;
@@ -104,19 +104,19 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(62,1490,l),
-(62,1442,l),
-(980,1442,l),
-(980,1490,l)
+(60,1490,l),
+(60,1442,l),
+(978,1442,l),
+(978,1490,l)
 );
 },
 {
 alignment = -1;
-pos = (328,0);
+pos = (326,0);
 ref = afii10040;
 }
 );
-width = 1602;
+width = 1600;
 }
 );
 metricLeft = T;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/_part.bottom_rrthook.glyph b/src/Inter-Roman.glyphspackage/glyphs/_part.bottom_rrthook.glyph
new file mode 100644
index 000000000..eb2e8c10d
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/_part.bottom_rrthook.glyph
@@ -0,0 +1,204 @@
+{
+export = 0;
+glyphname = _part.bottom_rrthook;
+layers = (
+{
+anchors = (
+{
+name = _bottomr;
+pos = (110,0);
+}
+);
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+closed = 1;
+nodes = (
+(266,-418,o),
+(297,-418,o),
+(320,-418,c),
+(320,-372,l),
+(295,-372,o),
+(265,-372,o),
+(248,-372,cs),
+(152,-372,o),
+(110,-329,o),
+(110,-220,cs),
+(110,0,l),
+(64,0,l),
+(64,-220,ls),
+(64,-356,o),
+(125,-418,o),
+(248,-418,cs)
+);
+}
+);
+width = 384;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (110,0);
+}
+);
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(266,-418,o),
+(297,-418,o),
+(320,-418,c),
+(320,-372,l),
+(295,-372,o),
+(265,-372,o),
+(248,-372,cs),
+(152,-372,o),
+(110,-329,o),
+(110,-220,cs),
+(110,0,l),
+(64,0,l),
+(64,-220,ls),
+(64,-356,o),
+(125,-418,o),
+(248,-418,cs)
+);
+}
+);
+width = 384;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (228,0);
+}
+);
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+closed = 1;
+nodes = (
+(387,-426,o),
+(425,-422,o),
+(442,-418,c),
+(442,-274,l),
+(423,-277,o),
+(402,-278,o),
+(386,-278,cs),
+(273,-278,o),
+(228,-246,o),
+(228,-176,cs),
+(228,160,l),
+(64,160,l),
+(64,-176,ls),
+(64,-338,o),
+(157,-426,o),
+(342,-426,cs)
+);
+}
+);
+width = 506;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (226,0);
+}
+);
+layerId = m007;
+shapes = (
+{
+closed = 1;
+nodes = (
+(385,-418,o),
+(412,-418,o),
+(440,-418,c),
+(440,-270,l),
+(419,-270,o),
+(360,-270,o),
+(340,-270,cs),
+(255,-270,o),
+(226,-241,o),
+(226,-170,cs),
+(226,152,l),
+(64,152,l),
+(64,-170,ls),
+(64,-332,o),
+(155,-418,o),
+(340,-418,cs)
+);
+}
+);
+width = 504;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (454,0);
+}
+);
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+closed = 1;
+nodes = (
+(547,-441,o),
+(613,-433,o),
+(672,-417,c),
+(672,-144,l),
+(632,-149,o),
+(596,-153,o),
+(557,-153,cs),
+(479,-153,o),
+(454,-133,o),
+(454,-73,cs),
+(454,224,l),
+(64,224,l),
+(64,-73,ls),
+(64,-318,o),
+(193,-441,o),
+(474,-441,cs)
+);
+}
+);
+width = 736;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (452,0);
+}
+);
+layerId = m009;
+shapes = (
+{
+closed = 1;
+nodes = (
+(469,-418,o),
+(628,-418,o),
+(672,-418,c),
+(672,-114,l),
+(648,-114,o),
+(577,-114,o),
+(516,-114,cs),
+(474,-114,o),
+(452,-90,o),
+(452,-48,cs),
+(452,200,l),
+(64,200,l),
+(64,-102,ls),
+(64,-305,o),
+(177,-418,o),
+(378,-418,cs)
+);
+}
+);
+width = 736;
+}
+);
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/_part.bottom_rthook.glyph b/src/Inter-Roman.glyphspackage/glyphs/_part.bottom_rthook.glyph
new file mode 100644
index 000000000..37dd410e5
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/_part.bottom_rthook.glyph
@@ -0,0 +1,204 @@
+{
+export = 0;
+glyphname = _part.bottom_rthook;
+layers = (
+{
+anchors = (
+{
+name = _bottomr;
+pos = (110,0);
+}
+);
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+closed = 1;
+nodes = (
+(266,-418,o),
+(297,-418,o),
+(320,-418,c),
+(320,-372,l),
+(295,-372,o),
+(265,-372,o),
+(248,-372,cs),
+(152,-372,o),
+(110,-329,o),
+(110,-220,cs),
+(110,0,l),
+(64,0,l),
+(64,-220,ls),
+(64,-356,o),
+(125,-418,o),
+(248,-418,cs)
+);
+}
+);
+width = 384;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (110,0);
+}
+);
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(266,-418,o),
+(297,-418,o),
+(320,-418,c),
+(320,-372,l),
+(295,-372,o),
+(265,-372,o),
+(248,-372,cs),
+(152,-372,o),
+(110,-329,o),
+(110,-220,cs),
+(110,0,l),
+(64,0,l),
+(64,-220,ls),
+(64,-356,o),
+(125,-418,o),
+(248,-418,cs)
+);
+}
+);
+width = 384;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (298,0);
+}
+);
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+closed = 1;
+nodes = (
+(457,-426,o),
+(495,-422,o),
+(512,-418,c),
+(512,-274,l),
+(493,-277,o),
+(472,-278,o),
+(456,-278,cs),
+(343,-278,o),
+(298,-246,o),
+(298,-176,cs),
+(298,160,l),
+(128,160,l),
+(128,-176,ls),
+(128,-338,o),
+(227,-426,o),
+(412,-426,cs)
+);
+}
+);
+width = 640;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (298,0);
+}
+);
+layerId = m007;
+shapes = (
+{
+closed = 1;
+nodes = (
+(457,-418,o),
+(484,-418,o),
+(512,-418,c),
+(512,-270,l),
+(491,-270,o),
+(432,-270,o),
+(412,-270,cs),
+(327,-270,o),
+(298,-241,o),
+(298,-170,cs),
+(298,152,l),
+(128,152,l),
+(128,-170,ls),
+(128,-332,o),
+(227,-418,o),
+(412,-418,cs)
+);
+}
+);
+width = 640;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (530,0);
+}
+);
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+closed = 1;
+nodes = (
+(623,-441,o),
+(689,-433,o),
+(748,-417,c),
+(748,-144,l),
+(708,-149,o),
+(672,-153,o),
+(633,-153,cs),
+(555,-153,o),
+(530,-133,o),
+(530,-73,cs),
+(530,224,l),
+(128,224,l),
+(128,-73,ls),
+(128,-318,o),
+(269,-441,o),
+(550,-441,cs)
+);
+}
+);
+width = 876;
+},
+{
+anchors = (
+{
+name = _bottomr;
+pos = (528,0);
+}
+);
+layerId = m009;
+shapes = (
+{
+closed = 1;
+nodes = (
+(533,-418,o),
+(704,-418,o),
+(748,-418,c),
+(748,-114,l),
+(724,-114,o),
+(653,-114,o),
+(592,-114,cs),
+(550,-114,o),
+(528,-90,o),
+(528,-48,cs),
+(528,200,l),
+(128,200,l),
+(128,-102,ls),
+(128,-305,o),
+(241,-418,o),
+(442,-418,cs)
+);
+}
+);
+width = 876;
+}
+);
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/_part.bottom_srthook.glyph b/src/Inter-Roman.glyphspackage/glyphs/_part.bottom_srthook.glyph
new file mode 100644
index 000000000..a65bfe9d2
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/_part.bottom_srthook.glyph
@@ -0,0 +1,204 @@
+{
+export = 0;
+glyphname = _part.bottom_srthook;
+layers = (
+{
+anchors = (
+{
+name = _rthook;
+pos = (64,256);
+}
+);
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+closed = 1;
+nodes = (
+(266,-418,o),
+(297,-418,o),
+(320,-418,c),
+(320,-372,l),
+(295,-372,o),
+(265,-372,o),
+(248,-372,cs),
+(152,-372,o),
+(110,-329,o),
+(110,-220,cs),
+(110,256,l),
+(64,256,l),
+(64,-220,ls),
+(64,-356,o),
+(125,-418,o),
+(248,-418,cs)
+);
+}
+);
+width = 384;
+},
+{
+anchors = (
+{
+name = _rthook;
+pos = (64,256);
+}
+);
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(266,-418,o),
+(297,-418,o),
+(320,-418,c),
+(320,-372,l),
+(295,-372,o),
+(265,-372,o),
+(248,-372,cs),
+(152,-372,o),
+(110,-329,o),
+(110,-220,cs),
+(110,256,l),
+(64,256,l),
+(64,-220,ls),
+(64,-356,o),
+(125,-418,o),
+(248,-418,cs)
+);
+}
+);
+width = 384;
+},
+{
+anchors = (
+{
+name = _rthook;
+pos = (64,268);
+}
+);
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+shapes = (
+{
+closed = 1;
+nodes = (
+(393,-426,o),
+(431,-422,o),
+(448,-418,c),
+(448,-274,l),
+(429,-277,o),
+(408,-278,o),
+(392,-278,cs),
+(279,-278,o),
+(224,-246,o),
+(224,-176,cs),
+(224,268,l),
+(64,268,l),
+(64,-176,ls),
+(64,-338,o),
+(163,-426,o),
+(348,-426,cs)
+);
+}
+);
+width = 512;
+},
+{
+anchors = (
+{
+name = _rthook;
+pos = (64,316);
+}
+);
+layerId = m007;
+shapes = (
+{
+closed = 1;
+nodes = (
+(391,-418,o),
+(418,-418,o),
+(446,-418,c),
+(446,-270,l),
+(425,-270,o),
+(366,-270,o),
+(346,-270,cs),
+(261,-270,o),
+(226,-241,o),
+(226,-170,cs),
+(226,316,l),
+(64,316,l),
+(64,-170,ls),
+(64,-332,o),
+(161,-418,o),
+(346,-418,cs)
+);
+}
+);
+width = 510;
+},
+{
+anchors = (
+{
+name = _rthook;
+pos = (64,360);
+}
+);
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+closed = 1;
+nodes = (
+(559,-441,o),
+(625,-433,o),
+(684,-417,c),
+(684,-144,l),
+(644,-149,o),
+(592,-153,o),
+(553,-153,cs),
+(455,-153,o),
+(418,-131,o),
+(418,-73,cs),
+(418,360,l),
+(64,360,l),
+(64,-73,ls),
+(64,-318,o),
+(205,-441,o),
+(486,-441,cs)
+);
+}
+);
+width = 748;
+},
+{
+anchors = (
+{
+name = _rthook;
+pos = (64,345);
+}
+);
+layerId = m009;
+shapes = (
+{
+closed = 1;
+nodes = (
+(469,-418,o),
+(640,-418,o),
+(684,-418,c),
+(684,-114,l),
+(660,-114,o),
+(541,-114,o),
+(480,-114,cs),
+(438,-114,o),
+(416,-90,o),
+(416,-48,cs),
+(416,345,l),
+(64,345,l),
+(64,-102,ls),
+(64,-305,o),
+(177,-418,o),
+(378,-418,cs)
+);
+}
+);
+width = 748;
+}
+);
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/_part.q_big.glyph b/src/Inter-Roman.glyphspackage/glyphs/_part.q_big.glyph
new file mode 100644
index 000000000..c2f607db0
--- /dev/null
+++ b/src/Inter-Roman.glyphspackage/glyphs/_part.q_big.glyph
@@ -0,0 +1,464 @@
+{
+export = 0;
+glyphname = _part.q_big;
+layers = (
+{
+anchors = (
+{
+name = bottomr;
+pos = (1292,0);
+}
+);
+layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1246,1490,l),
+(1246,1106,l),
+(1240,1106,l),
+(1156,1374,o),
+(994,1510,o),
+(766,1510,cs),
+(399,1510,o),
+(148,1200,o),
+(148,744,cs),
+(148,292,o),
+(397,-20,o),
+(758,-20,cs),
+(989,-20,o),
+(1155,118,o),
+(1240,382,c),
+(1246,382,l),
+(1246,0,l),
+(1292,0,l),
+(1292,1490,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(425,26,o),
+(194,316,o),
+(194,744,cs),
+(194,1172,o),
+(425,1464,o),
+(766,1464,cs),
+(1064,1464,o),
+(1250,1190,o),
+(1250,744,cs),
+(1250,295,o),
+(1068,26,o),
+(766,26,cs)
+);
+}
+);
+width = 1524;
+},
+{
+anchors = (
+{
+name = bottomr;
+pos = (1228,0);
+}
+);
+layerId = m011;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1182,1490,l),
+(1182,1106,l),
+(1176,1106,l),
+(1092,1374,o),
+(930,1510,o),
+(702,1510,cs),
+(335,1510,o),
+(84,1200,o),
+(84,744,cs),
+(84,292,o),
+(333,-20,o),
+(694,-20,cs),
+(925,-20,o),
+(1091,118,o),
+(1176,382,c),
+(1182,382,l),
+(1182,0,l),
+(1228,0,l),
+(1228,1490,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(361,26,o),
+(130,316,o),
+(130,744,cs),
+(130,1172,o),
+(361,1464,o),
+(702,1464,cs),
+(1000,1464,o),
+(1186,1190,o),
+(1186,744,cs),
+(1186,295,o),
+(1004,26,o),
+(702,26,cs)
+);
+}
+);
+width = 1396;
+},
+{
+anchors = (
+{
+name = bottomr;
+pos = (1386,0);
+}
+);
+background = {
+shapes = (
+{
+ref = O;
+}
+);
+};
+layerId = m007;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1216,1490,l),
+(1216,1260,l),
+(1214,1260,l),
+(1143,1413,o),
+(957,1514,o),
+(748,1514,cs),
+(369,1514,o),
+(90,1188,o),
+(90,745,cs),
+(90,302,o),
+(369,-24,o),
+(748,-24,cs),
+(960,-24,o),
+(1142,77,o),
+(1214,236,c),
+(1216,236,l),
+(1216,0,l),
+(1386,0,l),
+(1386,1490,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(464,144,o),
+(268,389,o),
+(268,745,cs),
+(268,1097,o),
+(468,1346,o),
+(750,1346,cs),
+(1036,1346,o),
+(1218,1112,o),
+(1218,745,cs),
+(1218,384,o),
+(1031,144,o),
+(748,144,cs)
+);
+}
+);
+width = 1534;
+},
+{
+anchors = (
+{
+name = bottomr;
+pos = (1524,0);
+}
+);
+layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1122,1490,l),
+(1122,1280,l),
+(1112,1280,l),
+(1039,1401,o),
+(911,1510,o),
+(710,1510,cs),
+(362,1510,o),
+(90,1169,o),
+(90,744,cs),
+(90,323,o),
+(353,-20,o),
+(710,-20,cs),
+(910,-20,o),
+(1040,87,o),
+(1112,210,c),
+(1122,210,l),
+(1122,0,l),
+(1524,0,l),
+(1524,1490,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(614,332,o),
+(506,477,o),
+(506,744,cs),
+(506,1012,o),
+(614,1158,o),
+(814,1158,cs),
+(1015,1158,o),
+(1122,1012,o),
+(1122,744,cs),
+(1122,477,o),
+(1015,332,o),
+(814,332,cs)
+);
+}
+);
+width = 1620;
+},
+{
+anchors = (
+{
+name = bottomr;
+pos = (1466,0);
+}
+);
+background = {
+shapes = (
+{
+ref = O;
+}
+);
+};
+layerId = m009;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1066,1490,l),
+(1066,1288,l),
+(1064,1288,l),
+(976,1433,o),
+(836,1510,o),
+(660,1510,cs),
+(298,1510,o),
+(40,1191,o),
+(40,744,cs),
+(40,295,o),
+(295,-20,o),
+(660,-20,cs),
+(840,-20,o),
+(979,56,o),
+(1064,202,c),
+(1066,202,l),
+(1066,0,l),
+(1466,0,l),
+(1466,1490,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(562,332,o),
+(456,478,o),
+(456,744,cs),
+(456,1011,o),
+(562,1158,o),
+(756,1158,cs),
+(953,1158,o),
+(1064,1009,o),
+(1064,744,cs),
+(1064,482,o),
+(952,332,o),
+(756,332,cs)
+);
+}
+);
+width = 1546;
+},
+{
+anchors = (
+{
+name = bottomr;
+pos = (1386,0);
+}
+);
+associatedMasterId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+layerId = "F22D811B-6DE8-4FFC-A463-7CB102E75E2F";
+name = "Sep 28, 22, 12:02";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1146,-20,o),
+(1358,273,o),
+(1358,744,cs),
+(1358,1216,o),
+(1146,1510,o),
+(765,1510,cs),
+(384,1510,o),
+(106,1216,o),
+(106,744,cs),
+(106,273,o),
+(384,-20,o),
+(765,-20,cs)
+);
+},
+{
+closed = 1;
+nodes = (
+(494,148,o),
+(280,358,o),
+(280,744,cs),
+(280,1132,o),
+(494,1342,o),
+(765,1342,cs),
+(1035,1342,o),
+(1208,1132,o),
+(1208,744,cs),
+(1208,358,o),
+(1035,148,o),
+(765,148,cs)
+);
+},
+{
+closed = 0;
+nodes = (
+(1196,236,l),
+(1216,236,l),
+(1216,0,l),
+(1386,0,l),
+(1386,1490,l),
+(1216,1490,l),
+(1216,1345,l),
+(1196,1345,l)
+);
+}
+);
+width = 1558;
+},
+{
+anchors = (
+{
+name = bottomr;
+pos = (1378,0);
+}
+);
+layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
+name = Regular;
+shapes = (
+{
+closed = 1;
+nodes = (
+(1208,1490,l),
+(1208,1260,l),
+(1196,1260,l),
+(1123,1417,o),
+(957,1510,o),
+(754,1510,cs),
+(378,1510,o),
+(122,1193,o),
+(122,750,cs),
+(122,294,o),
+(381,-24,o),
+(754,-24,cs),
+(954,-24,o),
+(1120,70,o),
+(1196,236,c),
+(1208,236,l),
+(1208,0,l),
+(1378,0,l),
+(1378,1490,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(489,148,o),
+(300,378,o),
+(300,748,cs),
+(300,1094,o),
+(480,1346,o),
+(756,1346,cs),
+(1066,1346,o),
+(1210,1076,o),
+(1210,748,cs),
+(1210,412,o),
+(1081,148,o),
+(754,148,cs)
+);
+}
+);
+width = 1558;
+},
+{
+anchors = (
+{
+name = bottomr;
+pos = (1506,0);
+}
+);
+associatedMasterId = m009;
+background = {
+shapes = (
+{
+ref = O;
+}
+);
+};
+layerId = "AE33CE71-6DA7-43CC-B167-D8650DB5DE68";
+name = "Sep 28, 22, 12:09";
+shapes = (
+{
+closed = 1;
+nodes = (
+(1106,1490,l),
+(1106,1288,l),
+(1104,1288,l),
+(1019,1428,o),
+(862,1510,o),
+(676,1510,cs),
+(315,1510,o),
+(40,1179,o),
+(40,744,cs),
+(40,299,o),
+(305,-20,o),
+(676,-20,cs),
+(866,-20,o),
+(1022,61,o),
+(1104,202,c),
+(1106,202,l),
+(1106,0,l),
+(1506,0,l),
+(1506,1490,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(580,332,o),
+(456,486,o),
+(456,744,cs),
+(456,1003,o),
+(581,1158,o),
+(788,1158,cs),
+(991,1158,o),
+(1104,1009,o),
+(1104,744,cs),
+(1104,480,o),
+(991,332,o),
+(788,332,cs)
+);
+}
+);
+width = 1586;
+}
+);
+metricLeft = C;
+metricRight = H;
+}
diff --git a/src/Inter-Roman.glyphspackage/glyphs/_part.top_r_hook.glyph b/src/Inter-Roman.glyphspackage/glyphs/_part.top_r_hook.glyph
index 601dd48b6..4026bba4b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/_part.top_r_hook.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/_part.top_r_hook.glyph
@@ -48,9 +48,9 @@ shapes = (
 closed = 1;
 nodes = (
 (322,1118,l),
-(322,1254,l),
-(323,1324,o),
-(373,1355,o),
+(322,1254,ls),
+(322,1324,o),
+(373,1356,o),
 (486,1356,cs),
 (502,1356,o),
 (523,1355,o),
@@ -60,8 +60,8 @@ nodes = (
 (487,1504,o),
 (442,1504,cs),
 (257,1504,o),
-(157,1416,o),
-(158,1254,c),
+(158,1416,o),
+(158,1254,cs),
 (158,1118,l)
 );
 }
@@ -116,7 +116,7 @@ nodes = (
 (500,1118,l),
 (500,1136,ls),
 (500,1196,o),
-(529,1218,o),
+(529,1216,o),
 (607,1216,cs),
 (646,1216,o),
 (682,1212,o),
@@ -141,29 +141,6 @@ name = _topr;
 pos = (484,1056);
 }
 );
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(501,1102,o),
-(525,1123,o),
-(594,1122,cs),
-(650,1121,o),
-(705,1107,o),
-(722,1102,c),
-(722,1348,l),
-(685,1358,o),
-(615,1372,o),
-(524,1372,cs),
-(223,1372,o),
-(102,1291,o),
-(102,1056,c),
-(500,1056,l)
-);
-}
-);
-};
 layerId = m009;
 shapes = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/a.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/a.1.glyph
index de41ca11d..543554d15 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/a.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/a.1.glyph
@@ -11,6 +11,10 @@ name = bottom;
 pos = (600,0);
 },
 {
+name = bottomr;
+pos = (992,0);
+},
+{
 name = ogonek;
 pos = (992,0);
 },
@@ -76,6 +80,10 @@ name = bottom;
 pos = (616,0);
 },
 {
+name = bottomr;
+pos = (1090,0);
+},
+{
 name = ogonek;
 pos = (1090,0);
 },
@@ -141,6 +149,10 @@ name = bottom;
 pos = (656,0);
 },
 {
+name = bottomr;
+pos = (1220,0);
+},
+{
 name = ogonek;
 pos = (1220,0);
 },
@@ -206,6 +218,10 @@ name = bottom;
 pos = (560,0);
 },
 {
+name = bottomr;
+pos = (1032,0);
+},
+{
 name = ogonek;
 pos = (1032,0);
 },
@@ -277,8 +293,12 @@ name = bottom;
 pos = (640,0);
 },
 {
+name = bottomr;
+pos = (1196,0);
+},
+{
 name = ogonek;
-pos = (1204,0);
+pos = (1196,0);
 },
 {
 name = rhalfring;
@@ -342,6 +362,10 @@ name = bottom;
 pos = (536,0);
 },
 {
+name = bottomr;
+pos = (928,0);
+},
+{
 name = ogonek;
 pos = (928,0);
 },
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10020.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10020.glyph
index 3a5304bde..609588c1c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10020.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10020.glyph
@@ -28,7 +28,7 @@ shapes = (
 ref = Gamma;
 }
 );
-width = 1168;
+width = 1172;
 },
 {
 layerId = m007;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10044.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10044.glyph
index 47cdd0c44..39df5a01f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10044.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10044.glyph
@@ -47,19 +47,19 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(556,1442,l),
-(556,1490,l),
-(126,1490,l),
-(126,1442,l)
+(558,1442,l),
+(558,1490,l),
+(128,1490,l),
+(128,1442,l)
 );
 },
 {
 alignment = -1;
-pos = (318,0);
+pos = (320,0);
 ref = afii10046;
 }
 );
-width = 1656;
+width = 1658;
 },
 {
 layerId = m007;
@@ -105,19 +105,19 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(492,1442,l),
-(492,1490,l),
-(62,1490,l),
-(62,1442,l)
+(490,1442,l),
+(490,1490,l),
+(60,1490,l),
+(60,1442,l)
 );
 },
 {
 alignment = -1;
-pos = (318,0);
+pos = (316,0);
 ref = afii10046;
 }
 );
-width = 1528;
+width = 1526;
 }
 );
 metricLeft = T;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10050.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10050.glyph
index 3a9a9809a..67b31695b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10050.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10050.glyph
@@ -58,7 +58,7 @@ nodes = (
 );
 }
 );
-width = 1162;
+width = 1166;
 },
 {
 layerId = m007;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10051.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10051.glyph
index 01e91c297..7610af785 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10051.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10051.glyph
@@ -107,48 +107,48 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(751,815,o),
-(872,847,o),
-(984,846,cs),
-(1233,847,o),
-(1393,691,o),
-(1394,440,cs),
-(1394,201,o),
-(1248,44,o),
-(1022,42,c),
-(1026,-4,l),
-(1271,-4,o),
-(1439,177,o),
-(1440,440,cs),
-(1441,713,o),
-(1259,893,o),
-(984,894,cs),
-(877,893,o),
-(759,865,o),
-(620,806,c),
-(620,754,l)
+(753,815,o),
+(874,847,o),
+(986,846,cs),
+(1235,847,o),
+(1395,691,o),
+(1396,440,cs),
+(1396,201,o),
+(1250,44,o),
+(1024,42,c),
+(1028,-4,l),
+(1273,-4,o),
+(1441,177,o),
+(1442,440,cs),
+(1443,713,o),
+(1261,893,o),
+(986,894,cs),
+(879,893,o),
+(761,865,o),
+(622,806,c),
+(622,754,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(606,1464,l),
-(606,0,l),
-(652,0,l),
-(652,1464,l)
+(608,1464,l),
+(608,0,l),
+(654,0,l),
+(654,1464,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(126,1490,l),
-(126,1442,l),
-(1132,1442,l),
-(1132,1490,l)
+(128,1490,l),
+(128,1442,l),
+(1134,1442,l),
+(1134,1490,l)
 );
 }
 );
-width = 1570;
+width = 1572;
 },
 {
 layerId = m007;
@@ -254,48 +254,48 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(687,815,o),
-(808,847,o),
-(920,846,cs),
-(1169,847,o),
-(1329,691,o),
-(1330,440,cs),
-(1330,201,o),
-(1184,44,o),
-(958,42,c),
-(962,-4,l),
-(1207,-4,o),
-(1375,177,o),
-(1376,440,cs),
-(1377,713,o),
-(1195,893,o),
-(920,894,cs),
-(813,893,o),
-(695,865,o),
-(556,806,c),
-(556,754,l)
+(685,815,o),
+(806,847,o),
+(918,846,cs),
+(1167,847,o),
+(1327,691,o),
+(1328,440,cs),
+(1328,201,o),
+(1182,44,o),
+(956,42,c),
+(960,-4,l),
+(1205,-4,o),
+(1373,177,o),
+(1374,440,cs),
+(1375,713,o),
+(1193,893,o),
+(918,894,cs),
+(811,893,o),
+(693,865,o),
+(554,806,c),
+(554,754,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(542,1464,l),
-(542,0,l),
-(588,0,l),
-(588,1464,l)
+(540,1464,l),
+(540,0,l),
+(586,0,l),
+(586,1464,l)
 );
 },
 {
 closed = 1;
 nodes = (
-(62,1490,l),
-(62,1442,l),
-(1068,1442,l),
-(1068,1490,l)
+(60,1490,l),
+(60,1442,l),
+(1066,1442,l),
+(1066,1490,l)
 );
 }
 );
-width = 1442;
+width = 1440;
 }
 );
 metricLeft = T;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10052.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10052.glyph
index 55fc2b6e2..dfc7eb5cd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10052.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10052.glyph
@@ -40,7 +40,7 @@ pos = (352,436);
 ref = acute;
 }
 );
-width = 1168;
+width = 1172;
 },
 {
 layerId = m007;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10056.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10056.1.glyph
index 2d33cc457..2e182dac1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10056.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10056.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-316,372);
+pos = (-314,372);
 ref = dieresis;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-316,372);
+pos = (-318,372);
 ref = dieresis;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/afii10060.glyph b/src/Inter-Roman.glyphspackage/glyphs/afii10060.glyph
index d11984c66..5fc60c1ca 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/afii10060.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/afii10060.glyph
@@ -53,19 +53,19 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(126,1490,l),
-(126,1442,l),
-(1246,1442,l),
-(1246,1490,l)
+(128,1490,l),
+(128,1442,l),
+(1248,1442,l),
+(1248,1490,l)
 );
 },
 {
 alignment = -1;
-pos = (436,0);
+pos = (438,0);
 ref = Shhacyrillic;
 }
 );
-width = 1836;
+width = 1838;
 },
 {
 layerId = m007;
@@ -117,19 +117,19 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(62,1490,l),
-(62,1442,l),
-(1182,1442,l),
-(1182,1490,l)
+(60,1490,l),
+(60,1442,l),
+(1180,1442,l),
+(1180,1490,l)
 );
 },
 {
 alignment = -1;
-pos = (436,0);
+pos = (434,0);
 ref = Shhacyrillic;
 }
 );
-width = 1708;
+width = 1706;
 }
 );
 metricLeft = T;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aogonek.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/aogonek.1.glyph
index b43437919..e15769168 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aogonek.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aogonek.1.glyph
@@ -68,7 +68,7 @@ alignment = 1;
 ref = a.1;
 },
 {
-pos = (674,0);
+pos = (666,0);
 ref = ogonek;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/aturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/aturn.glyph
index 8f50e29a8..e22dc98b7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/aturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/aturn.glyph
@@ -123,7 +123,7 @@ layerId = m011;
 shapes = (
 {
 angle = 180;
-pos = (974,1056);
+pos = (974,1118);
 ref = a;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/b.glyph b/src/Inter-Roman.glyphspackage/glyphs/b.glyph
index 632068931..196cc205d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/b.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/b.glyph
@@ -412,15 +412,15 @@ width = 1322;
 anchors = (
 {
 name = bottom;
-pos = (622,0);
+pos = (620,0);
 },
 {
 name = cross;
-pos = (384,1262);
+pos = (382,1262);
 },
 {
 name = top;
-pos = (822,1304);
+pos = (820,1304);
 },
 {
 name = topbar;
@@ -431,7 +431,7 @@ guides = (
 {
 orientation = center;
 angle = 90;
-pos = (-2825,128);
+pos = (-3468,128);
 }
 );
 layerId = m009;
@@ -439,46 +439,46 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1057,-24,o),
-(1236,194,o),
-(1236,530,cs),
-(1236,853,o),
-(1049,1080,o),
-(784,1080,cs),
-(647,1080,o),
-(555,1027,o),
-(493,924,c),
-(488,924,l),
-(488,1490,l),
+(1055,-24,o),
+(1234,194,o),
+(1234,530,cs),
+(1234,853,o),
+(1047,1080,o),
+(782,1080,cs),
+(645,1080,o),
+(553,1027,o),
+(491,924,c),
+(486,924,l),
+(486,1490,l),
 (86,1490,l),
 (86,0,l),
-(484,0,l),
-(484,156,l),
-(488,156,l),
-(536,40,o),
-(640,-24,o),
-(780,-24,cs)
+(482,0,l),
+(482,156,l),
+(486,156,l),
+(534,40,o),
+(638,-24,o),
+(778,-24,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(552,290,o),
-(474,384,o),
-(474,530,cs),
-(474,675,o),
-(552,768,o),
-(661,768,cs),
-(770,768,o),
-(832,675,o),
-(832,530,cs),
-(832,384,o),
-(770,290,o),
-(661,290,cs)
+(550,290,o),
+(472,384,o),
+(472,530,cs),
+(472,675,o),
+(550,768,o),
+(659,768,cs),
+(768,768,o),
+(830,675,o),
+(830,530,cs),
+(830,384,o),
+(768,290,o),
+(659,290,cs)
 );
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 anchors = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/baht.glyph b/src/Inter-Roman.glyphspackage/glyphs/baht.glyph
index 8b1ac800e..f2dd73956 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/baht.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/baht.glyph
@@ -109,7 +109,7 @@ nodes = (
 ref = B;
 }
 );
-width = 1184;
+width = 1182;
 }
 );
 metricLeft = B;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/bbar.glyph b/src/Inter-Roman.glyphspackage/glyphs/bbar.glyph
index 9d23502d9..9b695d74b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/bbar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/bbar.glyph
@@ -61,11 +61,11 @@ shapes = (
 ref = b;
 },
 {
-pos = (-136,541);
+pos = (-138,541);
 ref = crossbar;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/bdotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/bdotaccent.glyph
index 175459246..bf1357e4b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/bdotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/bdotaccent.glyph
@@ -62,11 +62,11 @@ shapes = (
 ref = b;
 },
 {
-pos = (504,42);
+pos = (502,42);
 ref = dotaccent;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/bdotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/bdotbelow.glyph
index 7976e9891..c820be72c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/bdotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/bdotbelow.glyph
@@ -62,11 +62,11 @@ shapes = (
 ref = b;
 },
 {
-pos = (1174,0);
+pos = (1172,0);
 ref = dotbelow;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/bitcoin.glyph b/src/Inter-Roman.glyphspackage/glyphs/bitcoin.glyph
index c3990aa10..b3bdd0423 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/bitcoin.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/bitcoin.glyph
@@ -449,7 +449,7 @@ nodes = (
 ref = B;
 }
 );
-width = 1184;
+width = 1182;
 }
 );
 metricLeft = B;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/blinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/blinebelow.glyph
index bc381a600..30507ab3d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/blinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/blinebelow.glyph
@@ -62,11 +62,11 @@ shapes = (
 ref = b;
 },
 {
-pos = (1266,0);
+pos = (1264,0);
 ref = macronsubnosp;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/btopbar.glyph b/src/Inter-Roman.glyphspackage/glyphs/btopbar.glyph
index 1e6a96f3a..8068a0081 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/btopbar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/btopbar.glyph
@@ -65,7 +65,7 @@ pos = (-42,0);
 ref = _part.topbar;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/d.glyph b/src/Inter-Roman.glyphspackage/glyphs/d.glyph
index 3914b87b0..2526f356e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/d.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/d.glyph
@@ -7,68 +7,20 @@ layers = (
 {
 anchors = (
 {
-name = bottom;
-pos = (614,0);
-},
-{
-name = cross;
-pos = (928,1280);
+name = bottomr;
+pos = (1088,0);
 },
 {
 name = raccent;
 pos = (1232,1490);
-},
-{
-name = top;
-pos = (598,1490);
-},
-{
-name = topbar;
-pos = (1088,1490);
 }
 );
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(793,-24,o),
-(866,111,o),
-(904,172,c),
-(924,172,l),
-(924,0,l),
-(1088,0,l),
-(1088,1490,l),
-(918,1490,l),
-(918,940,l),
-(904,940,l),
-(866,998,o),
-(799,1132,o),
-(580,1132,cs),
-(298,1132,o),
-(104,908,o),
-(104,556,cs),
-(104,201,o),
-(298,-24,o),
-(578,-24,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(386,130,o),
-(276,320,o),
-(276,558,cs),
-(276,794,o),
-(383,978,o),
-(600,978,cs),
-(810,978,o),
-(920,809,o),
-(920,558,cs),
-(920,305,o),
-(807,130,o),
-(600,130,cs)
-);
+pos = (1246,0);
+ref = b;
+scale = (-1,1);
 }
 );
 width = 1246;
@@ -76,68 +28,20 @@ width = 1246;
 {
 anchors = (
 {
-name = bottom;
-pos = (656,0);
-},
-{
-name = cross;
-pos = (936,1280);
+name = bottomr;
+pos = (1220,0);
 },
 {
 name = raccent;
 pos = (1338,1490);
-},
-{
-name = top;
-pos = (542,1490);
-},
-{
-name = topbar;
-pos = (1220,1490);
 }
 );
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(659,-14,o),
-(766,70,o),
-(812,184,c),
-(822,184,l),
-(822,0,l),
-(1220,0,l),
-(1220,1490,l),
-(818,1490,l),
-(818,922,l),
-(812,922,l),
-(769,1036,o),
-(664,1132,o),
-(498,1132,cs),
-(277,1132,o),
-(62,963,o),
-(62,558,cs),
-(62,172,o),
-(263,-14,o),
-(502,-14,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(539,294,o),
-(476,393,o),
-(476,558,cs),
-(476,724,o),
-(539,824,o),
-(650,824,cs),
-(760,824,o),
-(828,724,o),
-(828,558,cs),
-(828,396,o),
-(760,294,o),
-(650,294,cs)
-);
+pos = (1322,0);
+ref = b;
+scale = (-1,1);
 }
 );
 width = 1322;
@@ -145,68 +49,20 @@ width = 1322;
 {
 anchors = (
 {
-name = bottom;
-pos = (596,0);
-},
-{
-name = cross;
-pos = (910,1280);
+name = bottomr;
+pos = (992,0);
 },
 {
 name = raccent;
 pos = (1122,1490);
-},
-{
-name = top;
-pos = (576,1490);
-},
-{
-name = topbar;
-pos = (992,1490);
 }
 );
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(740,-24,o),
-(881,94,o),
-(940,280,c),
-(946,280,l),
-(946,0,l),
-(992,0,l),
-(992,1490,l),
-(946,1490,l),
-(946,832,l),
-(940,832,l),
-(883,1018,o),
-(738,1134,o),
-(560,1134,cs),
-(299,1134,o),
-(130,884,o),
-(130,556,cs),
-(130,225,o),
-(297,-24,o),
-(560,-24,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(324,22,o),
-(176,253,o),
-(176,556,cs),
-(176,858,o),
-(325,1088,o),
-(560,1088,cs),
-(796,1088,o),
-(946,858,o),
-(946,556,cs),
-(946,253,o),
-(798,22,o),
-(560,22,cs)
-);
+pos = (1190,0);
+ref = b;
+scale = (-1,1);
 }
 );
 width = 1190;
@@ -214,68 +70,20 @@ width = 1190;
 {
 anchors = (
 {
-name = bottom;
-pos = (558,0);
-},
-{
-name = cross;
-pos = (872,1280);
+name = bottomr;
+pos = (1032,0);
 },
 {
 name = raccent;
 pos = (1176,1490);
-},
-{
-name = top;
-pos = (542,1490);
-},
-{
-name = topbar;
-pos = (1032,1490);
 }
 );
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(667,-20,o),
-(788,38,o),
-(864,160,c),
-(866,160,l),
-(866,0,l),
-(1032,0,l),
-(1032,1490,l),
-(862,1490,l),
-(862,900,l),
-(860,900,l),
-(792,1018,o),
-(667,1076,o),
-(530,1076,cs),
-(255,1076,o),
-(72,854,o),
-(72,528,cs),
-(72,203,o),
-(255,-20,o),
-(530,-20,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(373,133,o),
-(244,269,o),
-(244,528,cs),
-(244,787,o),
-(373,924,o),
-(556,924,cs),
-(752,924,o),
-(876,767,o),
-(876,528,cs),
-(876,289,o),
-(752,133,o),
-(556,133,cs)
-);
+pos = (1160,0);
+ref = b;
+scale = (-1,1);
 }
 );
 width = 1160;
@@ -283,72 +91,24 @@ width = 1160;
 {
 anchors = (
 {
-name = bottom;
-pos = (632,0);
-},
-{
-name = cross;
-pos = (912,1280);
+name = bottomr;
+pos = (1194,0);
 },
 {
 name = raccent;
-pos = (1314,1490);
-},
-{
-name = top;
-pos = (518,1490);
-},
-{
-name = topbar;
-pos = (1196,1490);
+pos = (1312,1490);
 }
 );
 layerId = m009;
 name = "Black Display";
 shapes = (
 {
-closed = 1;
-nodes = (
-(642,-24,o),
-(746,40,o),
-(794,156,c),
-(798,156,l),
-(798,0,l),
-(1196,0,l),
-(1196,1490,l),
-(794,1490,l),
-(794,924,l),
-(789,924,l),
-(727,1027,o),
-(635,1080,o),
-(498,1080,cs),
-(233,1080,o),
-(46,853,o),
-(46,530,cs),
-(46,194,o),
-(225,-24,o),
-(502,-24,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(512,290,o),
-(450,384,o),
-(450,530,cs),
-(450,675,o),
-(512,768,o),
-(621,768,cs),
-(730,768,o),
-(808,675,o),
-(808,530,cs),
-(808,384,o),
-(730,290,o),
-(621,290,cs)
-);
+pos = (1280,0);
+ref = b;
+scale = (-1,1);
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 anchors = (
@@ -465,68 +225,20 @@ width = 1242;
 {
 anchors = (
 {
-name = bottom;
-pos = (532,0);
-},
-{
-name = cross;
-pos = (846,1280);
+name = bottomr;
+pos = (928,0);
 },
 {
 name = raccent;
 pos = (1058,1490);
-},
-{
-name = top;
-pos = (512,1490);
-},
-{
-name = topbar;
-pos = (928,1490);
 }
 );
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(676,-24,o),
-(817,94,o),
-(876,280,c),
-(882,280,l),
-(882,0,l),
-(928,0,l),
-(928,1490,l),
-(882,1490,l),
-(882,832,l),
-(876,832,l),
-(819,1018,o),
-(674,1134,o),
-(496,1134,cs),
-(235,1134,o),
-(66,884,o),
-(66,556,cs),
-(66,225,o),
-(233,-24,o),
-(496,-24,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(260,22,o),
-(112,253,o),
-(112,556,cs),
-(112,858,o),
-(261,1088,o),
-(496,1088,cs),
-(732,1088,o),
-(882,858,o),
-(882,556,cs),
-(882,253,o),
-(734,22,o),
-(496,22,cs)
-);
+pos = (1062,0);
+ref = b;
+scale = (-1,1);
 }
 );
 width = 1062;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/dcaron.glyph
index e05f2dda2..6759ae1ee 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dcaron.glyph
@@ -67,7 +67,7 @@ alignment = -1;
 ref = d;
 },
 {
-pos = (1204,0);
+pos = (1202,0);
 ref = commaaccentright.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dcedilla.glyph b/src/Inter-Roman.glyphspackage/glyphs/dcedilla.glyph
index 698dd7181..c1817fd92 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dcedilla.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dcedilla.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (334,0);
+pos = (300,0);
 ref = commaaccent;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (376,0);
+pos = (404,0);
 ref = commaaccent;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (316,0);
+pos = (280,0);
 ref = commaaccent;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (310,0);
+pos = (286,0);
 ref = commaaccent;
 }
 );
@@ -62,11 +62,11 @@ shapes = (
 ref = d;
 },
 {
-pos = (368,0);
+pos = (396,0);
 ref = commaaccent;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 layerId = m011;
@@ -75,7 +75,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (316,0);
+pos = (247,0);
 ref = commaaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dcircumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/dcircumflexbelow.glyph
index ce65cd2bd..4c45f1a2b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dcircumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dcircumflexbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1196,0);
+pos = (1162,0);
 ref = circumflexsubnosp;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1330,0);
+pos = (1358,0);
 ref = circumflexsubnosp;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1108,0);
+pos = (1072,0);
 ref = circumflexsubnosp;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1172,0);
+pos = (1148,0);
 ref = circumflexsubnosp;
 }
 );
@@ -62,11 +62,11 @@ shapes = (
 ref = d;
 },
 {
-pos = (1322,0);
+pos = (1350,0);
 ref = circumflexsubnosp;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 layerId = m011;
@@ -75,7 +75,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1108,0);
+pos = (1039,0);
 ref = circumflexsubnosp;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dcroat.glyph b/src/Inter-Roman.glyphspackage/glyphs/dcroat.glyph
index 466e7af51..134f54a76 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dcroat.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dcroat.glyph
@@ -9,7 +9,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (468,559);
+pos = (458,583);
 ref = crossbar;
 }
 );
@@ -22,7 +22,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (416,559);
+pos = (418,583);
 ref = crossbar;
 }
 );
@@ -35,7 +35,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (486,558);
+pos = (522,582);
 ref = crossbar;
 }
 );
@@ -48,7 +48,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (424,560);
+pos = (414,542);
 ref = crossbar;
 }
 );
@@ -61,11 +61,11 @@ shapes = (
 ref = d;
 },
 {
-pos = (392,559);
+pos = (378,541);
 ref = crossbar;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 layerId = m011;
@@ -74,7 +74,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (486,558);
+pos = (522,540);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ddotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/ddotaccent.glyph
index 55b5f8995..247af5a13 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ddotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ddotaccent.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (354,186);
+pos = (340,0);
 ref = dotaccent;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (208,186);
+pos = (150,0);
 ref = dotaccent;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (390,186);
+pos = (374,0);
 ref = dotaccent;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (330,186);
+pos = (302,-42);
 ref = dotaccent;
 }
 );
@@ -62,11 +62,11 @@ shapes = (
 ref = d;
 },
 {
-pos = (200,228);
+pos = (142,42);
 ref = dotaccent;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 layerId = m011;
@@ -75,7 +75,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (390,186);
+pos = (341,0);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ddotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/ddotbelow.glyph
index 6bc0019ef..24985a170 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ddotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ddotbelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1220,0);
+pos = (1186,0);
 ref = dotbelow;
 }
 );
@@ -23,7 +23,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1192,0);
+pos = (1220,0);
 ref = dotbelow;
 }
 );
@@ -36,7 +36,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1154,0);
+pos = (1118,0);
 ref = dotbelow;
 }
 );
@@ -49,7 +49,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1196,0);
+pos = (1172,0);
 ref = dotbelow;
 }
 );
@@ -62,11 +62,11 @@ shapes = (
 ref = d;
 },
 {
-pos = (1184,0);
+pos = (1212,0);
 ref = dotbelow;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 layerId = m011;
@@ -75,7 +75,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1154,0);
+pos = (1085,0);
 ref = dotbelow;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dlinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/dlinebelow.glyph
index cb07b8ea4..a8c440e5e 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dlinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dlinebelow.glyph
@@ -10,7 +10,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1220,0);
+pos = (1186,0);
 ref = macronsubnosp;
 }
 );
@@ -51,7 +51,7 @@ shapes = (
 ref = d;
 },
 {
-pos = (1196,0);
+pos = (1172,0);
 ref = macronsubnosp;
 }
 );
@@ -69,7 +69,7 @@ pos = (1268,0);
 ref = macronsubnosp;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dong.glyph b/src/Inter-Roman.glyphspackage/glyphs/dong.glyph
index 772b2cd54..419796a50 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dong.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dong.glyph
@@ -9,12 +9,12 @@ shapes = (
 ref = d;
 },
 {
-pos = (468,559);
+pos = (458,583);
 ref = crossbar;
 },
 {
 alignment = 1;
-pos = (154,-158);
+pos = (120,-158);
 ref = underscore;
 }
 );
@@ -27,12 +27,12 @@ shapes = (
 ref = d;
 },
 {
-pos = (416,559);
+pos = (418,583);
 ref = crossbar;
 },
 {
 alignment = 1;
-pos = (150,-126);
+pos = (178,-126);
 ref = underscore;
 }
 );
@@ -45,12 +45,12 @@ shapes = (
 ref = d;
 },
 {
-pos = (486,558);
+pos = (522,582);
 ref = crossbar;
 },
 {
 alignment = 1;
-pos = (162,-178);
+pos = (126,-178);
 ref = underscore;
 }
 );
@@ -63,12 +63,12 @@ shapes = (
 ref = d;
 },
 {
-pos = (424,560);
+pos = (414,542);
 ref = crossbar;
 },
 {
 alignment = 1;
-pos = (130,-158);
+pos = (106,-158);
 ref = underscore;
 }
 );
@@ -81,16 +81,16 @@ shapes = (
 ref = d;
 },
 {
-pos = (392,559);
+pos = (378,541);
 ref = crossbar;
 },
 {
 alignment = 1;
-pos = (142,-126);
+pos = (170,-126);
 ref = underscore;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 layerId = m011;
@@ -99,12 +99,12 @@ shapes = (
 ref = d;
 },
 {
-pos = (486,558);
+pos = (522,540);
 ref = crossbar;
 },
 {
 alignment = 1;
-pos = (162,-178);
+pos = (93,-178);
 ref = underscore;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/drthook.glyph b/src/Inter-Roman.glyphspackage/glyphs/drthook.glyph
index aba2ceffd..4c87a7592 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/drthook.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/drthook.glyph
@@ -7,28 +7,11 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(1243,-418,o),
-(1281,-416,o),
-(1308,-410,c),
-(1308,-264,l),
-(1293,-268,o),
-(1272,-270,o),
-(1252,-270,cs),
-(1159,-270,o),
-(1088,-236,o),
-(1088,-120,cs),
-(1088,212,l),
-(922,212,l),
-(922,-120,ls),
-(922,-311,o),
-(1045,-418,o),
-(1208,-418,cs)
-);
+ref = d;
 },
 {
-ref = d;
+pos = (790,0);
+ref = _part.bottom_rthook;
 }
 );
 width = 1246;
@@ -37,157 +20,66 @@ width = 1246;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(1352,-419,o),
-(1422,-410,o),
-(1462,-408,c),
-(1462,-110,l),
-(1431,-113,o),
-(1402,-116,o),
-(1372,-116,cs),
-(1303,-116,o),
-(1220,-102,o),
-(1220,-34,cs),
-(1220,248,l),
-(822,248,l),
-(822,-34,ls),
-(822,-364,o),
-(1018,-419,o),
-(1262,-418,cs)
-);
+ref = d;
 },
 {
-ref = d;
+pos = (690,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1326;
+width = 1322;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(1150,-416,o),
-(1177,-415,o),
-(1202,-412,c),
-(1202,-366,l),
-(1176,-368,o),
-(1149,-369,o),
-(1130,-370,cs),
-(1028,-369,o),
-(992,-324,o),
-(992,-200,cs),
-(992,14,l,{
-name = hr00;
-}),
-(946,14,l),
-(946,-200,ls),
-(946,-351,o),
-(1002,-416,o),
-(1130,-416,cs)
-);
+ref = d;
 },
 {
-alignment = -1;
-ref = d;
+pos = (882,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1200;
+width = 1190;
 },
 {
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1187,-418,o),
-(1225,-417,o),
-(1252,-410,c),
-(1252,-264,l),
-(1237,-268,o),
-(1216,-270,o),
-(1196,-270,cs),
-(1103,-270,o),
-(1032,-236,o),
-(1032,-120,cs),
-(1032,212,l),
-(866,212,l),
-(866,-120,ls),
-(866,-311,o),
-(989,-418,o),
-(1152,-418,cs)
-);
+ref = d;
 },
 {
-ref = d;
+pos = (734,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1184;
+width = 1160;
 },
 {
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1328,-418,o),
-(1397,-413,o),
-(1438,-408,c),
-(1438,-110,l),
-(1407,-114,o),
-(1378,-116,o),
-(1348,-116,cs),
-(1279,-116,o),
-(1196,-103,o),
-(1196,-34,cs),
-(1196,248,l),
-(798,248,l),
-(798,-34,ls),
-(798,-364,o),
-(994,-418,o),
-(1238,-418,cs)
-);
+ref = d;
 },
 {
-ref = d;
+pos = (666,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1294;
+width = 1280;
 },
 {
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1086,-416,o),
-(1113,-415,o),
-(1138,-412,c),
-(1138,-366,l),
-(1112,-368,o),
-(1085,-369,o),
-(1066,-370,cs),
-(964,-369,o),
-(928,-324,o),
-(928,-200,cs),
-(928,14,l,{
-name = hr00;
-}),
-(882,14,l),
-(882,-200,ls),
-(882,-351,o),
-(938,-416,o),
-(1066,-416,cs)
-);
+ref = d;
 },
 {
-alignment = -1;
-ref = d;
+pos = (818,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1072;
+width = 1062;
 }
 );
 metricLeft = d;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/dtopbar.glyph b/src/Inter-Roman.glyphspackage/glyphs/dtopbar.glyph
index c3c1b7b5a..ae23b380b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/dtopbar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/dtopbar.glyph
@@ -62,11 +62,11 @@ shapes = (
 ref = d;
 },
 {
-pos = (168,0);
+pos = (166,0);
 ref = _part.rtopbar;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/eightroman.glyph b/src/Inter-Roman.glyphspackage/glyphs/eightroman.glyph
index 796080554..d22d3ae4c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/eightroman.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/eightroman.glyph
@@ -13,15 +13,15 @@ pos = (1140,0);
 ref = i;
 },
 {
-pos = (1695,0);
+pos = (1626,0);
 ref = i;
 },
 {
-pos = (2250,0);
+pos = (2112,0);
 ref = i;
 }
 );
-width = 2736;
+width = 2598;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -34,15 +34,15 @@ pos = (1240,0);
 ref = i;
 },
 {
-pos = (1939,0);
+pos = (1846,0);
 ref = i;
 },
 {
-pos = (2638,0);
+pos = (2452,0);
 ref = i;
 }
 );
-width = 3244;
+width = 3058;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -55,15 +55,15 @@ pos = (1070,0);
 ref = i;
 },
 {
-pos = (1581,0);
+pos = (1512,0);
 ref = i;
 },
 {
-pos = (2092,0);
+pos = (1954,0);
 ref = i;
 }
 );
-width = 2534;
+width = 2396;
 },
 {
 layerId = m007;
@@ -76,15 +76,15 @@ pos = (1064,0);
 ref = i;
 },
 {
-pos = (1559,0);
+pos = (1490,0);
 ref = i;
 },
 {
-pos = (2054,0);
+pos = (1916,0);
 ref = i;
 }
 );
-width = 2480;
+width = 2342;
 },
 {
 layerId = m009;
@@ -97,15 +97,15 @@ pos = (1192,0);
 ref = i;
 },
 {
-pos = (1833,0);
+pos = (1764,0);
 ref = i;
 },
 {
-pos = (2474,0);
+pos = (2336,0);
 ref = i;
 }
 );
-width = 3046;
+width = 2908;
 },
 {
 layerId = m011;
@@ -114,19 +114,19 @@ shapes = (
 ref = v;
 },
 {
-pos = (1023,0);
+pos = (942,0);
 ref = i;
 },
 {
-pos = (1418,0);
+pos = (1256,0);
 ref = i;
 },
 {
-pos = (1813,0);
+pos = (1570,0);
 ref = i;
 }
 );
-width = 2127;
+width = 1884;
 }
 );
 unicode = 8567;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ercyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/ercyrillic.glyph
index 62ad58d05..9612a97a8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ercyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ercyrillic.glyph
@@ -46,7 +46,7 @@ shapes = (
 ref = p;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/eturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/eturn.glyph
index 32f9a4a7d..88533e93a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/eturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/eturn.glyph
@@ -171,7 +171,7 @@ layerId = m011;
 shapes = (
 {
 angle = 180;
-pos = (1048,1056);
+pos = (1048,1118);
 ref = e;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/h.glyph b/src/Inter-Roman.glyphspackage/glyphs/h.glyph
index 5df2a8b2f..638c3da93 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/h.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/h.glyph
@@ -30,12 +30,6 @@ ref = n;
 }
 );
 };
-guides = (
-{
-angle = 90;
-pos = (336,1860);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/hturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/hturn.glyph
index 4603381eb..56f0dd777 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/hturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/hturn.glyph
@@ -4,16 +4,6 @@ kernLeft = u;
 kernRight = g;
 layers = (
 {
-anchors = (
-{
-name = bottom;
-pos = (968,-372);
-},
-{
-name = top;
-pos = (606,1304);
-}
-);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
@@ -25,16 +15,6 @@ ref = h;
 width = 1212;
 },
 {
-anchors = (
-{
-name = bottom;
-pos = (1028,-372);
-},
-{
-name = top;
-pos = (658,1304);
-}
-);
 guides = (
 {
 pos = (1820,1536);
@@ -51,16 +31,6 @@ ref = h;
 width = 1330;
 },
 {
-anchors = (
-{
-name = bottom;
-pos = (942,-372);
-},
-{
-name = top;
-pos = (582,1304);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
@@ -72,16 +42,6 @@ ref = h;
 width = 1164;
 },
 {
-anchors = (
-{
-name = bottom;
-pos = (904,-372);
-},
-{
-name = top;
-pos = (542,1304);
-}
-);
 layerId = m007;
 shapes = (
 {
@@ -93,21 +53,6 @@ ref = h;
 width = 1138;
 },
 {
-anchors = (
-{
-name = bottom;
-pos = (996,-372);
-},
-{
-name = top;
-pos = (626,1304);
-}
-);
-guides = (
-{
-pos = (1788,1536);
-}
-);
 layerId = m009;
 shapes = (
 {
@@ -119,16 +64,6 @@ ref = h;
 width = 1298;
 },
 {
-anchors = (
-{
-name = bottom;
-pos = (942,-372);
-},
-{
-name = top;
-pos = (582,1304);
-}
-);
 layerId = m011;
 shapes = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/hturnhook2.glyph b/src/Inter-Roman.glyphspackage/glyphs/hturnhook2.glyph
index da7613472..6b0c9c4d6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/hturnhook2.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/hturnhook2.glyph
@@ -9,55 +9,55 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(102,980,o),
-(122,983,o),
-(142,984,cs),
-(236,983,o),
-(305,948,o),
-(306,832,cs),
-(306,408,ls),
-(305,119,o),
-(457,-15,o),
-(686,-14,cs),
-(861,-15,o),
-(963,58,o),
-(1016,174,c),
-(1030,174,l),
-(1030,-120,ls),
-(1030,-311,o),
-(1158,-419,o),
-(1320,-418,cs),
-(1356,-419,o),
-(1393,-419,o),
-(1420,-410,c),
-(1420,-264,l),
-(1405,-268,o),
-(1385,-271,o),
-(1364,-270,cs),
-(1271,-271,o),
-(1201,-236,o),
-(1202,-120,cs),
-(1202,1118,l),
-(1030,1118,l),
-(1030,446,ls),
-(1030,250,o),
-(905,140,o),
-(736,140,cs),
-(573,140,o),
-(477,241,o),
-(478,418,cs),
-(478,832,ls),
-(477,1024,o),
-(349,1132,o),
-(186,1132,cs),
-(151,1132,o),
-(113,1132,o),
-(88,1122,c),
-(88,978,l)
+(1319,-426,o),
+(1357,-422,o),
+(1374,-418,c),
+(1374,-274,l),
+(1355,-277,o),
+(1334,-278,o),
+(1318,-278,cs),
+(1205,-278,o),
+(1160,-246,o),
+(1160,-176,cs),
+(1160,1118,l),
+(990,1118,l),
+(990,446,ls),
+(990,251,o),
+(865,140,o),
+(696,140,cs),
+(534,140,o),
+(436,242,o),
+(436,420,cs),
+(436,832,ls),
+(436,1024,o),
+(307,1132,o),
+(144,1132,cs),
+(109,1132,o),
+(71,1132,o),
+(46,1122,c),
+(46,978,l),
+(59,981,o),
+(80,984,o),
+(100,984,cs),
+(194,984,o),
+(264,948,o),
+(264,832,cs),
+(264,408,ls),
+(264,121,o),
+(418,-14,o),
+(646,-14,cs),
+(822,-14,o),
+(922,60,o),
+(974,176,c),
+(990,176,l),
+(990,-176,ls),
+(990,-338,o),
+(1089,-426,o),
+(1274,-426,cs)
 );
 }
 );
-width = 1394;
+width = 1318;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -65,55 +65,55 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(58,826,o),
-(87,829,o),
-(116,830,cs),
-(186,829,o),
-(268,815,o),
-(268,748,cs),
-(268,404,ls),
-(268,160,o),
-(422,-15,o),
-(658,-14,cs),
-(823,-15,o),
-(945,70,o),
-(994,212,c),
-(1006,212,l),
-(1006,-34,ls),
-(1007,-364,o),
-(1199,-419,o),
-(1442,-418,cs),
-(1542,-419,o),
-(1594,-410,o),
-(1644,-408,c),
-(1644,-110,l),
-(1615,-113,o),
-(1580,-116,o),
-(1554,-116,cs),
-(1481,-116,o),
-(1393,-102,o),
-(1394,-34,cs),
-(1394,1118,l),
-(992,1118,l),
-(992,488,ls),
-(992,378,o),
-(928,311,o),
-(830,312,cs),
-(727,311,o),
-(669,378,o),
-(670,488,cs),
-(670,748,ls),
-(669,1076,o),
-(468,1132,o),
-(224,1132,cs),
-(128,1132,o),
-(73,1123,o),
-(26,1120,c),
-(26,824,l)
+(1499,-441,o),
+(1565,-433,o),
+(1624,-417,c),
+(1624,-144,l),
+(1584,-149,o),
+(1544,-153,o),
+(1505,-153,cs),
+(1427,-153,o),
+(1398,-133,o),
+(1398,-73,cs),
+(1398,1118,l),
+(996,1118,l),
+(996,490,ls),
+(996,379,o),
+(932,312,o),
+(834,312,cs),
+(731,312,o),
+(674,379,o),
+(674,490,cs),
+(674,748,ls),
+(674,1076,o),
+(472,1132,o),
+(228,1132,cs),
+(132,1132,o),
+(77,1126,o),
+(30,1120,c),
+(30,824,l),
+(62,827,o),
+(91,830,o),
+(120,830,cs),
+(190,830,o),
+(272,815,o),
+(272,748,cs),
+(272,406,ls),
+(272,161,o),
+(426,-14,o),
+(662,-14,cs),
+(827,-14,o),
+(949,71,o),
+(1000,214,c),
+(1004,214,l),
+(1004,-73,ls),
+(1004,-318,o),
+(1145,-441,o),
+(1426,-441,cs)
 );
 }
 );
-width = 1518;
+width = 1508;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -121,55 +121,55 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(154,1092,o),
-(180,1094,o),
-(200,1094,cs),
-(303,1094,o),
-(337,1049,o),
-(338,926,cs),
-(338,366,ls),
-(337,143,o),
-(495,-15,o),
-(718,-14,cs),
-(873,-15,o),
-(1001,61,o),
-(1054,178,c),
-(1058,178,l),
-(1058,-200,ls),
-(1059,-352,o),
-(1116,-416,o),
-(1244,-416,cs),
-(1264,-416,o),
-(1290,-415,o),
-(1314,-412,c),
-(1314,-366,l),
-(1290,-368,o),
-(1263,-369,o),
-(1244,-370,cs),
-(1142,-369,o),
-(1105,-324,o),
-(1106,-200,cs),
-(1106,1118,l),
-(1058,1118,l),
-(1058,366,ls),
-(1059,172,o),
-(916,32,o),
-(718,32,cs),
-(521,32,o),
-(384,169,o),
-(384,366,cs),
-(384,926,ls),
-(384,1076,o),
-(327,1140,o),
-(200,1140,cs),
-(180,1140,o),
-(153,1139,o),
-(128,1136,c),
-(128,1090,l)
+(1190,-418,o),
+(1221,-418,o),
+(1244,-418,c),
+(1244,-372,l),
+(1219,-372,o),
+(1189,-372,o),
+(1172,-372,cs),
+(1076,-372,o),
+(1034,-329,o),
+(1034,-220,cs),
+(1034,1118,l),
+(988,1118,l),
+(988,366,ls),
+(988,172,o),
+(846,32,o),
+(648,32,cs),
+(451,32,o),
+(314,169,o),
+(314,366,cs),
+(314,926,ls),
+(314,1076,o),
+(257,1140,o),
+(130,1140,cs),
+(110,1140,o),
+(83,1139,o),
+(58,1136,c),
+(58,1090,l),
+(84,1092,o),
+(110,1094,o),
+(130,1094,cs),
+(233,1094,o),
+(268,1049,o),
+(268,926,cs),
+(268,366,ls),
+(268,143,o),
+(425,-14,o),
+(648,-14,cs),
+(803,-14,o),
+(931,61,o),
+(984,178,c),
+(988,178,l),
+(988,-220,ls),
+(988,-356,o),
+(1049,-418,o),
+(1172,-418,cs)
 );
 }
 );
-width = 1318;
+width = 1232;
 },
 {
 layerId = m007;
@@ -177,55 +177,55 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(74,980,o),
-(94,983,o),
-(114,984,cs),
-(208,983,o),
-(277,948,o),
-(278,832,cs),
-(278,408,ls),
-(277,119,o),
-(429,-15,o),
-(658,-14,cs),
-(833,-15,o),
-(935,58,o),
-(988,174,c),
-(1002,174,l),
-(1002,-120,ls),
-(1002,-311,o),
-(1130,-419,o),
-(1292,-418,cs),
-(1328,-419,o),
-(1365,-419,o),
-(1392,-410,c),
-(1392,-264,l),
-(1377,-268,o),
-(1357,-271,o),
-(1336,-270,cs),
-(1243,-271,o),
-(1173,-236,o),
-(1174,-120,cs),
-(1174,1118,l),
-(1002,1118,l),
-(1002,446,ls),
-(1002,250,o),
-(877,140,o),
-(708,140,cs),
-(545,140,o),
-(449,241,o),
-(450,418,cs),
-(450,832,ls),
-(449,1024,o),
-(321,1132,o),
-(158,1132,cs),
-(123,1132,o),
-(85,1132,o),
-(60,1122,c),
-(60,978,l)
+(1305,-418,o),
+(1332,-418,o),
+(1360,-418,c),
+(1360,-270,l),
+(1339,-270,o),
+(1280,-270,o),
+(1260,-270,cs),
+(1175,-270,o),
+(1146,-241,o),
+(1146,-170,cs),
+(1146,1056,l),
+(976,1056,l),
+(976,438,ls),
+(976,225,o),
+(846,136,o),
+(692,136,cs),
+(534,136,o),
+(432,229,o),
+(432,412,cs),
+(432,778,ls),
+(432,961,o),
+(321,1056,o),
+(124,1056,cs),
+(97,1056,o),
+(67,1056,o),
+(42,1056,c),
+(42,910,l),
+(60,910,o),
+(78,910,o),
+(96,910,cs),
+(218,910,o),
+(262,879,o),
+(262,770,cs),
+(262,400,ls),
+(262,119,o),
+(444,-20,o),
+(657,-20,cs),
+(824,-20,o),
+(926,68,o),
+(972,170,c),
+(976,170,l),
+(976,-170,ls),
+(976,-332,o),
+(1075,-418,o),
+(1260,-418,cs)
 );
 }
 );
-width = 1334;
+width = 1272;
 },
 {
 layerId = m009;
@@ -233,55 +233,55 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(42,826,o),
-(71,829,o),
-(100,830,cs),
-(170,829,o),
-(252,815,o),
-(252,748,cs),
-(252,404,ls),
-(252,160,o),
-(406,-15,o),
-(642,-14,cs),
-(807,-15,o),
-(929,70,o),
-(978,212,c),
-(990,212,l),
-(990,-34,ls),
-(991,-364,o),
-(1183,-419,o),
-(1426,-418,cs),
-(1526,-419,o),
-(1578,-410,o),
-(1628,-408,c),
-(1628,-110,l),
-(1599,-113,o),
-(1564,-116,o),
-(1538,-116,cs),
-(1465,-116,o),
-(1377,-102,o),
-(1378,-34,cs),
-(1378,1118,l),
-(976,1118,l),
-(976,488,ls),
-(976,378,o),
-(912,311,o),
-(814,312,cs),
-(711,311,o),
-(653,378,o),
-(654,488,cs),
-(654,748,ls),
-(653,1076,o),
-(452,1132,o),
-(208,1132,cs),
-(112,1132,o),
-(57,1123,o),
-(10,1120,c),
-(10,824,l)
+(1389,-418,o),
+(1560,-418,o),
+(1604,-418,c),
+(1604,-114,l),
+(1580,-114,o),
+(1509,-114,o),
+(1448,-114,cs),
+(1406,-114,o),
+(1384,-90,o),
+(1384,-48,cs),
+(1384,1056,l),
+(984,1056,l),
+(984,472,ls),
+(984,364,o),
+(918,298,o),
+(821,298,cs),
+(720,298,o),
+(658,364,o),
+(658,472,cs),
+(658,702,ls),
+(658,948,o),
+(523,1056,o),
+(214,1056,cs),
+(148,1056,o),
+(82,1056,o),
+(16,1056,c),
+(16,752,l),
+(46,752,o),
+(142,752,o),
+(172,752,cs),
+(232,752,o),
+(258,729,o),
+(258,678,cs),
+(258,390,ls),
+(258,150,o),
+(416,-24,o),
+(651,-24,cs),
+(812,-24,o),
+(932,60,o),
+(982,200,c),
+(984,200,l),
+(984,-102,ls),
+(984,-305,o),
+(1097,-418,o),
+(1298,-418,cs)
 );
 }
 );
-width = 1486;
+width = 1470;
 },
 {
 layerId = m011;
@@ -289,58 +289,60 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(90,1092,o),
-(116,1094,o),
-(136,1094,cs),
-(239,1094,o),
-(273,1049,o),
-(274,926,cs),
-(274,366,ls),
-(273,143,o),
-(431,-15,o),
-(654,-14,cs),
-(809,-15,o),
-(937,61,o),
-(990,178,c),
-(994,178,l),
-(994,-200,ls),
-(995,-352,o),
-(1052,-416,o),
-(1180,-416,cs),
-(1200,-416,o),
-(1226,-415,o),
-(1250,-412,c),
-(1250,-366,l),
-(1226,-368,o),
-(1199,-369,o),
-(1180,-370,cs),
-(1078,-369,o),
-(1041,-324,o),
-(1042,-200,cs),
-(1042,1118,l),
-(994,1118,l),
-(994,366,ls),
-(995,172,o),
-(852,32,o),
-(654,32,cs),
-(457,32,o),
-(320,169,o),
-(320,366,cs),
-(320,926,ls),
-(320,1076,o),
-(263,1140,o),
-(136,1140,cs),
-(116,1140,o),
-(89,1139,o),
-(64,1136,c),
-(64,1090,l)
+(1126,-418,o),
+(1157,-418,o),
+(1180,-418,c),
+(1180,-372,l),
+(1155,-372,o),
+(1125,-372,o),
+(1108,-372,cs),
+(1012,-372,o),
+(970,-329,o),
+(970,-220,cs),
+(970,1118,l),
+(924,1118,l),
+(924,366,ls),
+(924,172,o),
+(782,32,o),
+(584,32,cs),
+(387,32,o),
+(250,169,o),
+(250,366,cs),
+(250,912,ls),
+(250,1062,o),
+(193,1118,o),
+(66,1118,cs),
+(42,1118,o),
+(18,1118,o),
+(-6,1118,c),
+(-6,1072,l),
+(18,1072,o),
+(42,1072,o),
+(66,1072,cs),
+(169,1072,o),
+(204,1035,o),
+(204,912,cs),
+(204,366,ls),
+(204,143,o),
+(361,-14,o),
+(584,-14,cs),
+(739,-14,o),
+(867,61,o),
+(920,178,c),
+(924,178,l),
+(924,-220,ls),
+(924,-356,o),
+(985,-418,o),
+(1108,-418,cs)
 );
 }
 );
-width = 1190;
+width = 1104;
 }
 );
-metricLeft = x;
+metricLeft = "=|r";
+metricRight = nrthook;
+note = "Made from\012/hturnlthook + /_part.bottom_rthook";
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/hturnlthook.glyph b/src/Inter-Roman.glyphspackage/glyphs/hturnlthook.glyph
index f21d12465..e02a3b9cf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/hturnlthook.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/hturnlthook.glyph
@@ -9,87 +9,129 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(102,980,o),
-(122,983,o),
-(142,984,cs),
-(236,983,o),
-(305,948,o),
-(306,832,cs),
-(306,408,ls),
-(305,119,o),
-(457,-15,o),
-(686,-14,cs),
-(861,-15,o),
-(963,58,o),
-(1016,174,c),
-(1030,174,l),
-(1030,-418,l),
-(1202,-418,l),
-(1202,1118,l),
-(1030,1118,l),
-(1030,446,ls),
-(1030,250,o),
-(905,140,o),
-(736,140,cs),
-(573,140,o),
-(477,241,o),
-(478,418,cs),
-(478,832,ls),
-(477,1024,o),
-(349,1132,o),
-(186,1132,cs),
-(151,1132,o),
-(113,1132,o),
-(88,1122,c),
-(88,978,l)
+(1160,-418,l),
+(1160,1118,l),
+(990,1118,l),
+(990,446,ls),
+(990,251,o),
+(865,140,o),
+(696,140,cs),
+(534,140,o),
+(436,242,o),
+(436,420,cs),
+(436,832,ls),
+(436,1024,o),
+(307,1132,o),
+(144,1132,cs),
+(109,1132,o),
+(71,1132,o),
+(46,1122,c),
+(46,978,l),
+(59,981,o),
+(80,984,o),
+(100,984,cs),
+(194,984,o),
+(264,948,o),
+(264,832,cs),
+(264,408,ls),
+(264,121,o),
+(418,-14,o),
+(646,-14,cs),
+(822,-14,o),
+(922,60,o),
+(974,176,c),
+(990,176,l),
+(990,-418,l)
 );
 }
 );
-width = 1360;
+width = 1318;
 },
 {
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(1398,-418,l),
+(1398,1118,l),
+(996,1118,l),
+(996,488,ls),
+(996,378,o),
+(932,311,o),
+(834,312,cs),
+(731,311,o),
+(674,378,o),
+(674,488,cs),
+(674,748,ls),
+(674,1076,o),
+(472,1132,o),
+(228,1132,cs),
+(132,1132,o),
+(77,1123,o),
+(30,1120,c),
+(30,824,l),
+(62,826,o),
+(91,829,o),
+(120,830,cs),
+(190,829,o),
+(272,815,o),
+(272,748,cs),
+(272,404,ls),
+(272,160,o),
+(426,-15,o),
+(662,-14,cs),
+(827,-15,o),
+(949,70,o),
+(998,212,c),
+(1010,212,l),
+(1010,-418,l)
+);
+}
+);
+};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
 closed = 1;
 nodes = (
-(58,826,o),
-(87,829,o),
-(116,830,cs),
-(186,829,o),
-(268,815,o),
-(268,748,cs),
-(268,404,ls),
-(268,160,o),
-(422,-15,o),
-(658,-14,cs),
-(823,-15,o),
-(945,70,o),
-(994,212,c),
-(1006,212,l),
-(1006,-418,l),
-(1394,-418,l),
-(1394,1118,l),
-(992,1118,l),
-(992,488,ls),
-(992,378,o),
-(928,311,o),
-(830,312,cs),
-(727,311,o),
-(669,378,o),
-(670,488,cs),
-(670,748,ls),
-(669,1076,o),
-(468,1132,o),
-(224,1132,cs),
-(128,1132,o),
-(73,1123,o),
-(26,1120,c),
-(26,824,l)
+(1398,-418,l),
+(1398,1118,l),
+(996,1118,l),
+(996,490,ls),
+(996,379,o),
+(932,312,o),
+(834,312,cs),
+(731,312,o),
+(674,379,o),
+(674,490,cs),
+(674,748,ls),
+(674,1076,o),
+(472,1132,o),
+(228,1132,cs),
+(132,1132,o),
+(77,1126,o),
+(30,1120,c),
+(30,824,l),
+(62,827,o),
+(91,830,o),
+(120,830,cs),
+(190,830,o),
+(272,815,o),
+(272,748,cs),
+(272,406,ls),
+(272,161,o),
+(426,-14,o),
+(662,-14,cs),
+(827,-14,o),
+(949,71,o),
+(1000,214,c),
+(1012,214,l),
+(1012,-418,l)
 );
 }
 );
-width = 1496;
+width = 1500;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -97,43 +139,43 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(154,1092,o),
-(180,1094,o),
-(200,1094,cs),
-(303,1094,o),
-(337,1049,o),
-(338,926,cs),
-(338,366,ls),
-(337,143,o),
-(495,-15,o),
-(718,-14,cs),
-(873,-15,o),
-(1001,61,o),
-(1054,178,c),
-(1058,178,l),
-(1058,-418,l),
-(1106,-418,l),
-(1106,1118,l),
-(1058,1118,l),
-(1058,366,ls),
-(1059,172,o),
-(916,32,o),
-(718,32,cs),
-(521,32,o),
-(384,169,o),
-(384,366,cs),
-(384,926,ls),
-(384,1076,o),
-(327,1140,o),
-(200,1140,cs),
-(180,1140,o),
-(153,1139,o),
-(128,1136,c),
-(128,1090,l)
+(1034,-418,l),
+(1034,1118,l),
+(988,1118,l),
+(988,366,ls),
+(988,172,o),
+(846,32,o),
+(648,32,cs),
+(451,32,o),
+(314,169,o),
+(314,366,cs),
+(314,912,ls),
+(314,1062,o),
+(257,1126,o),
+(130,1126,cs),
+(110,1126,o),
+(83,1125,o),
+(58,1122,c),
+(58,1076,l),
+(84,1078,o),
+(110,1080,o),
+(130,1080,cs),
+(233,1080,o),
+(268,1035,o),
+(268,912,cs),
+(268,366,ls),
+(268,143,o),
+(425,-14,o),
+(648,-14,cs),
+(803,-14,o),
+(931,61,o),
+(984,178,c),
+(988,178,l),
+(988,-418,l)
 );
 }
 );
-width = 1304;
+width = 1232;
 },
 {
 layerId = m007;
@@ -141,43 +183,43 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(74,980,o),
-(94,983,o),
-(114,984,cs),
-(208,983,o),
-(277,948,o),
-(278,832,cs),
-(278,408,ls),
-(277,119,o),
-(429,-15,o),
-(658,-14,cs),
-(833,-15,o),
-(935,58,o),
-(988,174,c),
-(1002,174,l),
-(1002,-418,l),
-(1174,-418,l),
-(1174,1118,l),
-(1002,1118,l),
-(1002,446,ls),
-(1002,250,o),
-(877,140,o),
-(708,140,cs),
-(545,140,o),
-(449,241,o),
-(450,418,cs),
-(450,832,ls),
-(449,1024,o),
-(321,1132,o),
-(158,1132,cs),
-(123,1132,o),
-(85,1132,o),
-(60,1122,c),
-(60,978,l)
+(1146,-418,l),
+(1146,1056,l),
+(976,1056,l),
+(976,438,ls),
+(976,225,o),
+(846,136,o),
+(692,136,cs),
+(534,136,o),
+(432,229,o),
+(432,412,cs),
+(432,778,ls),
+(432,961,o),
+(321,1056,o),
+(124,1056,cs),
+(97,1056,o),
+(67,1056,o),
+(42,1056,c),
+(42,910,l),
+(60,910,o),
+(78,910,o),
+(96,910,cs),
+(218,910,o),
+(262,879,o),
+(262,770,cs),
+(262,400,ls),
+(262,119,o),
+(444,-20,o),
+(657,-20,cs),
+(824,-20,o),
+(926,68,o),
+(972,170,c),
+(976,170,l),
+(976,-418,l)
 );
 }
 );
-width = 1302;
+width = 1274;
 },
 {
 layerId = m009;
@@ -185,43 +227,43 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(42,826,o),
-(71,829,o),
-(100,830,cs),
-(170,829,o),
-(252,815,o),
-(252,748,cs),
-(252,404,ls),
-(252,160,o),
-(406,-15,o),
-(642,-14,cs),
-(807,-15,o),
-(929,70,o),
-(978,212,c),
-(990,212,l),
-(990,-418,l),
-(1378,-418,l),
-(1378,1118,l),
-(976,1118,l),
-(976,488,ls),
-(976,378,o),
-(912,311,o),
-(814,312,cs),
-(711,311,o),
-(653,378,o),
-(654,488,cs),
-(654,748,ls),
-(653,1076,o),
-(452,1132,o),
-(208,1132,cs),
-(112,1132,o),
-(57,1123,o),
-(10,1120,c),
-(10,824,l)
+(1384,-418,l),
+(1384,1056,l),
+(984,1056,l),
+(984,472,ls),
+(984,364,o),
+(918,298,o),
+(821,298,cs),
+(720,298,o),
+(658,364,o),
+(658,472,cs),
+(658,702,ls),
+(658,948,o),
+(523,1056,o),
+(214,1056,cs),
+(148,1056,o),
+(82,1056,o),
+(16,1056,c),
+(16,752,l),
+(46,752,o),
+(142,752,o),
+(172,752,cs),
+(232,752,o),
+(258,729,o),
+(258,678,cs),
+(258,390,ls),
+(258,150,o),
+(416,-24,o),
+(651,-24,cs),
+(812,-24,o),
+(932,60,o),
+(982,200,c),
+(984,200,l),
+(984,-418,l)
 );
 }
 );
-width = 1464;
+width = 1470;
 },
 {
 layerId = m011;
@@ -229,47 +271,48 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(90,1092,o),
-(116,1094,o),
-(136,1094,cs),
-(239,1094,o),
-(273,1049,o),
-(274,926,cs),
-(274,366,ls),
-(273,143,o),
-(431,-15,o),
-(654,-14,cs),
-(809,-15,o),
-(937,61,o),
-(990,178,c),
-(994,178,l),
-(994,-418,l),
-(1042,-418,l),
-(1042,1118,l),
-(994,1118,l),
-(994,366,ls),
-(995,172,o),
-(852,32,o),
-(654,32,cs),
-(457,32,o),
-(320,169,o),
-(320,366,cs),
-(320,926,ls),
-(320,1076,o),
-(263,1140,o),
-(136,1140,cs),
-(116,1140,o),
-(89,1139,o),
-(64,1136,c),
-(64,1090,l)
+(970,-418,l),
+(970,1118,l),
+(924,1118,l),
+(924,366,ls),
+(924,172,o),
+(782,32,o),
+(584,32,cs),
+(387,32,o),
+(250,169,o),
+(250,366,cs),
+(250,912,ls),
+(250,1062,o),
+(193,1118,o),
+(66,1118,cs),
+(42,1118,o),
+(18,1118,o),
+(-6,1118,c),
+(-6,1072,l),
+(18,1072,o),
+(42,1072,o),
+(66,1072,cs),
+(169,1072,o),
+(204,1035,o),
+(204,912,cs),
+(204,366,ls),
+(204,143,o),
+(361,-14,o),
+(584,-14,cs),
+(739,-14,o),
+(867,61,o),
+(920,178,c),
+(924,178,l),
+(924,-418,l)
 );
 }
 );
-width = 1176;
+width = 1104;
 }
 );
-metricLeft = x;
-metricRight = g;
+metricLeft = "=|r";
+metricRight = l;
+note = "Based on /h";
 tags = (
 "TODO-opsz"
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/i.glyph b/src/Inter-Roman.glyphspackage/glyphs/i.glyph
index 7d4be6936..c1b192684 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/i.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/i.glyph
@@ -1,7 +1,6 @@
 {
 color = (219,235,247,1);
 glyphname = i;
-kernLeft = idotless;
 kernRight = idotless;
 layers = (
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/j.glyph b/src/Inter-Roman.glyphspackage/glyphs/j.glyph
index c72eb00a1..5de4538c9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/j.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/j.glyph
@@ -99,7 +99,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-31,0);
+pos = (-30,0);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/jcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/jcaron.glyph
index 205fa3027..17ceef5d7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/jcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/jcaron.glyph
@@ -62,7 +62,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-343,-42);
+pos = (-342,-42);
 ref = caron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/jcircumflex.glyph b/src/Inter-Roman.glyphspackage/glyphs/jcircumflex.glyph
index 10c091f7e..62727fb8a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/jcircumflex.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/jcircumflex.glyph
@@ -62,7 +62,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-343,-42);
+pos = (-342,-42);
 ref = circumflex;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/jdotless.glyph b/src/Inter-Roman.glyphspackage/glyphs/jdotless.glyph
index fafaa5bb7..3dbee9425 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/jdotless.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/jdotless.glyph
@@ -210,17 +210,11 @@ pos = (228,-398);
 },
 {
 name = cross;
-pos = (286,686);
+pos = (288,686);
 },
 {
 name = top;
-pos = (287,1262);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (207,1088);
+pos = (288,1262);
 }
 );
 layerId = m009;
@@ -228,8 +222,8 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(86,0,ls),
-(86,-82,o),
+(88,0,ls),
+(88,-82,o),
 (59,-114,o),
 (-12,-114,cs),
 (-86,-114,l),
@@ -239,7 +233,7 @@ nodes = (
 (488,-292,o),
 (488,-38,cs),
 (488,1056,l),
-(86,1056,l)
+(88,1056,l)
 );
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/jdotlessbar.glyph b/src/Inter-Roman.glyphspackage/glyphs/jdotlessbar.glyph
index 50d8f6ba9..707a7d879 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/jdotlessbar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/jdotlessbar.glyph
@@ -62,7 +62,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-234,-35);
+pos = (-232,-35);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/kturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/kturn.glyph
index 34cbac1e1..378356df5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/kturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/kturn.glyph
@@ -133,7 +133,7 @@ layerId = m011;
 shapes = (
 {
 angle = 180;
-pos = (870,1056);
+pos = (870,1118);
 ref = k;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/l.glyph b/src/Inter-Roman.glyphspackage/glyphs/l.glyph
index 035b72101..fbe080d34 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/l.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/l.glyph
@@ -1,7 +1,6 @@
 {
 color = (219,235,247,1);
 glyphname = l;
-kernLeft = B;
 kernRight = H;
 layers = (
 {
@@ -11,6 +10,10 @@ name = bottom;
 pos = (242,0);
 },
 {
+name = bottomr;
+pos = (328,0);
+},
+{
 name = cross;
 pos = (242,768);
 },
@@ -44,6 +47,10 @@ name = bottom;
 pos = (302,0);
 },
 {
+name = bottomr;
+pos = (504,0);
+},
+{
 name = cross;
 pos = (302,768);
 },
@@ -77,6 +84,10 @@ name = bottom;
 pos = (222,0);
 },
 {
+name = bottomr;
+pos = (244,0);
+},
+{
 name = cross;
 pos = (222,768);
 },
@@ -110,6 +121,10 @@ name = bottom;
 pos = (212,0);
 },
 {
+name = bottomr;
+pos = (298,0);
+},
+{
 name = cross;
 pos = (212,768);
 },
@@ -142,7 +157,11 @@ width = 426;
 anchors = (
 {
 name = bottom;
-pos = (286,0);
+pos = (285,0);
+},
+{
+name = bottomr;
+pos = (486,0);
 },
 {
 name = cross;
@@ -150,7 +169,7 @@ pos = (286,768);
 },
 {
 name = raccent;
-pos = (604,1490);
+pos = (602,1490);
 },
 {
 name = top;
@@ -164,12 +183,12 @@ closed = 1;
 nodes = (
 (86,1490,l),
 (86,0,l),
-(488,0,l),
-(488,1490,l)
+(486,0,l),
+(486,1490,l)
 );
 }
 );
-width = 574;
+width = 572;
 },
 {
 anchors = (
@@ -178,6 +197,10 @@ name = bottom;
 pos = (158,0);
 },
 {
+name = bottomr;
+pos = (180,0);
+},
+{
 name = cross;
 pos = (158,768);
 },
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/lacute.glyph
index b433cc409..0e717de88 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lacute.glyph
@@ -66,7 +66,7 @@ pos = (-124,414);
 ref = acute;
 }
 );
-width = 574;
+width = 572;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lbar.glyph b/src/Inter-Roman.glyphspackage/glyphs/lbar.glyph
index e03577aea..ce2af3b09 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lbar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lbar.glyph
@@ -66,7 +66,7 @@ pos = (-234,47);
 ref = crossbar;
 }
 );
-width = 574;
+width = 572;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lcaron.glyph b/src/Inter-Roman.glyphspackage/glyphs/lcaron.glyph
index 726dcf2c1..542590fc6 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lcaron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lcaron.glyph
@@ -66,7 +66,7 @@ alignment = -1;
 ref = l;
 },
 {
-pos = (494,0);
+pos = (492,0);
 ref = commaaccentright.cn;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.glyph
index 2e8ae7500..4ef83eff1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lcircumflexbelow.glyph
@@ -62,11 +62,11 @@ shapes = (
 ref = l;
 },
 {
-pos = (976,0);
+pos = (975,0);
 ref = circumflexsubnosp;
 }
 );
-width = 574;
+width = 572;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lcommaaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/lcommaaccent.glyph
index fa182d74e..db611ebfd 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lcommaaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lcommaaccent.glyph
@@ -62,11 +62,11 @@ shapes = (
 ref = l;
 },
 {
-pos = (22,0);
+pos = (21,0);
 ref = commaaccent;
 }
 );
-width = 574;
+width = 572;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ldotbelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/ldotbelow.glyph
index f1d07f632..7c680e3bc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ldotbelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ldotbelow.glyph
@@ -62,11 +62,11 @@ shapes = (
 ref = l;
 },
 {
-pos = (838,0);
+pos = (837,0);
 ref = dotbelow;
 }
 );
-width = 574;
+width = 572;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.glyph b/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.glyph
index 166b290bc..35ea281d8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/ldotbelowmacron.glyph
@@ -78,7 +78,7 @@ shapes = (
 ref = l;
 },
 {
-pos = (838,0);
+pos = (837,0);
 ref = dotbelow;
 },
 {
@@ -86,7 +86,7 @@ pos = (-356,372);
 ref = macron;
 }
 );
-width = 574;
+width = 572;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/llinebelow.glyph b/src/Inter-Roman.glyphspackage/glyphs/llinebelow.glyph
index 01e13c2fd..257acde91 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/llinebelow.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/llinebelow.glyph
@@ -62,11 +62,11 @@ shapes = (
 ref = l;
 },
 {
-pos = (930,0);
+pos = (929,0);
 ref = macronsubnosp;
 }
 );
-width = 574;
+width = 572;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lmidtilde.glyph b/src/Inter-Roman.glyphspackage/glyphs/lmidtilde.glyph
index 18e4810a0..2ae3426ec 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lmidtilde.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lmidtilde.glyph
@@ -66,7 +66,7 @@ pos = (-192,0);
 ref = _tildecross.cn;
 }
 );
-width = 574;
+width = 572;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lrthook.glyph b/src/Inter-Roman.glyphspackage/glyphs/lrthook.glyph
index caf2af65d..9a2a07105 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lrthook.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lrthook.glyph
@@ -1,194 +1,83 @@
 {
 glyphname = lrthook;
-kernLeft = B;
 kernRight = rthook;
 layers = (
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(158,0,l),
-(158,-120,ls),
-(157,-311,o),
-(285,-419,o),
-(448,-418,cs),
-(483,-419,o),
-(521,-419,o),
-(546,-410,c),
-(546,-264,l),
-(532,-268,o),
-(512,-271,o),
-(492,-270,cs),
-(399,-271,o),
-(329,-236,o),
-(328,-120,cs),
-(328,0,l)
-);
+ref = l;
 },
 {
-ref = l;
+pos = (30,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 546;
+width = 486;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(102,0,l),
-(102,-34,ls),
-(102,-364,o),
-(300,-419,o),
-(546,-418,cs),
-(644,-419,o),
-(699,-410,o),
-(744,-408,c),
-(744,-110,l),
-(713,-113,o),
-(684,-116,o),
-(654,-116,cs),
-(585,-116,o),
-(503,-102,o),
-(504,-34,cs),
-(504,0,l)
-);
+ref = l;
 },
 {
-ref = l;
+pos = (-26,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 744;
+width = 606;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(198,14,l),
-(198,-200,ls),
-(198,-351,o),
-(255,-416,o),
-(382,-416,cs),
-(402,-416,o),
-(429,-415,o),
-(454,-412,c),
-(454,-366,l),
-(428,-368,o),
-(401,-369,o),
-(382,-370,cs),
-(280,-369,o),
-(244,-324,o),
-(244,-200,cs),
-(244,14,l,{
-name = hr00;
-})
-);
+ref = l;
 },
 {
-alignment = -1;
-ref = l;
+pos = (134,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 428;
+width = 442;
 },
 {
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(128,0,l),
-(128,-120,ls),
-(127,-311,o),
-(255,-419,o),
-(418,-418,cs),
-(453,-419,o),
-(491,-419,o),
-(516,-410,c),
-(516,-264,l),
-(502,-268,o),
-(482,-271,o),
-(462,-270,cs),
-(369,-271,o),
-(299,-236,o),
-(298,-120,cs),
-(298,0,l)
-);
+ref = l;
 },
 {
-pos = (2,0);
-ref = l;
+ref = _part.bottom_rthook;
 }
 );
-width = 484;
+width = 426;
 },
 {
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(86,0,l),
-(86,-34,ls),
-(86,-364,o),
-(284,-419,o),
-(530,-418,cs),
-(628,-419,o),
-(683,-410,o),
-(728,-408,c),
-(728,-110,l),
-(697,-113,o),
-(668,-116,o),
-(638,-116,cs),
-(569,-116,o),
-(487,-102,o),
-(488,-34,cs),
-(488,0,l)
-);
+ref = l;
 },
 {
-ref = l;
+pos = (-42,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 712;
+width = 572;
 },
 {
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(134,14,l),
-(134,-200,ls),
-(134,-351,o),
-(191,-416,o),
-(318,-416,cs),
-(338,-416,o),
-(365,-415,o),
-(390,-412,c),
-(390,-366,l),
-(364,-368,o),
-(337,-369,o),
-(318,-370,cs),
-(216,-369,o),
-(180,-324,o),
-(180,-200,cs),
-(180,14,l,{
-name = hr00;
-})
-);
+ref = l;
 },
 {
-alignment = -1;
-ref = l;
+pos = (70,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 300;
+width = 314;
 }
 );
 metricLeft = l;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/lslash.glyph b/src/Inter-Roman.glyphspackage/glyphs/lslash.glyph
index 82921390d..cf4250af0 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/lslash.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/lslash.glyph
@@ -66,7 +66,7 @@ pos = (-40,0);
 ref = slashshortcomb;
 }
 );
-width = 574;
+width = 572;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/mturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/mturn.glyph
index 69e97d45f..452f457ad 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/mturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/mturn.glyph
@@ -123,7 +123,7 @@ layerId = m011;
 shapes = (
 {
 angle = 180;
-pos = (1582,1056);
+pos = (1582,1118);
 ref = m;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/n.glyph b/src/Inter-Roman.glyphspackage/glyphs/n.glyph
index d7f2c79c4..02b1e3324 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/n.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/n.glyph
@@ -1,7 +1,6 @@
 {
 color = (219,235,247,1);
 glyphname = n;
-kernLeft = m;
 kernRight = a;
 layers = (
 {
@@ -11,6 +10,10 @@ name = bottom;
 pos = (600,0);
 },
 {
+name = bottomr;
+pos = (1042,0);
+},
+{
 name = top;
 pos = (600,1304);
 },
@@ -64,6 +67,10 @@ name = bottom;
 pos = (664,0);
 },
 {
+name = bottomr;
+pos = (1228,0);
+},
+{
 name = top;
 pos = (664,1304);
 },
@@ -168,6 +175,10 @@ name = bottom;
 pos = (582,0);
 },
 {
+name = bottomr;
+pos = (966,0);
+},
+{
 name = top;
 pos = (584,1304);
 },
@@ -301,6 +312,10 @@ name = bottom;
 pos = (568,0);
 },
 {
+name = bottomr;
+pos = (1010,0);
+},
+{
 name = top;
 pos = (568,1262);
 },
@@ -353,6 +368,10 @@ name = bottom;
 pos = (648,0);
 },
 {
+name = bottomr;
+pos = (1212,0);
+},
+{
 name = top;
 pos = (648,1262);
 },
@@ -406,6 +425,10 @@ name = bottom;
 pos = (518,0);
 },
 {
+name = bottomr;
+pos = (902,0);
+},
+{
 name = top;
 pos = (520,1304);
 },
diff --git a/src/Inter-Roman.glyphspackage/glyphs/nrthook.glyph b/src/Inter-Roman.glyphspackage/glyphs/nrthook.glyph
index 95d077cc1..50a52c014 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/nrthook.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/nrthook.glyph
@@ -7,185 +7,79 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(870,0,l),
-(870,-120,ls),
-(870,-311,o),
-(998,-419,o),
-(1160,-418,cs),
-(1196,-419,o),
-(1233,-419,o),
-(1260,-410,c),
-(1260,-264,l),
-(1245,-268,o),
-(1225,-271,o),
-(1204,-270,cs),
-(1111,-271,o),
-(1041,-236,o),
-(1042,-120,cs),
-(1042,0,l)
-);
+ref = n;
 },
 {
-ref = n;
+pos = (744,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1190;
+width = 1200;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(826,0,l),
-(826,-34,ls),
-(826,-364,o),
-(1025,-419,o),
-(1268,-418,cs),
-(1368,-419,o),
-(1420,-410,o),
-(1470,-408,c),
-(1470,-110,l),
-(1403,-116,o),
-(1409,-116,o),
-(1378,-116,cs),
-(1307,-116,o),
-(1228,-102,o),
-(1228,-34,cs),
-(1228,0,l)
-);
+ref = n;
 },
 {
-ref = n;
+pos = (698,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1410;
+width = 1330;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(920,14,l),
-(920,-200,ls),
-(919,-351,o),
-(976,-416,o),
-(1104,-416,cs),
-(1124,-416,o),
-(1151,-415,o),
-(1176,-412,c),
-(1176,-366,l),
-(1150,-368,o),
-(1123,-369,o),
-(1104,-370,cs),
-(1001,-369,o),
-(966,-324,o),
-(966,-200,cs),
-(966,14,l,{
-name = hr00;
-})
-);
+ref = n;
 },
 {
-ref = n;
+pos = (856,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1058;
+width = 1164;
 },
 {
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(838,0,l),
-(838,-120,ls),
-(838,-311,o),
-(966,-419,o),
-(1128,-418,cs),
-(1164,-419,o),
-(1201,-419,o),
-(1228,-410,c),
-(1228,-264,l),
-(1213,-268,o),
-(1193,-271,o),
-(1172,-270,cs),
-(1079,-271,o),
-(1009,-236,o),
-(1010,-120,cs),
-(1010,0,l)
-);
+ref = n;
 },
 {
-ref = n;
+pos = (712,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1126;
+width = 1136;
 },
 {
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(810,0,l),
-(810,-34,ls),
-(810,-364,o),
-(1009,-419,o),
-(1252,-418,cs),
-(1352,-419,o),
-(1404,-410,o),
-(1454,-408,c),
-(1454,-110,l),
-(1387,-116,o),
-(1393,-116,o),
-(1362,-116,cs),
-(1291,-116,o),
-(1212,-102,o),
-(1212,-34,cs),
-(1212,0,l)
-);
+ref = n;
 },
 {
-ref = n;
+pos = (684,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1378;
+width = 1298;
 },
 {
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(856,14,l),
-(856,-200,ls),
-(855,-351,o),
-(912,-416,o),
-(1040,-416,cs),
-(1060,-416,o),
-(1087,-415,o),
-(1112,-412,c),
-(1112,-366,l),
-(1086,-368,o),
-(1059,-369,o),
-(1040,-370,cs),
-(937,-369,o),
-(902,-324,o),
-(902,-200,cs),
-(902,14,l,{
-name = hr00;
-})
-);
+ref = n;
 },
 {
-ref = n;
+pos = (792,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 930;
+width = 1036;
 }
 );
 metricLeft = n;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/p.glyph b/src/Inter-Roman.glyphspackage/glyphs/p.glyph
index 852d1c29b..5d7f89e67 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/p.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/p.glyph
@@ -530,36 +530,81 @@ pos = (286,-162);
 },
 {
 name = top;
-pos = (641,1262);
+pos = (639,1262);
 },
 {
 name = topr;
-pos = (484,1056);
+pos = (482,1056);
+}
+);
+background = {
+shapes = (
+{
+closed = 1;
+nodes = (
+(486,-418,l),
+(486,156,l),
+(490,156,l),
+(538,40,o),
+(638,-24,o),
+(778,-24,cs),
+(1055,-24,o),
+(1234,194,o),
+(1234,530,cs),
+(1234,853,o),
+(1047,1080,o),
+(782,1080,cs),
+(645,1080,o),
+(549,1027,o),
+(487,924,c),
+(482,924,l),
+(482,1056,l),
+(86,1056,l),
+(86,-418,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(550,290,o),
+(472,384,o),
+(472,530,cs),
+(472,675,o),
+(550,768,o),
+(659,768,cs),
+(768,768,o),
+(830,675,o),
+(830,530,cs),
+(830,384,o),
+(768,290,o),
+(659,290,cs)
+);
 }
 );
+};
 layerId = m009;
 name = "Black Display";
 shapes = (
 {
 closed = 1;
 nodes = (
-(488,-418,l),
-(488,156,l),
-(492,156,l),
-(540,40,o),
-(640,-24,o),
-(780,-24,cs),
-(1057,-24,o),
-(1236,194,o),
-(1236,530,cs),
-(1236,853,o),
-(1049,1080,o),
-(784,1080,cs),
-(647,1080,o),
-(551,1027,o),
-(489,924,c),
-(484,924,l),
-(484,1056,l),
+(486,-418,l),
+(486,156,l),
+(490,156,l),
+(538,40,o),
+(638,-24,o),
+(778,-24,cs),
+(1055,-24,o),
+(1234,194,o),
+(1234,530,cs),
+(1234,853,o),
+(1047,1080,o),
+(782,1080,cs),
+(645,1080,o),
+(549,1027,o),
+(487,924,c),
+(482,924,l),
+(482,1056,l),
 (86,1056,l),
 (86,-418,l)
 );
@@ -567,22 +612,22 @@ nodes = (
 {
 closed = 1;
 nodes = (
-(552,290,o),
-(474,384,o),
-(474,530,cs),
-(474,675,o),
-(552,768,o),
-(661,768,cs),
-(770,768,o),
-(832,675,o),
-(832,530,cs),
-(832,384,o),
-(770,290,o),
-(661,290,cs)
+(550,290,o),
+(472,384,o),
+(472,530,cs),
+(472,675,o),
+(550,768,o),
+(659,768,cs),
+(768,768,o),
+(830,675,o),
+(830,530,cs),
+(830,384,o),
+(768,290,o),
+(659,290,cs)
 );
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 anchors = (
@@ -798,6 +843,73 @@ nodes = (
 }
 );
 width = 1062;
+},
+{
+anchors = (
+{
+name = bottom;
+pos = (286,-418);
+},
+{
+name = cross;
+pos = (286,-162);
+},
+{
+name = top;
+pos = (639,1262);
+},
+{
+name = topr;
+pos = (482,1056);
+}
+);
+associatedMasterId = m009;
+layerId = "8F7B12D8-FB34-4DB7-B324-426541465C93";
+name = "Sep 28, 22, 09:54";
+shapes = (
+{
+closed = 1;
+nodes = (
+(486,-418,l),
+(486,156,l),
+(490,156,l),
+(538,40,o),
+(638,-24,o),
+(778,-24,cs),
+(1055,-24,o),
+(1234,194,o),
+(1234,530,cs),
+(1234,853,o),
+(1047,1080,o),
+(782,1080,cs),
+(645,1080,o),
+(549,1027,o),
+(487,924,c),
+(482,924,l),
+(482,1056,l),
+(86,1056,l),
+(86,-418,l)
+);
+},
+{
+closed = 1;
+nodes = (
+(550,290,o),
+(472,384,o),
+(472,530,cs),
+(472,675,o),
+(550,768,o),
+(659,768,cs),
+(768,768,o),
+(830,675,o),
+(830,530,cs),
+(830,384,o),
+(768,290,o),
+(659,290,cs)
+);
+}
+);
+width = 1280;
 }
 );
 metricLeft = l;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/pacute.glyph b/src/Inter-Roman.glyphspackage/glyphs/pacute.glyph
index 93ab7a497..bba7a80b4 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/pacute.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/pacute.glyph
@@ -62,11 +62,11 @@ shapes = (
 ref = p;
 },
 {
-pos = (231,0);
+pos = (229,0);
 ref = acute;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/pdotaccent.glyph b/src/Inter-Roman.glyphspackage/glyphs/pdotaccent.glyph
index 9faba45df..44ad6ef13 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/pdotaccent.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/pdotaccent.glyph
@@ -62,11 +62,11 @@ shapes = (
 ref = p;
 },
 {
-pos = (323,0);
+pos = (321,0);
 ref = dotaccent;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/phook.glyph b/src/Inter-Roman.glyphspackage/glyphs/phook.glyph
index 2658f7d49..f6b5ef907 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/phook.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/phook.glyph
@@ -59,10 +59,11 @@ shapes = (
 ref = p;
 },
 {
+pos = (-2,0);
 ref = _part.top_r_hook;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/pipedblbar.glyph b/src/Inter-Roman.glyphspackage/glyphs/pipedblbar.glyph
index 23bac31c1..ea39449cf 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/pipedblbar.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/pipedblbar.glyph
@@ -130,7 +130,7 @@ pos = (-234,-16);
 ref = crossbar;
 }
 );
-width = 574;
+width = 572;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/q.glyph b/src/Inter-Roman.glyphspackage/glyphs/q.glyph
index 8850ac011..fa683ac36 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/q.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/q.glyph
@@ -7,18 +7,6 @@ layers = (
 {
 anchors = (
 {
-name = bottom;
-pos = (1004,-418);
-},
-{
-name = cross;
-pos = (1002,-162);
-},
-{
-name = top;
-pos = (588,1304);
-},
-{
 name = topr;
 pos = (1088,1118);
 }
@@ -26,45 +14,9 @@ pos = (1088,1118);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(1088,-418,l),
-(1088,1118,l),
-(924,1118,l),
-(924,940,l),
-(904,940,l),
-(866,998,o),
-(799,1132,o),
-(580,1132,cs),
-(298,1132,o),
-(104,908,o),
-(104,556,cs),
-(104,201,o),
-(298,-24,o),
-(578,-24,cs),
-(793,-24,o),
-(866,111,o),
-(904,172,c),
-(918,172,l),
-(918,-418,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(386,130,o),
-(276,320,o),
-(276,558,cs),
-(276,794,o),
-(383,978,o),
-(600,978,cs),
-(810,978,o),
-(920,809,o),
-(920,558,cs),
-(920,305,o),
-(807,130,o),
-(600,130,cs)
-);
+pos = (1246,0);
+ref = p;
+scale = (-1,1);
 }
 );
 width = 1246;
@@ -72,18 +24,6 @@ width = 1246;
 {
 anchors = (
 {
-name = bottom;
-pos = (1018,-402);
-},
-{
-name = cross;
-pos = (1022,-162);
-},
-{
-name = top;
-pos = (596,1304);
-},
-{
 name = topr;
 pos = (1220,1118);
 }
@@ -91,45 +31,9 @@ pos = (1220,1118);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(1220,-418,l),
-(1220,1118,l),
-(822,1118,l),
-(822,922,l),
-(812,922,l),
-(769,1036,o),
-(664,1132,o),
-(498,1132,cs),
-(277,1132,o),
-(62,963,o),
-(62,558,cs),
-(62,172,o),
-(263,-14,o),
-(502,-14,cs),
-(659,-14,o),
-(766,70,o),
-(812,184,c),
-(818,184,l),
-(818,-418,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(539,294,o),
-(476,393,o),
-(476,558,cs),
-(476,724,o),
-(539,824,o),
-(650,824,cs),
-(760,824,o),
-(828,724,o),
-(828,558,cs),
-(828,396,o),
-(760,294,o),
-(650,294,cs)
-);
+pos = (1322,0);
+ref = p;
+scale = (-1,1);
 }
 );
 width = 1322;
@@ -137,18 +41,6 @@ width = 1322;
 {
 anchors = (
 {
-name = bottom;
-pos = (968,-418);
-},
-{
-name = cross;
-pos = (968,-162);
-},
-{
-name = top;
-pos = (562,1304);
-},
-{
 name = topr;
 pos = (992,1118);
 }
@@ -156,45 +48,9 @@ pos = (992,1118);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(992,-418,l),
-(992,1118,l),
-(946,1118,l),
-(946,832,l),
-(940,832,l),
-(883,1018,o),
-(738,1134,o),
-(560,1134,cs),
-(299,1134,o),
-(130,884,o),
-(130,556,cs),
-(130,225,o),
-(297,-24,o),
-(560,-24,cs),
-(740,-24,o),
-(881,94,o),
-(940,280,c),
-(946,280,l),
-(946,-418,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(324,22,o),
-(176,253,o),
-(176,556,cs),
-(176,858,o),
-(325,1088,o),
-(560,1088,cs),
-(796,1088,o),
-(946,858,o),
-(946,556,cs),
-(946,253,o),
-(798,22,o),
-(560,22,cs)
-);
+pos = (1190,0);
+ref = p;
+scale = (-1,1);
 }
 );
 width = 1190;
@@ -202,18 +58,6 @@ width = 1190;
 {
 anchors = (
 {
-name = bottom;
-pos = (947,-418);
-},
-{
-name = cross;
-pos = (945,-162);
-},
-{
-name = top;
-pos = (531,1262);
-},
-{
 name = topr;
 pos = (1032,1056);
 }
@@ -221,45 +65,9 @@ pos = (1032,1056);
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1032,-418,l),
-(1032,1056,l),
-(866,1056,l),
-(866,900,l),
-(864,900,l),
-(796,1018,o),
-(667,1076,o),
-(530,1076,cs),
-(255,1076,o),
-(72,854,o),
-(72,528,cs),
-(72,203,o),
-(255,-20,o),
-(530,-20,cs),
-(667,-20,o),
-(784,38,o),
-(860,160,c),
-(862,160,l),
-(862,-418,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(373,133,o),
-(244,269,o),
-(244,528,cs),
-(244,787,o),
-(373,924,o),
-(556,924,cs),
-(752,924,o),
-(876,767,o),
-(876,528,cs),
-(876,289,o),
-(752,133,o),
-(556,133,cs)
-);
+pos = (1160,0);
+ref = p;
+scale = (-1,1);
 }
 );
 width = 1160;
@@ -267,77 +75,19 @@ width = 1160;
 {
 anchors = (
 {
-name = bottom;
-pos = (996,-418);
-},
-{
-name = cross;
-pos = (996,-162);
-},
-{
-name = top;
-pos = (633,1262);
-},
-{
 name = topr;
-pos = (1196,1056);
-}
-);
-guides = (
-{
-angle = 90;
-pos = (553,1088);
-},
-{
-angle = 90;
-pos = (916,-432);
+pos = (1194,1056);
 }
 );
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1196,-418,l),
-(1196,1056,l),
-(798,1056,l),
-(798,924,l),
-(793,924,l),
-(731,1027,o),
-(635,1080,o),
-(498,1080,cs),
-(233,1080,o),
-(46,853,o),
-(46,530,cs),
-(46,194,o),
-(225,-24,o),
-(502,-24,cs),
-(642,-24,o),
-(742,40,o),
-(790,156,c),
-(794,156,l),
-(794,-418,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(512,290,o),
-(450,384,o),
-(450,530,cs),
-(450,675,o),
-(512,768,o),
-(621,768,cs),
-(730,768,o),
-(808,675,o),
-(808,530,cs),
-(808,384,o),
-(730,290,o),
-(621,290,cs)
-);
+pos = (1280,0);
+ref = p;
+scale = (-1,1);
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 anchors = (
@@ -419,18 +169,6 @@ width = 1242;
 {
 anchors = (
 {
-name = bottom;
-pos = (904,-418);
-},
-{
-name = cross;
-pos = (904,-162);
-},
-{
-name = top;
-pos = (498,1304);
-},
-{
 name = topr;
 pos = (928,1118);
 }
@@ -438,45 +176,9 @@ pos = (928,1118);
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(928,-418,l),
-(928,1118,l),
-(882,1118,l),
-(882,832,l),
-(876,832,l),
-(819,1018,o),
-(674,1134,o),
-(496,1134,cs),
-(235,1134,o),
-(66,884,o),
-(66,556,cs),
-(66,225,o),
-(233,-24,o),
-(496,-24,cs),
-(676,-24,o),
-(817,94,o),
-(876,280,c),
-(882,280,l),
-(882,-418,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(260,22,o),
-(112,253,o),
-(112,556,cs),
-(112,858,o),
-(261,1088,o),
-(496,1088,cs),
-(732,1088,o),
-(882,858,o),
-(882,556,cs),
-(882,253,o),
-(734,22,o),
-(496,22,cs)
-);
+pos = (1062,0);
+ref = p;
+scale = (-1,1);
 }
 );
 width = 1062;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/qhook.glyph b/src/Inter-Roman.glyphspackage/glyphs/qhook.glyph
index 8957f4620..2e9f65d34 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/qhook.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/qhook.glyph
@@ -62,11 +62,11 @@ shapes = (
 ref = q;
 },
 {
-pos = (712,0);
+pos = (710,0);
 ref = _part.top_r_hook;
 }
 );
-width = 1282;
+width = 1280;
 },
 {
 anchors = (
diff --git a/src/Inter-Roman.glyphspackage/glyphs/qrthook.glyph b/src/Inter-Roman.glyphspackage/glyphs/qrthook.glyph
index 3cb02a71a..a7ea3ba5d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/qrthook.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/qrthook.glyph
@@ -14,484 +14,85 @@ ref = q;
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(1245,-419,o),
-(1283,-419,o),
-(1310,-410,c),
-(1310,-264,l),
-(1295,-268,o),
-(1274,-271,o),
-(1254,-270,cs),
-(1161,-271,o),
-(1091,-236,o),
-(1090,-120,cs),
-(1090,-46,l),
-(920,-46,l),
-(920,-120,ls),
-(919,-311,o),
-(1047,-419,o),
-(1210,-418,cs)
-);
+alignment = 1;
+ref = a.1;
 },
 {
-closed = 1;
-nodes = (
-(794,-23,o),
-(867,111,o),
-(904,172,c),
-(990,172,l),
-(990,940,l),
-(904,940,l),
-(867,998,o),
-(800,1132,o),
-(582,1132,cs),
-(300,1132,o),
-(105,908,o),
-(104,556,cs),
-(105,201,o),
-(300,-23,o),
-(578,-24,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(1090,1118,l),
-(926,1118,l),
-(926,908,l),
-(978,546,l),
-(920,264,l),
-(920,-46,l),
-(1090,-46,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(387,131,o),
-(276,320,o),
-(276,558,cs),
-(276,794,o),
-(384,977,o),
-(602,978,cs),
-(812,977,o),
-(922,809,o),
-(922,558,cs),
-(922,305,o),
-(809,131,o),
-(602,130,cs)
-);
+pos = (792,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1310;
+width = 1248;
 },
 {
-background = {
-shapes = (
-{
-pos = (-4,0);
-ref = q;
-}
-);
-};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(1352,-419,o),
-(1421,-410,o),
-(1462,-408,c),
-(1462,-110,l),
-(1430,-113,o),
-(1401,-116,o),
-(1372,-116,cs),
-(1302,-116,o),
-(1221,-102,o),
-(1220,-34,cs),
-(1220,46,l),
-(820,46,l),
-(820,-34,ls),
-(819,-364,o),
-(1017,-419,o),
-(1262,-418,cs)
-);
+alignment = 1;
+ref = a.1;
 },
 {
-closed = 1;
-nodes = (
-(659,-15,o),
-(767,70,o),
-(814,184,c),
-(980,184,l),
-(980,922,l),
-(814,922,l),
-(770,1036,o),
-(665,1132,o),
-(500,1132,cs),
-(278,1132,o),
-(63,963,o),
-(62,558,cs),
-(63,172,o),
-(264,-15,o),
-(502,-14,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(1220,1118,l),
-(822,1118,l),
-(822,862,l),
-(910,558,l),
-(820,250,l),
-(820,46,l),
-(1220,46,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(540,294,o),
-(476,393,o),
-(476,558,cs),
-(476,724,o),
-(540,823,o),
-(650,824,cs),
-(761,823,o),
-(828,724,o),
-(828,558,cs),
-(828,396,o),
-(761,294,o),
-(650,294,cs)
-);
+pos = (690,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1462;
+width = 1322;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(1151,-416,o),
-(1177,-415,o),
-(1202,-412,c),
-(1202,-366,l),
-(1176,-368,o),
-(1149,-369,o),
-(1130,-370,cs),
-(1028,-369,o),
-(992,-324,o),
-(992,-200,cs),
-(992,14,l,{
-name = hr00;
-}),
-(946,14,l),
-(946,-200,ls),
-(945,-351,o),
-(1002,-416,o),
-(1130,-416,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(739,-23,o),
-(881,93,o),
-(940,280,c),
-(974,280,l),
-(968,832,l),
-(940,832,l),
-(880,1018,o),
-(742,1135,o),
-(562,1134,cs),
-(298,1135,o),
-(131,886,o),
-(130,556,cs),
-(131,227,o),
-(300,-23,o),
-(562,-24,cs)
-);
+alignment = 1;
+ref = a.1;
 },
 {
-closed = 1;
-nodes = (
-(992,1118,l),
-(946,1118,l),
-(946,832,l),
-(960,558,l),
-(946,280,l),
-(946,-128,l),
-(992,-128,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(326,23,o),
-(177,253,o),
-(178,556,cs),
-(177,858,o),
-(324,1088,o),
-(562,1088,cs),
-(799,1088,o),
-(945,858,o),
-(946,556,cs),
-(945,253,o),
-(797,23,o),
-(562,24,cs)
-);
+pos = (882,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1206;
+width = 1190;
 },
 {
-background = {
-shapes = (
-{
-ref = q;
-}
-);
-};
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1213,-419,o),
-(1251,-419,o),
-(1278,-410,c),
-(1278,-264,l),
-(1263,-268,o),
-(1242,-271,o),
-(1222,-270,cs),
-(1129,-271,o),
-(1059,-236,o),
-(1058,-120,cs),
-(1058,-46,l),
-(888,-46,l),
-(888,-120,ls),
-(887,-311,o),
-(1015,-419,o),
-(1178,-418,cs)
-);
+alignment = 1;
+ref = a.1;
 },
 {
-closed = 1;
-nodes = (
-(762,-23,o),
-(835,111,o),
-(872,172,c),
-(958,172,l),
-(958,940,l),
-(872,940,l),
-(835,998,o),
-(768,1132,o),
-(550,1132,cs),
-(268,1132,o),
-(73,908,o),
-(72,556,cs),
-(73,201,o),
-(268,-23,o),
-(546,-24,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(1058,1118,l),
-(894,1118,l),
-(894,908,l),
-(946,546,l),
-(888,264,l),
-(888,-46,l),
-(1058,-46,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(355,131,o),
-(244,320,o),
-(244,558,cs),
-(244,794,o),
-(352,977,o),
-(570,978,cs),
-(780,977,o),
-(890,809,o),
-(890,558,cs),
-(890,305,o),
-(777,131,o),
-(570,130,cs)
-);
+pos = (734,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1246;
+width = 1160;
 },
 {
-background = {
-shapes = (
-{
-pos = (-4,0);
-ref = q;
-}
-);
-};
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1336,-419,o),
-(1405,-410,o),
-(1446,-408,c),
-(1446,-110,l),
-(1414,-113,o),
-(1385,-116,o),
-(1356,-116,cs),
-(1286,-116,o),
-(1205,-102,o),
-(1204,-34,cs),
-(1204,46,l),
-(804,46,l),
-(804,-34,ls),
-(803,-364,o),
-(1001,-419,o),
-(1246,-418,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(643,-15,o),
-(751,70,o),
-(798,184,c),
-(964,184,l),
-(964,922,l),
-(798,922,l),
-(754,1036,o),
-(649,1132,o),
-(484,1132,cs),
-(262,1132,o),
-(47,963,o),
-(46,558,cs),
-(47,172,o),
-(248,-15,o),
-(486,-14,cs)
-);
+alignment = 1;
+ref = a.1;
 },
 {
-closed = 1;
-nodes = (
-(1204,1118,l),
-(806,1118,l),
-(806,862,l),
-(894,558,l),
-(804,250,l),
-(804,46,l),
-(1204,46,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(524,294,o),
-(460,393,o),
-(460,558,cs),
-(460,724,o),
-(524,823,o),
-(634,824,cs),
-(745,823,o),
-(812,724,o),
-(812,558,cs),
-(812,396,o),
-(745,294,o),
-(634,294,cs)
-);
+pos = (668,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1430;
+width = 1282;
 },
 {
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(1087,-416,o),
-(1113,-415,o),
-(1138,-412,c),
-(1138,-366,l),
-(1112,-368,o),
-(1085,-369,o),
-(1066,-370,cs),
-(964,-369,o),
-(928,-324,o),
-(928,-200,cs),
-(928,14,l,{
-name = hr00;
-}),
-(882,14,l),
-(882,-200,ls),
-(881,-351,o),
-(938,-416,o),
-(1066,-416,cs)
-);
-},
-{
-closed = 1;
-nodes = (
-(675,-23,o),
-(817,93,o),
-(876,280,c),
-(910,280,l),
-(904,832,l),
-(876,832,l),
-(816,1018,o),
-(678,1135,o),
-(498,1134,cs),
-(234,1135,o),
-(67,886,o),
-(66,556,cs),
-(67,227,o),
-(236,-23,o),
-(498,-24,cs)
-);
+alignment = 1;
+ref = a.1;
 },
 {
-closed = 1;
-nodes = (
-(928,1118,l),
-(882,1118,l),
-(882,832,l),
-(896,558,l),
-(882,280,l),
-(882,-128,l),
-(928,-128,l)
-);
-},
-{
-closed = 1;
-nodes = (
-(262,23,o),
-(113,253,o),
-(114,556,cs),
-(113,858,o),
-(260,1088,o),
-(498,1088,cs),
-(735,1088,o),
-(881,858,o),
-(882,556,cs),
-(881,253,o),
-(733,23,o),
-(498,24,cs)
-);
+pos = (818,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1078;
+width = 1062;
 }
 );
 metricLeft = q;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/r.glyph b/src/Inter-Roman.glyphspackage/glyphs/r.glyph
index 2e389e7cf..b022557cc 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/r.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/r.glyph
@@ -10,6 +10,10 @@ name = bottom;
 pos = (242,0);
 },
 {
+name = bottomr;
+pos = (328,0);
+},
+{
 name = cross;
 pos = (244,536);
 },
@@ -18,13 +22,6 @@ name = top;
 pos = (422,1304);
 }
 );
-background = {
-shapes = (
-{
-ref = r.1;
-}
-);
-};
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
@@ -61,6 +58,10 @@ name = bottom;
 pos = (306,0);
 },
 {
+name = bottomr;
+pos = (504,0);
+},
+{
 name = cross;
 pos = (302,536);
 },
@@ -69,13 +70,6 @@ name = top;
 pos = (482,1304);
 }
 );
-background = {
-shapes = (
-{
-ref = r.1;
-}
-);
-};
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
@@ -112,6 +106,10 @@ name = bottom;
 pos = (222,0);
 },
 {
+name = bottomr;
+pos = (244,0);
+},
+{
 name = cross;
 pos = (222,536);
 },
@@ -156,6 +154,10 @@ name = bottom;
 pos = (210,0);
 },
 {
+name = bottomr;
+pos = (296,0);
+},
+{
 name = cross;
 pos = (212,536);
 },
@@ -391,6 +393,10 @@ name = bottom;
 pos = (286,0);
 },
 {
+name = bottomr;
+pos = (486,0);
+},
+{
 name = cross;
 pos = (286,528);
 },
@@ -442,6 +448,10 @@ name = bottom;
 pos = (158,0);
 },
 {
+name = bottomr;
+pos = (180,0);
+},
+{
 name = cross;
 pos = (158,536);
 },
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rrthook.glyph b/src/Inter-Roman.glyphspackage/glyphs/rrthook.glyph
index a884deeb2..0f03ebf52 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rrthook.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rrthook.glyph
@@ -7,28 +7,11 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(483,-419,o),
-(521,-419,o),
-(546,-410,c),
-(546,-264,l),
-(532,-268,o),
-(512,-271,o),
-(492,-270,cs),
-(399,-271,o),
-(329,-236,o),
-(328,-120,cs),
-(328,0,l),
-(158,0,l),
-(158,-120,ls),
-(157,-311,o),
-(285,-419,o),
-(448,-418,cs)
-);
+ref = r;
 },
 {
-ref = r;
+pos = (30,0);
+ref = _part.bottom_rthook;
 }
 );
 width = 762;
@@ -37,28 +20,11 @@ width = 762;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(643,-419,o),
-(698,-410,o),
-(744,-408,c),
-(744,-110,l),
-(713,-113,o),
-(684,-116,o),
-(654,-116,cs),
-(585,-116,o),
-(503,-102,o),
-(504,-34,cs),
-(504,0,l),
-(102,0,l),
-(102,-34,ls),
-(102,-364,o),
-(300,-419,o),
-(546,-418,cs)
-);
+ref = r;
 },
 {
-ref = r;
+pos = (-26,0);
+ref = _part.bottom_rthook;
 }
 );
 width = 888;
@@ -67,29 +33,11 @@ width = 888;
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(416,-393,o),
-(431,-393,o),
-(442,-392,c),
-(442,-346,l),
-(431,-346,o),
-(416,-346,o),
-(404,-346,cs),
-(311,-346,o),
-(244,-280,o),
-(244,-186,cs),
-(244,0,l),
-(198,0,l),
-(198,-186,ls),
-(198,-307,o),
-(284,-393,o),
-(404,-392,cs)
-);
+ref = r;
 },
 {
-alignment = -1;
-ref = r;
+pos = (134,0);
+ref = _part.bottom_rthook;
 }
 );
 width = 666;
@@ -98,28 +46,11 @@ width = 666;
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(451,-419,o),
-(489,-419,o),
-(514,-410,c),
-(514,-264,l),
-(500,-268,o),
-(480,-271,o),
-(460,-270,cs),
-(367,-271,o),
-(297,-236,o),
-(296,-120,cs),
-(296,0,l),
-(126,0,l),
-(126,-120,ls),
-(125,-311,o),
-(253,-419,o),
-(416,-418,cs)
-);
+ref = r;
 },
 {
-ref = r;
+pos = (-2,0);
+ref = _part.bottom_rthook;
 }
 );
 width = 660;
@@ -128,28 +59,11 @@ width = 660;
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(627,-419,o),
-(682,-410,o),
-(728,-408,c),
-(728,-110,l),
-(697,-113,o),
-(668,-116,o),
-(638,-116,cs),
-(569,-116,o),
-(487,-102,o),
-(488,-34,cs),
-(488,0,l),
-(86,0,l),
-(86,-34,ls),
-(86,-364,o),
-(284,-419,o),
-(530,-418,cs)
-);
+ref = r;
 },
 {
-ref = r;
+pos = (-42,0);
+ref = _part.bottom_rthook;
 }
 );
 width = 852;
@@ -158,29 +72,11 @@ width = 852;
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(352,-393,o),
-(367,-393,o),
-(378,-392,c),
-(378,-346,l),
-(367,-346,o),
-(352,-346,o),
-(340,-346,cs),
-(247,-346,o),
-(180,-280,o),
-(180,-186,cs),
-(180,0,l),
-(134,0,l),
-(134,-186,ls),
-(134,-307,o),
-(220,-393,o),
-(340,-392,cs)
-);
+ref = r;
 },
 {
-alignment = -1;
-ref = r;
+pos = (70,0);
+ref = _part.bottom_rthook;
 }
 );
 width = 538;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/rturn.glyph
index bb48d9489..1a04a7e77 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rturn.glyph
@@ -9,6 +9,10 @@ name = bottom;
 pos = (380,0);
 },
 {
+name = bottomr;
+pos = (604,0);
+},
+{
 name = top;
 pos = (518,1304);
 }
@@ -30,6 +34,10 @@ name = bottom;
 pos = (450,0);
 },
 {
+name = bottomr;
+pos = (786,0);
+},
+{
 name = top;
 pos = (586,1304);
 }
@@ -51,6 +59,10 @@ name = bottom;
 pos = (344,0);
 },
 {
+name = bottomr;
+pos = (468,0);
+},
+{
 name = top;
 pos = (444,1304);
 }
@@ -69,11 +81,15 @@ width = 666;
 anchors = (
 {
 name = bottom;
-pos = (380,0);
+pos = (353,0);
+},
+{
+name = bottomr;
+pos = (534,0);
 },
 {
 name = top;
-pos = (518,1304);
+pos = (447,1262);
 }
 );
 layerId = m007;
@@ -90,11 +106,15 @@ width = 660;
 anchors = (
 {
 name = bottom;
-pos = (450,0);
+pos = (428,0);
+},
+{
+name = bottomr;
+pos = (766,0);
 },
 {
 name = top;
-pos = (586,1304);
+pos = (575,1262);
 }
 );
 layerId = m009;
@@ -111,18 +131,22 @@ width = 852;
 anchors = (
 {
 name = bottom;
-pos = (344,0);
+pos = (278,0);
+},
+{
+name = bottomr;
+pos = (404,0);
 },
 {
 name = top;
-pos = (444,1304);
+pos = (381,1262);
 }
 );
 layerId = m011;
 shapes = (
 {
 angle = 180;
-pos = (538,1056);
+pos = (538,1118);
 ref = r;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/rturnrthook.glyph b/src/Inter-Roman.glyphspackage/glyphs/rturnrthook.glyph
index eca096511..7b1728d78 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/rturnrthook.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/rturnrthook.glyph
@@ -6,183 +6,79 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(756,-436,o),
-(797,-433,o),
-(824,-424,c),
-(824,-290,l),
-(809,-297,o),
-(783,-297,o),
-(768,-296,cs),
-(661,-297,o),
-(605,-243,o),
-(606,-140,cs),
-(606,0,l),
-(440,0,l),
-(440,-140,ls),
-(439,-332,o),
-(561,-436,o),
-(724,-436,cs)
-);
+ref = rturn;
 },
 {
-ref = rturn;
+pos = (376,0);
+ref = _part.bottom_rrthook;
 }
 );
-width = 800;
+width = 762;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(937,-436,o),
-(995,-431,o),
-(1056,-422,c),
-(1056,-172,l),
-(1021,-175,o),
-(1001,-177,o),
-(962,-178,cs),
-(840,-177,o),
-(785,-133,o),
-(786,-32,cs),
-(786,0,l),
-(396,0,l),
-(396,-56,ls),
-(396,-387,o),
-(608,-436,o),
-(856,-436,cs)
-);
+ref = rturn;
 },
 {
-ref = rturn;
+pos = (332,0);
+ref = _part.bottom_rrthook;
 }
 );
-width = 1032;
+width = 888;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(640,-393,o),
-(655,-393,o),
-(666,-392,c),
-(666,-346,l),
-(655,-346,o),
-(640,-346,o),
-(628,-346,cs),
-(535,-346,o),
-(468,-280,o),
-(468,-186,cs),
-(468,0,l),
-(422,0,l),
-(422,-186,ls),
-(422,-307,o),
-(508,-393,o),
-(628,-392,cs)
-);
+ref = rturn;
 },
 {
-alignment = -1;
-ref = rturn;
+pos = (358,0);
+ref = _part.bottom_rrthook;
 }
 );
-width = 642;
+width = 666;
 },
 {
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(688,-436,o),
-(729,-433,o),
-(756,-424,c),
-(756,-290,l),
-(741,-297,o),
-(711,-297,o),
-(696,-296,cs),
-(589,-297,o),
-(533,-243,o),
-(534,-140,cs),
-(534,0,l),
-(372,0,l),
-(372,-140,ls),
-(372,-332,o),
-(493,-436,o),
-(656,-436,cs)
-);
+ref = rturn;
 },
 {
-ref = rturn;
+pos = (308,0);
+ref = _part.bottom_rrthook;
 }
 );
-width = 736;
+width = 660;
 },
 {
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(919,-436,o),
-(977,-431,o),
-(1038,-422,c),
-(1038,-172,l),
-(1003,-175,o),
-(981,-177,o),
-(942,-178,cs),
-(820,-177,o),
-(765,-133,o),
-(766,-32,cs),
-(766,0,l),
-(378,0,l),
-(378,-56,ls),
-(378,-387,o),
-(590,-436,o),
-(838,-436,cs)
-);
+ref = rturn;
 },
 {
-ref = rturn;
+pos = (314,0);
+ref = _part.bottom_rrthook;
 }
 );
-width = 1000;
+width = 852;
 },
 {
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(576,-393,o),
-(591,-393,o),
-(602,-392,c),
-(602,-346,l),
-(591,-346,o),
-(576,-346,o),
-(564,-346,cs),
-(471,-346,o),
-(404,-280,o),
-(404,-186,cs),
-(404,0,l),
-(358,0,l),
-(358,-186,ls),
-(358,-307,o),
-(444,-393,o),
-(564,-392,cs)
-);
+ref = rturn;
 },
 {
-alignment = -1;
-ref = rturn;
+pos = (294,0);
+ref = _part.bottom_rrthook;
 }
 );
-width = 514;
+width = 538;
 }
 );
 metricLeft = rturn;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/s.glyph b/src/Inter-Roman.glyphspackage/glyphs/s.glyph
index ebd9cbfec..7a0e6f992 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/s.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/s.glyph
@@ -15,6 +15,10 @@ name = cedilla;
 pos = (544,0);
 },
 {
+name = rthook;
+pos = (108,268);
+},
+{
 name = top;
 pos = (552,1304);
 }
@@ -86,6 +90,10 @@ name = cedilla;
 pos = (614,0);
 },
 {
+name = rthook;
+pos = (52,360);
+},
+{
 name = top;
 pos = (602,1304);
 }
@@ -156,6 +164,10 @@ name = cedilla;
 pos = (512,0);
 },
 {
+name = rthook;
+pos = (136,256);
+},
+{
 name = top;
 pos = (518,1304);
 }
@@ -274,6 +286,10 @@ name = cedilla;
 pos = (512,0);
 },
 {
+name = rthook;
+pos = (76,316);
+},
+{
 name = top;
 pos = (487,1262);
 }
@@ -339,6 +355,10 @@ name = cedilla;
 pos = (598,0);
 },
 {
+name = rthook;
+pos = (36,345);
+},
+{
 name = top;
 pos = (572,1262);
 }
@@ -604,6 +624,10 @@ name = cedilla;
 pos = (448,0);
 },
 {
+name = rthook;
+pos = (72,256);
+},
+{
 name = top;
 pos = (454,1304);
 }
diff --git a/src/Inter-Roman.glyphspackage/glyphs/seven.glyph b/src/Inter-Roman.glyphspackage/glyphs/seven.glyph
index e6cb55ca3..22f76558f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/seven.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/seven.glyph
@@ -92,7 +92,7 @@ nodes = (
 );
 }
 );
-width = 1110;
+width = 1112;
 },
 {
 anchors = (
@@ -167,7 +167,7 @@ nodes = (
 );
 }
 );
-width = 982;
+width = 980;
 }
 );
 metricRight = "=|T";
diff --git a/src/Inter-Roman.glyphspackage/glyphs/sevenroman.glyph b/src/Inter-Roman.glyphspackage/glyphs/sevenroman.glyph
index 3894d1d8a..1ca60ea3a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/sevenroman.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/sevenroman.glyph
@@ -13,11 +13,11 @@ pos = (1140,0);
 ref = i;
 },
 {
-pos = (1695,0);
+pos = (1626,0);
 ref = i;
 }
 );
-width = 2181;
+width = 2112;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -30,11 +30,11 @@ pos = (1240,0);
 ref = i;
 },
 {
-pos = (1939,0);
+pos = (1846,0);
 ref = i;
 }
 );
-width = 2545;
+width = 2452;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -47,11 +47,11 @@ pos = (1070,0);
 ref = i;
 },
 {
-pos = (1581,0);
+pos = (1512,0);
 ref = i;
 }
 );
-width = 2023;
+width = 1954;
 },
 {
 layerId = m007;
@@ -64,11 +64,11 @@ pos = (1064,0);
 ref = i;
 },
 {
-pos = (1559,0);
+pos = (1490,0);
 ref = i;
 }
 );
-width = 1985;
+width = 1916;
 },
 {
 layerId = m009;
@@ -81,11 +81,11 @@ pos = (1192,0);
 ref = i;
 },
 {
-pos = (1833,0);
+pos = (1764,0);
 ref = i;
 }
 );
-width = 2405;
+width = 2336;
 },
 {
 layerId = m011;
@@ -94,15 +94,15 @@ shapes = (
 ref = v;
 },
 {
-pos = (1023,0);
+pos = (942,0);
 ref = i;
 },
 {
-pos = (1418,0);
+pos = (1256,0);
 ref = i;
 }
 );
-width = 1732;
+width = 1570;
 }
 );
 unicode = 8566;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/srthook.glyph b/src/Inter-Roman.glyphspackage/glyphs/srthook.glyph
index 94d6fcfc6..434d02aa2 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/srthook.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/srthook.glyph
@@ -7,28 +7,11 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(108,-32,ls),
-(108,-224,o),
-(236,-329,o),
-(402,-328,cs),
-(433,-329,o),
-(474,-326,o),
-(500,-318,c),
-(500,-168,l),
-(486,-175,o),
-(460,-175,o),
-(446,-174,cs),
-(352,-175,o),
-(256,-148,o),
-(256,-32,cs),
-(256,268,l),
-(108,268,l)
-);
+ref = s;
 },
 {
-ref = s;
+pos = (44,0);
+ref = _part.bottom_srthook;
 }
 );
 width = 1070;
@@ -37,28 +20,11 @@ width = 1070;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(52,-78,ls),
-(52,-312,o),
-(196,-454,o),
-(434,-454,cs),
-(492,-454,o),
-(529,-451,o),
-(584,-440,c),
-(584,-198,l),
-(550,-202,o),
-(524,-204,o),
-(488,-204,cs),
-(393,-204,o),
-(343,-152,o),
-(344,-52,cs),
-(344,360,l),
-(52,360,l)
-);
+ref = s;
 },
 {
-ref = s;
+pos = (-12,0);
+ref = _part.bottom_srthook;
 }
 );
 width = 1204;
@@ -67,31 +33,11 @@ width = 1204;
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(136,-40,ls),
-(137,-190,o),
-(193,-255,o),
-(322,-254,cs),
-(341,-255,o),
-(368,-253,o),
-(392,-250,c),
-(392,-204,l),
-(367,-207,o),
-(340,-208,o),
-(322,-208,cs),
-(219,-208,o),
-(183,-162,o),
-(184,-40,cs),
-(184,256,l,{
-name = hr00;
-}),
-(136,256,l)
-);
+ref = s;
 },
 {
-alignment = -1;
-ref = s;
+pos = (72,0);
+ref = _part.bottom_srthook;
 }
 );
 width = 1010;
@@ -100,28 +46,11 @@ width = 1010;
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(76,-32,ls),
-(76,-224,o),
-(204,-329,o),
-(370,-328,cs),
-(401,-329,o),
-(442,-326,o),
-(468,-318,c),
-(468,-168,l),
-(454,-175,o),
-(428,-175,o),
-(414,-174,cs),
-(320,-175,o),
-(224,-148,o),
-(224,-32,cs),
-(224,320,l),
-(76,320,l)
-);
+ref = s;
 },
 {
-ref = s;
+pos = (12,0);
+ref = _part.bottom_srthook;
 }
 );
 width = 972;
@@ -130,28 +59,11 @@ width = 972;
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(36,-78,ls),
-(36,-312,o),
-(180,-454,o),
-(418,-454,cs),
-(476,-454,o),
-(513,-451,o),
-(568,-440,c),
-(568,-198,l),
-(534,-202,o),
-(508,-204,o),
-(472,-204,cs),
-(377,-204,o),
-(327,-152,o),
-(328,-52,cs),
-(328,360,l),
-(36,360,l)
-);
+ref = s;
 },
 {
-ref = s;
+pos = (-28,0);
+ref = _part.bottom_srthook;
 }
 );
 width = 1144;
@@ -160,31 +72,11 @@ width = 1144;
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(72,-40,ls),
-(73,-190,o),
-(129,-255,o),
-(258,-254,cs),
-(277,-255,o),
-(304,-253,o),
-(328,-250,c),
-(328,-204,l),
-(303,-207,o),
-(276,-208,o),
-(258,-208,cs),
-(155,-208,o),
-(119,-162,o),
-(120,-40,cs),
-(120,256,l,{
-name = hr00;
-}),
-(72,256,l)
-);
+ref = s;
 },
 {
-alignment = -1;
-ref = s;
+pos = (8,0);
+ref = _part.bottom_srthook;
 }
 );
 width = 882;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/threeroman.glyph b/src/Inter-Roman.glyphspackage/glyphs/threeroman.glyph
index 378da5d0b..4ca867e5c 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/threeroman.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/threeroman.glyph
@@ -9,15 +9,15 @@ shapes = (
 ref = i;
 },
 {
-pos = (555,0);
+pos = (486,0);
 ref = i;
 },
 {
-pos = (1110,0);
+pos = (972,0);
 ref = i;
 }
 );
-width = 1596;
+width = 1458;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -26,15 +26,15 @@ shapes = (
 ref = i;
 },
 {
-pos = (699,0);
+pos = (606,0);
 ref = i;
 },
 {
-pos = (1398,0);
+pos = (1212,0);
 ref = i;
 }
 );
-width = 2004;
+width = 1818;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -43,15 +43,15 @@ shapes = (
 ref = i;
 },
 {
-pos = (511,0);
+pos = (442,0);
 ref = i;
 },
 {
-pos = (1022,0);
+pos = (884,0);
 ref = i;
 }
 );
-width = 1464;
+width = 1326;
 },
 {
 layerId = m007;
@@ -60,15 +60,15 @@ shapes = (
 ref = i;
 },
 {
-pos = (495,0);
+pos = (426,0);
 ref = i;
 },
 {
-pos = (990,0);
+pos = (852,0);
 ref = i;
 }
 );
-width = 1416;
+width = 1278;
 },
 {
 layerId = m009;
@@ -77,15 +77,15 @@ shapes = (
 ref = i;
 },
 {
-pos = (641,0);
+pos = (572,0);
 ref = i;
 },
 {
-pos = (1282,0);
+pos = (1144,0);
 ref = i;
 }
 );
-width = 1854;
+width = 1716;
 },
 {
 layerId = m011;
@@ -94,15 +94,15 @@ shapes = (
 ref = i;
 },
 {
-pos = (395,0);
+pos = (314,0);
 ref = i;
 },
 {
-pos = (790,0);
+pos = (628,0);
 ref = i;
 }
 );
-width = 1104;
+width = 942;
 }
 );
 unicode = 8562;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tsecyrillic.glyph b/src/Inter-Roman.glyphspackage/glyphs/tsecyrillic.glyph
index 4431c8641..2e7f72d28 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tsecyrillic.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tsecyrillic.glyph
@@ -94,7 +94,7 @@ metricRight = "=idotless-22";
 shapes = (
 {
 angle = 180;
-pos = (1048,1056);
+pos = (1048,1118);
 ref = pecyrillic;
 },
 {
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tugrik.glyph b/src/Inter-Roman.glyphspackage/glyphs/tugrik.glyph
index 634eec3e5..ec37ba1f1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tugrik.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tugrik.glyph
@@ -81,7 +81,7 @@ alignment = -1;
 ref = T;
 }
 );
-width = 1256;
+width = 1262;
 },
 {
 layerId = m007;
@@ -163,7 +163,7 @@ alignment = -1;
 ref = T;
 }
 );
-width = 1128;
+width = 1126;
 }
 );
 metricLeft = T;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/twelveroman.glyph b/src/Inter-Roman.glyphspackage/glyphs/twelveroman.glyph
index f8a65e19c..ee5d8948f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/twelveroman.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/twelveroman.glyph
@@ -13,11 +13,11 @@ pos = (1106,0);
 ref = i;
 },
 {
-pos = (1661,0);
+pos = (1592,0);
 ref = i;
 }
 );
-width = 2147;
+width = 2078;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -30,11 +30,11 @@ pos = (1222,0);
 ref = i;
 },
 {
-pos = (1921,0);
+pos = (1828,0);
 ref = i;
 }
 );
-width = 2527;
+width = 2434;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -47,11 +47,11 @@ pos = (1024,0);
 ref = i;
 },
 {
-pos = (1535,0);
+pos = (1466,0);
 ref = i;
 }
 );
-width = 1977;
+width = 1908;
 },
 {
 layerId = m007;
@@ -64,11 +64,11 @@ pos = (1042,0);
 ref = i;
 },
 {
-pos = (1537,0);
+pos = (1468,0);
 ref = i;
 }
 );
-width = 1963;
+width = 1894;
 },
 {
 layerId = m009;
@@ -81,11 +81,11 @@ pos = (1176,0);
 ref = i;
 },
 {
-pos = (1817,0);
+pos = (1748,0);
 ref = i;
 }
 );
-width = 2389;
+width = 2320;
 },
 {
 layerId = m011;
@@ -98,11 +98,11 @@ pos = (896,0);
 ref = i;
 },
 {
-pos = (1291,0);
+pos = (1210,0);
 ref = i;
 }
 );
-width = 1605;
+width = 1524;
 }
 );
 unicode = 8571;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/tworoman.glyph b/src/Inter-Roman.glyphspackage/glyphs/tworoman.glyph
index d16180c84..136a8db88 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/tworoman.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/tworoman.glyph
@@ -9,11 +9,11 @@ shapes = (
 ref = i;
 },
 {
-pos = (555,0);
+pos = (486,0);
 ref = i;
 }
 );
-width = 1041;
+width = 972;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
@@ -22,11 +22,11 @@ shapes = (
 ref = i;
 },
 {
-pos = (699,0);
+pos = (606,0);
 ref = i;
 }
 );
-width = 1305;
+width = 1212;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
@@ -35,11 +35,11 @@ shapes = (
 ref = i;
 },
 {
-pos = (511,0);
+pos = (442,0);
 ref = i;
 }
 );
-width = 953;
+width = 884;
 },
 {
 layerId = m007;
@@ -48,11 +48,11 @@ shapes = (
 ref = i;
 },
 {
-pos = (495,0);
+pos = (426,0);
 ref = i;
 }
 );
-width = 921;
+width = 852;
 },
 {
 layerId = m009;
@@ -61,11 +61,11 @@ shapes = (
 ref = i;
 },
 {
-pos = (641,0);
+pos = (572,0);
 ref = i;
 }
 );
-width = 1213;
+width = 1144;
 },
 {
 layerId = m011;
@@ -74,11 +74,11 @@ shapes = (
 ref = i;
 },
 {
-pos = (395,0);
+pos = (314,0);
 ref = i;
 }
 );
-width = 709;
+width = 628;
 }
 );
 unicode = 8561;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni023E_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni023E_.glyph
index a53d7e8e1..48ab6e6ed 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni023E_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni023E_.glyph
@@ -56,7 +56,7 @@ alignment = -1;
 ref = T;
 }
 );
-width = 1256;
+width = 1262;
 },
 {
 layerId = m007;
@@ -111,7 +111,7 @@ alignment = -1;
 ref = T;
 }
 );
-width = 1128;
+width = 1126;
 }
 );
 metricLeft = T;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0249.ccmp.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0249.ccmp.glyph
index 64d69a463..1ce13f511 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0249.ccmp.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0249.ccmp.glyph
@@ -62,7 +62,7 @@ shapes = (
 ref = jdotless;
 },
 {
-pos = (-234,-35);
+pos = (-232,-35);
 ref = crossbar;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni0249.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni0249.glyph
index bed995dc9..df3d14d77 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni0249.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni0249.glyph
@@ -62,7 +62,7 @@ shapes = (
 ref = uni0249.ccmp;
 },
 {
-pos = (-31,0);
+pos = (-30,0);
 ref = dotaccent;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni04C_F_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni04C_F_.glyph
index d5408f3ea..8b263595f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni04C_F_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni04C_F_.glyph
@@ -46,7 +46,7 @@ shapes = (
 ref = l;
 }
 );
-width = 574;
+width = 572;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni04F_6.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni04F_6.glyph
index b95e8e725..4abb1cf06 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni04F_6.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni04F_6.glyph
@@ -39,7 +39,7 @@ pos = (224,0);
 ref = cyrillictic.cn;
 }
 );
-width = 1168;
+width = 1172;
 },
 {
 layerId = m007;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni04F_A_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni04F_A_.glyph
index bb441ac42..80a492f7d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni04F_A_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni04F_A_.glyph
@@ -51,7 +51,7 @@ pos = (-64,0);
 ref = cyrillichook;
 }
 );
-width = 1168;
+width = 1172;
 },
 {
 layerId = m007;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_38.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_38.1.glyph
index 34e23c95f..399f94515 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_38.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_38.1.glyph
@@ -37,16 +37,16 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (294,0);
+pos = (296,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (-84,-6);
+pos = (-82,-6);
 ref = koronisaccentleft.cn;
 }
 );
-width = 1008;
+width = 1016;
 },
 {
 layerId = m007;
@@ -83,16 +83,16 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (294,0);
+pos = (292,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (-84,-6);
+pos = (-86,-6);
 ref = koronisaccentleft.cn;
 }
 );
-width = 880;
+width = 876;
 }
 );
 metricLeft = I.1;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_39.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_39.1.glyph
index 60fb37638..1e3a23111 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_39.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_39.1.glyph
@@ -37,16 +37,16 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (234,0);
+pos = (236,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (-50,0);
+pos = (-48,0);
 ref = uni1FFE.tonos;
 }
 );
-width = 948;
+width = 956;
 },
 {
 layerId = m007;
@@ -83,16 +83,16 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (234,0);
+pos = (232,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (-50,0);
+pos = (-52,0);
 ref = uni1FFE.tonos;
 }
 );
-width = 820;
+width = 816;
 }
 );
 metricLeft = I.1;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_3A_.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_3A_.1.glyph
index ef765c76e..d1ec28997 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_3A_.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_3A_.1.glyph
@@ -37,16 +37,16 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (716,0);
+pos = (718,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (-34,0);
+pos = (-32,0);
 ref = uni1FCD.tonos;
 }
 );
-width = 1430;
+width = 1438;
 },
 {
 layerId = m007;
@@ -83,16 +83,16 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (716,0);
+pos = (714,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (-34,0);
+pos = (-36,0);
 ref = uni1FCD.tonos;
 }
 );
-width = 1302;
+width = 1298;
 }
 );
 metricLeft = I.1;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_3B_.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_3B_.1.glyph
index 2e5262871..215e778e7 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_3B_.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_3B_.1.glyph
@@ -37,16 +37,16 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (712,0);
+pos = (714,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (-50,0);
+pos = (-48,0);
 ref = uni1FDD.tonos;
 }
 );
-width = 1426;
+width = 1434;
 },
 {
 layerId = m007;
@@ -83,16 +83,16 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (712,0);
+pos = (710,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (-50,0);
+pos = (-52,0);
 ref = uni1FDD.tonos;
 }
 );
-width = 1298;
+width = 1294;
 }
 );
 metricLeft = I.1;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_3C_.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_3C_.1.glyph
index 233db43e1..589969880 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_3C_.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_3C_.1.glyph
@@ -37,16 +37,16 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (628,0);
+pos = (630,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (18,0);
+pos = (20,0);
 ref = uni1FCE.tonos;
 }
 );
-width = 1342;
+width = 1350;
 },
 {
 layerId = m007;
@@ -83,16 +83,16 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (628,0);
+pos = (626,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (18,0);
+pos = (16,0);
 ref = uni1FCE.tonos;
 }
 );
-width = 1214;
+width = 1210;
 }
 );
 metricLeft = I.1;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_3D_.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_3D_.1.glyph
index b14ae8e9e..c6ca1c0ca 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_3D_.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_3D_.1.glyph
@@ -37,16 +37,16 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (662,0);
+pos = (664,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (22,0);
+pos = (24,0);
 ref = uni1FDE.tonos;
 }
 );
-width = 1376;
+width = 1384;
 },
 {
 layerId = m007;
@@ -83,16 +83,16 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (662,0);
+pos = (660,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (22,0);
+pos = (20,0);
 ref = uni1FDE.tonos;
 }
 );
-width = 1248;
+width = 1244;
 }
 );
 metricLeft = I.1;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_3E_.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_3E_.1.glyph
index 09048f64f..19af10021 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_3E_.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_3E_.1.glyph
@@ -37,16 +37,16 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (526,0);
+pos = (528,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (52,34);
+pos = (54,34);
 ref = uni1FCF.tonos;
 }
 );
-width = 1240;
+width = 1248;
 },
 {
 layerId = m007;
@@ -83,16 +83,16 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (526,0);
+pos = (524,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (52,34);
+pos = (50,34);
 ref = uni1FCF.tonos;
 }
 );
-width = 1112;
+width = 1108;
 }
 );
 metricLeft = I.1;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_3F_.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_3F_.1.glyph
index fd16087ad..a175bedb5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_3F_.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_3F_.1.glyph
@@ -37,16 +37,16 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (516,0);
+pos = (518,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (52,34);
+pos = (54,34);
 ref = uni1FDF.tonos;
 }
 );
-width = 1230;
+width = 1238;
 },
 {
 layerId = m007;
@@ -83,16 +83,16 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (516,0);
+pos = (514,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (52,34);
+pos = (50,34);
 ref = uni1FDF.tonos;
 }
 );
-width = 1102;
+width = 1098;
 }
 );
 metricLeft = I.1;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_8.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_8.1.glyph
index cfdcdf234..7410c31c8 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_8.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_8.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-58,372);
+pos = (-56,372);
 ref = breve;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (-122,414);
+pos = (-124,414);
 ref = breve;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.1.glyph
index 3e58a671c..e0f9f91c1 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_9.1.glyph
@@ -35,7 +35,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (58,372);
+pos = (60,372);
 ref = macron;
 }
 );
@@ -74,7 +74,7 @@ shapes = (
 ref = I.1;
 },
 {
-pos = (58,372);
+pos = (56,372);
 ref = macron;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_A_.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_A_.1.glyph
index 124305ea4..78d16c25b 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_A_.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_A_.1.glyph
@@ -37,16 +37,16 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (300,0);
+pos = (302,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (46,0);
+pos = (48,0);
 ref = uni1FEF.tonos;
 }
 );
-width = 1014;
+width = 1022;
 },
 {
 layerId = m007;
@@ -83,16 +83,16 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (300,0);
+pos = (298,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (46,0);
+pos = (44,0);
 ref = uni1FEF.tonos;
 }
 );
-width = 886;
+width = 882;
 }
 );
 metricLeft = I.1;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_B_.1.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_B_.1.glyph
index 06de27f25..b77be9ac5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_B_.1.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni1F_D_B_.1.glyph
@@ -37,16 +37,16 @@ layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
 alignment = -1;
-pos = (244,0);
+pos = (246,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (-90,0);
+pos = (-88,0);
 ref = uni1FFD.tonos;
 }
 );
-width = 958;
+width = 966;
 },
 {
 layerId = m007;
@@ -83,16 +83,16 @@ layerId = m011;
 shapes = (
 {
 alignment = -1;
-pos = (244,0);
+pos = (242,0);
 ref = I.1;
 },
 {
 alignment = -1;
-pos = (-90,0);
+pos = (-92,0);
 ref = uni1FFD.tonos;
 }
 );
-width = 830;
+width = 826;
 }
 );
 metricLeft = I.1;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/uni217C_.glyph b/src/Inter-Roman.glyphspackage/glyphs/uni217C_.glyph
index b7d066fd6..c869bcba5 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/uni217C_.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/uni217C_.glyph
@@ -45,7 +45,7 @@ shapes = (
 ref = l;
 }
 );
-width = 574;
+width = 572;
 },
 {
 layerId = m011;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/vturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/vturn.glyph
index b6b954d40..ce9be7e7d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/vturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/vturn.glyph
@@ -121,7 +121,7 @@ layerId = m011;
 shapes = (
 {
 angle = 180;
-pos = (942,1056);
+pos = (942,1118);
 ref = v;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/wturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/wturn.glyph
index e67f72368..45373f6a9 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/wturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/wturn.glyph
@@ -133,7 +133,7 @@ layerId = m011;
 shapes = (
 {
 angle = 180;
-pos = (1490,1056);
+pos = (1490,1118);
 ref = w;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/yturn.glyph b/src/Inter-Roman.glyphspackage/glyphs/yturn.glyph
index 52b1a0f9f..de465fe4a 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/yturn.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/yturn.glyph
@@ -123,7 +123,7 @@ layerId = m011;
 shapes = (
 {
 angle = 180;
-pos = (942,1056);
+pos = (942,1118);
 ref = y;
 }
 );
diff --git a/src/Inter-Roman.glyphspackage/glyphs/z.glyph b/src/Inter-Roman.glyphspackage/glyphs/z.glyph
index 49eb3c451..53d85c5af 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/z.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/z.glyph
@@ -11,6 +11,10 @@ name = bottom;
 pos = (546,0);
 },
 {
+name = bottomr;
+pos = (1000,0);
+},
+{
 name = cross;
 pos = (552,558);
 },
@@ -58,6 +62,10 @@ name = bottom;
 pos = (610,0);
 },
 {
+name = bottomr;
+pos = (1094,0);
+},
+{
 name = cross;
 pos = (602,558);
 },
@@ -113,6 +121,10 @@ name = bottom;
 pos = (504,0);
 },
 {
+name = bottomr;
+pos = (914,0);
+},
+{
 name = cross;
 pos = (520,558);
 },
@@ -160,6 +172,10 @@ name = bottom;
 pos = (489,0);
 },
 {
+name = bottomr;
+pos = (886,0);
+},
+{
 name = cross;
 pos = (512,558);
 },
@@ -168,27 +184,6 @@ name = top;
 pos = (488,1262);
 }
 );
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(972,0,l),
-(972,160,l),
-(336,160,l),
-(336,172,l),
-(952,980,l),
-(952,1118,l),
-(118,1118,l),
-(118,958,l),
-(732,958,l),
-(732,946,l),
-(98,130,l),
-(98,0,l)
-);
-}
-);
-};
 guides = (
 {
 angle = 90;
@@ -236,6 +231,10 @@ name = bottom;
 pos = (582,0);
 },
 {
+name = bottomr;
+pos = (1066,0);
+},
+{
 name = cross;
 pos = (582,528);
 },
@@ -244,27 +243,6 @@ name = top;
 pos = (582,1262);
 }
 );
-background = {
-shapes = (
-{
-closed = 1;
-nodes = (
-(1094,0,l),
-(1094,306,l),
-(632,306,l),
-(632,312,l),
-(1076,872,l),
-(1076,1118,l),
-(130,1118,l),
-(130,812,l),
-(602,812,l),
-(602,806,l),
-(114,222,l),
-(114,0,l)
-);
-}
-);
-};
 guides = (
 {
 angle = 90;
@@ -304,6 +282,10 @@ name = bottom;
 pos = (440,0);
 },
 {
+name = bottomr;
+pos = (850,0);
+},
+{
 name = cross;
 pos = (456,558);
 },
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zeta.glyph b/src/Inter-Roman.glyphspackage/glyphs/zeta.glyph
index 4259ed58f..97176396d 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zeta.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zeta.glyph
@@ -157,7 +157,7 @@ nodes = (
 );
 }
 );
-width = 1014;
+width = 1016;
 },
 {
 layerId = m007;
@@ -315,7 +315,7 @@ nodes = (
 );
 }
 );
-width = 886;
+width = 884;
 }
 );
 metricLeft = seven;
diff --git a/src/Inter-Roman.glyphspackage/glyphs/zrthook.glyph b/src/Inter-Roman.glyphspackage/glyphs/zrthook.glyph
index 59b4b3b4c..9a6c1fd4f 100644
--- a/src/Inter-Roman.glyphspackage/glyphs/zrthook.glyph
+++ b/src/Inter-Roman.glyphspackage/glyphs/zrthook.glyph
@@ -7,31 +7,14 @@ layers = (
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-closed = 1;
-nodes = (
-(830,-140,ls),
-(829,-332,o),
-(957,-436,o),
-(1122,-436,cs),
-(1155,-436,o),
-(1196,-433,o),
-(1222,-424,c),
-(1222,-276,l),
-(1207,-282,o),
-(1181,-282,o),
-(1166,-282,cs),
-(1073,-282,o),
-(1001,-256,o),
-(1000,-140,cs),
-(1000,0,l),
-(830,0,l)
-);
+ref = z;
 },
 {
-ref = z;
+pos = (702,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1222;
+width = 1108;
 },
 {
 guides = (
@@ -44,94 +27,40 @@ pos = (748,656);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-closed = 1;
-nodes = (
-(846,-56,ls),
-(847,-297,o),
-(980,-436,o),
-(1218,-436,cs),
-(1271,-436,o),
-(1309,-433,o),
-(1364,-422,c),
-(1364,-178,l),
-(1329,-180,o),
-(1309,-183,o),
-(1272,-184,cs),
-(1199,-183,o),
-(1094,-157,o),
-(1094,-56,cs),
-(1094,0,l),
-(846,0,l)
-);
+ref = z;
 },
 {
-ref = z;
+pos = (564,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1364;
+width = 1214;
 },
 {
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-closed = 1;
-nodes = (
-(866,-200,ls),
-(867,-351,o),
-(924,-416,o),
-(1052,-416,cs),
-(1072,-416,o),
-(1098,-415,o),
-(1122,-412,c),
-(1122,-366,l),
-(1097,-368,o),
-(1071,-369,o),
-(1052,-370,cs),
-(949,-369,o),
-(913,-324,o),
-(914,-200,cs),
-(914,14,l,{
-name = hr00;
-}),
-(866,14,l)
-);
+ref = z;
 },
 {
-alignment = -1;
-ref = z;
+pos = (804,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1106;
+width = 1042;
 },
 {
 layerId = m007;
 shapes = (
 {
-closed = 1;
-nodes = (
-(736,-140,ls),
-(736,-332,o),
-(843,-418,o),
-(1008,-418,cs),
-(1041,-418,o),
-(1078,-418,o),
-(1108,-418,c),
-(1108,-272,l),
-(1093,-272,o),
-(1067,-272,o),
-(1052,-272,cs),
-(959,-272,o),
-(886,-256,o),
-(886,-140,cs),
-(886,0,l),
-(736,0,l)
-);
+ref = z;
 },
 {
-ref = z;
+pos = (588,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1076;
+width = 976;
 },
 {
 guides = (
@@ -144,64 +73,27 @@ pos = (-2702,656);
 layerId = m009;
 shapes = (
 {
-closed = 1;
-nodes = (
-(830,-56,ls),
-(831,-297,o),
-(964,-436,o),
-(1202,-436,cs),
-(1255,-436,o),
-(1293,-433,o),
-(1348,-422,c),
-(1348,-178,l),
-(1313,-180,o),
-(1293,-183,o),
-(1256,-184,cs),
-(1183,-183,o),
-(1078,-157,o),
-(1078,-56,cs),
-(1078,0,l),
-(830,0,l)
-);
+ref = z;
 },
 {
-ref = z;
+pos = (538,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 1332;
+width = 1164;
 },
 {
 layerId = m011;
 shapes = (
 {
-closed = 1;
-nodes = (
-(802,-200,ls),
-(803,-351,o),
-(860,-416,o),
-(988,-416,cs),
-(1008,-416,o),
-(1034,-415,o),
-(1058,-412,c),
-(1058,-366,l),
-(1033,-368,o),
-(1007,-369,o),
-(988,-370,cs),
-(885,-369,o),
-(849,-324,o),
-(850,-200,cs),
-(850,14,l,{
-name = hr00;
-}),
-(802,14,l)
-);
+ref = z;
 },
 {
-alignment = -1;
-ref = z;
+pos = (740,0);
+ref = _part.bottom_rthook;
 }
 );
-width = 978;
+width = 914;
 }
 );
 metricLeft = z;
diff --git a/src/Inter-Roman.glyphspackage/order.plist b/src/Inter-Roman.glyphspackage/order.plist
index e1d7da2b7..c1ef5cf3a 100644
--- a/src/Inter-Roman.glyphspackage/order.plist
+++ b/src/Inter-Roman.glyphspackage/order.plist
@@ -381,6 +381,7 @@ Phook,
 Rho,
 uni1FEC,
 Q,
+Q_rthook,
 R,
 Racute,
 Rcommaaccent,
@@ -836,7 +837,6 @@ ercyrillic,
 q,
 qhook,
 qrthook,
-Q_rthook,
 r,
 rrthook,
 uni024D,
@@ -2551,10 +2551,14 @@ cyrillictail.cn,
 cyrillictic.cn,
 koronisaccentleft.cn,
 debug1,
+_part.bottom_rrthook,
+_part.bottom_rthook,
+_part.bottom_srthook,
 _part.brackquill_left,
 _part.brackquill_right,
 _part.divfrac,
 _part.otophorn,
+_part.q_big,
 _part.rtopbar,
 _part.rtophorn,
 _part.top_left_hook,