WIP

author: Rasmus Andersson <rasmus@notion.se> 2022-07-08 18:56:40 +0300
committer: Rasmus Andersson <rasmus@notion.se> 2022-07-08 18:56:40 +0300
commit: 7ec83d25f69e6570fecba4edb903c0fd18d6c60c (patch)
tree: 364a9cfb64755ac7c77d62f9391099415645c547 /src/Inter.glyphspackage
parent: 59728bcde13b300f0db70d8cd6d14d18c9fa6420 (diff)
download: inter-7ec83d25f69e6570fecba4edb903c0fd18d6c60c.tar.xz
123 files changed, 6788 insertions, 7852 deletions
diff --git a/src/Inter.glyphspackage/glyphs/A_.circled.glyph b/src/Inter.glyphspackage/glyphs/A_.circled.glyph
index 81a253231..30846c7fa 100644
--- a/src/Inter.glyphspackage/glyphs/A_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/A_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
-ref = A;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+pos = (2846,0);
+ref = A;
 }
 );
-width = 2846;
+width = 4108;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
-ref = A;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+pos = (2846,0);
+ref = A;
 }
 );
-width = 2846;
+width = 4108;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (730,0);
-ref = A;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+pos = (2846,0);
+ref = A;
 }
 );
-width = 2846;
+width = 4230;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (722,0);
-ref = A;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+pos = (2846,0);
+ref = A;
 }
 );
-width = 2846;
+width = 4232;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
-ref = A;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+pos = (2846,0);
+ref = A;
 }
 );
-width = 2846;
+width = 4474;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (600,8);
-ref = A;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+pos = (2847,0);
+ref = A;
 }
 );
-width = 2846;
+width = 4477;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (730,0);
-ref = A;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+pos = (2846,0);
+ref = A;
 }
 );
-width = 2782;
+width = 4184;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (722,0);
-ref = A;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+pos = (2848,0);
+ref = A;
 }
 );
-width = 2782;
+width = 4186;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
-ref = A;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+pos = (2846,0);
+ref = A;
 }
 );
-width = 2814;
+width = 4382;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (600,8);
-ref = A;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+pos = (2847,0);
+ref = A;
 }
 );
-width = 2814;
+width = 4443;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
-ref = A;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+pos = (2846,0);
+ref = A;
 }
 );
-width = 2718;
+width = 3980;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
-ref = A;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+pos = (2847,0);
+ref = A;
 }
 );
