diff --git a/docs/app/assets/fonts/Qahiri-Regular.ttf b/docs/app/assets/fonts/Qahiri-Regular.ttf
index 7538994..17e5f9d 100644
Binary files a/docs/app/assets/fonts/Qahiri-Regular.ttf and b/docs/app/assets/fonts/Qahiri-Regular.ttf differ
diff --git a/docs/assets/fonts/Qahiri-Regular.woff2 b/docs/assets/fonts/Qahiri-Regular.woff2
index bf39bd5..197875f 100644
Binary files a/docs/assets/fonts/Qahiri-Regular.woff2 and b/docs/assets/fonts/Qahiri-Regular.woff2 differ
diff --git a/fonts/Qahiri-Regular.ttf b/fonts/Qahiri-Regular.ttf
index 7538994..17e5f9d 100644
Binary files a/fonts/Qahiri-Regular.ttf and b/fonts/Qahiri-Regular.ttf differ
diff --git a/sources/Qahiri.glyphspackage/fontinfo.plist b/sources/Qahiri.glyphspackage/fontinfo.plist
index 0227bb7..b599f35 100644
--- a/sources/Qahiri.glyphspackage/fontinfo.plist
+++ b/sources/Qahiri.glyphspackage/fontinfo.plist
@@ -60,7 +60,7 @@ name = AllMediTemp2;
 },
 {
 automatic = 1;
-code = "hamza-ar alef-ar alef-ar.1 alef-ar.2 alef-ar.3 alef-ar.fina behDotless-ar behDotless-ar.fina behDotless-ar.fina.1 behDotless-ar.medi behDotless-ar.medi.1 behDotless-ar.medi.high behDotless-ar.medi.high.1 behDotless-ar.medi.yeh behDotless-ar.init behDotless-ar.init.hah hah-ar hah-ar.1 hah-ar.2 hah-ar.3 hah-ar.4 hah-ar.5 hah-ar.fina hah-ar.fina.1 hah-ar.medi hah-ar.medi.1 hah-ar.medi.2 hah-ar.medi.3 hah-ar.init hah-ar.init.1 hah-ar.init.2 dal-ar dal-ar.fina reh-ar reh-ar.1 reh-ar.fina reh-ar.fina.1 seen-ar seen-ar.1 seen-ar.2 seen-ar.3 seen-ar.4 seen-ar.5 seen-ar.6 seen-ar.fina seen-ar.fina.1 seen-ar.fina.2 seen-ar.fina.3 seen-ar.fina.4 seen-ar.fina.5 seen-ar.medi seen-ar.medi.1 seen-ar.medi.2 seen-ar.medi.3 seen-ar.medi.4 seen-ar.medi.5 seen-ar.medi.6 seen-ar.init seen-ar.init.1 seen-ar.init.2 seen-ar.init.3 seen-ar.init.4 seen-ar.init.5 seen-ar.init.6 sad-ar sad-ar.1 sad-ar.fina sad-ar.fina.1 sad-ar.medi sad-ar.init tah-ar tah-ar.fina tah-ar.medi tah-ar.medi.short tah-ar.medi.short2 tah-ar.init tah-ar.init.short tah-ar.init.short2 ain-ar ain-ar.1 ain-ar.2 ain-ar.fina ain-ar.medi ain-ar.init ain-ar.init.1 fehDotless-ar fehDotless-ar.1 fehDotless-ar.2 fehDotless-ar.3 fehDotless-ar.fina fehDotless-ar.fina.1 fehDotless-ar.fina.2 fehDotless-ar.fina.3 fehDotless-ar.medi fehDotless-ar.medi.1 fehDotless-ar.init fehDotless-ar.init.1 qafDotless-ar qafDotless-ar.fina kaf-ar kaf-ar.1 kaf-ar.fina kaf-ar.fina.1 kaf-ar.medi kaf-ar.medi.1 kaf-ar.medi.2 kaf-ar.init kaf-ar.init.1 kaf-ar.init.2 lam-ar lam-ar.fina lam-ar.medi lam-ar.medi.lellah lam-ar.medi.short lam-ar.medi.short2 lam-ar.medi.yeh lam-ar.init lam-ar.init.hah lam-ar.init.hah2 lam-ar.init.lellah lam-ar.init.short lam-ar.init.short2 meem-ar meem-ar.1 meem-ar.2 meem-ar.fina meem-ar.fina.1 meem-ar.fina.2 meem-ar.medi meem-ar.medi.1 meem-ar.init noonghunna-ar noonghunna-ar.fina heh-ar heh-ar.1 heh-ar.2 heh-ar.isol heh-ar.fina heh-ar.fina.1 heh-ar.fina.2 heh-ar.medi heh-ar.medi.1 heh-ar.medi.2 heh-ar.medi.3 heh-ar.medi.4 heh-ar.medi.5 heh-ar.medi.6 heh-ar.medi.7 heh-ar.init heh-ar.init.1 heh-ar.init.2 heh-ar.init.3 heh-ar.init.4 heh-ar.init.5 heh-ar.init.6 heh-ar.init.7 waw-ar waw-ar.1 waw-ar.fina waw-ar.fina.1 alefMaksura-ar alefMaksura-ar.1 alefMaksura-ar.2 alefMaksura-ar.3 alefMaksura-ar.4 alefMaksura-ar.5 alefMaksura-ar.6 alefMaksura-ar.fina alefMaksura-ar.fina.0 alefMaksura-ar.fina.1 alefMaksura-ar.fina.2 alefMaksura-ar.fina.3 alefMaksura-ar.fina.4 alefMaksura-ar.fina.tooth ae-ar kashida-ar lam_alef-ar lam_alef-ar.fina lam_alef-ar.1 lam_alef-ar.2 lam_alef-ar.3 lam_alef-ar.4 lam_alef-ar.5 lam_alef-ar.fina.1 lam_alef-ar.fina.2 lam_alef-ar.fina.3 lam_alef-ar.fina.4 lam_alef-ar.fina.5";
+code = "hamza-ar alef-ar alef-ar.1 alef-ar.2 alef-ar.3 alef-ar.fina behDotless-ar behDotless-ar.fina behDotless-ar.fina.1 behDotless-ar.medi behDotless-ar.medi.1 behDotless-ar.medi.high behDotless-ar.medi.high.1 behDotless-ar.medi.yeh behDotless-ar.init behDotless-ar.init.hah hah-ar hah-ar.1 hah-ar.2 hah-ar.3 hah-ar.4 hah-ar.5 hah-ar.fina hah-ar.fina.1 hah-ar.medi hah-ar.medi.1 hah-ar.medi.2 hah-ar.medi.3 hah-ar.init hah-ar.init.1 hah-ar.init.2 dal-ar dal-ar.fina reh-ar reh-ar.1 reh-ar.fina reh-ar.fina.1 seen-ar seen-ar.1 seen-ar.2 seen-ar.3 seen-ar.4 seen-ar.5 seen-ar.6 seen-ar.fina seen-ar.fina.1 seen-ar.fina.2 seen-ar.fina.3 seen-ar.fina.4 seen-ar.fina.5 seen-ar.medi seen-ar.medi.1 seen-ar.medi.2 seen-ar.medi.3 seen-ar.medi.4 seen-ar.medi.5 seen-ar.medi.6 seen-ar.init seen-ar.init.1 seen-ar.init.2 seen-ar.init.3 seen-ar.init.4 seen-ar.init.5 seen-ar.init.6 sad-ar sad-ar.1 sad-ar.fina sad-ar.fina.1 sad-ar.medi sad-ar.init tah-ar tah-ar.fina tah-ar.medi tah-ar.medi.short tah-ar.medi.short2 tah-ar.init tah-ar.init.short tah-ar.init.short2 ain-ar ain-ar.1 ain-ar.2 ain-ar.fina ain-ar.medi ain-ar.init ain-ar.init.1 fehDotless-ar fehDotless-ar.1 fehDotless-ar.2 fehDotless-ar.3 fehDotless-ar.fina fehDotless-ar.fina.1 fehDotless-ar.fina.2 fehDotless-ar.fina.3 fehDotless-ar.medi fehDotless-ar.medi.1 fehDotless-ar.init fehDotless-ar.init.1 qafDotless-ar qafDotless-ar.fina kaf-ar kaf-ar.1 kaf-ar.fina kaf-ar.fina.1 kaf-ar.medi kaf-ar.medi.1 kaf-ar.medi.2 kaf-ar.init kaf-ar.init.1 kaf-ar.init.2 lam-ar lam-ar.fina lam-ar.medi lam-ar.medi.lellah lam-ar.medi.short lam-ar.medi.short2 lam-ar.medi.yeh lam-ar.init lam-ar.init.hah lam-ar.init.hah2 lam-ar.init.lellah lam-ar.init.short lam-ar.init.short2 meem-ar meem-ar.1 meem-ar.2 meem-ar.fina meem-ar.fina.1 meem-ar.fina.2 meem-ar.medi meem-ar.medi.1 meem-ar.init noonghunna-ar noonghunna-ar.fina heh-ar heh-ar.1 heh-ar.2 heh-ar.isol heh-ar.fina heh-ar.fina.1 heh-ar.fina.2 heh-ar.medi heh-ar.medi.1 heh-ar.medi.2 heh-ar.medi.3 heh-ar.medi.4 heh-ar.medi.5 heh-ar.medi.6 heh-ar.medi.7 heh-ar.init heh-ar.init.1 heh-ar.init.2 heh-ar.init.3 heh-ar.init.4 heh-ar.init.5 heh-ar.init.6 heh-ar.init.7 waw-ar waw-ar.1 waw-ar.fina waw-ar.fina.1 alefMaksura-ar alefMaksura-ar.1 alefMaksura-ar.2 alefMaksura-ar.3 alefMaksura-ar.4 alefMaksura-ar.fina alefMaksura-ar.fina.0 alefMaksura-ar.fina.1 alefMaksura-ar.fina.2 alefMaksura-ar.fina.3 alefMaksura-ar.fina.4 alefMaksura-ar.fina.tooth ae-ar kashida-ar lam_alef-ar lam_alef-ar.fina lam_alef-ar.1 lam_alef-ar.2 lam_alef-ar.3 lam_alef-ar.4 lam_alef-ar.5 lam_alef-ar.fina.1 lam_alef-ar.fina.2 lam_alef-ar.fina.3 lam_alef-ar.fina.4 lam_alef-ar.fina.5";
 name = ArabicLetters;
 }
 );
