diff --git a/keyboards/zsa/ergodox_ez/ergodox_ez.c b/keyboards/zsa/ergodox_ez/ergodox_ez.c
index 1a25f2ac6d..d3360a0d68 100644
--- a/keyboards/zsa/ergodox_ez/ergodox_ez.c
+++ b/keyboards/zsa/ergodox_ez/ergodox_ez.c
@@ -26,8 +26,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "oryx.h"
 #endif // COMMUNITY_MODULE_ORYX_ENABLE
 #ifdef COMMUNITY_MODULE_DEFAULTS_ENABLE
-#     include "defaults.h"
-#endif
+#    include "defaults.h"
+#endif // COMMUNITY_MODULE_ORYX_ENABLE
 
 keyboard_config_t keyboard_config;
 
@@ -283,6 +283,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
             }
             break;
         case RGB_TOG:
+        case QK_RGB_MATRIX_TOGGLE:
             if (record->event.pressed) {
                 switch (rgb_matrix_get_flags()) {
                     case LED_FLAG_ALL: {
diff --git a/keyboards/zsa/moonlander/moonlander.c b/keyboards/zsa/moonlander/moonlander.c
index e1918c1364..e2ee4575fe 100644
--- a/keyboards/zsa/moonlander/moonlander.c
+++ b/keyboards/zsa/moonlander/moonlander.c
@@ -21,6 +21,9 @@
 #ifdef COMMUNITY_MODULE_ORYX_ENABLE
 #    include "oryx.h"
 #endif // COMMUNITY_MODULE_ORYX_ENABLE
+#ifdef COMMUNITY_MODULE_DEFAULTS_ENABLE
+#    include "defaults.h"
+#endif // COMMUNITY_MODULE_ORYX_ENABLE
 
 #ifdef COMMUNITY_MODULE_DEFAULTS_ENABLE
 #     include "defaults.h"
@@ -415,6 +418,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
                 eeconfig_update_kb(keyboard_config.raw);
             }
             break;
+        case RGB_TOG:
         case QK_RGB_MATRIX_TOGGLE:
             if (record->event.pressed) {
                 switch (rgb_matrix_get_flags()) {
diff --git a/keyboards/zsa/planck_ez/planck_ez.c b/keyboards/zsa/planck_ez/planck_ez.c
index b960d08696..045db959da 100644
--- a/keyboards/zsa/planck_ez/planck_ez.c
+++ b/keyboards/zsa/planck_ez/planck_ez.c
@@ -23,9 +23,8 @@
 #ifdef COMMUNITY_MODULE_ORYX_ENABLE
 #    include "oryx.h"
 #endif // COMMUNITY_MODULE_ORYX_ENABLE
-       //
 #ifdef COMMUNITY_MODULE_DEFAULTS_ENABLE
-#     include "defaults.h"
+#    include "defaults.h"
 #endif
 
 keyboard_config_t keyboard_config;
@@ -213,6 +212,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
                 eeconfig_update_kb(keyboard_config.raw);
             }
             break;
+        case RGB_TOG:
         case QK_RGB_MATRIX_TOGGLE:
             if (record->event.pressed) {
               switch (rgb_matrix_get_flags()) {
diff --git a/keyboards/zsa/voyager/voyager.c b/keyboards/zsa/voyager/voyager.c
index 84d3eb095d..cca353950a 100644
--- a/keyboards/zsa/voyager/voyager.c
+++ b/keyboards/zsa/voyager/voyager.c
@@ -7,7 +7,6 @@
 #ifdef COMMUNITY_MODULE_ORYX_ENABLE
 #    include "oryx.h"
 #endif // COMMUNITY_MODULE_ORYX_ENABLE
-       //
 #ifdef COMMUNITY_MODULE_DEFAULTS_ENABLE
 #     include "defaults.h"
 #endif
@@ -259,6 +258,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
                 if (keyboard_config.disable_layer_led) rgb_matrix_set_color_all(0, 0, 0);
             }
             break;
+        case RGB_TOG:
         case QK_RGB_MATRIX_TOGGLE:
             if (record->event.pressed) {
                 switch (rgb_matrix_get_flags()) {
diff --git a/modules/zsa b/modules/zsa
index 4645104081..e9e7563dec 160000
--- a/modules/zsa
+++ b/modules/zsa
@@ -1 +1 @@
-Subproject commit 464510408106a718592eb43cb9cad167a6754b05
+Subproject commit e9e7563dec3be5e0144f1d6c08576a99a013230f