diff --git a/sources/NotoSansArabic.glyphspackage/fontinfo.plist b/sources/NotoSansArabic.glyphspackage/fontinfo.plist
index 9898657a2..faa9004d8 100644
--- a/sources/NotoSansArabic.glyphspackage/fontinfo.plist
+++ b/sources/NotoSansArabic.glyphspackage/fontinfo.plist
@@ -215,7 +215,7 @@ twodotshorizontalcenter-ar
 fourdotscenter-ar
 tahcenter-ar
 twodotshorizontalcenter_tahabove-ar
-fourdotscenter-ar
+fourcenter-ar
 ";
 name = widemarks.center;
 },
diff --git a/sources/NotoSansArabic.glyphspackage/glyphs/hahF_ourbelow-ar.glyph b/sources/NotoSansArabic.glyphspackage/glyphs/hahF_ourbelow-ar.glyph
index e891476cb..7f17a2024 100644
--- a/sources/NotoSansArabic.glyphspackage/glyphs/hahF_ourbelow-ar.glyph
+++ b/sources/NotoSansArabic.glyphspackage/glyphs/hahF_ourbelow-ar.glyph
@@ -4,37 +4,37 @@ layers = (
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "fourcenter-ar";
-transform = "{1, 0, 0, 1, 202, -57}";
+transform = "{1, 0, 0, 1, 172, -86}";
 }
 );
 layerId = "9B455188-434F-489F-9A18-4C18DBE88840";
-width = 494;
+width = 514;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "fourcenter-ar";
-transform = "{1, 0, 0, 1, 271, -23}";
+transform = "{1, 0, 0, 1, 262, -23}";
 }
 );
 layerId = "A7E21968-E455-4749-BB19-379F5EDC3B9B";
-width = 624;
+width = 654;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "fourcenter-ar";
-transform = "{1, 0, 0, 1, 221, -68}";
+transform = "{1, 0, 0, 1, 176, -96}";
 }
 );
 layerId = "D3B47D5E-6A85-4361-9DF6-638C8B7E2782";
@@ -43,11 +43,11 @@ width = 500;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "fourcenter-ar";
-transform = "{1, 0, 0, 1, 249, -36}";
+transform = "{1, 0, 0, 1, 221, -39}";
 }
 );
 layerId = "08F1692B-9525-48D2-9816-1987B1C44D50";
@@ -56,11 +56,11 @@ width = 578;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "fourcenter-ar";
-transform = "{1, 0, 0, 1, 252, -100}";
+transform = "{1, 0, 0, 1, 252, -86}";
 }
 );
 layerId = "A2AC38AA-6CC4-4B2B-B5AB-64A49772F2D3";
@@ -69,7 +69,7 @@ width = 620;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "fourcenter-ar";
@@ -77,16 +77,16 @@ transform = "{1, 0, 0, 1, 239, -66}";
 }
 );
 layerId = "6D0603BE-7277-4DA4-8C59-7934AF28E45B";
-width = 639;
+width = 659;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "fourcenter-ar";
-transform = "{1, 0, 0, 1, 278, -35}";
+transform = "{1, 0, 0, 1, 278, -41}";
 }
 );
 layerId = "E1555194-BAFD-4DCC-A026-E2F9BA1917F2";
@@ -95,11 +95,11 @@ width = 687;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "fourcenter-ar";
-transform = "{1, 0, 0, 1, 291, -34}";
+transform = "{1, 0, 0, 1, 301, -22}";
 }
 );
 layerId = "8594390A-478C-48BC-BAB2-0B8797A53DFB";
diff --git a/sources/NotoSansArabic.glyphspackage/glyphs/hahT_ahT_wodotshorizontalbelow-ar.glyph b/sources/NotoSansArabic.glyphspackage/glyphs/hahT_ahT_wodotshorizontalbelow-ar.glyph
index 379c8ed17..313deeb97 100644
--- a/sources/NotoSansArabic.glyphspackage/glyphs/hahT_ahT_wodotshorizontalbelow-ar.glyph
+++ b/sources/NotoSansArabic.glyphspackage/glyphs/hahT_ahT_wodotshorizontalbelow-ar.glyph
@@ -4,37 +4,37 @@ layers = (
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "twodotshorizontalcenter_tahabove-ar";
-transform = "{1, 0, 0, 1, 160, -57}";
+transform = "{1, 0, 0, 1, 130, -86}";
 }
 );
 layerId = "9B455188-434F-489F-9A18-4C18DBE88840";
-width = 494;
+width = 514;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "twodotshorizontalcenter_tahabove-ar";
-transform = "{1, 0, 0, 1, 252, -23}";
+transform = "{1, 0, 0, 1, 243, -23}";
 }
 );
 layerId = "A7E21968-E455-4749-BB19-379F5EDC3B9B";
-width = 624;
+width = 654;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "twodotshorizontalcenter_tahabove-ar";
-transform = "{1, 0, 0, 1, 165, -68}";
+transform = "{1, 0, 0, 1, 120, -96}";
 }
 );
 layerId = "D3B47D5E-6A85-4361-9DF6-638C8B7E2782";
