diff --git a/sources/NotoSerifGeorgian.glyphspackage/fontinfo.plist b/sources/NotoSerifGeorgian.glyphspackage/fontinfo.plist
index d17b5b36..69d1e7f0 100644
--- a/sources/NotoSerifGeorgian.glyphspackage/fontinfo.plist
+++ b/sources/NotoSerifGeorgian.glyphspackage/fontinfo.plist
@@ -322,9 +322,10 @@ code = "table GDEF {
   GlyphClassDef
     [An-georgian An-georgian_acutecomb An-georgian_dieresiscomb An-georgian_macroncomb An-georgian_macroncomb_dieresiscomb En-georgian En-georgian_acutecomb En-georgian_macroncomb In-georgian In-georgian_acutecomb In-georgian_macroncomb On-georgian On-georgian_acutecomb On-georgian_dieresiscomb On-georgian_macroncomb On-georgian_macroncomb_dieresiscomb Un-georgian Un-georgian_acutecomb Un-georgian_circumflexcomb Un-georgian_dieresiscomb Un-georgian_macroncomb Un-georgian_macroncomb_dieresiscomb Yn-georgian Yn-georgian_acutecomb Yn-georgian_macroncomb an-georgian an-georgian_acutecomb an-georgian_dieresiscomb an-georgian_macroncomb an-georgian_macroncomb_dieresiscomb en-georgian en-georgian_acutecomb en-georgian_macroncomb in-georgian in-georgian_acutecomb in-georgian_macroncomb on-georgian on-georgian_acutecomb on-georgian_dieresiscomb on-georgian_macroncomb on-georgian_macroncomb_dieresiscomb un-georgian un-georgian_acutecomb un-georgian_circumflexcomb un-georgian_dieresiscomb un-georgian_macroncomb un-georgian_macroncomb_dieresiscomb yn-georgian yn-georgian_acutecomb yn-georgian_macroncomb], # Base
     , # Liga
-    [acutecomb circumflexcomb dieresiscomb macroncomb], # Mark
+    [acutecomb.geor circumflexcomb.geor dieresiscomb.geor macroncomb.geor], # Mark
     ;
-} GDEF;";
+} GDEF;
+";
 name = Prefix;
 }
 );