-width = 2718;
+width = 3969;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/A_.squared.glyph b/src/Inter.glyphspackage/glyphs/A_.squared.glyph
index cba00c0a4..4397cb7a5 100644
--- a/src/Inter.glyphspackage/glyphs/A_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/A_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = A;
 },
 {
-alignment = -1;
-pos = (830,4);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1262,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4090;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = A;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1262,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4090;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (730,0);
 ref = A;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1384,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4212;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (728,0);
 ref = A;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1386,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4214;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
 ref = A;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1628,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4456;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
 ref = A;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1630,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4458;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (730,0);
 ref = A;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1338,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4166;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (728,0);
 ref = A;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1338,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4166;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
 ref = A;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1536,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4364;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
 ref = A;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1596,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4424;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = A;
 },
 {
-alignment = -1;
-pos = (830,4);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1134,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3962;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = A;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1122,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3950;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/B_.circled.glyph b/src/Inter.glyphspackage/glyphs/B_.circled.glyph
index 17c6a5a2e..7538b3a2d 100644
--- a/src/Inter.glyphspackage/glyphs/B_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/B_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (786,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1312,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4158;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1312,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4158;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (780,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1332,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4178;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (780,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1332,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4178;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (776,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1368,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4214;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (788,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1368,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4215;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (780,0);
-ref = B;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+pos = (791,0);
+ref = B;
 }
 );
-width = 2782;
+width = 2846;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (780,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1273,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4121;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (776,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1328,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4174;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (788,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1343,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4190;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (786,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1184,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4030;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1184,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4031;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/B_.glyph b/src/Inter.glyphspackage/glyphs/B_.glyph
index e15992888..16cc615a7 100644
--- a/src/Inter.glyphspackage/glyphs/B_.glyph
+++ b/src/Inter.glyphspackage/glyphs/B_.glyph
@@ -438,6 +438,10 @@ width = 1312;
 {
 anchors = (
 {
+name = _center;
+pos = (632,745);
+},
+{
 name = bottom;
 pos = (614,0);
 },
diff --git a/src/Inter.glyphspackage/glyphs/B_.squared.glyph b/src/Inter.glyphspackage/glyphs/B_.squared.glyph
index caeb0a842..95e0e6f0c 100644
--- a/src/Inter.glyphspackage/glyphs/B_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/B_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (794,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1312,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4140;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (780,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1312,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4140;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (750,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1332,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4160;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (750,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1332,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4160;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (744,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1368,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4196;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (744,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1368,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4196;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (750,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1268,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4096;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (750,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1273,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4101;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (744,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1328,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4156;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (744,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1343,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4171;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (794,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1184,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4012;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (780,0);
 ref = B;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1184,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4012;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/C_.circled.glyph b/src/Inter.glyphspackage/glyphs/C_.circled.glyph
index 6177d1093..4cccebe06 100644
--- a/src/Inter.glyphspackage/glyphs/C_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/C_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (680,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1480,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4326;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1481,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4327;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (672,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1490,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4336;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (656,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1491,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4337;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (634,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1574,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4420;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (622,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1573,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4420;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (672,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1479,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4325;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (656,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1432,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4280;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (634,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1508,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4354;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (622,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1546,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4393;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (680,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1352,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4198;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1353,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4200;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/C_.squared.glyph b/src/Inter.glyphspackage/glyphs/C_.squared.glyph
index 41a4b64fe..9d30a79c9 100644
--- a/src/Inter.glyphspackage/glyphs/C_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/C_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (680,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1480,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4308;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1481,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4309;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (672,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1490,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4318;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (656,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1491,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4319;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (634,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1574,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4402;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (622,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1573,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4401;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (672,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1479,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4307;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (656,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1432,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4260;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (634,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1508,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4336;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (622,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1546,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4374;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (680,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1352,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4180;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = C;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1353,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4181;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/D_.circled.glyph b/src/Inter.glyphspackage/glyphs/D_.circled.glyph
index 8496908c5..6ef00142d 100644
--- a/src/Inter.glyphspackage/glyphs/D_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/D_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (722,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1462,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4308;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1462,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4308;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1472,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4318;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1471,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4317;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (802,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1500,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4346;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (784,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1501,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4348;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1412,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4258;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1407,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4255;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (802,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1456,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4302;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (784,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1471,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4318;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (722,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1334,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4180;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1334,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4181;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/D_.squared.glyph b/src/Inter.glyphspackage/glyphs/D_.squared.glyph
index dc86ec60c..5895dffce 100644
--- a/src/Inter.glyphspackage/glyphs/D_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/D_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (706,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1462,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4290;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (702,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1462,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4290;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (702,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1472,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4300;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (698,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1471,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4299;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (684,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1500,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4328;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (712,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1501,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4329;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (702,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1412,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4240;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (698,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1407,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4235;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (684,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1456,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4284;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (712,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1471,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4299;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (706,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1334,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4162;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (702,0);
 ref = D;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1334,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4162;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/E_.circled.glyph b/src/Inter.glyphspackage/glyphs/E_.circled.glyph
index 22acaf0c1..b323d3751 100644
--- a/src/Inter.glyphspackage/glyphs/E_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/E_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (782,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1196,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4042;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1196,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4042;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (786,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1224,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4070;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1224,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4070;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (790,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1274,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4120;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (790,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1274,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4121;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (786,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1160,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4006;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1165,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4013;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (790,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1260,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4106;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (790,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1249,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4096;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (782,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1068,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3914;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1068,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3915;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/E_.squared.glyph b/src/Inter.glyphspackage/glyphs/E_.squared.glyph
index 1defd9838..9092a1422 100644
--- a/src/Inter.glyphspackage/glyphs/E_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/E_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (782,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1196,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4024;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1196,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4024;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (786,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1224,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4052;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1224,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4052;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (790,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1274,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4102;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (790,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1274,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4102;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (786,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1160,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3988;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1165,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3993;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (790,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1260,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4088;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (790,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1249,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4077;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (782,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1068,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3896;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = E;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1068,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3896;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/F_.circled.glyph b/src/Inter.glyphspackage/glyphs/F_.circled.glyph
index 9b215193b..5f3be493f 100644
--- a/src/Inter.glyphspackage/glyphs/F_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/F_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (790,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1198,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4044;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (790,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1198,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4044;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (796,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1202,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4048;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (796,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1202,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4048;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (802,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1196,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4042;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (802,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1196,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4043;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (796,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1138,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3984;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (796,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1143,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3991;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (802,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1192,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4038;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (802,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1171,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4018;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (790,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1070,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3916;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (790,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1070,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3917;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/F_.squared.glyph b/src/Inter.glyphspackage/glyphs/F_.squared.glyph
index 6fe86ecd4..f4e59c4f4 100644
--- a/src/Inter.glyphspackage/glyphs/F_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/F_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (818,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1198,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4026;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (818,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1198,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4026;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (810,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1202,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4030;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (810,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1202,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4030;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (818,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1196,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4024;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (812,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1196,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4024;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (810,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1138,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3966;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (810,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1143,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3971;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (818,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1192,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4020;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (812,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1171,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 3999;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (818,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1070,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3898;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (818,0);
 ref = F;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1070,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3898;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/G_.circled.glyph b/src/Inter.glyphspackage/glyphs/G_.circled.glyph
index 7053c43ae..70e496217 100644
--- a/src/Inter.glyphspackage/glyphs/G_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/G_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (674,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1512,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4358;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1513,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4359;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1522,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4368;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (654,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1521,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4367;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (632,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1582,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4428;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (626,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1582,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4429;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1496,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4342;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (654,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1462,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4310;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (632,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1516,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4362;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (626,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1555,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4402;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (674,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1384,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4230;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1385,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4232;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/G_.squared.glyph b/src/Inter.glyphspackage/glyphs/G_.squared.glyph
index ed91ee700..9ec929eac 100644
--- a/src/Inter.glyphspackage/glyphs/G_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/G_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (674,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1512,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4340;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1513,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4341;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1522,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4350;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (654,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1521,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4349;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (632,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1582,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4410;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (626,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1582,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4410;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1496,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4324;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (654,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1462,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4290;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (632,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1516,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4344;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (626,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1555,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4383;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (674,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1384,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4212;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = G;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1385,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4213;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/H_.circled.glyph b/src/Inter.glyphspackage/glyphs/H_.circled.glyph
index e6b36eeca..33d3d5eb6 100644
--- a/src/Inter.glyphspackage/glyphs/H_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/H_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1506,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4352;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1506,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4352;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1514,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4360;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1516,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4362;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1536,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4382;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (654,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1536,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4383;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1450,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4296;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1452,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4300;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1488,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4334;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (654,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1506,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4353;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1378,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4224;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1378,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4225;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/H_.squared.glyph b/src/Inter.glyphspackage/glyphs/H_.squared.glyph
index 87a21cc22..21b75a304 100644
--- a/src/Inter.glyphspackage/glyphs/H_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/H_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1506,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4334;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1506,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4334;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1514,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4342;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1516,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4344;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (654,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1536,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4364;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (654,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1536,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4364;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1450,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4278;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1452,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4280;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (654,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1488,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4316;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (654,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1506,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4334;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1378,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4206;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = H;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1378,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4206;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/I_.circled.glyph b/src/Inter.glyphspackage/glyphs/I_.circled.glyph
index 0c5a4760a..0df0c5755 100644
--- a/src/Inter.glyphspackage/glyphs/I_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/I_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (1166,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (512,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3358;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (1166,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (511,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3357;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (1152,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (540,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3386;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (1152,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (541,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3387;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (1124,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (596,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3442;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (1124,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (597,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3444;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (1152,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (476,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3322;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (1152,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (476,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3324;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (1124,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (576,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 3422;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (1124,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (566,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 3413;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (1166,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (384,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3230;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (1166,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (384,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3231;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/I_.squared.glyph b/src/Inter.glyphspackage/glyphs/I_.squared.glyph
index 6522a57c1..40d0c424f 100644
--- a/src/Inter.glyphspackage/glyphs/I_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/I_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (1166,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (512,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3340;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (1166,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (511,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3339;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (1152,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (540,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3368;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (1152,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (541,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3369;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (1124,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (596,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3424;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (1124,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (597,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3425;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (1152,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (476,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3304;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (1152,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (476,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3304;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (1124,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (576,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 3404;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (1124,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (566,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 3394;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (1166,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (384,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3212;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (1166,0);
 ref = I;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (384,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3212;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/J_.circled.glyph b/src/Inter.glyphspackage/glyphs/J_.circled.glyph
index 5c957db0b..c3becd491 100644
--- a/src/Inter.glyphspackage/glyphs/J_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/J_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (894,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1064,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3910;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (872,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1063,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3909;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (856,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1110,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3956;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (830,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1110,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3956;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (828,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1204,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4050;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1204,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4051;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (856,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1046,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3892;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (830,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1046,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3894;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (828,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1170,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4016;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1190,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4037;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (894,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (936,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3782;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (872,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (936,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3783;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/J_.squared.glyph b/src/Inter.glyphspackage/glyphs/J_.squared.glyph
index c74f545e1..32c7730fa 100644
--- a/src/Inter.glyphspackage/glyphs/J_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/J_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (908,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1064,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3892;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (914,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1063,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3891;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (886,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1110,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3938;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (888,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1110,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3938;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (828,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1204,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4032;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (822,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1204,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4032;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (886,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1046,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3874;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (888,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1046,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3874;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (828,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1170,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 3998;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (822,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1190,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4018;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (908,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (936,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3764;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (914,0);
 ref = J;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (936,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3764;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/K_.circled.glyph b/src/Inter.glyphspackage/glyphs/K_.circled.glyph
index 0ead608cf..c8e6ec8a6 100644
--- a/src/Inter.glyphspackage/glyphs/K_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/K_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (738,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1262,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4108;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (738,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1262,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4108;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1336,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4182;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1336,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4182;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1464,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4310;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1464,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4311;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1272,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4118;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1277,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4125;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1478,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4324;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1439,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4286;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (738,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1134,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3980;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (738,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1134,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3981;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/K_.squared.glyph b/src/Inter.glyphspackage/glyphs/K_.squared.glyph
index eb7af5d3a..29fea1dbe 100644
--- a/src/Inter.glyphspackage/glyphs/K_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/K_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (738,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1262,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4090;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (738,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1262,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4090;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (720,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1336,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4164;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (720,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1336,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4164;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1464,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4292;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1464,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4292;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (720,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1272,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4100;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (720,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1277,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4105;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1478,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4306;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (670,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1439,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4267;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (738,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1134,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3962;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (738,0);
 ref = K;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1134,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3962;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/L_.circled.glyph b/src/Inter.glyphspackage/glyphs/L_.circled.glyph
index 374255c5f..c88b7acde 100644
--- a/src/Inter.glyphspackage/glyphs/L_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/L_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1152,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3998;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (928,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1152,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3998;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (850,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1152,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3998;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (916,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1152,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3998;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (852,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1170,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4016;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (890,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1170,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4017;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (850,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1088,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3934;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (916,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1093,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3941;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (852,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1138,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 3984;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (890,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1145,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 3992;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1024,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3870;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (928,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1024,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3871;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/L_.squared.glyph b/src/Inter.glyphspackage/glyphs/L_.squared.glyph
index 4a89ebea5..31a87691b 100644
--- a/src/Inter.glyphspackage/glyphs/L_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/L_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1152,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3980;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (826,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1152,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3980;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (834,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1152,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3980;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (830,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1152,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3980;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (838,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1170,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3998;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (840,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1170,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3998;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (834,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1088,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3916;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (830,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1093,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3921;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (838,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1138,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 3966;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (840,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1145,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 3973;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1024,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3852;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (826,0);
 ref = L;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1024,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3852;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/M_.circled.glyph b/src/Inter.glyphspackage/glyphs/M_.circled.glyph
index c14b08cbf..bf7638a9d 100644
--- a/src/Inter.glyphspackage/glyphs/M_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/M_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (538,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1768,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4614;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (538,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1767,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4613;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (512,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1829,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4675;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (512,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1821,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4667;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (468,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1908,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4754;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (468,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1909,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4756;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (512,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1748,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4594;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (512,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1756,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4604;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (468,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1884,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4730;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (468,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1878,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4725;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (538,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1640,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4486;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (538,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1640,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4487;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/M_.squared.glyph b/src/Inter.glyphspackage/glyphs/M_.squared.glyph
index 8743e8a33..094b609ba 100644
--- a/src/Inter.glyphspackage/glyphs/M_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/M_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (538,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1768,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4596;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (538,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1767,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4595;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (512,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1829,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4657;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (512,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1821,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4649;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (468,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1908,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4736;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (468,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1909,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4737;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (512,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1748,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4576;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (512,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1756,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4584;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (468,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1884,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4712;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (468,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1878,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4706;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (538,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1640,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4468;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (538,0);
 ref = M;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1640,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4468;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/N_.circled.glyph b/src/Inter.glyphspackage/glyphs/N_.circled.glyph
index 64d1a20fb..148db782f 100644
--- a/src/Inter.glyphspackage/glyphs/N_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/N_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (632,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1582,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4428;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (632,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1581,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4427;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (652,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1544,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4390;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (652,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1542,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4388;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (682,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1480,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4326;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (682,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1481,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4328;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (652,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1464,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4310;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (652,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1478,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4326;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (682,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1508,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4354;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (682,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1450,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4297;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (632,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1454,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4300;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (632,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1454,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4301;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/N_.squared.glyph b/src/Inter.glyphspackage/glyphs/N_.squared.glyph
index 3dfbb48e4..120e4346c 100644
--- a/src/Inter.glyphspackage/glyphs/N_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/N_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (632,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1582,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4410;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (632,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1581,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4409;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (652,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1544,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4372;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (652,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1542,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4370;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (682,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1480,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4308;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (682,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1481,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4309;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (652,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1464,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4292;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (652,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1478,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4306;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (682,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1508,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4336;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (682,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1450,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4278;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (632,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1454,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4282;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (632,0);
 ref = N;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1454,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4282;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/O_.circled.glyph b/src/Inter.glyphspackage/glyphs/O_.circled.glyph
index 00c3ec4e2..ae9620819 100644
--- a/src/Inter.glyphspackage/glyphs/O_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_.circled.glyph
@@ -5,14 +5,12 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (658,0);
-ref = O;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+pos = (657,0);
+ref = O;
 }
 );
 width = 2846;
@@ -21,14 +19,12 @@ width = 2846;
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (658,0);
-ref = O;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+pos = (658,0);
+ref = O;
 }
 );
 width = 2846;
@@ -37,14 +33,12 @@ width = 2846;
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
-ref = O;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+pos = (642,0);
+ref = O;
 }
 );
 width = 2846;
@@ -53,14 +47,12 @@ width = 2846;
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
-ref = O;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+pos = (643,0);
+ref = O;
 }
 );
 width = 2846;
@@ -69,14 +61,12 @@ width = 2846;
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
-ref = O;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+pos = (607,0);
+ref = O;
 }
 );
 width = 2846;
@@ -85,113 +75,99 @@ width = 2846;
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
-ref = O;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+pos = (609,0);
+ref = O;
 }
 );
-width = 2846;
+width = 2847;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
-ref = O;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+pos = (656,0);
+ref = O;
 }
 );
-width = 2782;
+width = 2846;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
-ref = O;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+pos = (660,0);
+ref = O;
 }
 );
-width = 2782;
+width = 2848;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
-ref = O;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+pos = (659,0);
+ref = O;
 }
 );
-width = 2814;
+width = 2846;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
-ref = O;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+pos = (625,0);
+ref = O;
 }
 );
-width = 2814;
+width = 2847;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (658,0);
-ref = O;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+pos = (722,0);
+ref = O;
 }
 );
-width = 2718;
+width = 2846;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (658,0);
-ref = O;
+alignment = 1;
+ref = largeCircle;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+pos = (727,0);
+ref = O;
 }
 );
-width = 2718;
+width = 2847;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/O_.glyph b/src/Inter.glyphspackage/glyphs/O_.glyph
index 7204eaa24..11cc556cd 100644
--- a/src/Inter.glyphspackage/glyphs/O_.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_.glyph
@@ -7,6 +7,10 @@ layers = (
 {
 anchors = (
 {
+name = _center;
+pos = (766,745);
+},
+{
 name = bottom;
 pos = (766,0);
 },
@@ -69,6 +73,10 @@ width = 1530;
 {
 anchors = (
 {
+name = _center;
+pos = (701,745);
+},
+{
 name = bottom;
 pos = (702,0);
 },
@@ -131,6 +139,10 @@ width = 1402;
 {
 anchors = (
 {
+name = _center;
+pos = (781,745);
+},
+{
 name = bottom;
 pos = (781,0);
 },
@@ -199,6 +211,10 @@ width = 1560;
 {
 anchors = (
 {
+name = _center;
+pos = (767,745);
+},
+{
 name = bottom;
 pos = (767,0);
 },
@@ -399,6 +415,10 @@ width = 1560;
 {
 anchors = (
 {
+name = _center;
+pos = (814,745);
+},
+{
 name = bottom;
 pos = (814,0);
 },
@@ -468,6 +488,10 @@ width = 1628;
 {
 anchors = (
 {
+name = _center;
+pos = (764,745);
+},
+{
 name = bottom;
 pos = (764,0);
 },
@@ -615,6 +639,10 @@ width = 1630;
 {
 anchors = (
 {
+name = _center;
+pos = (796,745);
+},
+{
 name = bottom;
 pos = (673,0);
 },
@@ -677,6 +705,10 @@ width = 1530;
 {
 anchors = (
 {
+name = _center;
+pos = (732,745);
+},
+{
 name = bottom;
 pos = (609,0);
 },
@@ -739,6 +771,10 @@ width = 1402;
 {
 anchors = (
 {
+name = _center;
+pos = (811,745);
+},
+{
 name = bottom;
 pos = (688,0);
 },
@@ -879,6 +915,10 @@ width = 1560;
 {
 anchors = (
 {
+name = _center;
+pos = (800,745);
+},
+{
 name = bottom;
 pos = (677,0);
 },
@@ -1019,6 +1059,10 @@ width = 1560;
 {
 anchors = (
 {
+name = _center;
+pos = (845,745);
+},
+{
 name = bottom;
 pos = (721,0);
 },
@@ -1203,6 +1247,10 @@ width = 1536;
 {
 anchors = (
 {
+name = _center;
+pos = (834,745);
+},
+{
 name = bottom;
 pos = (711,0);
 },
diff --git a/src/Inter.glyphspackage/glyphs/O_.squared.glyph b/src/Inter.glyphspackage/glyphs/O_.squared.glyph
index 2f8c24be4..829d47396 100644
--- a/src/Inter.glyphspackage/glyphs/O_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/O_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (658,0);
-ref = O;
+alignment = 1;
+ref = whiteLargeSquare;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+pos = (648,0);
+ref = O;
 }
 );
-width = 2846;
+width = 2828;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (658,0);
-ref = O;
+alignment = 1;
+ref = whiteLargeSquare;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+pos = (649,0);
+ref = O;
 }
 );
-width = 2846;
+width = 2828;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
-ref = O;
+alignment = 1;
+ref = whiteLargeSquare;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+pos = (633,0);
+ref = O;
 }
 );
-width = 2846;
+width = 2828;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
-ref = O;
+alignment = 1;
+ref = whiteLargeSquare;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+pos = (634,0);
+ref = O;
 }
 );
-width = 2846;
+width = 2828;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
-ref = O;
+alignment = 1;
+ref = whiteLargeSquare;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+pos = (600,0);
+ref = O;
 }
 );
-width = 2846;
+width = 2828;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
-ref = O;
+alignment = 1;
+ref = whiteLargeSquare;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+pos = (600,0);
+ref = O;
 }
 );
-width = 2846;
+width = 2828;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
-ref = O;
+alignment = 1;
+ref = whiteLargeSquare;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+pos = (647,0);
+ref = O;
 }
 );
-width = 2782;
+width = 2828;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
-ref = O;
+alignment = 1;
+ref = whiteLargeSquare;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+pos = (650,0);
+ref = O;
 }
 );
-width = 2782;
+width = 2828;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
-ref = O;
+alignment = 1;
+ref = whiteLargeSquare;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+pos = (650,0);
+ref = O;
 }
 );
-width = 2814;
+width = 2828;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
-ref = O;
+alignment = 1;
+ref = whiteLargeSquare;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+pos = (616,0);
+ref = O;
 }
 );
-width = 2814;
+width = 2828;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (658,0);
-ref = O;
+alignment = 1;
+ref = whiteLargeSquare;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+pos = (713,0);
+ref = O;
 }
 );
-width = 2718;
+width = 2828;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (658,0);
-ref = O;
+alignment = 1;
+ref = whiteLargeSquare;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+pos = (718,0);
+ref = O;
 }
 );
-width = 2718;
+width = 2828;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/P_.circled.glyph b/src/Inter.glyphspackage/glyphs/P_.circled.glyph
index 50e186666..9f47dee46 100644
--- a/src/Inter.glyphspackage/glyphs/P_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/P_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (816,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1242,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4088;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (834,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1242,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4088;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (810,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1300,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4146;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (846,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1298,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4144;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (786,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1344,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4190;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (812,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1344,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4191;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (810,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1236,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4082;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (846,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1239,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4087;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (786,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1308,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4154;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (812,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1319,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4166;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (816,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1114,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3960;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (834,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1114,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3961;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/P_.squared.glyph b/src/Inter.glyphspackage/glyphs/P_.squared.glyph
index 8e48972e7..9955d8b72 100644
--- a/src/Inter.glyphspackage/glyphs/P_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/P_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1242,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4070;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1242,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4070;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1300,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4128;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1298,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4126;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (774,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1344,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4172;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (776,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1344,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4172;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1236,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4064;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1239,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4067;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (774,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1308,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4136;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (776,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1319,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4147;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1114,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3942;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = P;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1114,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3942;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/Q_.circled.glyph b/src/Inter.glyphspackage/glyphs/Q_.circled.glyph
index 937edd897..35f3f2832 100644
--- a/src/Inter.glyphspackage/glyphs/Q_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/Q_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (658,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1530,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4376;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (658,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1538,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4384;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1560,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4406;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1588,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4434;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (606,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1632,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4478;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1629,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4476;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1534,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4380;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1528,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4376;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (606,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1574,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4420;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1596,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4443;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (658,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1402,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4248;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (658,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1410,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4257;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/Q_.squared.glyph b/src/Inter.glyphspackage/glyphs/Q_.squared.glyph
index fad617d7b..2bce09018 100644
--- a/src/Inter.glyphspackage/glyphs/Q_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/Q_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (658,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1530,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4358;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (658,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1538,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4366;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1560,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4388;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1588,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4416;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (606,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1632,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4460;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1629,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4457;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1534,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4362;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1528,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4356;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (606,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1574,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4402;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1596,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4424;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (658,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1402,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4230;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (658,0);
 ref = Q;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1410,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4238;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/R_.circled.glyph b/src/Inter.glyphspackage/glyphs/R_.circled.glyph
index 0fde5e419..38e85627f 100644
--- a/src/Inter.glyphspackage/glyphs/R_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/R_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (796,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1260,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4106;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (818,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1260,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4106;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (752,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1310,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4156;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (770,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1310,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4156;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (762,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1368,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4214;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1388,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4235;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (752,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1246,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4092;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (770,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1251,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4099;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (762,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1344,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4190;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1363,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4210;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (796,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1132,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3978;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (818,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1132,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3979;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/R_.squared.glyph b/src/Inter.glyphspackage/glyphs/R_.squared.glyph
index 900fb92b7..9cf2a1d45 100644
--- a/src/Inter.glyphspackage/glyphs/R_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/R_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (796,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1260,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4088;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1260,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4088;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1310,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4138;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1310,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4138;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (734,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1368,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4196;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (720,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1388,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4216;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1246,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4074;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1251,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4079;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (734,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1344,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4172;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (720,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1363,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4191;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (796,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1132,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3960;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = R;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1132,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3960;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/S_.circled.glyph b/src/Inter.glyphspackage/glyphs/S_.circled.glyph
index df461891e..c7cd5c17e 100644
--- a/src/Inter.glyphspackage/glyphs/S_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/S_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (796,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1254,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4100;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (808,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1254,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4100;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (770,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1306,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4152;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (780,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1306,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4152;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (740,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1364,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4210;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (748,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1364,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4211;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (770,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1258,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4104;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (780,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1242,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4090;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (740,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1403,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4249;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (748,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1332,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4179;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (796,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1126,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3972;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (808,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1126,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3973;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/S_.squared.glyph b/src/Inter.glyphspackage/glyphs/S_.squared.glyph
index ab0bfd0ba..6d89a332e 100644
--- a/src/Inter.glyphspackage/glyphs/S_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/S_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (796,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1254,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4082;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (808,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1254,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4082;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (770,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1306,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4134;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (780,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1306,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4134;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (740,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1364,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4192;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (748,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1364,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4192;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (770,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1258,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4086;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (780,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1242,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4070;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (740,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1403,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4231;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (748,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1332,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4160;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (796,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1126,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3954;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (808,0);
 ref = S;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1126,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3954;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/T_.circled.glyph b/src/Inter.glyphspackage/glyphs/T_.circled.glyph
index cadda1695..2cfb06e45 100644
--- a/src/Inter.glyphspackage/glyphs/T_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/T_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (794,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1256,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4102;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1256,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4102;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1314,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4160;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (760,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1314,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4160;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (720,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1406,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4252;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (726,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1406,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4253;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1250,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4096;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (760,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1250,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4098;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (720,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1392,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4238;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (726,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1374,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4221;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (794,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1128,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3974;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1128,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3975;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/T_.squared.glyph b/src/Inter.glyphspackage/glyphs/T_.squared.glyph
index 02e2f4ce0..9f1343ccf 100644
--- a/src/Inter.glyphspackage/glyphs/T_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/T_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (794,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1256,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4084;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1256,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4084;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1314,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4142;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1314,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4142;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (720,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1406,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4234;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (724,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1406,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4234;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1250,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4078;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1250,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4078;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (720,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1392,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4220;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (724,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1374,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4202;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (794,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1128,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3956;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = T;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1128,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3956;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/U_.circled.glyph b/src/Inter.glyphspackage/glyphs/U_.circled.glyph
index 7d99a0054..4e74e9a42 100644
--- a/src/Inter.glyphspackage/glyphs/U_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/U_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (654,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1536,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4382;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (632,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1535,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4381;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1518,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4364;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (654,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1519,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4365;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (684,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1478,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4324;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (690,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1477,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4324;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1454,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4300;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (654,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1455,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4303;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (684,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1446,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4292;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (690,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1446,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4293;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (654,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1408,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4254;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (632,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1408,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4255;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/U_.squared.glyph b/src/Inter.glyphspackage/glyphs/U_.squared.glyph
index bae8ce9fe..10065b79f 100644
--- a/src/Inter.glyphspackage/glyphs/U_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/U_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (654,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1536,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4364;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (660,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1535,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4363;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1518,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4346;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (662,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1519,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4347;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (684,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1478,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4306;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (688,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1477,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4305;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (664,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1454,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4282;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (662,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1455,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4283;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (684,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1446,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4274;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (688,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1446,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4274;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (654,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1408,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4236;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (660,0);
 ref = U;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1408,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4236;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/V_.circled.glyph b/src/Inter.glyphspackage/glyphs/V_.circled.glyph
index 43d265507..e90f974a8 100644
--- a/src/Inter.glyphspackage/glyphs/V_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/V_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1262,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4108;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (790,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1262,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4108;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (730,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1384,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4230;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (730,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1386,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4232;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1628,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4474;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (610,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1630,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4477;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (730,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1320,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4166;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (730,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1320,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4168;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1536,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4382;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (610,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1596,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4443;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1134,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3980;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (790,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1122,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3969;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/V_.squared.glyph b/src/Inter.glyphspackage/glyphs/V_.squared.glyph
index d0b3fb389..aa999d856 100644
--- a/src/Inter.glyphspackage/glyphs/V_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/V_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1262,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4090;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1262,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4090;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (730,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1384,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4212;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (728,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1386,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4214;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1628,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4456;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (610,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1630,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4458;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (730,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1320,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4148;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (728,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1320,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4148;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (608,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1536,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4364;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (610,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1596,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4424;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1134,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3962;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (792,0);
 ref = V;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1122,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3950;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/W_.circled.glyph b/src/Inter.glyphspackage/glyphs/W_.circled.glyph
index 9f665d6d8..6c2293026 100644
--- a/src/Inter.glyphspackage/glyphs/W_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/W_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (510,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1818,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4664;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (510,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1824,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4670;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (450,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1944,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4790;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (450,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1946,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4792;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (302,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (2232,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 5078;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (302,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (630,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (2232,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 5079;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (450,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1890,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4736;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (450,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1890,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4738;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (302,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (2172,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 5018;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (302,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (630,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (2198,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 5045;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (510,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1690,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4536;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (510,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1684,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4531;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/W_.squared.glyph b/src/Inter.glyphspackage/glyphs/W_.squared.glyph
index fde9e1279..c07c46ba0 100644
--- a/src/Inter.glyphspackage/glyphs/W_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/W_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (510,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1818,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4646;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (510,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1824,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4652;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (450,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1944,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4772;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (450,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1946,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4774;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (302,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (2232,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 5060;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (302,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (606,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (2232,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 5060;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (450,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1890,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4718;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (450,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1890,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4718;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (302,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (2172,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 5000;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (302,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (606,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (2198,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 5026;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (510,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1690,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4518;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (510,0);
 ref = W;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1684,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4512;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/X_.circled.glyph b/src/Inter.glyphspackage/glyphs/X_.circled.glyph
index 954e2c118..fbc437f3a 100644
--- a/src/Inter.glyphspackage/glyphs/X_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/X_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1198,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4044;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1198,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4044;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1314,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4160;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1314,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4160;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1562,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4408;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1562,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4409;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1250,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4096;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1250,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4098;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1524,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4370;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1530,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4377;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1070,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3916;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1070,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3917;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/X_.squared.glyph b/src/Inter.glyphspackage/glyphs/X_.squared.glyph
index a1ff5b0a5..5ae246780 100644
--- a/src/Inter.glyphspackage/glyphs/X_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/X_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1198,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4026;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1198,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4026;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1314,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4142;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1314,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4142;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1562,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4390;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1562,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4390;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1250,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4078;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (766,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1250,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4078;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1524,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4352;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1530,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4358;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1070,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3898;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (824,0);
 ref = X;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1070,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3898;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/Y_.circled.glyph b/src/Inter.glyphspackage/glyphs/Y_.circled.glyph
index f81896b5c..ec7179dd6 100644
--- a/src/Inter.glyphspackage/glyphs/Y_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/Y_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (794,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1256,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4102;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (796,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1256,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4102;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (742,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1362,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4208;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (744,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1362,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4208;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (640,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1566,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4412;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1566,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4413;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (742,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1298,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4144;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (744,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1298,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4146;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (640,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1534,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4380;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (642,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1534,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4381;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (794,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1128,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3974;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (796,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1128,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3975;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/Y_.squared.glyph b/src/Inter.glyphspackage/glyphs/Y_.squared.glyph
index d3d171618..35bb6426e 100644
--- a/src/Inter.glyphspackage/glyphs/Y_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/Y_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (794,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1256,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4084;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (796,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1256,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4084;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (742,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1362,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4190;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (740,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1362,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4190;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (640,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1566,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4394;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (640,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1566,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4394;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (742,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1298,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4126;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (740,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1298,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4126;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (640,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1534,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4362;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (640,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1534,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4362;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (794,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1128,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3956;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (796,0);
 ref = Y;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1128,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3956;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/Z_.circled.glyph b/src/Inter.glyphspackage/glyphs/Z_.circled.glyph
index ba77fc1e4..5f0229045 100644
--- a/src/Inter.glyphspackage/glyphs/Z_.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/Z_.circled.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (800,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1240,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4086;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (802,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1240,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4086;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (782,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1280,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4126;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (782,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1280,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4126;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (712,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1422,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4268;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (712,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1422,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4269;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (782,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1216,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4062;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (782,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1216,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4064;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (712,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1390,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4236;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (712,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1390,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4237;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (800,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1112,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3958;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (802,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1112,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3959;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/Z_.squared.glyph b/src/Inter.glyphspackage/glyphs/Z_.squared.glyph
index 2c03e5e9c..5430a4cc2 100644
--- a/src/Inter.glyphspackage/glyphs/Z_.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/Z_.squared.glyph
@@ -5,193 +5,169 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-alignment = -1;
-pos = (800,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1240,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4068;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-alignment = -1;
-pos = (802,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1240,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4068;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-alignment = -1;
-pos = (782,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1280,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4108;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-alignment = -1;
-pos = (782,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1280,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4108;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-alignment = -1;
-pos = (712,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1422,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4250;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-alignment = -1;
-pos = (712,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1422,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4250;
 },
 {
 layerId = m007;
 shapes = (
 {
-alignment = -1;
-pos = (782,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1216,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4044;
 },
 {
 layerId = m008;
 shapes = (
 {
-alignment = -1;
-pos = (782,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1216,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4044;
 },
 {
 layerId = m009;
 shapes = (
 {
-alignment = -1;
-pos = (712,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1390,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4218;
 },
 {
 layerId = m010;
 shapes = (
 {
-alignment = -1;
-pos = (712,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1390,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4218;
 },
 {
 layerId = m011;
 shapes = (
 {
-alignment = -1;
-pos = (800,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1112,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3940;
 },
 {
 layerId = m012;
 shapes = (
 {
-alignment = -1;
-pos = (802,0);
 ref = Z;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1112,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3940;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/divide.circled.glyph b/src/Inter.glyphspackage/glyphs/divide.circled.glyph
index 2750d2fbb..0dce5ce91 100644
--- a/src/Inter.glyphspackage/glyphs/divide.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/divide.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1304,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4150;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1304,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4150;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1350,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4196;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1350,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4196;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1420,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4266;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1420,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4267;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1286,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4132;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1286,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4134;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1388,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4234;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1388,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4235;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4022;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4023;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/divide.squared.glyph b/src/Inter.glyphspackage/glyphs/divide.squared.glyph
index cbde31604..89daf6514 100644
--- a/src/Inter.glyphspackage/glyphs/divide.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/divide.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1304,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4132;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1304,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4132;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1350,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4178;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1350,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4178;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1420,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4248;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1420,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4248;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1286,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4114;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1286,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4114;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1388,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4216;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1388,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4216;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4004;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = divide.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4004;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/dngb_ballotx.circled.glyph b/src/Inter.glyphspackage/glyphs/dngb_ballotx.circled.glyph
index c5238874f..2eaf3c76c 100644
--- a/src/Inter.glyphspackage/glyphs/dngb_ballotx.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/dngb_ballotx.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (520,42);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1804,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4650;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (526,40);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1804,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4650;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (520,62);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1804,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4650;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (530,58);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1804,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4650;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (520,98);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1804,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4650;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (562,90);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1804,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4651;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (520,62);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1740,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4586;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (530,58);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1740,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4588;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (520,98);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1772,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4618;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (562,90);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1772,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4619;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (520,42);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1676,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4522;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (526,40);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1676,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4523;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/dngb_ballotx.squared.glyph b/src/Inter.glyphspackage/glyphs/dngb_ballotx.squared.glyph
index 55c86e6cc..fbb992da8 100644
--- a/src/Inter.glyphspackage/glyphs/dngb_ballotx.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/dngb_ballotx.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (520,42);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1804,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4632;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (526,44);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1804,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4632;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (520,62);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1804,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4632;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (530,58);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1804,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4632;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (520,98);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1804,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4632;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (562,90);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1804,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4632;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (520,62);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1740,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4568;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (530,58);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1740,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4568;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (520,98);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1772,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4600;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (562,90);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1772,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4600;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (520,42);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1676,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4504;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (526,44);
+alignment = 1;
 ref = dngb_ballotx;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1676,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4504;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/dngb_check.circled.glyph b/src/Inter.glyphspackage/glyphs/dngb_check.circled.glyph
index 23e67545d..0009d5913 100644
--- a/src/Inter.glyphspackage/glyphs/dngb_check.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/dngb_check.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (550,36);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1804,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4650;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (546,36);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1804,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4650;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (546,58);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1804,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4650;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (548,58);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1804,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4650;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (482,94);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1804,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4650;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (526,94);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1804,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4651;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (546,58);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1740,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4586;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (548,58);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1740,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4588;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (482,94);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1772,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4618;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (526,94);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1772,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4619;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (550,36);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1676,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4522;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (546,36);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1676,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4523;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/dngb_check.squared.glyph b/src/Inter.glyphspackage/glyphs/dngb_check.squared.glyph
index 1d35af339..c250ab156 100644
--- a/src/Inter.glyphspackage/glyphs/dngb_check.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/dngb_check.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (550,44);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1804,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4632;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (546,44);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1804,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4632;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (546,58);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1804,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4632;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (528,58);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1804,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4632;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (482,88);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1804,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4632;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (512,88);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1804,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4632;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (546,58);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1740,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4568;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (528,58);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1740,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4568;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (482,88);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1772,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4600;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (512,88);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1772,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4600;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (550,44);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1676,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4504;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (546,44);
+alignment = 1;
 ref = dngb_check;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1676,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4504;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/downA_rrow.circled.glyph b/src/Inter.glyphspackage/glyphs/downA_rrow.circled.glyph
index 239e3bc8b..6f6296350 100644
--- a/src/Inter.glyphspackage/glyphs/downA_rrow.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/downA_rrow.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (462,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (462,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (456,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4801;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1890,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4736;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (462,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1890,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4738;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1922,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4768;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (456,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1922,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4769;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1826,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4672;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (462,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1826,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4673;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/downA_rrow.squared.glyph b/src/Inter.glyphspackage/glyphs/downA_rrow.squared.glyph
index cec626e43..38b2973e0 100644
--- a/src/Inter.glyphspackage/glyphs/downA_rrow.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/downA_rrow.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (462,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (462,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (456,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1890,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4718;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (462,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1890,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4718;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1922,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4750;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (456,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1922,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4750;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1826,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4654;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (462,0);
+alignment = 1;
 ref = downArrow;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1826,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4654;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/eight.circled.glyph b/src/Inter.glyphspackage/glyphs/eight.circled.glyph
index a034314d7..f6d2fd343 100644
--- a/src/Inter.glyphspackage/glyphs/eight.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/eight.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (806,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1222,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4068;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (798,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1220,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4066;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (792,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1256,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4102;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (788,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1258,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4104;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (716,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1430,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4276;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (716,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1432,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4279;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (792,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1192,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4038;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (788,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1194,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4042;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (716,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1314,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4160;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (716,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1400,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4247;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (806,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1094,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3940;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (798,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1092,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3939;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/eight.squared.glyph b/src/Inter.glyphspackage/glyphs/eight.squared.glyph
index 60a6503f4..da0e61552 100644
--- a/src/Inter.glyphspackage/glyphs/eight.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/eight.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (806,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1222,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4050;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (798,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1220,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4048;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (792,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1256,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4084;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (788,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1258,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4086;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (716,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1430,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4258;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (716,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1432,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4260;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (792,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1192,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4020;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (788,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1194,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4022;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (716,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1314,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4142;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (716,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1400,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4228;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (806,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1094,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3922;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (798,0);
+alignment = 1;
 ref = eight;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1092,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3920;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/enclosingcirclecomb.glyph b/src/Inter.glyphspackage/glyphs/enclosingcirclecomb.glyph
index 1a3e36117..f442bb199 100644
--- a/src/Inter.glyphspackage/glyphs/enclosingcirclecomb.glyph
+++ b/src/Inter.glyphspackage/glyphs/enclosingcirclecomb.glyph
@@ -2,12 +2,6 @@
 glyphname = enclosingcirclecomb;
 layers = (
 {
-guides = (
-{
-angle = 90;
-pos = (824,1086);
-}
-);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
@@ -53,35 +47,35 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1172,-655,o),
-(1901,-31,o),
-(2030,742,cs),
-(2157,1516,o),
-(1633,2144,o),
-(858,2144,cs),
-(87,2144,o),
-(-641,1520,o),
-(-768,748,cs),
-(-897,-26,o),
-(-374,-655,o),
-(402,-654,cs)
+(1171,-655,o),
+(1900,-31,o),
+(2029,742,cs),
+(2156,1516,o),
+(1632,2144,o),
+(857,2144,cs),
+(86,2144,o),
+(-642,1520,o),
+(-769,748,cs),
+(-898,-26,o),
+(-375,-655,o),
+(401,-654,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(-345,-608,o),
-(-847,-6,o),
-(-722,740,cs),
-(-599,1489,o),
-(109,2097,o),
-(858,2098,cs),
-(1604,2097,o),
-(2107,1495,o),
-(1984,750,cs),
-(1859,0,o),
-(1151,-608,o),
-(402,-608,cs)
+(-346,-608,o),
+(-848,-6,o),
+(-723,740,cs),
+(-600,1489,o),
+(108,2097,o),
+(857,2098,cs),
+(1603,2097,o),
+(2106,1495,o),
+(1983,750,cs),
+(1858,0,o),
+(1150,-608,o),
+(401,-608,cs)
 );
 }
 );
@@ -260,27 +254,21 @@ nodes = (
 width = 0;
 },
 {
-guides = (
-{
-angle = 90;
-pos = (612,1214);
-}
-);
 layerId = m007;
 shapes = (
 {
 closed = 1;
 nodes = (
 (1399,-655,o),
-(2025,-28,o),
-(2024,744,cs),
-(2025,1518,o),
-(1399,2144,o),
-(626,2144,cs),
-(-148,2144,o),
-(-774,1518,o),
-(-774,744,cs),
-(-774,-28,o),
+(2025,-27,o),
+(2024,745,cs),
+(2025,1519,o),
+(1399,2145,o),
+(626,2145,cs),
+(-148,2145,o),
+(-774,1519,o),
+(-774,745,cs),
+(-774,-27,o),
 (-148,-655,o),
 (626,-654,cs)
 );
@@ -289,15 +277,15 @@ nodes = (
 closed = 1;
 nodes = (
 (-55,-486,o),
-(-605,65,o),
-(-606,744,cs),
-(-605,1425,o),
-(-55,1975,o),
-(626,1976,cs),
-(1306,1975,o),
-(1856,1425,o),
-(1856,744,cs),
-(1856,65,o),
+(-605,66,o),
+(-606,745,cs),
+(-605,1426,o),
+(-55,1976,o),
+(626,1977,cs),
+(1306,1976,o),
+(1856,1426,o),
+(1856,745,cs),
+(1856,66,o),
 (1306,-486,o),
 (626,-486,cs)
 );
@@ -483,35 +471,35 @@ shapes = (
 {
 closed = 1;
 nodes = (
-(1108,-655,o),
-(1837,-31,o),
-(1966,742,cs),
-(2093,1516,o),
-(1569,2144,o),
-(794,2144,cs),
-(23,2144,o),
-(-705,1520,o),
-(-832,748,cs),
-(-961,-26,o),
-(-438,-655,o),
-(338,-654,cs)
+(1107,-655,o),
+(1836,-31,o),
+(1965,742,cs),
+(2092,1516,o),
+(1568,2144,o),
+(793,2144,cs),
+(22,2144,o),
+(-706,1520,o),
+(-833,748,cs),
+(-962,-26,o),
+(-439,-655,o),
+(337,-654,cs)
 );
 },
 {
 closed = 1;
 nodes = (
-(-409,-608,o),
-(-911,-6,o),
-(-786,740,cs),
-(-663,1489,o),
-(45,2097,o),
-(794,2098,cs),
-(1540,2097,o),
-(2043,1495,o),
-(1920,750,cs),
-(1795,0,o),
-(1087,-608,o),
-(338,-608,cs)
+(-410,-608,o),
+(-912,-6,o),
+(-787,740,cs),
+(-664,1489,o),
+(44,2097,o),
+(793,2098,cs),
+(1539,2097,o),
+(2042,1495,o),
+(1919,750,cs),
+(1794,0,o),
+(1086,-608,o),
+(337,-608,cs)
 );
 }
 );
diff --git a/src/Inter.glyphspackage/glyphs/equal.circled.glyph b/src/Inter.glyphspackage/glyphs/equal.circled.glyph
index 16c6018a0..733965498 100644
--- a/src/Inter.glyphspackage/glyphs/equal.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/equal.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1304,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4150;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1304,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4150;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1350,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4196;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (750,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1350,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4196;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1420,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4266;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1420,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4267;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1286,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4132;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (750,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1286,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4134;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1388,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4234;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1388,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4235;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4022;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4023;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/equal.squared.glyph b/src/Inter.glyphspackage/glyphs/equal.squared.glyph
index 03a38deee..20a5fd30c 100644
--- a/src/Inter.glyphspackage/glyphs/equal.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/equal.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1304,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4132;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1304,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4132;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1350,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4178;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (750,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1350,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4178;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1420,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4248;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1420,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4248;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1286,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4114;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (750,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1286,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4114;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1388,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4216;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1388,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4216;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4004;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = equal.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4004;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/exclam.circled.glyph b/src/Inter.glyphspackage/glyphs/exclam.circled.glyph
index ecc5d6c82..fb4c8ece6 100644
--- a/src/Inter.glyphspackage/glyphs/exclam.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/exclam.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (1154,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (586,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3432;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (1166,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (586,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3432;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (1138,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (608,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3454;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (1144,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (608,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3454;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (1058,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (776,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3622;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (1046,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (776,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3623;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (1138,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (528,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3374;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (1144,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (528,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3376;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (1058,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (736,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 3582;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (1046,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (736,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 3583;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (1154,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (480,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3326;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (1166,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (480,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3327;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/exclam.squared.glyph b/src/Inter.glyphspackage/glyphs/exclam.squared.glyph
index 35ef1e278..3c5e175e6 100644
--- a/src/Inter.glyphspackage/glyphs/exclam.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/exclam.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (1154,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (586,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3414;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (1166,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (586,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3414;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (1138,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (608,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3436;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (1144,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (608,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3436;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (1058,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (776,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3604;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (1044,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (776,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3604;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (1138,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (528,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3356;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (1144,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (528,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3356;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (1058,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (736,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 3564;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (1044,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (736,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 3564;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (1154,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (480,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3308;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (1166,0);
+alignment = 1;
 ref = exclam;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (480,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3308;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/five.circled.glyph b/src/Inter.glyphspackage/glyphs/five.circled.glyph
index 3a0b072ca..3ef3976cb 100644
--- a/src/Inter.glyphspackage/glyphs/five.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/five.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1154,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4000;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (832,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1156,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4002;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (788,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1234,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4080;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (792,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1232,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4078;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1384,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4230;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (734,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1384,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4231;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (788,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1209,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4055;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (792,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1163,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4011;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1304,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4150;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (734,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1347,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4194;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1026,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3872;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (832,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1028,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3875;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/five.squared.glyph b/src/Inter.glyphspackage/glyphs/five.squared.glyph
index 8dca1d211..2f27cf328 100644
--- a/src/Inter.glyphspackage/glyphs/five.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/five.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1154,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3982;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (830,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1156,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3984;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (788,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1234,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4062;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (792,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1232,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4060;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1384,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4212;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (734,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1384,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4212;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (788,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1209,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4037;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (792,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1163,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3991;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1304,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4132;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (734,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1347,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4175;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1026,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3854;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (830,0);
+alignment = 1;
 ref = five;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1028,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3856;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/four.circled.glyph b/src/Inter.glyphspackage/glyphs/four.circled.glyph
index 4ec9084fa..3f00edbdb 100644
--- a/src/Inter.glyphspackage/glyphs/four.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/four.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1218,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4064;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1218,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4064;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (678,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1314,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4160;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (678,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1314,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4160;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (624,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1438,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4284;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (626,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1438,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4285;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (678,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1265,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4111;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (678,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1250,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4098;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (624,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1414,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4260;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (626,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1406,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4253;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1090,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3936;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1090,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3937;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/four.squared.glyph b/src/Inter.glyphspackage/glyphs/four.squared.glyph
index b8359daa8..96eed4666 100644
--- a/src/Inter.glyphspackage/glyphs/four.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/four.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (740,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1218,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4046;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (750,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1218,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4046;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (706,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1314,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4142;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1314,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4142;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (668,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1438,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4266;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (672,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1438,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4266;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (706,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1265,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4093;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1250,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4078;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (668,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1414,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4242;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (672,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1406,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4234;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (740,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1090,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3918;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (750,0);
+alignment = 1;
 ref = four;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1090,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3918;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/four.ss01.circled.glyph b/src/Inter.glyphspackage/glyphs/four.ss01.circled.glyph
index 4a8b6efc8..e13cf4402 100644
--- a/src/Inter.glyphspackage/glyphs/four.ss01.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/four.ss01.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (740,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1218,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4064;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (758,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1218,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4064;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1314,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4160;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1314,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4160;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (668,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1438,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4284;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (670,2);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1438,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4285;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1180,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4026;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1250,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4098;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (668,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1412,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4258;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (670,2);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1406,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4253;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (740,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1090,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3936;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (758,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1090,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3937;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/four.ss01.squared.glyph b/src/Inter.glyphspackage/glyphs/four.ss01.squared.glyph
index cabb8d265..563b45bcd 100644
--- a/src/Inter.glyphspackage/glyphs/four.ss01.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/four.ss01.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (740,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1218,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4046;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (742,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1218,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4046;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1314,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4142;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1314,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4142;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (668,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1438,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4266;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (672,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1438,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4266;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1180,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4008;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1250,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4078;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (668,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1412,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4240;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (672,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1406,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4234;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (740,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1090,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3918;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (742,0);
+alignment = 1;
 ref = four.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1090,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3918;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/greater.circled.glyph b/src/Inter.glyphspackage/glyphs/greater.circled.glyph
index 05399c0ab..95fcb92b6 100644
--- a/src/Inter.glyphspackage/glyphs/greater.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/greater.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (800,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1304,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4150;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (842,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1304,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4150;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (776,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1350,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4196;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (784,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1350,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4196;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (742,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1420,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4266;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (776,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1420,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4267;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (776,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1286,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4132;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (784,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1286,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4134;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (742,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1388,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4234;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (776,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1388,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4235;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (800,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4022;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (842,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4023;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/greater.squared.glyph b/src/Inter.glyphspackage/glyphs/greater.squared.glyph
index 2b777df57..2f5d97e0c 100644
--- a/src/Inter.glyphspackage/glyphs/greater.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/greater.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (800,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1304,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4132;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (814,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1304,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4132;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (776,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1350,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4178;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (754,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1350,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4178;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (742,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1420,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4248;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1420,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4248;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (776,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1286,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4114;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (754,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1286,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4114;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (742,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1388,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4216;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1388,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4216;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (800,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4004;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (814,0);
+alignment = 1;
 ref = greater.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4004;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/hyphen.circled.glyph b/src/Inter.glyphspackage/glyphs/hyphen.circled.glyph
index 4fa08c2c7..7fbe326b2 100644
--- a/src/Inter.glyphspackage/glyphs/hyphen.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/hyphen.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (974,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (898,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3744;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (974,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (898,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3744;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (952,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (940,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3786;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (952,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (942,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3788;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (936,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (972,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3818;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (936,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (972,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3819;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (952,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (878,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3724;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (952,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (878,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3726;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (936,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (940,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 3786;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (936,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (940,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 3787;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (974,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (770,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3616;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (974,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (770,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3617;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/hyphen.squared.glyph b/src/Inter.glyphspackage/glyphs/hyphen.squared.glyph
index 9bbba237d..87bbdffe8 100644
--- a/src/Inter.glyphspackage/glyphs/hyphen.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/hyphen.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (974,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (898,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3726;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (974,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (898,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3726;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (952,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (940,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3768;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (952,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (942,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3770;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (936,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (972,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3800;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (936,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (972,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3800;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (952,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (878,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3706;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (952,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (878,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3706;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (936,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (940,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 3768;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (936,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (940,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 3768;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (974,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (770,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3598;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (974,0);
+alignment = 1;
 ref = hyphen.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (770,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3598;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/largeC_ircle.glyph b/src/Inter.glyphspackage/glyphs/largeC_ircle.glyph
index 53e9fe919..4208129ea 100644
--- a/src/Inter.glyphspackage/glyphs/largeC_ircle.glyph
+++ b/src/Inter.glyphspackage/glyphs/largeC_ircle.glyph
@@ -2,6 +2,12 @@
 glyphname = largeCircle;
 layers = (
 {
+anchors = (
+{
+name = center;
+pos = (1423,745);
+}
+);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
@@ -12,6 +18,12 @@ ref = enclosingcirclecomb;
 width = 2846;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1454,745);
+}
+);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
@@ -22,6 +34,12 @@ ref = enclosingcirclecomb;
 width = 2846;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1423,745);
+}
+);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
@@ -32,6 +50,12 @@ ref = enclosingcirclecomb;
 width = 2846;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1454,745);
+}
+);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
@@ -42,6 +66,12 @@ ref = enclosingcirclecomb;
 width = 2846;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1421,745);
+}
+);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
@@ -52,74 +82,116 @@ ref = enclosingcirclecomb;
 width = 2846;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1454,745);
+}
+);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (642,0);
+pos = (643,0);
 ref = enclosingcirclecomb;
 }
 );
-width = 2846;
+width = 2847;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1423,745);
+}
+);
 layerId = m007;
 shapes = (
 {
-pos = (766,0);
+pos = (798,0);
 ref = enclosingcirclecomb;
 }
 );
-width = 2782;
+width = 2846;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1460,745);
+}
+);
 layerId = m008;
 shapes = (
 {
-pos = (766,0);
+pos = (804,0);
 ref = enclosingcirclecomb;
 }
 );
-width = 2782;
+width = 2848;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1423,745);
+}
+);
 layerId = m009;
 shapes = (
 {
-pos = (642,0);
+pos = (660,0);
 ref = enclosingcirclecomb;
 }
 );
-width = 2814;
+width = 2846;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1459,745);
+}
+);
 layerId = m010;
 shapes = (
 {
-pos = (642,0);
+pos = (664,0);
 ref = enclosingcirclecomb;
 }
 );
-width = 2814;
+width = 2847;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1423,745);
+}
+);
 layerId = m011;
 shapes = (
 {
-pos = (824,0);
+pos = (888,0);
 ref = enclosingcirclecomb;
 }
 );
-width = 2718;
+width = 2846;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1459,745);
+}
+);
 layerId = m012;
 shapes = (
 {
-pos = (824,0);
+pos = (893,0);
 ref = enclosingcirclecomb;
 }
 );
-width = 2718;
+width = 2847;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/leftA_rrow.circled.glyph b/src/Inter.glyphspackage/glyphs/leftA_rrow.circled.glyph
index ac2474ddf..6cf22aaa6 100644
--- a/src/Inter.glyphspackage/glyphs/leftA_rrow.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/leftA_rrow.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (472,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (470,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (472,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (466,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (472,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (460,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4801;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (472,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1890,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4736;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (466,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1890,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4738;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (472,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1922,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4768;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (460,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1922,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4769;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (472,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1826,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4672;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (470,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1826,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4673;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/leftA_rrow.squared.glyph b/src/Inter.glyphspackage/glyphs/leftA_rrow.squared.glyph
index 139e33202..7534da189 100644
--- a/src/Inter.glyphspackage/glyphs/leftA_rrow.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/leftA_rrow.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (472,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (470,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (472,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (466,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (472,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (460,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (472,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1890,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4718;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (466,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1890,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4718;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (472,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1922,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4750;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (460,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1922,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4750;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (472,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1826,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4654;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (470,0);
+alignment = 1;
 ref = leftArrow.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1826,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4654;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/less.circled.glyph b/src/Inter.glyphspackage/glyphs/less.circled.glyph
index 512d88e5b..77f466c32 100644
--- a/src/Inter.glyphspackage/glyphs/less.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/less.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (742,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1304,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4150;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (698,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1304,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4150;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (718,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1350,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4196;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (684,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1350,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4196;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (684,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1420,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4266;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (648,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1420,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4267;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (718,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1286,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4132;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (684,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1286,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4134;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (684,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1388,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4234;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (648,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1388,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4235;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (742,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4022;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (698,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4023;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/less.squared.glyph b/src/Inter.glyphspackage/glyphs/less.squared.glyph
index c28364502..f609fb171 100644
--- a/src/Inter.glyphspackage/glyphs/less.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/less.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (742,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1304,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4132;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (728,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1304,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4132;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (718,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1350,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4178;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1350,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4178;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (684,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1420,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4248;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (676,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1420,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4248;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (718,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1286,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4114;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1286,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4114;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (684,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1388,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4216;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (676,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1388,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4216;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (742,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4004;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (728,0);
+alignment = 1;
 ref = less.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4004;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/minus.circled.glyph b/src/Inter.glyphspackage/glyphs/minus.circled.glyph
index 99b0080ec..1bb2f0237 100644
--- a/src/Inter.glyphspackage/glyphs/minus.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/minus.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1304,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4150;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1304,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4150;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1350,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4196;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (750,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1350,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4196;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1420,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4266;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1420,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4267;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1286,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4132;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (750,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1286,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4134;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1388,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4234;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1388,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4235;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4022;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4023;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/minus.squared.glyph b/src/Inter.glyphspackage/glyphs/minus.squared.glyph
index 3ffbdc02b..18a7ba696 100644
--- a/src/Inter.glyphspackage/glyphs/minus.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/minus.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1304,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4132;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1304,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4132;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1350,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4178;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (750,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1350,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4178;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1420,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4248;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1420,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4248;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1286,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4114;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (750,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1286,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4114;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1388,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4216;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1388,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4216;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4004;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = minus.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4004;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/multiply.circled.glyph b/src/Inter.glyphspackage/glyphs/multiply.circled.glyph
index 93e1ad867..db6ee06dc 100644
--- a/src/Inter.glyphspackage/glyphs/multiply.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/multiply.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1304,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4150;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (774,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1304,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4150;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1350,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4196;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1350,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4196;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1420,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4266;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (714,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1420,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4267;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1286,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4132;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1286,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4134;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1388,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4234;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (714,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1388,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4235;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4022;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (774,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4023;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/multiply.squared.glyph b/src/Inter.glyphspackage/glyphs/multiply.squared.glyph
index 42f3e3a54..6b10d2245 100644
--- a/src/Inter.glyphspackage/glyphs/multiply.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/multiply.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1304,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4132;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (774,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1304,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4132;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1350,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4178;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1350,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4178;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1420,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4248;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (714,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1420,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4248;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1286,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4114;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1286,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4114;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1388,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4216;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (714,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1388,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4216;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4004;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (774,0);
+alignment = 1;
 ref = multiply.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4004;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/nine.circled.glyph b/src/Inter.glyphspackage/glyphs/nine.circled.glyph
index 402b4f43d..159703062 100644
--- a/src/Inter.glyphspackage/glyphs/nine.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/nine.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (826,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1156,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4002;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (830,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1156,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4002;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (784,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1260,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4106;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (784,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1258,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4104;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (726,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1422,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4268;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (744,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1420,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4267;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (784,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1196,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4042;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (784,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1194,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4042;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (726,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1322,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4168;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (744,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1388,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4235;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (826,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1028,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3874;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (830,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1028,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3875;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/nine.squared.glyph b/src/Inter.glyphspackage/glyphs/nine.squared.glyph
index cd721fd53..6916df2b9 100644
--- a/src/Inter.glyphspackage/glyphs/nine.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/nine.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (826,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1156,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3984;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (828,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1156,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3984;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (784,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1260,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4088;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (792,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1258,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4086;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (728,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1422,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4250;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (736,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1420,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4248;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (784,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1196,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4024;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (792,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1194,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4022;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (728,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1322,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4150;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (736,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1388,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4216;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (826,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1028,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3856;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (828,0);
+alignment = 1;
 ref = nine;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1028,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3856;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/nine.ss01.circled.glyph b/src/Inter.glyphspackage/glyphs/nine.ss01.circled.glyph
index c1266d124..71291ff11 100644
--- a/src/Inter.glyphspackage/glyphs/nine.ss01.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/nine.ss01.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (840,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1164,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4010;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (856,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1164,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4010;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4022;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (842,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4022;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (754,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1374,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4220;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (762,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1374,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4221;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1112,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3958;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (842,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1112,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3960;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (754,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1342,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4188;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (762,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1342,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4189;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (840,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1036,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3882;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (856,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1036,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3883;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/nine.ss01.squared.glyph b/src/Inter.glyphspackage/glyphs/nine.ss01.squared.glyph
index abbf42c5b..d5f1e32cc 100644
--- a/src/Inter.glyphspackage/glyphs/nine.ss01.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/nine.ss01.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (840,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1164,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3992;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (840,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1164,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3992;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4004;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4004;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (754,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1374,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4202;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (756,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1374,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4202;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1112,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3940;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1112,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3940;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (754,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1342,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4170;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (756,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1342,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4170;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (840,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1036,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3864;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (840,0);
+alignment = 1;
 ref = nine.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1036,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3864;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/numbersign.circled.glyph b/src/Inter.glyphspackage/glyphs/numbersign.circled.glyph
index 2ff25a0bc..670aa214a 100644
--- a/src/Inter.glyphspackage/glyphs/numbersign.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/numbersign.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (774,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1298,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4144;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (774,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1298,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4144;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (776,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1292,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4138;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (776,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1292,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4138;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (744,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1356,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4202;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (744,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1356,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4203;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (776,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1228,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4074;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (776,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1228,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4076;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (744,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1324,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4170;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (744,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1324,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4171;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (774,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1170,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4016;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (774,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1170,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4017;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/numbersign.squared.glyph b/src/Inter.glyphspackage/glyphs/numbersign.squared.glyph
index 1204c6ec5..9732ce059 100644
--- a/src/Inter.glyphspackage/glyphs/numbersign.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/numbersign.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (774,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1298,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4126;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (774,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1298,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4126;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (776,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1292,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4120;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (776,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1292,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4120;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (744,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1356,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4184;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (744,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1356,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4184;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (776,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1228,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4056;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (776,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1228,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4056;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (744,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1324,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4152;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (744,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1324,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4152;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (774,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1170,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3998;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (774,0);
+alignment = 1;
 ref = numbersign;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1170,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3998;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/one.circled.glyph b/src/Inter.glyphspackage/glyphs/one.circled.glyph
index f2ab74893..f669a9071 100644
--- a/src/Inter.glyphspackage/glyphs/one.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/one.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (958,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (752,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3598;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (956,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (752,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3598;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (872,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (824,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3670;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (866,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (858,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3704;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (926,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3772;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (854,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (926,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3773;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (872,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (742,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3588;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (866,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (789,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3637;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (852,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 3698;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (854,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (889,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 3736;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (958,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (624,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3470;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (956,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (624,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3471;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/one.squared.glyph b/src/Inter.glyphspackage/glyphs/one.squared.glyph
index 850d0dbb1..13720ae0a 100644
--- a/src/Inter.glyphspackage/glyphs/one.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/one.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (958,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (752,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3580;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (960,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (752,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3580;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (872,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (824,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3652;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (866,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (858,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3686;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (926,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3754;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (854,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (926,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3754;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (872,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (742,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3570;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (866,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (789,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3617;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (852,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 3680;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (854,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (889,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 3717;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (958,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (624,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3452;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (960,0);
+alignment = 1;
 ref = one;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (624,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3452;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/one.ss01.circled.glyph b/src/Inter.glyphspackage/glyphs/one.ss01.circled.glyph
index 0e9f28ed3..1df8c5d1f 100644
--- a/src/Inter.glyphspackage/glyphs/one.ss01.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/one.ss01.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (992,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (744,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3590;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (994,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (743,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3589;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (942,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (812,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3658;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (940,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (812,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3658;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (878,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (904,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3750;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (872,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (905,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3752;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (942,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (748,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3594;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (940,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (743,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3591;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (878,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (872,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 3718;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (872,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (867,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 3714;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (992,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (616,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3462;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (994,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (616,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3463;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/one.ss01.squared.glyph b/src/Inter.glyphspackage/glyphs/one.ss01.squared.glyph
index 9da9cd9b5..e5d20b7e4 100644
--- a/src/Inter.glyphspackage/glyphs/one.ss01.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/one.ss01.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (992,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (744,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3572;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (998,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (743,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3571;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (942,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (812,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3640;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (940,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (812,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3640;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (878,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (904,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3732;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (876,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (905,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3733;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (942,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (748,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3576;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (940,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (743,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3571;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (878,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (872,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 3700;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (876,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (867,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 3695;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (992,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (616,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3444;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (998,0);
+alignment = 1;
 ref = one.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (616,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3444;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/plus.circled.glyph b/src/Inter.glyphspackage/glyphs/plus.circled.glyph
index 84fac67ff..e06f43b11 100644
--- a/src/Inter.glyphspackage/glyphs/plus.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/plus.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1304,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4150;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (808,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1304,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4150;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1350,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4196;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (750,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1350,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4196;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1420,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4266;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1420,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4267;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1286,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4132;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (750,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1286,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4134;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1388,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4234;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1388,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4235;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4022;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (808,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4023;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/plus.squared.glyph b/src/Inter.glyphspackage/glyphs/plus.squared.glyph
index bfcedb668..3c5c1e0ad 100644
--- a/src/Inter.glyphspackage/glyphs/plus.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/plus.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1304,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4132;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (808,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1304,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4132;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1350,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4178;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (750,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1350,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4178;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1420,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4248;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1420,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4248;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (748,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1286,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4114;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (750,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1286,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4114;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1388,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4216;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1388,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4216;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4004;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (808,0);
+alignment = 1;
 ref = plus.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4004;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/question.circled.glyph b/src/Inter.glyphspackage/glyphs/question.circled.glyph
index b4d2b3021..a7724b08f 100644
--- a/src/Inter.glyphspackage/glyphs/question.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/question.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (964,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (980,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3826;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (962,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (980,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3826;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (942,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1038,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3884;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (936,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1038,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3884;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (830,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1230,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4076;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (830,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1230,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4077;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (942,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1073,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3919;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (936,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1073,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3921;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (830,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1238,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4084;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (830,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1238,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4085;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (964,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (920,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3766;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (962,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (920,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3767;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/question.squared.glyph b/src/Inter.glyphspackage/glyphs/question.squared.glyph
index f7d25ba41..7c29d3091 100644
--- a/src/Inter.glyphspackage/glyphs/question.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/question.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (964,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (980,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3808;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (962,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (980,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3808;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (942,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1038,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3866;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (940,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1038,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3866;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (830,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1230,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4058;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (832,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1230,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4058;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (942,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1073,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3901;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (940,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1073,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3901;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (830,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1238,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4066;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (832,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1238,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4066;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (964,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (920,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3748;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (962,0);
+alignment = 1;
 ref = question;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (920,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3748;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/rightA_rrow.circled.glyph b/src/Inter.glyphspackage/glyphs/rightA_rrow.circled.glyph
index 4ebffc9bc..ddf91eccc 100644
--- a/src/Inter.glyphspackage/glyphs/rightA_rrow.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/rightA_rrow.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (418,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (420,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (418,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (424,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (418,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (432,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4801;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (418,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1890,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4736;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (424,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1890,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4738;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (418,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1922,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4768;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (432,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1922,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4769;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (418,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1826,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4672;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (420,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1826,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4673;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/rightA_rrow.squared.glyph b/src/Inter.glyphspackage/glyphs/rightA_rrow.squared.glyph
index cc3e90470..12243cee4 100644
--- a/src/Inter.glyphspackage/glyphs/rightA_rrow.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/rightA_rrow.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (418,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (420,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (418,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (424,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (418,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (432,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (418,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1890,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4718;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (424,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1890,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4718;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (418,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1922,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4750;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (432,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1922,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4750;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (418,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1826,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4654;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (420,0);
+alignment = 1;
 ref = rightArrow.case;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1826,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4654;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/seven.circled.glyph b/src/Inter.glyphspackage/glyphs/seven.circled.glyph
index f83c735fb..4581e34e7 100644
--- a/src/Inter.glyphspackage/glyphs/seven.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/seven.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (914,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1110,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3956;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (862,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1108,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3954;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (888,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1152,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3998;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (882,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1152,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 3998;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1226,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4072;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (798,-2);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1226,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4073;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (888,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1054,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3900;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (882,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1078,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3926;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1194,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4040;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (798,-2);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1183,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4030;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (914,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (982,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3828;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (862,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (970,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3817;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/seven.squared.glyph b/src/Inter.glyphspackage/glyphs/seven.squared.glyph
index 9db19800c..076e70953 100644
--- a/src/Inter.glyphspackage/glyphs/seven.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/seven.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (914,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1110,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3938;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (906,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1108,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3936;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (876,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1152,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3980;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (882,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1152,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3980;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1226,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4054;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (828,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1226,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4054;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (876,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1054,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3882;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (882,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1078,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3906;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1194,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4022;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (828,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1183,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4011;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (914,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (982,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3810;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (906,0);
+alignment = 1;
 ref = seven;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (970,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3798;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/six.circled.glyph b/src/Inter.glyphspackage/glyphs/six.circled.glyph
index 651860153..bb3aba8bb 100644
--- a/src/Inter.glyphspackage/glyphs/six.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/six.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (826,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1156,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4002;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (824,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1158,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4004;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (784,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1260,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4106;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (774,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1260,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4106;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1422,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4268;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (704,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1420,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4267;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (784,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1196,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4042;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (774,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1196,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4044;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1322,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4168;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (704,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1388,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4235;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (826,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1028,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3874;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (824,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1030,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3877;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/six.squared.glyph b/src/Inter.glyphspackage/glyphs/six.squared.glyph
index 05ed6ed7e..f257f2bfb 100644
--- a/src/Inter.glyphspackage/glyphs/six.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/six.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (826,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1156,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3984;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (822,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1158,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3986;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1260,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4088;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (766,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1260,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4088;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1422,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4250;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1420,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4248;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (770,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1196,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4024;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (766,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1196,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4024;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1322,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4150;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (712,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1388,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4216;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (826,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1028,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3856;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (822,0);
+alignment = 1;
 ref = six;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1030,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3858;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/six.ss01.circled.glyph b/src/Inter.glyphspackage/glyphs/six.ss01.circled.glyph
index c0148153e..e8d1a51ee 100644
--- a/src/Inter.glyphspackage/glyphs/six.ss01.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/six.ss01.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (840,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1164,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4010;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (844,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1164,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4010;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4022;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (838,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4022;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (718,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1374,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4220;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (710,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1374,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4221;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1112,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3958;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (838,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1112,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 3960;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (718,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1342,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4188;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (710,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1342,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4189;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (840,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1036,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3882;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (844,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1036,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3883;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/six.ss01.squared.glyph b/src/Inter.glyphspackage/glyphs/six.ss01.squared.glyph
index b9192f4e4..ac31ebbb3 100644
--- a/src/Inter.glyphspackage/glyphs/six.ss01.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/six.ss01.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (840,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1164,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3992;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (846,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1164,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 3992;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4004;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (838,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4004;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (718,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1374,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4202;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (716,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1374,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4202;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (834,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1112,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3940;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (838,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1112,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3940;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (718,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1342,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4170;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (716,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1342,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4170;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (840,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1036,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3864;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (846,0);
+alignment = 1;
 ref = six.ss01;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1036,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3864;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/three.1.circled.glyph b/src/Inter.glyphspackage/glyphs/three.1.circled.glyph
index f4b6d7ac5..739dcbc67 100644
--- a/src/Inter.glyphspackage/glyphs/three.1.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/three.1.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1228,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4074;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (812,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1225,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4071;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (786,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1288,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4134;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (786,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1287,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4133;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (734,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1382,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4228;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1381,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4228;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (786,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1208,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4054;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (786,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1223,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4071;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (734,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1348,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4194;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1349,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4196;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1100,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3946;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (812,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1097,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3944;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/three.1.squared.glyph b/src/Inter.glyphspackage/glyphs/three.1.squared.glyph
index 614e09bb9..d38be8b34 100644
--- a/src/Inter.glyphspackage/glyphs/three.1.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/three.1.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1228,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4056;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (812,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1225,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4053;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (786,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1288,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4116;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (786,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1287,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4115;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (720,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1382,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4210;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1381,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4209;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (786,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1208,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4036;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (786,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1223,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4051;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (720,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1348,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4176;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (722,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1349,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4177;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1100,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3928;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (812,0);
+alignment = 1;
 ref = three.1;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1097,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3925;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/three.circled.glyph b/src/Inter.glyphspackage/glyphs/three.circled.glyph
index 173bdc978..45dd0f6b1 100644
--- a/src/Inter.glyphspackage/glyphs/three.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/three.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (802,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1256,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4102;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (810,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1256,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4102;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (766,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1304,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4150;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (766,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1304,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4150;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (734,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1382,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4228;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (744,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1382,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4229;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (766,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1232,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4078;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (766,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1240,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4088;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (734,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1344,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4190;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (744,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1350,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4197;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (802,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1128,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3974;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (810,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1128,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3975;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/three.squared.glyph b/src/Inter.glyphspackage/glyphs/three.squared.glyph
index 610010ebc..4c20baae2 100644
--- a/src/Inter.glyphspackage/glyphs/three.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/three.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (788,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1256,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4084;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (796,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1256,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4084;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (766,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1304,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4132;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (766,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1304,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4132;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (728,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1382,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4210;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (734,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1382,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4210;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (766,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1232,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4060;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (766,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1240,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4068;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (728,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1344,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4172;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (734,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1350,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4178;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (788,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1128,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3956;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (796,0);
+alignment = 1;
 ref = three;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1128,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3956;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/two.circled.glyph b/src/Inter.glyphspackage/glyphs/two.circled.glyph
index 3451267bc..2713821ff 100644
--- a/src/Inter.glyphspackage/glyphs/two.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/two.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (784,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1272,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4118;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (798,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1272,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4118;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (798,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1240,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4086;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (780,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1240,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4086;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (766,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1324,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4170;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (754,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1324,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4171;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (798,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1162,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4008;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (780,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1176,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4024;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (766,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1293,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4139;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (754,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1292,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4139;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (784,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1144,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3990;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (798,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1144,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3991;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/two.squared.glyph b/src/Inter.glyphspackage/glyphs/two.squared.glyph
index d56132dad..f09e02153 100644
--- a/src/Inter.glyphspackage/glyphs/two.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/two.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (784,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1272,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4100;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1272,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4100;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (798,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1240,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4068;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (794,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1240,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4068;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (766,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1324,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4152;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (760,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1324,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4152;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (798,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1162,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 3990;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (794,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1176,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4004;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (766,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1293,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4121;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (760,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1292,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4120;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (784,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1144,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3972;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = two;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1144,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3972;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/upA_rrow.circled.glyph b/src/Inter.glyphspackage/glyphs/upA_rrow.circled.glyph
index 29ca4dbbf..27abc3b61 100644
--- a/src/Inter.glyphspackage/glyphs/upA_rrow.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/upA_rrow.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (430,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (430,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4800;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (436,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1954,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4801;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1890,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4736;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (430,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1890,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4738;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1922,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4768;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (436,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1922,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4769;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1826,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4672;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (430,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1826,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 4673;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/upA_rrow.squared.glyph b/src/Inter.glyphspackage/glyphs/upA_rrow.squared.glyph
index 6ffe8647c..33feb78d0 100644
--- a/src/Inter.glyphspackage/glyphs/upA_rrow.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/upA_rrow.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (430,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (430,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (436,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1954,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4782;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1890,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4718;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (430,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1890,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4718;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1922,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4750;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (436,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1922,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4750;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (446,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1826,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4654;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (430,0);
+alignment = 1;
 ref = upArrow;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1826,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 4654;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/whiteL_argeS_quare.glyph b/src/Inter.glyphspackage/glyphs/whiteL_argeS_quare.glyph
index c4caec5e7..81dcbf6ac 100644
--- a/src/Inter.glyphspackage/glyphs/whiteL_argeS_quare.glyph
+++ b/src/Inter.glyphspackage/glyphs/whiteL_argeS_quare.glyph
@@ -2,124 +2,196 @@
 glyphname = whiteLargeSquare;
 layers = (
 {
+anchors = (
+{
+name = center;
+pos = (1414,745);
+}
+);
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (824,0);
+pos = (814,0);
 ref = enclosingsquarecomb;
 }
 );
-width = 2846;
+width = 2828;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1445,745);
+}
+);
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (824,0);
+pos = (815,0);
 ref = enclosingsquarecomb;
 }
 );
-width = 2846;
+width = 2828;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1414,745);
+}
+);
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (766,0);
+pos = (756,0);
 ref = enclosingsquarecomb;
 }
 );
-width = 2846;
+width = 2828;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1445,745);
+}
+);
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (766,0);
+pos = (757,0);
 ref = enclosingsquarecomb;
 }
 );
-width = 2846;
+width = 2828;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1414,745);
+}
+);
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (642,0);
+pos = (634,0);
 ref = enclosingsquarecomb;
 }
 );
-width = 2846;
+width = 2828;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1445,745);
+}
+);
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (642,0);
+pos = (635,0);
 ref = enclosingsquarecomb;
 }
 );
-width = 2846;
+width = 2828;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1414,745);
+}
+);
 layerId = m007;
 shapes = (
 {
-pos = (766,0);
+pos = (788,0);
 ref = enclosingsquarecomb;
 }
 );
-width = 2782;
+width = 2828;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1450,745);
+}
+);
 layerId = m008;
 shapes = (
 {
-pos = (766,0);
+pos = (794,0);
 ref = enclosingsquarecomb;
 }
 );
-width = 2782;
+width = 2828;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1414,745);
+}
+);
 layerId = m009;
 shapes = (
 {
-pos = (642,0);
+pos = (650,0);
 ref = enclosingsquarecomb;
 }
 );
-width = 2814;
+width = 2828;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1450,745);
+}
+);
 layerId = m010;
 shapes = (
 {
-pos = (642,0);
+pos = (656,0);
 ref = enclosingsquarecomb;
 }
 );
-width = 2814;
+width = 2828;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1414,745);
+}
+);
 layerId = m011;
 shapes = (
 {
-pos = (824,0);
+pos = (878,0);
 ref = enclosingsquarecomb;
 }
 );
-width = 2718;
+width = 2828;
 },
 {
+anchors = (
+{
+name = center;
+pos = (1450,745);
+}
+);
 layerId = m012;
 shapes = (
 {
-pos = (824,0);
+pos = (884,0);
 ref = enclosingsquarecomb;
 }
 );
-width = 2718;
+width = 2828;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/zero.circled.glyph b/src/Inter.glyphspackage/glyphs/zero.circled.glyph
index 990c2df92..0cfaff52a 100644
--- a/src/Inter.glyphspackage/glyphs/zero.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/zero.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1210,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4056;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1208,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4054;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1280,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4126;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1280,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4126;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (674,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1496,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4342;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (678,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1494,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4341;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1256,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4102;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1216,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4064;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (674,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1396,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4242;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (678,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1462,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4309;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1082,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3928;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1080,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3927;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/zero.slash.circled.glyph b/src/Inter.glyphspackage/glyphs/zero.slash.circled.glyph
index 11d51c320..2c07b3fe5 100644
--- a/src/Inter.glyphspackage/glyphs/zero.slash.circled.glyph
+++ b/src/Inter.glyphspackage/glyphs/zero.slash.circled.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1210,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4056;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1208,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4054;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1280,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4126;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1280,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4126;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (674,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1496,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4342;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (678,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1494,0);
+ref = largeCircle;
 }
 );
-width = 2846;
+width = 4341;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1256,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4102;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1216,0);
+ref = largeCircle;
 }
 );
-width = 2782;
+width = 4064;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (674,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1396,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4242;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (678,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1462,0);
+ref = largeCircle;
 }
 );
-width = 2814;
+width = 4309;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1082,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3928;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingcirclecomb;
+alignment = 1;
+pos = (1080,0);
+ref = largeCircle;
 }
 );
-width = 2718;
+width = 3927;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/zero.slash.squared.glyph b/src/Inter.glyphspackage/glyphs/zero.slash.squared.glyph
index 6f9cceb2c..ac06bc072 100644
--- a/src/Inter.glyphspackage/glyphs/zero.slash.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/zero.slash.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1210,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4038;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1208,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4036;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1280,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4108;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1280,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4108;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (674,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1496,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4324;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (676,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1494,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4322;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1256,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4084;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1216,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4044;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (674,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1396,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4224;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (676,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1462,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4290;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1082,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3910;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = zero.slash;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1080,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3908;
 }
 );
 tags = (
diff --git a/src/Inter.glyphspackage/glyphs/zero.squared.glyph b/src/Inter.glyphspackage/glyphs/zero.squared.glyph
index 97fe6c559..c2e296cc8 100644
--- a/src/Inter.glyphspackage/glyphs/zero.squared.glyph
+++ b/src/Inter.glyphspackage/glyphs/zero.squared.glyph
@@ -5,181 +5,181 @@ layers = (
 layerId = "B1F27B51-9973-4381-9301-4FE46FE1CA59";
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1210,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4038;
 },
 {
 layerId = "200BE2C5-40F6-4CF4-AF4F-A33C0CC0964F";
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1208,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4036;
 },
 {
 layerId = "C698F293-3EC0-4A5A-A3A0-0FDB1F5CF265";
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1280,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4108;
 },
 {
 layerId = "11F4534A-B963-4AB5-820F-DAF9A20CD933";
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1280,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4108;
 },
 {
 layerId = "5C20EF92-B63D-42A8-8878-93C2863E0093";
 shapes = (
 {
-pos = (674,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1496,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4324;
 },
 {
 layerId = "D0EC06BF-13F9-4C88-A6F5-B8203AF6C77E";
 shapes = (
 {
-pos = (676,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1494,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2846;
+width = 4322;
 },
 {
 layerId = m007;
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1256,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4084;
 },
 {
 layerId = m008;
 shapes = (
 {
-pos = (782,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (766,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1216,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2782;
+width = 4044;
 },
 {
 layerId = m009;
 shapes = (
 {
-pos = (674,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1396,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4224;
 },
 {
 layerId = m010;
 shapes = (
 {
-pos = (676,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (642,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1462,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2814;
+width = 4290;
 },
 {
 layerId = m011;
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1082,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3910;
 },
 {
 layerId = m012;
 shapes = (
 {
-pos = (818,0);
+alignment = 1;
 ref = zero;
 },
 {
-alignment = -1;
-pos = (824,0);
-ref = enclosingsquarecomb;
+alignment = 1;
+pos = (1080,0);
+ref = whiteLargeSquare;
 }
 );
-width = 2718;
+width = 3908;
 }
 );
 tags = (
author	Rasmus Andersson <rasmus@notion.se>	2022-07-08 18:56:40 +0300
committer	Rasmus Andersson <rasmus@notion.se>	2022-07-08 18:56:40 +0300
commit	7ec83d25f69e6570fecba4edb903c0fd18d6c60c (patch)
tree	364a9cfb64755ac7c77d62f9391099415645c547 /src/Inter.glyphspackage
parent	59728bcde13b300f0db70d8cd6d14d18c9fa6420 (diff)
download	inter-7ec83d25f69e6570fecba4edb903c0fd18d6c60c.tar.xz