diff --git a/config/base30.keymap b/config/base30.keymap
index 544f5b3b..fe395de4 100644
--- a/config/base30.keymap
+++ b/config/base30.keymap
@@ -96,8 +96,10 @@
 //                                           ╰─────────────┴─────────────╯   ╰─────────────┴─────────────╯
 
             #ifdef FIVEWAY
-                   &kp C &kp G &kp D &kp L &kp O 
+                // up           left            down         right           middle
+                   &kp PG_UP    &kp C_VOL_DN    &kp PG_DN    &kp C_VOL_UP    &kp C_MUTE 
             #endif
+
             >;
             #ifdef ENCODERS
               sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_UP PG_DN>;
@@ -125,9 +127,10 @@
 //                                           ╰─────────────┴─────────────╯   ╰─────────────┴─────────────╯
 
             #ifdef FIVEWAY
-                   &kp C &kp G &kp D &kp L &kp O 
+                // up           left            down         right           middle
+                   &kp PG_UP    &kp C_VOL_DN    &kp PG_DN    &kp C_VOL_UP    &kp C_MUTE 
             #endif
-            >;
+
             #ifdef ENCODERS
               sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP &inc_dec_kp PG_UP PG_DN>;
             #endif
@@ -145,8 +148,10 @@
 //                                           ╰─────────────┴─────────────╯   ╰─────────────┴─────────────╯
 
             #ifdef FIVEWAY
-                   &kp C &kp G &kp D &kp L &kp O 
+                // up           left            down         right           middle
+                   &kp PG_UP    &kp C_VOL_DN    &kp PG_DN    &kp C_VOL_UP    &kp C_MUTE 
             #endif
+
             >;
             #ifdef ENCODERS
               sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP &inc_dec_kp PG_UP PG_DN>;
@@ -165,8 +170,10 @@
 //                                           ╰─────────────┴─────────────╯   ╰─────────────┴─────────────╯
 
             #ifdef FIVEWAY
-                   &kp C &kp G &kp D &kp L &kp O 
+                // up           left            down         right           middle
+                   &kp PG_UP    &kp C_VOL_DN    &kp PG_DN    &kp C_VOL_UP    &kp C_MUTE 
             #endif
+
             >;
             #ifdef ENCODERS
               sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP &inc_dec_kp PG_UP PG_DN>;
@@ -185,8 +192,10 @@
 //                                           ╰─────────────┴─────────────╯   ╰─────────────┴─────────────╯
 
             #ifdef FIVEWAY
-                   &kp C &kp G &kp D &kp L &kp O 
+                // up           left            down         right           middle
+                   &kp PG_UP    &kp C_VOL_DN    &kp PG_DN    &kp C_VOL_UP    &kp C_MUTE 
             #endif
+
             >;
             #ifdef ENCODERS
               sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP &inc_dec_kp PG_UP PG_DN>;
@@ -207,8 +216,10 @@
 //                                           ╰─────────────┴─────────────╯   ╰─────────────┴─────────────╯
 
             #ifdef FIVEWAY
-                   &kp C &kp G &kp D &kp L &kp O 
+                // up           left            down         right           middle
+                   &kp PG_UP    &kp C_VOL_DN    &kp PG_DN    &kp C_VOL_UP    &kp C_MUTE 
             #endif
+
             >;
             #ifdef ENCODERS
               sensor-bindings = <&inc_dec_kp C_VOL_DN C_VOL_UP &inc_dec_kp PG_UP PG_DN>;
@@ -227,8 +238,10 @@
 //                                           ╰─────────────┴─────────────╯   ╰─────────────┴─────────────╯
 
             #ifdef FIVEWAY
-                   &kp C &kp G &kp D &kp L &kp O 
+                // up           left            down         right           middle
+                   &kp PG_UP    &kp C_VOL_DN    &kp PG_DN    &kp C_VOL_UP    &kp C_MUTE 
             #endif
+
             >;
 
             #ifdef ENCODERS
@@ -248,7 +261,8 @@
 //                                           ╰─────────────┴─────────────╯   ╰─────────────┴─────────────╯
 
             #ifdef FIVEWAY
-                   &kp C &kp G &kp D &kp L &kp O 
+                // up           left            down         right           middle
+                   &kp PG_UP    &kp C_VOL_DN    &kp PG_DN    &kp C_VOL_UP    &kp C_MUTE 
             #endif
 
             >;