@@ -335,51 +336,51 @@ code = "feature case;";
 tag = aalt;
 },
 {
-automatic = 1;
 code = "lookup ccmp_geor_1 {
-	lookupflag 0;
-	sub An-georgian macroncomb dieresiscomb by An-georgian_macroncomb_dieresiscomb;
-	sub On-georgian macroncomb dieresiscomb by On-georgian_macroncomb_dieresiscomb;
-	sub Un-georgian macroncomb dieresiscomb by Un-georgian_macroncomb_dieresiscomb;
-	sub an-georgian macroncomb dieresiscomb by an-georgian_macroncomb_dieresiscomb;
-	sub on-georgian macroncomb dieresiscomb by on-georgian_macroncomb_dieresiscomb;
-	sub un-georgian macroncomb dieresiscomb by un-georgian_macroncomb_dieresiscomb;
-	sub An-georgian acutecomb by An-georgian_acutecomb;
-	sub An-georgian dieresiscomb by An-georgian_dieresiscomb;
-	sub An-georgian macroncomb by An-georgian_macroncomb;
-	sub En-georgian acutecomb by En-georgian_acutecomb;
-	sub En-georgian macroncomb by En-georgian_macroncomb;
-	sub In-georgian acutecomb by In-georgian_acutecomb;
-	sub In-georgian macroncomb by In-georgian_macroncomb;
-	sub On-georgian acutecomb by On-georgian_acutecomb;
-	sub On-georgian dieresiscomb by On-georgian_dieresiscomb;
-	sub On-georgian macroncomb by On-georgian_macroncomb;
-	sub Un-georgian acutecomb by Un-georgian_acutecomb;
-	sub Un-georgian circumflexcomb by Un-georgian_circumflexcomb;
-	sub Un-georgian dieresiscomb by Un-georgian_dieresiscomb;
-	sub Un-georgian macroncomb by Un-georgian_macroncomb;
-	sub Yn-georgian acutecomb by Yn-georgian_acutecomb;
-	sub Yn-georgian macroncomb by Yn-georgian_macroncomb;
-	sub an-georgian acutecomb by an-georgian_acutecomb;
-	sub an-georgian dieresiscomb by an-georgian_dieresiscomb;
-	sub an-georgian macroncomb by an-georgian_macroncomb;
-	sub en-georgian acutecomb by en-georgian_acutecomb;
-	sub en-georgian macroncomb by en-georgian_macroncomb;
-	sub in-georgian acutecomb by in-georgian_acutecomb;
-	sub in-georgian macroncomb by in-georgian_macroncomb;
-	sub on-georgian acutecomb by on-georgian_acutecomb;
-	sub on-georgian dieresiscomb by on-georgian_dieresiscomb;
-	sub on-georgian macroncomb by on-georgian_macroncomb;
-	sub un-georgian acutecomb by un-georgian_acutecomb;
-	sub un-georgian circumflexcomb by un-georgian_circumflexcomb;
-	sub un-georgian dieresiscomb by un-georgian_dieresiscomb;
-	sub un-georgian macroncomb by un-georgian_macroncomb;
-	sub yn-georgian acutecomb by yn-georgian_acutecomb;
-	sub yn-georgian macroncomb by yn-georgian_macroncomb;
+    lookupflag 0;
+    sub An-georgian macroncomb.geor dieresiscomb.geor by An-georgian_macroncomb_dieresiscomb;
+    sub On-georgian macroncomb.geor dieresiscomb.geor by On-georgian_macroncomb_dieresiscomb;
+    sub Un-georgian macroncomb.geor dieresiscomb.geor by Un-georgian_macroncomb_dieresiscomb;
+    sub an-georgian macroncomb.geor dieresiscomb.geor by an-georgian_macroncomb_dieresiscomb;
+    sub on-georgian macroncomb.geor dieresiscomb.geor by on-georgian_macroncomb_dieresiscomb;
+    sub un-georgian macroncomb.geor dieresiscomb.geor by un-georgian_macroncomb_dieresiscomb;
+    sub An-georgian acutecomb.geor by An-georgian_acutecomb;
+    sub An-georgian dieresiscomb.geor by An-georgian_dieresiscomb;
+    sub An-georgian macroncomb.geor by An-georgian_macroncomb;
+    sub En-georgian acutecomb.geor by En-georgian_acutecomb;
+    sub En-georgian macroncomb.geor by En-georgian_macroncomb;
+    sub In-georgian acutecomb.geor by In-georgian_acutecomb;
+    sub In-georgian macroncomb.geor by In-georgian_macroncomb;
+    sub On-georgian acutecomb.geor by On-georgian_acutecomb;
+    sub On-georgian dieresiscomb.geor by On-georgian_dieresiscomb;
+    sub On-georgian macroncomb.geor by On-georgian_macroncomb;
+    sub Un-georgian acutecomb.geor by Un-georgian_acutecomb;
+    sub Un-georgian circumflexcomb.geor by Un-georgian_circumflexcomb;
+    sub Un-georgian dieresiscomb.geor by Un-georgian_dieresiscomb;
+    sub Un-georgian macroncomb.geor by Un-georgian_macroncomb;
+    sub Yn-georgian acutecomb.geor by Yn-georgian_acutecomb;
+    sub Yn-georgian macroncomb.geor by Yn-georgian_macroncomb;
+    sub an-georgian acutecomb.geor by an-georgian_acutecomb;
+    sub an-georgian dieresiscomb.geor by an-georgian_dieresiscomb;
+    sub an-georgian macroncomb.geor by an-georgian_macroncomb;
+    sub en-georgian acutecomb.geor by en-georgian_acutecomb;
+    sub en-georgian macroncomb.geor by en-georgian_macroncomb;
+    sub in-georgian acutecomb.geor by in-georgian_acutecomb;
+    sub in-georgian macroncomb.geor by in-georgian_macroncomb;
+    sub on-georgian acutecomb.geor by on-georgian_acutecomb;
+    sub on-georgian dieresiscomb.geor by on-georgian_dieresiscomb;
+    sub on-georgian macroncomb.geor by on-georgian_macroncomb;
+    sub un-georgian acutecomb.geor by un-georgian_acutecomb;
+    sub un-georgian circumflexcomb.geor by un-georgian_circumflexcomb;
+    sub un-georgian dieresiscomb.geor by un-georgian_dieresiscomb;
+    sub un-georgian macroncomb.geor by un-georgian_macroncomb;
+    sub yn-georgian acutecomb.geor by yn-georgian_acutecomb;
+    sub yn-georgian macroncomb.geor by yn-georgian_macroncomb;
 } ccmp_geor_1;
 
 script geor;
