diff --git a/modules/fonts/default.nix b/modules/fonts/default.nix
index 7bce85d..b68c960 100644
--- a/modules/fonts/default.nix
+++ b/modules/fonts/default.nix
@@ -19,22 +19,22 @@ with lib; let
         capital-i = "serifless";
         capital-j = "serifless";
         capital-k = "straight-serifless";
-        capital-m = "flat-bottom";
-        capital-w = "straight-flat-top";
+        capital-m = "flat-bottom-serifless";
+        capital-w = "straight-flat-top-serifless";
         a = "double-storey-serifless";
         d = "toothed-serifless";
         e = "flat-crossbar";
-        f = "flat-hook";
+        f = "flat-hook-serifless";
         g = "single-storey-serifless";
         i = "serifless";
         j = "flat-hook-serifless";
         k = "straight-serifless";
         l = "serifless";
-        r = "compact";
+        r = "compact-serifless";
         t = "flat-hook";
-        u = "toothed";
-        w = "straight-flat-top";
-        y = "straight";
+        u = "toothed-serifless";
+        w = "straight-flat-top-serifless";
+        y = "straight-serifless";
         long-s = "flat-hook-serifless";
         eszet = "longs-s-lig";
         lower-iota = "flat-tailed";
@@ -42,7 +42,7 @@ with lib; let
         cyrl-ef = "serifless";
         cyrl-capital-ka = "symmetric-connected-serifless";
         cyrl-ka = "symmetric-connected-serifless";
-        cyrl-capital-u = "straight";
+        cyrl-capital-u = "straight-serifless";
         at = "fourfold";
         percent = "rings-continuous-slash";
       };
@@ -51,22 +51,22 @@ with lib; let
         capital-i = "serifed";
         capital-j = "serifless";
         capital-k = "straight-serifless";
-        capital-m = "flat-bottom";
-        capital-w = "straight-flat-top";
+        capital-m = "flat-bottom-serifless";
+        capital-w = "straight-flat-top-serifless";
         a = "double-storey-serifless";
         d = "toothed-serifless";
         e = "flat-crossbar";
-        f = "flat-hook";
+        f = "flat-hook-serifless";
         g = "single-storey-serifless";
         i = "serifed";
         j = "flat-hook-serifed";
         k = "straight-serifless";
         l = "serifed";
-        r = "compact";
+        r = "compact-serifless";
         t = "flat-hook";
-        u = "toothed";
-        w = "straight-flat-top";
-        y = "straight";
+        u = "toothed-serifless";
+        w = "straight-flat-top-serifless";
+        y = "straight-serifless";
         long-s = "flat-hook-serifless";
         eszet = "longs-s-lig";
         lower-iota = "flat-tailed";
@@ -74,7 +74,7 @@ with lib; let
         cyrl-ef = "serifless";
         cyrl-capital-ka = "symmetric-connected-serifless";
         cyrl-ka = "symmetric-connected-serifless";
-        cyrl-capital-u = "straight";
+        cyrl-capital-u = "straight-serifless";
         at = "fourfold";
         percent = "rings-continuous-slash";
       };