@@ -43,11 +43,11 @@ width = 500;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "twodotshorizontalcenter_tahabove-ar";
-transform = "{1, 0, 0, 1, 220, -36}";
+transform = "{1, 0, 0, 1, 192, -39}";
 }
 );
 layerId = "08F1692B-9525-48D2-9816-1987B1C44D50";
@@ -56,11 +56,11 @@ width = 578;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "twodotshorizontalcenter_tahabove-ar";
-transform = "{1, 0, 0, 1, 213, -100}";
+transform = "{1, 0, 0, 1, 213, -86}";
 }
 );
 layerId = "A2AC38AA-6CC4-4B2B-B5AB-64A49772F2D3";
@@ -69,7 +69,7 @@ width = 620;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "twodotshorizontalcenter_tahabove-ar";
@@ -77,16 +77,16 @@ transform = "{1, 0, 0, 1, 210, -66}";
 }
 );
 layerId = "6D0603BE-7277-4DA4-8C59-7934AF28E45B";
-width = 639;
+width = 659;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "twodotshorizontalcenter_tahabove-ar";
-transform = "{1, 0, 0, 1, 264, -35}";
+transform = "{1, 0, 0, 1, 264, -41}";
 }
 );
 layerId = "E1555194-BAFD-4DCC-A026-E2F9BA1917F2";
@@ -95,11 +95,11 @@ width = 687;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "twodotshorizontalcenter_tahabove-ar";
-transform = "{1, 0, 0, 1, 287, -34}";
+transform = "{1, 0, 0, 1, 297, -22}";
 }
 );
 layerId = "8594390A-478C-48BC-BAB2-0B8797A53DFB";
diff --git a/sources/NotoSansArabic.glyphspackage/glyphs/hahT_ahbelow-ar.glyph b/sources/NotoSansArabic.glyphspackage/glyphs/hahT_ahbelow-ar.glyph
index 7f23a02bb..290bf0138 100644
--- a/sources/NotoSansArabic.glyphspackage/glyphs/hahT_ahbelow-ar.glyph
+++ b/sources/NotoSansArabic.glyphspackage/glyphs/hahT_ahbelow-ar.glyph
@@ -4,37 +4,37 @@ layers = (
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "tahcenter-ar";
-transform = "{1, 0, 0, 1, 180, -57}";
+transform = "{1, 0, 0, 1, 150, -86}";
 }
 );
 layerId = "9B455188-434F-489F-9A18-4C18DBE88840";
-width = 494;
+width = 514;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "tahcenter-ar";
-transform = "{1, 0, 0, 1, 263, -23}";
+transform = "{1, 0, 0, 1, 254, -23}";
 }
 );
 layerId = "A7E21968-E455-4749-BB19-379F5EDC3B9B";
-width = 624;
+width = 654;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "tahcenter-ar";
-transform = "{1, 0, 0, 1, 188, -68}";
+transform = "{1, 0, 0, 1, 143, -96}";
 }
 );
 layerId = "D3B47D5E-6A85-4361-9DF6-638C8B7E2782";
@@ -43,11 +43,11 @@ width = 500;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "tahcenter-ar";
-transform = "{1, 0, 0, 1, 235, -36}";
+transform = "{1, 0, 0, 1, 207, -39}";
 }
 );
 layerId = "08F1692B-9525-48D2-9816-1987B1C44D50";
@@ -56,11 +56,11 @@ width = 578;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "tahcenter-ar";
-transform = "{1, 0, 0, 1, 224, -100}";
+transform = "{1, 0, 0, 1, 224, -86}";
 }
 );
 layerId = "A2AC38AA-6CC4-4B2B-B5AB-64A49772F2D3";
@@ -69,7 +69,7 @@ width = 620;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "tahcenter-ar";
@@ -77,16 +77,16 @@ transform = "{1, 0, 0, 1, 217, -66}";
 }
 );
 layerId = "6D0603BE-7277-4DA4-8C59-7934AF28E45B";
-width = 639;
+width = 659;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "tahcenter-ar";
-transform = "{1, 0, 0, 1, 267, -35}";
+transform = "{1, 0, 0, 1, 267, -41}";
 }
 );
 layerId = "E1555194-BAFD-4DCC-A026-E2F9BA1917F2";
@@ -95,11 +95,11 @@ width = 687;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "tahcenter-ar";
-transform = "{1, 0, 0, 1, 298, -34}";
+transform = "{1, 0, 0, 1, 308, -22}";
 }
 );
 layerId = "8594390A-478C-48BC-BAB2-0B8797A53DFB";
diff --git a/sources/NotoSansArabic.glyphspackage/glyphs/hahT_hreedotsupbelow-ar.glyph b/sources/NotoSansArabic.glyphspackage/glyphs/hahT_hreedotsupbelow-ar.glyph
index dd10f0933..0559f8aff 100644
--- a/sources/NotoSansArabic.glyphspackage/glyphs/hahT_hreedotsupbelow-ar.glyph
+++ b/sources/NotoSansArabic.glyphspackage/glyphs/hahT_hreedotsupbelow-ar.glyph
@@ -4,37 +4,37 @@ layers = (
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsupcenter-ar";
-transform = "{1, 0, 0, 1, 160, -57}";
+transform = "{1, 0, 0, 1, 130, -86}";
 }
 );
 layerId = "9B455188-434F-489F-9A18-4C18DBE88840";