@@ -374,7 +374,7 @@ name = onum;
 code = "  sub ain-ar                  from [ain-ar ain-ar.1 ain-ar.2];
   sub ain-ar.init             from [ain-ar.init ain-ar.init.1];
   sub alef-ar                 from [alef-ar.1 alef-ar.2 alef-ar alef-ar.3];
-  sub alefMaksura-ar          from [alefMaksura-ar alefMaksura-ar.1 alefMaksura-ar.2 alefMaksura-ar.3 alefMaksura-ar.4 alefMaksura-ar.5 alefMaksura-ar.6];
+  sub alefMaksura-ar          from [alefMaksura-ar alefMaksura-ar.1 alefMaksura-ar.2 alefMaksura-ar.3 alefMaksura-ar.4];
   sub alefMaksura-ar.fina     from [alefMaksura-ar.fina.0 alefMaksura-ar.fina.1 alefMaksura-ar.fina.2 alefMaksura-ar.fina.3 alefMaksura-ar.fina.4];
   # Dummy entry for the app to show alternates.
   sub alefMaksura-ar.fina.tooth from [alefMaksura-ar.fina alefMaksura-ar.fina.1 alefMaksura-ar.fina.2 alefMaksura-ar.fina.3 alefMaksura-ar.fina.4 alefMaksura-ar.fina.tooth];
