diff --git a/keyboards/gboards/georgi/keymaps/plover-hid/keymap.c b/keyboards/gboards/georgi/keymaps/plover-hid/keymap.c
index c83b64c8f9..66ba17c7f1 100644
--- a/keyboards/gboards/georgi/keymaps/plover-hid/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/plover-hid/keymap.c
@@ -42,9 +42,9 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     // Main layer, everything goes through here
     [0] = LAYOUT_georgi(
-    PLV_X1,  PLV_S1,  PLV_TL,  PLV_PL,  PLV_HL,  PLV_ST1,       PLV_ST3, PLV_FR,  PLV_PR,  PLV_LR,  PLV_TR,  PLV_DR,
-    PLV_X2,  PLV_S2,  PLV_KL,  PLV_WL,  PLV_RL,  PLV_ST2,       PLV_ST4, PLV_RR,  PLV_BR,  PLV_GR,  PLV_SR,  PLV_ZR,
-                               PLV_N1,  PLV_A,     PLV_O,         PLV_E,  PLV_U,  PLV_N7
+    PLV_X1,  PLV_SL,  PLV_TL,  PLV_PL,  PLV_HL,  PLV_STR,       PLV_STR, PLV_FR,  PLV_PR,  PLV_LR,  PLV_TR,  PLV_DR,
+    PLV_X2,  PLV_SL,  PLV_KL,  PLV_WL,  PLV_RL,  PLV_STR,       PLV_STR, PLV_RR,  PLV_BR,  PLV_GR,  PLV_SR,  PLV_ZR,
+                              PLV_NUM,  PLV_A,     PLV_O,         PLV_E,  PLV_U, PLV_NUM
     )
 };
 // Don't fuck with this, thanks.
diff --git a/quantum/keymap_extras/keymap_plover_hid.h b/quantum/keymap_extras/keymap_plover_hid.h
index 4792f5d1f3..6a8d52d087 100644
--- a/quantum/keymap_extras/keymap_plover_hid.h
+++ b/quantum/keymap_extras/keymap_plover_hid.h
@@ -21,47 +21,32 @@
 // List of keycodes for the plover HID.
 enum steno_keycodes {
     PLV__MIN = QK_PLOVER_HID,
-    PLV_N1 = PLV__MIN,
-    PLV_N2,
-    PLV_N3,
-    PLV_N4,
-    PLV_N5,
-    PLV_N6,
-    PLV_N7,
-    PLV_N8,
-    PLV_N9,
-    PLV_NA,
-    PLV_NB,
-    PLV_NC,
-    PLV_X1,
-    PLV_S1,
+    PLV_SL = PLV__MIN,
     PLV_TL,
-    PLV_PL,
-    PLV_HL,
-    PLV_ST1,
-    PLV_ST3,
-    PLV_FR,
-    PLV_PR,
-    PLV_LR,
-    PLV_TR,
-    PLV_DR,
-    PLV_X2,
-    PLV_S2,
     PLV_KL,
+    PLV_PL,
     PLV_WL,
+    PLV_HL,
     PLV_RL,
-    PLV_ST2,
-    PLV_ST4,
-    PLV_RR,
-    PLV_BR,
-    PLV_GR,
-    PLV_SR,
-    PLV_ZR,
-    PLV_X3,
     PLV_A,
     PLV_O,
+    PLV_STR,
     PLV_E,
     PLV_U,
+    PLV_FR,
+    PLV_RR,
+    PLV_PR,
+    PLV_BR,
+    PLV_LR,
+    PLV_GR,
+    PLV_TR,
+    PLV_SR,
+    PLV_DR,
+    PLV_ZR,
+    PLV_NUM,
+    PLV_X1,
+    PLV_X2,
+    PLV_X3,
     PLV_X4,
     PLV_X5,
     PLV_X6,
@@ -85,5 +70,20 @@ enum steno_keycodes {
     PLV_X24,
     PLV_X25,
     PLV_X26,
-    PLV__MAX = PLV_X26,
+    PLV_X27,
+    PLV_X28,
+    PLV_X29,
+    PLV_X30,
+    PLV_X31,
+    PLV_X32,
+    PLV_X33,
+    PLV_X34,
+    PLV_X35,
+    PLV_X36,
+    PLV_X37,
+    PLV_X38,
+    PLV_X39,
+    PLV_X40,
+    PLV_X41,
+    PLV__MAX = PLV_X41,
 };