-width = 494;
+width = 514;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsupcenter-ar";
-transform = "{1, 0, 0, 1, 247, -23}";
+transform = "{1, 0, 0, 1, 238, -23}";
 }
 );
 layerId = "A7E21968-E455-4749-BB19-379F5EDC3B9B";
-width = 624;
+width = 654;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsupcenter-ar";
-transform = "{1, 0, 0, 1, 160, -68}";
+transform = "{1, 0, 0, 1, 115, -96}";
 }
 );
 layerId = "D3B47D5E-6A85-4361-9DF6-638C8B7E2782";
@@ -43,11 +43,11 @@ width = 500;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsupcenter-ar";
-transform = "{1, 0, 0, 1, 214, -36}";
+transform = "{1, 0, 0, 1, 186, -39}";
 }
 );
 layerId = "08F1692B-9525-48D2-9816-1987B1C44D50";
@@ -56,11 +56,11 @@ width = 578;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsupcenter-ar";
-transform = "{1, 0, 0, 1, 205, -100}";
+transform = "{1, 0, 0, 1, 205, -86}";
 }
 );
 layerId = "A2AC38AA-6CC4-4B2B-B5AB-64A49772F2D3";
@@ -69,7 +69,7 @@ width = 620;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsupcenter-ar";
@@ -77,16 +77,16 @@ transform = "{1, 0, 0, 1, 206, -66}";
 }
 );
 layerId = "6D0603BE-7277-4DA4-8C59-7934AF28E45B";
-width = 639;
+width = 659;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsupcenter-ar";
-transform = "{1, 0, 0, 1, 262, -35}";
+transform = "{1, 0, 0, 1, 262, -41}";
 }
 );
 layerId = "E1555194-BAFD-4DCC-A026-E2F9BA1917F2";
@@ -95,11 +95,11 @@ width = 687;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsupcenter-ar";
-transform = "{1, 0, 0, 1, 232, -34}";
+transform = "{1, 0, 0, 1, 242, -22}";
 }
 );
 layerId = "8594390A-478C-48BC-BAB2-0B8797A53DFB";
diff --git a/sources/NotoSansArabic.glyphspackage/glyphs/jeemT_hreedotsbelow-ar.glyph b/sources/NotoSansArabic.glyphspackage/glyphs/jeemT_hreedotsbelow-ar.glyph
index b70e61b61..4d7b12c85 100644
--- a/sources/NotoSansArabic.glyphspackage/glyphs/jeemT_hreedotsbelow-ar.glyph
+++ b/sources/NotoSansArabic.glyphspackage/glyphs/jeemT_hreedotsbelow-ar.glyph
@@ -4,7 +4,7 @@ layers = (
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "dotcenter_threedotsdownbelow-ar";
@@ -12,16 +12,16 @@ transform = "{1, 0, 0, 1, 272, 137}";
 }
 );
 layerId = "6D0603BE-7277-4DA4-8C59-7934AF28E45B";
-width = 639;
+width = 659;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "dotcenter_threedotsdownbelow-ar";
-transform = "{1, 0, 0, 1, 300, 82}";
+transform = "{1, 0, 0, 1, 300, 96}";
 }
 );
 layerId = "A2AC38AA-6CC4-4B2B-B5AB-64A49772F2D3";
@@ -30,11 +30,11 @@ width = 620;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "dotcenter_threedotsdownbelow-ar";
-transform = "{1, 0, 0, 1, 312, 205}";
+transform = "{1, 0, 0, 1, 312, 199}";
 }
 );
 layerId = "E1555194-BAFD-4DCC-A026-E2F9BA1917F2";
@@ -43,11 +43,11 @@ width = 687;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "dotcenter_threedotsdownbelow-ar";
-transform = "{1, 0, 0, 1, 312, 229}";
+transform = "{1, 0, 0, 1, 322, 241}";
 }
 );
 layerId = "8594390A-478C-48BC-BAB2-0B8797A53DFB";
@@ -56,11 +56,11 @@ width = 733;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "dotcenter_threedotsdownbelow-ar";
-transform = "{1, 0, 0, 1, 253, 114}";
+transform = "{1, 0, 0, 1, 208, 86}";
 }
 );
 layerId = "D3B47D5E-6A85-4361-9DF6-638C8B7E2782";
@@ -69,24 +69,24 @@ width = 500;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "dotcenter_threedotsdownbelow-ar";
-transform = "{1, 0, 0, 1, 229, 148}";
+transform = "{1, 0, 0, 1, 199, 119}";
 }
 );
 layerId = "9B455188-434F-489F-9A18-4C18DBE88840";
-width = 494;
+width = 514;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "dotcenter_threedotsdownbelow-ar";
-transform = "{1, 0, 0, 1, 267, 189}";
+transform = "{1, 0, 0, 1, 239, 186}";
 }
 );
 layerId = "08F1692B-9525-48D2-9816-1987B1C44D50";
@@ -95,15 +95,15 @@ width = 578;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "dotcenter_threedotsdownbelow-ar";
-transform = "{1, 0, 0, 1, 282, 239}";
+transform = "{1, 0, 0, 1, 273, 239}";
 }
 );
 layerId = "A7E21968-E455-4749-BB19-379F5EDC3B9B";
-width = 624;
+width = 654;
 }
 );
 unicode = 08C6;