@@ -590,19 +590,17 @@ keepAlternatesTogether = 1;
 kerning = {
 "67aa4fb0-543e-4232-8202-ade6a11e0795" = {
 "@MMK_L_bowel" = {
+"@MMK_R_yeh.2" = -70;
 "alefMaksura-ar" = 100;
 "alefMaksura-ar.1" = 100;
-"alefMaksura-ar.2" = 180;
-"alefMaksura-ar.3" = 325;
 "alefMaksura-ar.4" = 480;
-"alefMaksura-ar.5" = 110;
-"alefMaksura-ar.6" = 480;
 "lam-ar" = 100;
 "noonghunna-ar" = 100;
 "qafDotless-ar" = 100;
 };
 "@MMK_L_dal" = {
 "@MMK_R_hah-ar.init" = -40;
+"@MMK_R_yeh.2" = -30;
 "ain-ar" = -40;
 "ain-ar.1" = -40;
 "ain-ar.2" = -40;
@@ -613,11 +611,7 @@ kerning = {
 "alef-ar.2" = -20;
 "alefMaksura-ar" = -30;
 "alefMaksura-ar.1" = -30;
-"alefMaksura-ar.2" = -30;
-"alefMaksura-ar.3" = -30;
 "alefMaksura-ar.4" = -30;
-"alefMaksura-ar.5" = -30;
-"alefMaksura-ar.6" = -30;
 "fehDotless-ar" = -20;
 "fehDotless-ar.2" = -20;
 "fehDotless-ar.init" = -20;
@@ -722,11 +716,7 @@ kerning = {
 "@MMK_L_waw" = {
 "alefMaksura-ar" = 40;
 "alefMaksura-ar.1" = 40;
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 "lam-ar" = 40;
 "lam_alef-ar" = -20;
 "lam_alef-ar.2" = -20;
@@ -736,32 +726,16 @@ kerning = {
 "noonghunna-ar" = 40;
 };
 "ain-ar" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "ain-ar.1" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "ain-ar.2" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "ain-ar.fina" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "ain-ar.init" = {
 "@MMK_R_pyramid" = -20;
@@ -788,88 +762,34 @@ kerning = {
 "qafDotless-ar" = -50;
 };
 "alefMaksura-ar" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "alefMaksura-ar.1" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "alefMaksura-ar.2" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "alefMaksura-ar.3" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "alefMaksura-ar.4" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
-};
-"alefMaksura-ar.5" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
-"alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
-};
-"alefMaksura-ar.6" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
-"alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "alefMaksura-ar.fina" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "alefMaksura-ar.fina.1" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "alefMaksura-ar.fina.2" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "alefMaksura-ar.fina.3" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "alefMaksura-ar.fina.4" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "fehDotless-ar.init" = {
 "@MMK_R_pyramid" = -30;
@@ -894,53 +814,25 @@ kerning = {
 "@MMK_R_yeh" = -50;
 };
 "hah-ar" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "hah-ar.1" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "hah-ar.2" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "hah-ar.3" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "hah-ar.4" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "hah-ar.5" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "hah-ar.fina.1" = {
-"alefMaksura-ar.2" = 240;
-"alefMaksura-ar.3" = 385;
 "alefMaksura-ar.4" = 540;
-"alefMaksura-ar.5" = 170;
-"alefMaksura-ar.6" = 540;
 };
 "hah-ar.init.1" = {
 "@MMK_R_pyramid" = -20;
@@ -964,32 +856,16 @@ kerning = {
 "@MMK_R_yeh" = -30;
 };
 "qafDotless-ar" = {
-"alefMaksura-ar.2" = 220;
-"alefMaksura-ar.3" = 365;
 "alefMaksura-ar.4" = 520;
-"alefMaksura-ar.5" = 150;
-"alefMaksura-ar.6" = 520;
 };
 "qafDotless-ar.fina" = {
-"alefMaksura-ar.2" = 220;
-"alefMaksura-ar.3" = 365;
 "alefMaksura-ar.4" = 520;
-"alefMaksura-ar.5" = 150;
-"alefMaksura-ar.6" = 520;
 };
 "reh-ar.fina" = {
-"alefMaksura-ar.2" = 260;
-"alefMaksura-ar.3" = 405;
 "alefMaksura-ar.4" = 560;
-"alefMaksura-ar.5" = 190;
-"alefMaksura-ar.6" = 560;
 };
 "reh-ar.fina.1" = {
-"alefMaksura-ar.2" = 260;
-"alefMaksura-ar.3" = 405;
 "alefMaksura-ar.4" = 560;
-"alefMaksura-ar.5" = 190;
-"alefMaksura-ar.6" = 560;
 };
 };
 };
diff --git a/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.2.glyph b/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.2.glyph
index 9c96cfc..30bf692 100644
--- a/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.2.glyph
+++ b/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.2.glyph
@@ -5,11 +5,11 @@ layers = (
 anchors = (
 {
 name = bottom;
-position = "{239, -135}";
+position = "{239, -25}";
 },
 {
 name = top;
-position = "{57, 198}";
+position = "{57, 308}";
 }
 );
 guideLines = (
@@ -28,47 +28,48 @@ paths = (
 {
 closed = 1;
 nodes = (
-"149 -40 LINE",
-"117 -40 OFFCURVE",
-"105 -37 OFFCURVE",
-"82 -14 CURVE SMOOTH",
-"51 17 LINE SMOOTH",
-"34 34 OFFCURVE",
-"43 81 OFFCURVE",
-"57 67 CURVE SMOOTH",
-"109 15 LINE SMOOTH",
-"119 5 OFFCURVE",
-"128 0 OFFCURVE",
-"140 0 CURVE SMOOTH",
-"156 0 OFFCURVE",
-"192 10 OFFCURVE",
-"202 90 CURVE",
-"199 75 OFFCURVE",
-"185 70 OFFCURVE",
-"176 70 CURVE SMOOTH",
-"167 70 OFFCURVE",
-"162 75 OFFCURVE",
-"158 79 CURVE SMOOTH",
-"94 143 LINE SMOOTH",
-"44 193 OFFCURVE",
-"0 44 OFFCURVE",
-"0 -5 CURVE SMOOTH",
-"0 -92 OFFCURVE",
-"60 -110 OFFCURVE",
-"137 -110 CURVE"
+"149 70 LINE",
+"117 70 OFFCURVE",
+"105 73 OFFCURVE",
+"82 96 CURVE SMOOTH",
+"51 127 LINE SMOOTH",
+"34 144 OFFCURVE",
+"43 191 OFFCURVE",
+"57 177 CURVE SMOOTH",
+"109 125 LINE SMOOTH",
+"119 115 OFFCURVE",
+"128 110 OFFCURVE",
+"140 110 CURVE SMOOTH",
+"156 110 OFFCURVE",
+"192 120 OFFCURVE",
+"202 200 CURVE",
+"199 185 OFFCURVE",
+"185 180 OFFCURVE",
+"176 180 CURVE SMOOTH",
+"167 180 OFFCURVE",
+"162 185 OFFCURVE",
+"158 189 CURVE SMOOTH",
+"94 253 LINE SMOOTH",
+"44 303 OFFCURVE",
+"0 154 OFFCURVE",
+"0 105 CURVE SMOOTH",
+"0 18 OFFCURVE",
+"60 0 OFFCURVE",
+"137 0 CURVE"
 );
 },
 {
 closed = 1;
 nodes = (
-"391 -110 LINE",
-"432 -40 LINE",
-"141 -40 LINE",
-"131 -110 LINE"
+"391 0 LINE",
+"432 70 LINE",
+"141 70 LINE",
+"131 0 LINE"
 );
 }
 );
-width = 242;
+width = 472;
 }
 );
+leftKerningGroup = yeh.2;
 }
diff --git a/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.3.glyph b/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.3.glyph
index 48a5336..cb99859 100644
--- a/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.3.glyph
+++ b/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.3.glyph
@@ -5,11 +5,11 @@ layers = (
 anchors = (
 {
 name = bottom;
-position = "{289, -135}";
+position = "{289, -25}";
 },
 {
 name = top;
-position = "{57, 198}";
+position = "{57, 308}";
 }
 );
 guideLines = (
@@ -28,47 +28,48 @@ paths = (
 {
 closed = 1;
 nodes = (
-"149 -40 LINE",
-"117 -40 OFFCURVE",
-"105 -37 OFFCURVE",
-"82 -14 CURVE SMOOTH",
-"51 17 LINE SMOOTH",
-"34 34 OFFCURVE",
-"43 81 OFFCURVE",
-"57 67 CURVE SMOOTH",
-"109 15 LINE SMOOTH",
-"119 5 OFFCURVE",
-"128 0 OFFCURVE",
-"140 0 CURVE SMOOTH",
-"156 0 OFFCURVE",
-"192 10 OFFCURVE",
-"202 90 CURVE",
-"199 75 OFFCURVE",
-"185 70 OFFCURVE",
-"176 70 CURVE SMOOTH",
-"167 70 OFFCURVE",
-"162 75 OFFCURVE",
-"158 79 CURVE SMOOTH",
-"94 143 LINE SMOOTH",
-"44 193 OFFCURVE",
-"0 44 OFFCURVE",
-"0 -5 CURVE SMOOTH",
-"0 -92 OFFCURVE",
-"60 -110 OFFCURVE",
-"137 -110 CURVE"
+"149 70 LINE",
+"117 70 OFFCURVE",
+"105 73 OFFCURVE",
+"82 96 CURVE SMOOTH",
+"51 127 LINE SMOOTH",
+"34 144 OFFCURVE",
+"43 191 OFFCURVE",
+"57 177 CURVE SMOOTH",
+"109 125 LINE SMOOTH",
+"119 115 OFFCURVE",
+"128 110 OFFCURVE",
+"140 110 CURVE SMOOTH",
+"156 110 OFFCURVE",
+"192 120 OFFCURVE",
+"202 200 CURVE",
+"199 185 OFFCURVE",
+"185 180 OFFCURVE",
+"176 180 CURVE SMOOTH",
+"167 180 OFFCURVE",
+"162 185 OFFCURVE",
+"158 189 CURVE SMOOTH",
+"94 253 LINE SMOOTH",
+"44 303 OFFCURVE",
+"0 154 OFFCURVE",
+"0 105 CURVE SMOOTH",
+"0 18 OFFCURVE",
+"60 0 OFFCURVE",
+"137 0 CURVE"
 );
 },
 {
 closed = 1;
 nodes = (
-"536 -110 LINE",
-"577 -40 LINE",
-"141 -40 LINE",
-"131 -110 LINE"
+"536 0 LINE",
+"577 70 LINE",
+"141 70 LINE",
+"131 0 LINE"
 );
 }
 );
-width = 242;
+width = 617;
 }
 );
+leftKerningGroup = yeh.2;
 }
diff --git a/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.4.glyph b/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.4.glyph
index 64ad16d..5d56842 100644
--- a/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.4.glyph
+++ b/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.4.glyph
@@ -5,11 +5,11 @@ layers = (
 anchors = (
 {
 name = bottom;
-position = "{349, -135}";
+position = "{349, -25}";
 },
 {
 name = top;
-position = "{57, 198}";
+position = "{57, 308}";
 }
 );
 guideLines = (
@@ -28,47 +28,47 @@ paths = (
 {
 closed = 1;
 nodes = (
-"149 -40 LINE",
-"117 -40 OFFCURVE",
-"105 -37 OFFCURVE",
-"82 -14 CURVE SMOOTH",
-"51 17 LINE SMOOTH",
-"34 34 OFFCURVE",
-"43 81 OFFCURVE",
-"57 67 CURVE SMOOTH",
-"109 15 LINE SMOOTH",
-"119 5 OFFCURVE",
-"128 0 OFFCURVE",
-"140 0 CURVE SMOOTH",
-"156 0 OFFCURVE",
-"192 10 OFFCURVE",
-"202 90 CURVE",
-"199 75 OFFCURVE",
-"185 70 OFFCURVE",
-"176 70 CURVE SMOOTH",
-"167 70 OFFCURVE",
-"162 75 OFFCURVE",
-"158 79 CURVE SMOOTH",
-"94 143 LINE SMOOTH",
-"44 193 OFFCURVE",
-"0 44 OFFCURVE",
-"0 -5 CURVE SMOOTH",
-"0 -92 OFFCURVE",
-"60 -110 OFFCURVE",
-"137 -110 CURVE"
+"149 70 LINE",
+"117 70 OFFCURVE",
+"105 73 OFFCURVE",
+"82 96 CURVE SMOOTH",
+"51 127 LINE SMOOTH",
+"34 144 OFFCURVE",
+"43 191 OFFCURVE",
+"57 177 CURVE SMOOTH",
+"109 125 LINE SMOOTH",
+"119 115 OFFCURVE",
+"128 110 OFFCURVE",
+"140 110 CURVE SMOOTH",
+"156 110 OFFCURVE",
+"192 120 OFFCURVE",
+"202 200 CURVE",
+"199 185 OFFCURVE",
+"185 180 OFFCURVE",
+"176 180 CURVE SMOOTH",
+"167 180 OFFCURVE",
+"162 185 OFFCURVE",
+"158 189 CURVE SMOOTH",
+"94 253 LINE SMOOTH",
+"44 303 OFFCURVE",
+"0 154 OFFCURVE",
+"0 105 CURVE SMOOTH",
+"0 18 OFFCURVE",
+"60 0 OFFCURVE",
+"137 0 CURVE"
 );
 },
 {
 closed = 1;
 nodes = (
-"691 -110 LINE",
-"732 -40 LINE",
-"141 -40 LINE",
-"131 -110 LINE"
+"691 0 LINE",
+"732 70 LINE",
+"141 70 LINE",
+"131 0 LINE"
 );
 }
 );
-width = 242;
+width = 772;
 }
 );
 }
diff --git a/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.5.glyph b/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.5.glyph
deleted file mode 100644
index 62d6487..0000000
--- a/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.5.glyph
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-glyphname = "alefMaksura-ar.5";
-layers = (
-{
-anchors = (
-{
-name = bottom;
-position = "{129, -135}";
-},
-{
-name = top;
-position = "{57, 198}";
-}
-);
-guideLines = (
-{
-position = "{-33, 155}";
-},
-{
-position = "{-33, -110}";
-},
-{
-position = "{-33, 70}";
-}
-);
-layerId = "67aa4fb0-543e-4232-8202-ade6a11e0795";
-paths = (
-{
-closed = 1;
-nodes = (
-"149 -40 LINE",
-"117 -40 OFFCURVE",
-"105 -37 OFFCURVE",
-"82 -14 CURVE SMOOTH",
-"51 17 LINE SMOOTH",
-"34 34 OFFCURVE",
-"43 81 OFFCURVE",
-"57 67 CURVE SMOOTH",
-"109 15 LINE SMOOTH",
-"119 5 OFFCURVE",
-"128 0 OFFCURVE",
-"140 0 CURVE SMOOTH",
-"156 0 OFFCURVE",
-"192 10 OFFCURVE",
-"202 90 CURVE",
-"199 75 OFFCURVE",
-"185 70 OFFCURVE",
-"176 70 CURVE SMOOTH",
-"167 70 OFFCURVE",
-"162 75 OFFCURVE",
-"158 79 CURVE SMOOTH",
-"94 143 LINE SMOOTH",
-"44 193 OFFCURVE",
-"0 44 OFFCURVE",
-"0 -5 CURVE SMOOTH",
-"0 -92 OFFCURVE",
-"60 -110 OFFCURVE",
-"137 -110 CURVE"
-);
-},
-{
-closed = 1;
-nodes = (
-"176 -110 LINE SMOOTH",
-"207 -110 OFFCURVE",
-"308 -63 OFFCURVE",
-"362 -40 CURVE",
-"141 -40 LINE",
-"131 -110 LINE"
-);
-}
-);
-width = 242;
-}
-);
-}
diff --git a/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.6.glyph b/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.6.glyph
deleted file mode 100644
index 2902dbe..0000000
--- a/sources/Qahiri.glyphspackage/glyphs/alefM_aksura-ar.6.glyph
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-glyphname = "alefMaksura-ar.6";
-layers = (
-{
-anchors = (
-{
-name = bottom;
-position = "{289, -135}";
-},
-{
-name = top;
-position = "{57, 198}";
-}
-);
-guideLines = (
-{
-position = "{-33, 155}";
-},
-{
-position = "{-33, -110}";
-},
-{
-position = "{-33, 70}";
-}
-);
-layerId = "67aa4fb0-543e-4232-8202-ade6a11e0795";
-paths = (
-{
-closed = 1;
-nodes = (
-"149 -40 LINE",
-"117 -40 OFFCURVE",
-"105 -37 OFFCURVE",
-"82 -14 CURVE SMOOTH",
-"51 17 LINE SMOOTH",
-"34 34 OFFCURVE",
-"43 81 OFFCURVE",
-"57 67 CURVE SMOOTH",
-"109 15 LINE SMOOTH",
-"119 5 OFFCURVE",
-"128 0 OFFCURVE",
-"140 0 CURVE SMOOTH",
-"156 0 OFFCURVE",
-"192 10 OFFCURVE",
-"202 90 CURVE",
-"199 75 OFFCURVE",
-"185 70 OFFCURVE",
-"176 70 CURVE SMOOTH",
-"167 70 OFFCURVE",
-"162 75 OFFCURVE",
-"158 79 CURVE SMOOTH",
-"94 143 LINE SMOOTH",
-"44 193 OFFCURVE",
-"0 44 OFFCURVE",
-"0 -5 CURVE SMOOTH",
-"0 -92 OFFCURVE",
-"60 -110 OFFCURVE",
-"137 -110 CURVE"
-);
-},
-{
-closed = 1;
-nodes = (
-"177 -110 LINE",
-"302 -110 OFFCURVE",
-"560 -74 OFFCURVE",
-"723 -56 CURVE",
-"732 -40 LINE",
-"141 -40 LINE",
-"131 -110 LINE"
-);
-}
-);
-width = 242;
-}
-);
-}
diff --git a/sources/Qahiri.glyphspackage/glyphs/yehbarree-ar.glyph b/sources/Qahiri.glyphspackage/glyphs/yehbarree-ar.glyph
index cdb454a..c813c91 100644
--- a/sources/Qahiri.glyphspackage/glyphs/yehbarree-ar.glyph
+++ b/sources/Qahiri.glyphspackage/glyphs/yehbarree-ar.glyph
@@ -9,7 +9,7 @@ name = "alefMaksura-ar.2";
 }
 );
 layerId = "67aa4fb0-543e-4232-8202-ade6a11e0795";