-lookup ccmp_geor_1;";
+lookup ccmp_geor_1;
+";
 tag = ccmp;
 },
 {
@@ -1092,6 +1093,7 @@ instanceInterpolations = {
 m001 = 1;
 };
 name = Thin;
+weightClass = 100;
 },
 {
 axesValues = (
@@ -1103,6 +1105,7 @@ m001 = 0.78788;
 m002 = 0.21212;
 };
 name = ExtraLight;
+weightClass = 200;
 },
 {
 axesValues = (
@@ -1114,6 +1117,7 @@ m001 = 0.45455;
 m002 = 0.54545;
 };
 name = Light;
+weightClass = 300;
 },
 {
 axesValues = (
@@ -1135,6 +1139,7 @@ m002 = 0.84;
 m004 = 0.16;
 };
 name = Medium;
+weightClass = 500;
 },
 {
 axesValues = (
@@ -1146,6 +1151,7 @@ m002 = 0.64;
 m004 = 0.36;
 };
 name = SemiBold;
+weightClass = 600;
 },
 {
 axesValues = (
@@ -1157,6 +1163,7 @@ m002 = 0.42;
 m004 = 0.58;
 };
 name = Bold;
+weightClass = 700;
 },
 {
 axesValues = (
@@ -1168,6 +1175,7 @@ m002 = 0.19;
 m004 = 0.81;
 };
 name = ExtraBold;
+weightClass = 800;
 },
 {
 axesValues = (
@@ -1178,6 +1186,7 @@ instanceInterpolations = {
 m004 = 1;
 };
 name = Black;
+weightClass = 900;
 },
 {
 axesValues = (
@@ -1189,6 +1198,8 @@ m001 = 0.63333;
 m005 = 0.36667;
 };
 name = "SemiCondensed Thin";
+weightClass = 100;
+widthClass = 4;
 },
 {
 axesValues = (
@@ -1202,6 +1213,8 @@ m005 = 0.28889;
 m006 = 0.07778;
 };
 name = "SemiCondensed ExtraLight";
+weightClass = 200;
+widthClass = 4;
 },
 {
 axesValues = (
@@ -1215,6 +1228,8 @@ m005 = 0.16667;
 m006 = 0.2;
 };
 name = "SemiCondensed Light";
+weightClass = 300;
+widthClass = 4;
 },
 {
 axesValues = (
@@ -1226,6 +1241,7 @@ m002 = 0.63333;
 m006 = 0.36667;
 };
 name = SemiCondensed;
+widthClass = 4;
 },
 {
 axesValues = (
@@ -1239,6 +1255,8 @@ m006 = 0.308;
 m008 = 0.05867;
 };
 name = "SemiCondensed Medium";
+weightClass = 500;
+widthClass = 4;
 },
 {
 axesValues = (
@@ -1252,6 +1270,8 @@ m006 = 0.23467;
 m008 = 0.132;
 };
 name = "SemiCondensed SemiBold";
+weightClass = 600;
+widthClass = 4;
 },
 {
 axesValues = (
@@ -1265,6 +1285,8 @@ m006 = 0.154;
 m008 = 0.21267;
 };
 name = "SemiCondensed Bold";
+weightClass = 700;
+widthClass = 4;
 },
 {
 axesValues = (
@@ -1278,6 +1300,8 @@ m006 = 0.06967;
 m008 = 0.297;
 };
 name = "SemiCondensed ExtraBold";
+weightClass = 800;
+widthClass = 4;
 },
 {
 axesValues = (
@@ -1289,6 +1313,8 @@ m004 = 0.63333;
 m008 = 0.36667;
 };
 name = "SemiCondensed Black";
+weightClass = 900;
+widthClass = 4;
 },
 {
 axesValues = (
@@ -1300,6 +1326,8 @@ m001 = 0.3;
 m005 = 0.7;
 };
 name = "Condensed Thin";
+weightClass = 100;
+widthClass = 3;
 },
 {
 axesValues = (
@@ -1313,6 +1341,8 @@ m005 = 0.55152;
 m006 = 0.14848;
 };
 name = "Condensed ExtraLight";
+weightClass = 200;
+widthClass = 3;
 },
 {
 axesValues = (
@@ -1326,6 +1356,8 @@ m005 = 0.31818;
 m006 = 0.38182;
 };
 name = "Condensed Light";
+weightClass = 300;
+widthClass = 3;
 },
 {
 axesValues = (
@@ -1337,6 +1369,7 @@ m002 = 0.3;
 m006 = 0.7;
 };
 name = Condensed;
+widthClass = 3;
 },
 {
 axesValues = (
@@ -1350,6 +1383,8 @@ m006 = 0.588;
 m008 = 0.112;
 };
 name = "Condensed Medium";
+weightClass = 500;
+widthClass = 3;
 },
 {
 axesValues = (
@@ -1363,6 +1398,8 @@ m006 = 0.448;
 m008 = 0.252;
 };
 name = "Condensed SemiBold ";
+weightClass = 600;
+widthClass = 3;
 },
 {
 axesValues = (
@@ -1376,6 +1413,8 @@ m006 = 0.294;
 m008 = 0.406;
 };
 name = "Condensed Bold";
+weightClass = 700;
+widthClass = 3;
 },
 {
 axesValues = (
@@ -1389,6 +1428,8 @@ m006 = 0.133;
 m008 = 0.567;
 };
 name = "Condensed ExtraBold";
+weightClass = 800;
+widthClass = 3;
 },
 {
 axesValues = (
@@ -1400,6 +1441,8 @@ m004 = 0.3;
 m008 = 0.7;
 };
 name = "Condensed Black";
+weightClass = 900;
+widthClass = 3;
 },
 {
 axesValues = (
@@ -1410,6 +1453,8 @@ instanceInterpolations = {
 m005 = 1;
 };
 name = "ExtraCondensed Thin";
+weightClass = 100;
+widthClass = 2;
 },
 {
 axesValues = (
@@ -1421,6 +1466,8 @@ m005 = 0.78788;
 m006 = 0.21212;
 };
 name = "ExtraCondensed ExtraLight";
+weightClass = 200;
+widthClass = 2;
 },
 {
 axesValues = (
@@ -1432,6 +1479,8 @@ m005 = 0.45455;
 m006 = 0.54545;
 };
 name = "ExtraCondensed Light";
+weightClass = 300;
+widthClass = 2;
 },
 {
 axesValues = (
@@ -1442,6 +1491,7 @@ instanceInterpolations = {
 m006 = 1;
 };
 name = ExtraCondensed;
+widthClass = 2;
 },
 {
 axesValues = (
@@ -1453,6 +1503,8 @@ m006 = 0.84;
 m008 = 0.16;
 };
 name = "ExtraCondensed Medium";
+weightClass = 500;
+widthClass = 2;
 },
 {
 axesValues = (
@@ -1464,6 +1516,8 @@ m006 = 0.64;
 m008 = 0.36;
 };
 name = "ExtraCondensed SemiBold";
+weightClass = 600;
+widthClass = 2;
 },
 {
 axesValues = (
@@ -1475,6 +1529,8 @@ m006 = 0.42;
 m008 = 0.58;
 };
 name = "ExtraCondensed Bold";
+weightClass = 700;
+widthClass = 2;
 },
 {
 axesValues = (
@@ -1486,6 +1542,8 @@ m006 = 0.19;
 m008 = 0.81;
 };
 name = "ExtraCondensed ExtraBold";
+weightClass = 800;
+widthClass = 2;
 },
 {
 axesValues = (
@@ -1496,6 +1554,8 @@ instanceInterpolations = {
 m008 = 1;
 };
 name = "ExtraCondensed Black";
+weightClass = 900;
+widthClass = 2;
 }
 );
 kerningLTR = {