diff --git a/sources/NotoSansArabic.glyphspackage/glyphs/nyeh-ar.fina.glyph b/sources/NotoSansArabic.glyphspackage/glyphs/nyeh-ar.fina.glyph
index cbec8e30e..c039a9cbd 100644
--- a/sources/NotoSansArabic.glyphspackage/glyphs/nyeh-ar.fina.glyph
+++ b/sources/NotoSansArabic.glyphspackage/glyphs/nyeh-ar.fina.glyph
@@ -5,54 +5,54 @@ layers = (
 anchors = (
 {
 name = top;
-position = "{304, 416}";
+position = "{311, 416}";
 }
 );
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "twodotshorizontalcenter-ar";
-transform = "{1, 0, 0, 1, 160, -57}";
+transform = "{1, 0, 0, 1, 130, -86}";
 }
 );
 layerId = "9B455188-434F-489F-9A18-4C18DBE88840";
-width = 540;
+width = 600;
 },
 {
 anchors = (
 {
 name = top;
-position = "{291, 550}";
+position = "{311, 416}";
 }
 );
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "twodotshorizontalcenter-ar";
-transform = "{1, 0, 0, 1, 205, -23}";
+transform = "{1, 0, 0, 1, 196, -23}";
 }
 );
 layerId = "A7E21968-E455-4749-BB19-379F5EDC3B9B";
-width = 602;
+width = 652;
 },
 {
 anchors = (
 {
 name = top;
-position = "{251, 370}";
+position = "{311, 416}";
 }
 );
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "twodotshorizontalcenter-ar";
-transform = "{1, 0, 0, 1, 161, -68}";
+transform = "{1, 0, 0, 1, 116, -96}";
 }
 );
 layerId = "D3B47D5E-6A85-4361-9DF6-638C8B7E2782";
@@ -62,35 +62,35 @@ width = 510;
 anchors = (
 {
 name = top;
-position = "{293, 500}";
+position = "{311, 416}";
 }
 );
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "twodotshorizontalcenter-ar";
-transform = "{1, 0, 0, 1, 186, -36}";
+transform = "{1, 0, 0, 1, 158, -39}";
 }
 );
 layerId = "08F1692B-9525-48D2-9816-1987B1C44D50";
-width = 577;
+width = 627;
 },
 {
 anchors = (
 {
 name = top;
-position = "{331, 370}";
+position = "{311, 416}";
 }
 );
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "twodotshorizontalcenter-ar";
-transform = "{1, 0, 0, 1, 206, -100}";
+transform = "{1, 0, 0, 1, 206, -86}";
 }
 );
 layerId = "A2AC38AA-6CC4-4B2B-B5AB-64A49772F2D3";
@@ -105,7 +105,7 @@ position = "{311, 416}";
 );
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "twodotshorizontalcenter-ar";
@@ -113,45 +113,45 @@ transform = "{1, 0, 0, 1, 206, -66}";
 }
 );
 layerId = "6D0603BE-7277-4DA4-8C59-7934AF28E45B";
-width = 649;
+width = 719;
 },
 {
 anchors = (
 {
 name = top;
-position = "{329, 500}";
+position = "{311, 416}";
 }
 );
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "twodotshorizontalcenter-ar";
-transform = "{1, 0, 0, 1, 225, -35}";
+transform = "{1, 0, 0, 1, 225, -41}";
 }
 );
 layerId = "E1555194-BAFD-4DCC-A026-E2F9BA1917F2";
-width = 739;
+width = 759;
 },
 {
 anchors = (
 {
 name = top;
-position = "{341, 550}";
+position = "{311, 416}";
 }
 );
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "twodotshorizontalcenter-ar";
-transform = "{1, 0, 0, 1, 240, -34}";
+transform = "{1, 0, 0, 1, 250, -22}";
 }
 );
 layerId = "8594390A-478C-48BC-BAB2-0B8797A53DFB";
-width = 771;
+width = 821;
 }
 );
 unicode = FB77;
diff --git a/sources/NotoSansArabic.glyphspackage/glyphs/nyeh-ar.glyph b/sources/NotoSansArabic.glyphspackage/glyphs/nyeh-ar.glyph
index 7fb0ed9c1..e40461899 100644
--- a/sources/NotoSansArabic.glyphspackage/glyphs/nyeh-ar.glyph
+++ b/sources/NotoSansArabic.glyphspackage/glyphs/nyeh-ar.glyph
@@ -4,37 +4,37 @@ layers = (
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "twodotshorizontalcenter-ar";
-transform = "{1, 0, 0, 1, 160, -57}";
+transform = "{1, 0, 0, 1, 130, -86}";
 }
 );
 layerId = "9B455188-434F-489F-9A18-4C18DBE88840";
-width = 494;
+width = 514;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "twodotshorizontalcenter-ar";
-transform = "{1, 0, 0, 1, 205, -23}";
+transform = "{1, 0, 0, 1, 196, -23}";
 }
 );
 layerId = "A7E21968-E455-4749-BB19-379F5EDC3B9B";
-width = 624;
+width = 654;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "twodotshorizontalcenter-ar";
-transform = "{1, 0, 0, 1, 161, -68}";
+transform = "{1, 0, 0, 1, 116, -96}";
 }
 );
 layerId = "D3B47D5E-6A85-4361-9DF6-638C8B7E2782";