-width = 242;
+width = 472;
 }
 );
 unicode = 06D2;
diff --git a/sources/Qahiri.glyphspackage/glyphs/yehbarreeH_amzaabove-ar.glyph b/sources/Qahiri.glyphspackage/glyphs/yehbarreeH_amzaabove-ar.glyph
index 0b599ef..9f3de93 100644
--- a/sources/Qahiri.glyphspackage/glyphs/yehbarreeH_amzaabove-ar.glyph
+++ b/sources/Qahiri.glyphspackage/glyphs/yehbarreeH_amzaabove-ar.glyph
@@ -10,11 +10,11 @@ name = "yehbarree-ar";
 },
 {
 name = "hamzaabove-ar";
-transform = "{1, 0, 0, 1, -2, 198}";
+transform = "{1, 0, 0, 1, -2, 308}";
 }
 );
 layerId = "67aa4fb0-543e-4232-8202-ade6a11e0795";
-width = 242;
+width = 472;
 }
 );
 unicode = 06D3;
diff --git a/sources/Qahiri.glyphspackage/order.plist b/sources/Qahiri.glyphspackage/order.plist
index 886899c..ed03a89 100644
--- a/sources/Qahiri.glyphspackage/order.plist
+++ b/sources/Qahiri.glyphspackage/order.plist
@@ -201,8 +201,6 @@ z,
 "alefMaksura-ar.2",
 "alefMaksura-ar.3",
 "alefMaksura-ar.4",
-"alefMaksura-ar.5",
-"alefMaksura-ar.6",
 "alefMaksura-ar.fina",
 "alefMaksura-ar.fina.0",
 "alefMaksura-ar.fina.1",