@@ -43,11 +43,11 @@ width = 500;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "twodotshorizontalcenter-ar";
-transform = "{1, 0, 0, 1, 186, -36}";
+transform = "{1, 0, 0, 1, 158, -39}";
 }
 );
 layerId = "08F1692B-9525-48D2-9816-1987B1C44D50";
@@ -56,11 +56,11 @@ width = 578;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "twodotshorizontalcenter-ar";
-transform = "{1, 0, 0, 1, 206, -100}";
+transform = "{1, 0, 0, 1, 206, -86}";
 }
 );
 layerId = "A2AC38AA-6CC4-4B2B-B5AB-64A49772F2D3";
@@ -69,7 +69,7 @@ width = 620;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "twodotshorizontalcenter-ar";
@@ -77,16 +77,16 @@ transform = "{1, 0, 0, 1, 206, -66}";
 }
 );
 layerId = "6D0603BE-7277-4DA4-8C59-7934AF28E45B";
-width = 639;
+width = 659;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "twodotshorizontalcenter-ar";
-transform = "{1, 0, 0, 1, 225, -35}";
+transform = "{1, 0, 0, 1, 225, -41}";
 }
 );
 layerId = "E1555194-BAFD-4DCC-A026-E2F9BA1917F2";
@@ -95,11 +95,11 @@ width = 687;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "twodotshorizontalcenter-ar";
-transform = "{1, 0, 0, 1, 240, -34}";
+transform = "{1, 0, 0, 1, 250, -22}";
 }
 );
 layerId = "8594390A-478C-48BC-BAB2-0B8797A53DFB";
diff --git a/sources/NotoSansArabic.glyphspackage/glyphs/tcheh-ar.fina.glyph b/sources/NotoSansArabic.glyphspackage/glyphs/tcheh-ar.fina.glyph
index 795915886..ff1a5ddb0 100644
--- a/sources/NotoSansArabic.glyphspackage/glyphs/tcheh-ar.fina.glyph
+++ b/sources/NotoSansArabic.glyphspackage/glyphs/tcheh-ar.fina.glyph
@@ -5,54 +5,54 @@ layers = (
 anchors = (
 {
 name = top;
-position = "{304, 416}";
+position = "{311, 416}";
 }
 );
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 161, -57}";
+transform = "{1, 0, 0, 1, 131, -86}";
 }
 );
 layerId = "9B455188-434F-489F-9A18-4C18DBE88840";
-width = 540;
+width = 600;
 },
 {
 anchors = (
 {
 name = top;
-position = "{291, 550}";
+position = "{311, 416}";
 }
 );
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 247, -23}";
+transform = "{1, 0, 0, 1, 238, -23}";
 }
 );
 layerId = "A7E21968-E455-4749-BB19-379F5EDC3B9B";
-width = 602;
+width = 652;
 },
 {
 anchors = (
 {
 name = top;
-position = "{251, 370}";
+position = "{311, 416}";
 }
 );
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 161, -68}";
+transform = "{1, 0, 0, 1, 116, -96}";
 }
 );
 layerId = "D3B47D5E-6A85-4361-9DF6-638C8B7E2782";
@@ -62,35 +62,35 @@ width = 510;
 anchors = (
 {
 name = top;
-position = "{293, 500}";
+position = "{311, 416}";
 }
 );
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 218, -36}";
+transform = "{1, 0, 0, 1, 190, -39}";
 }
 );
 layerId = "08F1692B-9525-48D2-9816-1987B1C44D50";
-width = 577;
+width = 627;
 },
 {
 anchors = (
 {
 name = top;
-position = "{331, 370}";
+position = "{311, 416}";
 }
 );
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 206, -100}";
+transform = "{1, 0, 0, 1, 206, -86}";
 }
 );
 layerId = "A2AC38AA-6CC4-4B2B-B5AB-64A49772F2D3";
@@ -105,7 +105,7 @@ position = "{311, 416}";
 );
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "threedotsdowncenter-ar";
@@ -113,45 +113,45 @@ transform = "{1, 0, 0, 1, 207, -66}";
 }
 );
 layerId = "6D0603BE-7277-4DA4-8C59-7934AF28E45B";
-width = 649;
+width = 719;
 },
 {
 anchors = (
 {
 name = top;
-position = "{329, 500}";
+position = "{311, 416}";
 }
 );
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 269, -35}";
+transform = "{1, 0, 0, 1, 269, -41}";
 }
 );
 layerId = "E1555194-BAFD-4DCC-A026-E2F9BA1917F2";
-width = 739;
+width = 759;
 },
 {
 anchors = (
 {
 name = top;
-position = "{341, 550}";
+position = "{311, 416}";
 }
 );
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 283, -34}";
+transform = "{1, 0, 0, 1, 293, -22}";
 }
 );
 layerId = "8594390A-478C-48BC-BAB2-0B8797A53DFB";
-width = 771;
+width = 821;
 }
 );
 unicode = FB7B;
diff --git a/sources/NotoSansArabic.glyphspackage/glyphs/tcheh-ar.glyph b/sources/NotoSansArabic.glyphspackage/glyphs/tcheh-ar.glyph
index 2efaf3ca9..ed62c1bbd 100644
--- a/sources/NotoSansArabic.glyphspackage/glyphs/tcheh-ar.glyph
+++ b/sources/NotoSansArabic.glyphspackage/glyphs/tcheh-ar.glyph
@@ -4,37 +4,37 @@ layers = (
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 161, -57}";
+transform = "{1, 0, 0, 1, 131, -86}";
 }
 );
 layerId = "9B455188-434F-489F-9A18-4C18DBE88840";
-width = 494;
+width = 514;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 247, -23}";
+transform = "{1, 0, 0, 1, 238, -23}";
 }
 );
 layerId = "A7E21968-E455-4749-BB19-379F5EDC3B9B";
-width = 624;
+width = 654;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 161, -68}";
+transform = "{1, 0, 0, 1, 116, -96}";
 }
 );
 layerId = "D3B47D5E-6A85-4361-9DF6-638C8B7E2782";
@@ -43,11 +43,11 @@ width = 500;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 218, -36}";
+transform = "{1, 0, 0, 1, 190, -39}";
 }
 );
 layerId = "08F1692B-9525-48D2-9816-1987B1C44D50";
@@ -56,11 +56,11 @@ width = 578;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 206, -100}";
+transform = "{1, 0, 0, 1, 206, -86}";
 }
 );
 layerId = "A2AC38AA-6CC4-4B2B-B5AB-64A49772F2D3";
@@ -69,7 +69,7 @@ width = 620;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
@@ -77,16 +77,16 @@ transform = "{1, 0, 0, 1, 207, -66}";
 }
 );
 layerId = "6D0603BE-7277-4DA4-8C59-7934AF28E45B";
-width = 639;
+width = 659;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 269, -35}";
+transform = "{1, 0, 0, 1, 269, -41}";
 }
 );
 layerId = "E1555194-BAFD-4DCC-A026-E2F9BA1917F2";
@@ -95,11 +95,11 @@ width = 687;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 283, -34}";
+transform = "{1, 0, 0, 1, 293, -22}";
 }
 );
 layerId = "8594390A-478C-48BC-BAB2-0B8797A53DFB";
diff --git a/sources/NotoSansArabic.glyphspackage/glyphs/tchehD_otabove-ar.glyph b/sources/NotoSansArabic.glyphspackage/glyphs/tchehD_otabove-ar.glyph
index 85433ee5d..67e770b7a 100644
--- a/sources/NotoSansArabic.glyphspackage/glyphs/tchehD_otabove-ar.glyph
+++ b/sources/NotoSansArabic.glyphspackage/glyphs/tchehD_otabove-ar.glyph
@@ -4,45 +4,45 @@ layers = (
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 161, -57}";
+transform = "{1, 0, 0, 1, 131, -86}";
 },
 {
 name = "dotabove-ar";
-transform = "{1, 0, 0, 1, 231, -47}";
+transform = "{1, 0, 0, 1, 241, -47}";
 }
 );
 layerId = "9B455188-434F-489F-9A18-4C18DBE88840";
-width = 494;
+width = 514;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 247, -23}";
+transform = "{1, 0, 0, 1, 238, -23}";
 },
 {
 name = "dotabove-ar";
-transform = "{1, 0, 0, 1, 187, 109}";
+transform = "{1, 0, 0, 1, 197, 109}";
 }
 );
 layerId = "A7E21968-E455-4749-BB19-379F5EDC3B9B";
-width = 624;
+width = 654;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 161, -68}";
+transform = "{1, 0, 0, 1, 116, -96}";
 },
 {
 name = "dotabove-ar";
@@ -55,15 +55,15 @@ width = 500;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 218, -36}";
+transform = "{1, 0, 0, 1, 190, -39}";
 },
 {
 name = "dotabove-ar";
-transform = "{1, 0, 0, 1, 203, 50}";
+transform = "{1, 0, 0, 1, 213, 50}";
 }
 );
 layerId = "08F1692B-9525-48D2-9816-1987B1C44D50";
@@ -72,11 +72,11 @@ width = 578;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 206, -100}";
+transform = "{1, 0, 0, 1, 206, -86}";
 },
 {
 name = "dotabove-ar";
@@ -89,7 +89,7 @@ width = 620;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
@@ -97,24 +97,24 @@ transform = "{1, 0, 0, 1, 207, -66}";
 },
 {
 name = "dotabove-ar";
-transform = "{1, 0, 0, 1, 236, -47}";
+transform = "{1, 0, 0, 1, 246, -47}";
 }
 );
 layerId = "6D0603BE-7277-4DA4-8C59-7934AF28E45B";
-width = 639;
+width = 659;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 269, -35}";
+transform = "{1, 0, 0, 1, 269, -41}";
 },
 {
 name = "dotabove-ar";
-transform = "{1, 0, 0, 1, 230, 49}";
+transform = "{1, 0, 0, 1, 250, 49}";
 }
 );
 layerId = "E1555194-BAFD-4DCC-A026-E2F9BA1917F2";
@@ -123,15 +123,15 @@ width = 687;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 283, -34}";
+transform = "{1, 0, 0, 1, 293, -22}";
 },
 {
 name = "dotabove-ar";
-transform = "{1, 0, 0, 1, 244, 103}";
+transform = "{1, 0, 0, 1, 254, 103}";
 }
 );
 layerId = "8594390A-478C-48BC-BAB2-0B8797A53DFB";
diff --git a/sources/NotoSansArabic.glyphspackage/glyphs/tchehV_above-ar.glyph b/sources/NotoSansArabic.glyphspackage/glyphs/tchehV_above-ar.glyph
index 43989256f..070b1149b 100644
--- a/sources/NotoSansArabic.glyphspackage/glyphs/tchehV_above-ar.glyph
+++ b/sources/NotoSansArabic.glyphspackage/glyphs/tchehV_above-ar.glyph
@@ -4,11 +4,11 @@ layers = (
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 206, -100}";
+transform = "{1, 0, 0, 1, 206, -86}";
 },
 {
 name = "vabove-ar";
@@ -21,7 +21,7 @@ width = 620;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
@@ -29,24 +29,24 @@ transform = "{1, 0, 0, 1, 207, -66}";
 },
 {
 name = "vabove-ar";
-transform = "{1, 0, 0, 1, 196, -14}";
+transform = "{1, 0, 0, 1, 206, -14}";
 }
 );
 layerId = "6D0603BE-7277-4DA4-8C59-7934AF28E45B";
-width = 639;
+width = 659;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 269, -35}";
+transform = "{1, 0, 0, 1, 269, -41}";
 },
 {
 name = "vabove-ar";
-transform = "{1, 0, 0, 1, 202, 50}";
+transform = "{1, 0, 0, 1, 222, 50}";
 }
 );
 layerId = "E1555194-BAFD-4DCC-A026-E2F9BA1917F2";
@@ -55,15 +55,15 @@ width = 687;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 283, -34}";
+transform = "{1, 0, 0, 1, 293, -22}";
 },
 {
 name = "vabove-ar";
-transform = "{1, 0, 0, 1, 220, 101}";
+transform = "{1, 0, 0, 1, 230, 101}";
 }
 );
 layerId = "8594390A-478C-48BC-BAB2-0B8797A53DFB";
@@ -72,11 +72,11 @@ width = 733;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 161, -68}";
+transform = "{1, 0, 0, 1, 116, -96}";
 },
 {
 name = "vabove-ar";
@@ -89,32 +89,32 @@ width = 500;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 161, -57}";
+transform = "{1, 0, 0, 1, 131, -86}";
 },
 {
 name = "vabove-ar";
-transform = "{1, 0, 0, 1, 201, -14}";
+transform = "{1, 0, 0, 1, 211, -14}";
 }
 );
 layerId = "9B455188-434F-489F-9A18-4C18DBE88840";
-width = 494;
+width = 514;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 218, -36}";
+transform = "{1, 0, 0, 1, 190, -39}";
 },
 {
 name = "vabove-ar";
-transform = "{1, 0, 0, 1, 190, 50}";
+transform = "{1, 0, 0, 1, 200, 50}";
 }
 );
 layerId = "08F1692B-9525-48D2-9816-1987B1C44D50";
@@ -123,19 +123,19 @@ width = 578;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "threedotsdowncenter-ar";
-transform = "{1, 0, 0, 1, 247, -23}";
+transform = "{1, 0, 0, 1, 238, -23}";
 },
 {
 name = "vabove-ar";
-transform = "{1, 0, 0, 1, 185, 101}";
+transform = "{1, 0, 0, 1, 195, 101}";
 }
 );
 layerId = "A7E21968-E455-4749-BB19-379F5EDC3B9B";
-width = 624;
+width = 654;
 }
 );
 unicode = 08C1;
diff --git a/sources/NotoSansArabic.glyphspackage/glyphs/tcheheh-ar.fina.glyph b/sources/NotoSansArabic.glyphspackage/glyphs/tcheheh-ar.fina.glyph
index 1134e8777..577c98b9a 100644
--- a/sources/NotoSansArabic.glyphspackage/glyphs/tcheheh-ar.fina.glyph
+++ b/sources/NotoSansArabic.glyphspackage/glyphs/tcheheh-ar.fina.glyph
@@ -2,110 +2,74 @@
 glyphname = "tcheheh-ar.fina";
 layers = (
 {
-anchors = (
-{
-name = top;
-position = "{304, 416}";
-}
-);
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "fourdotscenter-ar";
-transform = "{1, 0, 0, 1, 160, -57}";
+transform = "{1, 0, 0, 1, 130, -86}";
 }
 );
 layerId = "9B455188-434F-489F-9A18-4C18DBE88840";
-width = 540;
+width = 600;
 },
 {
-anchors = (
-{
-name = top;
-position = "{291, 550}";
-}
-);
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "fourdotscenter-ar";
-transform = "{1, 0, 0, 1, 243, -23}";
+transform = "{1, 0, 0, 1, 234, -23}";
 }
 );
 layerId = "A7E21968-E455-4749-BB19-379F5EDC3B9B";
-width = 602;
+width = 652;
 },
 {
-anchors = (
-{
-name = top;
-position = "{251, 370}";
-}
-);
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "fourdotscenter-ar";
-transform = "{1, 0, 0, 1, 160, -68}";
+transform = "{1, 0, 0, 1, 115, -96}";
 }
 );
 layerId = "D3B47D5E-6A85-4361-9DF6-638C8B7E2782";
 width = 510;
 },
 {
-anchors = (
-{
-name = top;
-position = "{293, 500}";
-}
-);
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "fourdotscenter-ar";
-transform = "{1, 0, 0, 1, 215, -36}";
+transform = "{1, 0, 0, 1, 187, -39}";
 }
 );
 layerId = "08F1692B-9525-48D2-9816-1987B1C44D50";
-width = 577;
+width = 627;
 },
 {
-anchors = (
-{
-name = top;
-position = "{331, 370}";
-}
-);
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "fourdotscenter-ar";
-transform = "{1, 0, 0, 1, 205, -100}";
+transform = "{1, 0, 0, 1, 205, -86}";
 }
 );
 layerId = "A2AC38AA-6CC4-4B2B-B5AB-64A49772F2D3";
 width = 650;
 },
 {
-anchors = (
-{
-name = top;
-position = "{311, 416}";
-}
-);
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "fourdotscenter-ar";
@@ -113,45 +77,33 @@ transform = "{1, 0, 0, 1, 205, -66}";
 }
 );
 layerId = "6D0603BE-7277-4DA4-8C59-7934AF28E45B";
-width = 649;
+width = 719;
 },
 {
-anchors = (
-{
-name = top;
-position = "{329, 500}";
-}
-);
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "fourdotscenter-ar";
-transform = "{1, 0, 0, 1, 257, -35}";
+transform = "{1, 0, 0, 1, 257, -41}";
 }
 );
 layerId = "E1555194-BAFD-4DCC-A026-E2F9BA1917F2";
-width = 739;
+width = 759;
 },
 {
-anchors = (
-{
-name = top;
-position = "{341, 550}";
-}
-);
 components = (
 {
-name = "hah-ar.fina";
+name = "hah-ar.fina.wide";
 },
 {
 name = "fourdotscenter-ar";
-transform = "{1, 0, 0, 1, 271, -34}";
+transform = "{1, 0, 0, 1, 281, -22}";
 }
 );
 layerId = "8594390A-478C-48BC-BAB2-0B8797A53DFB";
-width = 771;
+width = 821;
 }
 );
 unicode = FB7F;
diff --git a/sources/NotoSansArabic.glyphspackage/glyphs/tcheheh-ar.glyph b/sources/NotoSansArabic.glyphspackage/glyphs/tcheheh-ar.glyph
index 0d46cdbce..f1efd43cb 100644
--- a/sources/NotoSansArabic.glyphspackage/glyphs/tcheheh-ar.glyph
+++ b/sources/NotoSansArabic.glyphspackage/glyphs/tcheheh-ar.glyph
@@ -4,37 +4,37 @@ layers = (
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "fourdotscenter-ar";
-transform = "{1, 0, 0, 1, 160, -57}";
+transform = "{1, 0, 0, 1, 130, -86}";
 }
 );
 layerId = "9B455188-434F-489F-9A18-4C18DBE88840";
-width = 494;
+width = 514;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "fourdotscenter-ar";
-transform = "{1, 0, 0, 1, 243, -23}";
+transform = "{1, 0, 0, 1, 234, -23}";
 }
 );
 layerId = "A7E21968-E455-4749-BB19-379F5EDC3B9B";
-width = 624;
+width = 654;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "fourdotscenter-ar";
-transform = "{1, 0, 0, 1, 160, -68}";
+transform = "{1, 0, 0, 1, 115, -96}";
 }
 );
 layerId = "D3B47D5E-6A85-4361-9DF6-638C8B7E2782";
@@ -43,11 +43,11 @@ width = 500;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "fourdotscenter-ar";
-transform = "{1, 0, 0, 1, 215, -36}";
+transform = "{1, 0, 0, 1, 187, -39}";
 }
 );
 layerId = "08F1692B-9525-48D2-9816-1987B1C44D50";
@@ -56,11 +56,11 @@ width = 578;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "fourdotscenter-ar";
-transform = "{1, 0, 0, 1, 205, -100}";
+transform = "{1, 0, 0, 1, 205, -86}";
 }
 );
 layerId = "A2AC38AA-6CC4-4B2B-B5AB-64A49772F2D3";
@@ -69,7 +69,7 @@ width = 620;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "fourdotscenter-ar";
@@ -77,16 +77,16 @@ transform = "{1, 0, 0, 1, 205, -66}";
 }
 );
 layerId = "6D0603BE-7277-4DA4-8C59-7934AF28E45B";
-width = 639;
+width = 659;
 },
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "fourdotscenter-ar";
-transform = "{1, 0, 0, 1, 257, -35}";
+transform = "{1, 0, 0, 1, 257, -41}";
 }
 );
 layerId = "E1555194-BAFD-4DCC-A026-E2F9BA1917F2";
@@ -95,11 +95,11 @@ width = 687;
 {
 components = (
 {
-name = "hah-ar";
+name = "hah-ar.wide";
 },
 {
 name = "fourdotscenter-ar";
-transform = "{1, 0, 0, 1, 271, -34}";
+transform = "{1, 0, 0, 1, 281, -22}";
 }
 );
 layerId = "8594390A-478C-48BC-BAB2-0B8797A53DFB";