Merge branch 'develop' -- breaking changes 2022-05-28.

124 files changed, 212 insertions, 30 deletions

diff --git a/keyboards/gmmk/pro/config.h b/keyboards/gmmk/pro/config.h
index d83c965fc5..aba69c8872 100644
--- a/keyboards/gmmk/pro/config.h
+++ b/keyboards/gmmk/pro/config.h
@@ -53,7 +53,6 @@
 #define LOCKING_RESYNC_ENABLE
 
 /* SPI Config for LED Driver */
-#define SPI_DRIVER SPID1
 #define SPI_SCK_PIN A5
 #define SPI_MOSI_PIN A6
 #define SPI_MISO_PIN A7
diff --git a/keyboards/gmmk/pro/halconf.h b/keyboards/gmmk/pro/halconf.h
deleted file mode 100644
index 23ecb202a1..0000000000
--- a/keyboards/gmmk/pro/halconf.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#define HAL_USE_SPI TRUE
-#define SPI_USE_WAIT TRUE
-#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
-
-#include_next <halconf.h>
diff --git a/keyboards/gmmk/pro/mcuconf.h b/keyboards/gmmk/pro/mcuconf.h
deleted file mode 100644
index bb1c0acde2..0000000000
--- a/keyboards/gmmk/pro/mcuconf.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#pragma once
-
-#include_next <mcuconf.h>
-
-#undef STM32_SPI_USE_SPI1
-#define STM32_SPI_USE_SPI1 TRUE
diff --git a/keyboards/gmmk/pro/pro.h b/keyboards/gmmk/pro/pro.h
index 38dd4d78b9..0e53ffe225 100644
--- a/keyboards/gmmk/pro/pro.h
+++ b/keyboards/gmmk/pro/pro.h
@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-#if defined(KEYBOARD_gmmk_pro_ansi)
-#    include "ansi.h"
-#elif defined(KEYBOARD_gmmk_pro_iso)
-#    include "iso.h"
+#if defined(KEYBOARD_gmmk_pro_rev1_ansi)
+#    include "rev1/ansi/ansi.h"
+#elif defined(KEYBOARD_gmmk_pro_rev1_iso)
+#    include "rev1/iso/iso.h"
 #endif  // GMMK Pro revisions
diff --git a/keyboards/gmmk/pro/ansi/ansi.c b/keyboards/gmmk/pro/rev1/ansi/ansi.c
index 1df3319fd2..1df3319fd2 100644
--- a/keyboards/gmmk/pro/ansi/ansi.c
+++ b/keyboards/gmmk/pro/rev1/ansi/ansi.c
diff --git a/keyboards/gmmk/pro/ansi/ansi.h b/keyboards/gmmk/pro/rev1/ansi/ansi.h
index ab08d66592..ab08d66592 100644
--- a/keyboards/gmmk/pro/ansi/ansi.h
+++ b/keyboards/gmmk/pro/rev1/ansi/ansi.h
diff --git a/keyboards/gmmk/pro/ansi/config.h b/keyboards/gmmk/pro/rev1/ansi/config.h
index 7c68375b2f..7c68375b2f 100644
--- a/keyboards/gmmk/pro/ansi/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/config.h
diff --git a/keyboards/gmmk/pro/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json
index c3e76391d1..c3e76391d1 100644
--- a/keyboards/gmmk/pro/ansi/info.json
+++ b/keyboards/gmmk/pro/rev1/ansi/info.json
diff --git a/keyboards/gmmk/pro/ansi/keymaps/alexmarmon/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/keymap.c
index 99504de956..99504de956 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/alexmarmon/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/alexmarmon/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/readme.md
index 36ad42b1af..36ad42b1af 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/alexmarmon/readme.md
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/alexmarmon/readme.md
diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h
index 1438d317fb..1438d317fb 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/config.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
index e521425f26..e521425f26 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/readme.md
index 99d0a36721..99d0a36721 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/readme.md
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/readme.md
diff --git a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk
index 057e9a9541..057e9a9541 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/andrebrait/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrebrait/rules.mk
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/config.h
new file mode 100644
index 0000000000..aee1ba39d5
--- /dev/null
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/config.h
@@ -0,0 +1,24 @@
+/* Copyright 2021 Andrew Charnley
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_STATIC_LIGHT
+#define RGBLIGHT_DEFAULT_SAT 0
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+
+
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/keymap.c
new file mode 100644
index 0000000000..d044008a23
--- /dev/null
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/keymap.c
@@ -0,0 +1,87 @@
+/* Copyright 2021 Andrew Charnley
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// Windows key changed to second FN key. Use KC_LGUI to revert.
+
+enum userspace_layers {
+  QWERTY,
+  FNLAYER
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the RESET key (to put the board into bootloader mode). Without
+    // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
+    // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
+    // if that's your preference.
+    //
+    // To put the keyboard in bootloader mode, use FN+backslash. If you accidentally put it into bootloader, you can just unplug the USB cable and
+    // it'll be back to normal when you plug it back in.
+
+    [QWERTY] = LAYOUT(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          KC_MUTE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_DEL,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,          KC_PGUP,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,           KC_PGDN,
+        KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_UP,   KC_END,
+        KC_LCTL, MO(FNLAYER), KC_LALT,                            KC_SPC,                       KC_RALT, MO(FNLAYER),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [FNLAYER] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MEDIA_PLAY_PAUSE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET  ,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, RGB_VAI, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, RGB_VAD, _______
+    ),
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+  if(IS_LAYER_ON(FNLAYER)) {
+     if (clockwise) {
+       tap_code(KC_MEDIA_NEXT_TRACK);
+     } else {
+       tap_code(KC_MEDIA_PREV_TRACK);
+     }
+  } else {
+     if (clockwise) {
+       tap_code(KC_VOLU);
+     } else {
+       tap_code(KC_VOLD);
+     }
+  }
+  return false;
+}
+
+static uint8_t val;
+
+void keyboard_post_init_user(void) {
+
+  val = rgb_matrix_get_val();
+}
+
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+
+  if (host_keyboard_led_state().caps_lock) {
+    rgb_matrix_set_color_all(val,0,0);
+  } else {
+    rgb_matrix_set_color_all(val, val, val);
+    val = rgb_matrix_get_val();
+  }
+}
diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/readme.md
new file mode 100644
index 0000000000..e064edd83a
--- /dev/null
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/andrewcharnley/readme.md
@@ -0,0 +1,18 @@
+# Description
+A keymap designed to be functional for development purposes - no flashing lights or gimmicks. PRTSC and DEL key in the top right corner.
+Solid backlight that changes red if CAPS is on and reverts back afterwards. Brightness retained in both cases.
+Backlight is disabled on suspend and restored upon wake-up.
+The 'Windows' key is a second FN key. This makes it more natural to use the encoder wheel (good luck trying to do it with one hand).
+
+Compile using `qmk compile -kb gmmk/pro/ansi -km andrewcharnley`
+
+# Encoder
+FN + Encoder scroll = media next/prev
+FN + Encoder press = media pause
+default encoder behavior = volume up/down
+
+# Function Layer
+FN + Up = increase brightness
+FN + Down = decrease brightness
+FN + Backslash = bootloader
+
diff --git a/keyboards/gmmk/pro/ansi/keymaps/batin/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/batin/keymap.c
index be88ea82f8..be88ea82f8 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/batin/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/batin/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/benschaeff/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/keymap.c
index 5f3e3f5fd8..5f3e3f5fd8 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/benschaeff/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/benschaeff/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/readme.md
index 8162002892..8162002892 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/benschaeff/readme.md
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/benschaeff/readme.md
diff --git a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/config.h
index 16ac4f2407..16ac4f2407 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/config.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c
index 1ad8417de2..1ad8417de2 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/readme.md
index d340bf86ed..d340bf86ed 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/readme.md
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/readme.md
diff --git a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/rgb_matrix_user.inc b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/rgb_matrix_user.inc
index 0d61e19f4c..0d61e19f4c 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/rgb_matrix_user.inc
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/rgb_matrix_user.inc
diff --git a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/rules.mk
index 08f832c51b..08f832c51b 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/byungyoonc/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/byungyoonc/rules.mk
diff --git a/keyboards/gmmk/pro/ansi/keymaps/cedrikl/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
index 2361ab5660..2361ab5660 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/cedrikl/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/cedrikl/rgb_matrix_map.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/rgb_matrix_map.h
index 484f64b74c..484f64b74c 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/cedrikl/rgb_matrix_map.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/rgb_matrix_map.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/cedrikl/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/rules.mk
index 4b7ed8bf0b..4b7ed8bf0b 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/cedrikl/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/cedrikl/rules.mk
diff --git a/keyboards/gmmk/pro/ansi/keymaps/coryginsberg/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/config.h
index 6b06448f71..6b06448f71 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/coryginsberg/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/config.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/coryginsberg/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c
index 41278868db..41278868db 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/coryginsberg/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/coryginsberg/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/readme.md
index e448521572..e448521572 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/coryginsberg/readme.md
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/readme.md
diff --git a/keyboards/gmmk/pro/ansi/keymaps/coryginsberg/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/rules.mk
index 1dd6809223..1dd6809223 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/coryginsberg/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/coryginsberg/rules.mk
diff --git a/keyboards/gmmk/pro/ansi/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
index 0d161e5bdd..91f29f8d62 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/default/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
 
 
-    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the RESET key (to put the board into bootloader mode). Without
+    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without
     // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
     // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
     // if that's your preference.
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          _______,
         _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,            _______,
         _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
         _______,          _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
diff --git a/keyboards/gmmk/pro/ansi/keymaps/gigahawk/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/config.h
index 9ba8a7b1b7..9ba8a7b1b7 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/gigahawk/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/config.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/gigahawk/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c
index 8eedeb6e00..8eedeb6e00 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/gigahawk/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/gigahawk/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/caps_word.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/caps_word.c
index d2f7b6ee7f..d2f7b6ee7f 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/caps_word.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/caps_word.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/caps_word.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/caps_word.h
index 7f58dd3f17..7f58dd3f17 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/caps_word.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/caps_word.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/config.h
index 582e473cb2..582e473cb2 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/config.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/keymap.c
index 97db98dd12..97db98dd12 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/readme.md
index 3db6923d76..3db6923d76 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/readme.md
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/readme.md
diff --git a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/rgb_matrix_map.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/rgb_matrix_map.h
index 38da50754b..38da50754b 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/rgb_matrix_map.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/rgb_matrix_map.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/rules.mk
index b236d9132c..b236d9132c 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/gourdo1/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/gourdo1/rules.mk
diff --git a/keyboards/gmmk/pro/ansi/keymaps/hachetman/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/config.h
index 1438d317fb..1438d317fb 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/hachetman/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/config.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/hachetman/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c
index 19694d54c1..19694d54c1 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/hachetman/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/hachetman/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/readme.md
index bc8c580dbb..bc8c580dbb 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/hachetman/readme.md
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/readme.md
diff --git a/keyboards/gmmk/pro/ansi/keymaps/hachetman/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/rules.mk
index 9995f3f4d2..9995f3f4d2 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/hachetman/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/hachetman/rules.mk
diff --git a/keyboards/gmmk/pro/ansi/keymaps/jackkenney/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/jackkenney/keymap.c
index cfca7960ca..cfca7960ca 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/jackkenney/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/jackkenney/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/config.h
index ed78f99eca..ed78f99eca 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/config.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c
index 0d318885f4..0d318885f4 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/readme.md
index 6e8d6ba8a5..6e8d6ba8a5 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/readme.md
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/readme.md
diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rgb_matrix_map.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/rgb_matrix_map.h
index 1ee5388905..1ee5388905 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rgb_matrix_map.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/rgb_matrix_map.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/rules.mk
index 1ffc2058a2..1ffc2058a2 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/jonavin/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/jonavin/rules.mk
diff --git a/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/config.h
index 74c018f7f1..74c018f7f1 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/config.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
index 7bedf05987..7bedf05987 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/rules.mk
index 0a5b666e85..0a5b666e85 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/lalitmaganti/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/lalitmaganti/rules.mk
diff --git a/keyboards/gmmk/pro/ansi/keymaps/macos/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h
index 799c5d9593..799c5d9593 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/macos/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/config.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/macos/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
index 1f8c47306a..1f8c47306a 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/macos/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/macos/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/readme.md
index 8024e77cc1..8024e77cc1 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/macos/readme.md
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/readme.md
diff --git a/keyboards/gmmk/pro/ansi/keymaps/macos/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/rules.mk
index e9073d44a0..e9073d44a0 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/macos/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/macos/rules.mk
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/ansi.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/ansi.c
index 52c9dfdf99..52c9dfdf99 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/ansi.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/ansi.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/config.h
index 26417b8234..26417b8234 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/config.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/helpers.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/helpers.c
index f3f443cedb..f3f443cedb 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/helpers.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/helpers.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c
index f96be6ffe9..f96be6ffe9 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/keymap_helpers.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap_helpers.h
index 2a6e8dae7b..2a6e8dae7b 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/keymap_helpers.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/keymap_helpers.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/readme.md
index f388a3fbf1..f388a3fbf1 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/readme.md
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/readme.md
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/rules.mk
index 76e1674d58..76e1674d58 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mattgauf/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mattgauf/rules.mk
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/.gitignore b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/.gitignore
index 03b2b46668..03b2b46668 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mike1808/.gitignore
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/.gitignore
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/README.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/README.md
index cb17239882..cb17239882 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mike1808/README.md
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/README.md
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h
index 46719e3a78..46719e3a78 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mike1808/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/config.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/encoder.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.c
index 049f4df7e4..049f4df7e4 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mike1808/encoder.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/encoder.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.h
index 204922730e..204922730e 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mike1808/encoder.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/encoder.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/fun.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/fun.c
index f553874eb0..f553874eb0 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mike1808/fun.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/fun.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/keymap.c
index 30c59e941d..30c59e941d 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mike1808/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/mike1808.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.c
index dda68fda2f..dda68fda2f 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mike1808/mike1808.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/mike1808.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h
index bc010108fb..bc010108fb 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mike1808/mike1808.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/mike1808.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/process_record.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.c
index ac0164e73f..ac0164e73f 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mike1808/process_record.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/process_record.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.h
index 1021751655..1021751655 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mike1808/process_record.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/process_record.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
index 6f4d333ede..6f4d333ede 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h
index eace217d18..eace217d18 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rgb_matrix_ledmaps.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rules.mk
index a6d4e6259c..a6d4e6259c 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mike1808/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/rules.mk
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/utils.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.c
index 35ae20b126..35ae20b126 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mike1808/utils.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/mike1808/utils.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.h
index 49d0745cf8..49d0745cf8 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/mike1808/utils.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/mike1808/utils.h
diff --git a/keyboards/gmmk/pro/keymaps/moults31/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/moults31/keymap.c
index 90ac428c74..90ac428c74 100644
--- a/keyboards/gmmk/pro/keymaps/moults31/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/moults31/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/config.h
index 4f83c6af1f..4f83c6af1f 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/config.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
index 5c702b1686..5c702b1686 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/paddlegame.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/paddlegame.h
index 27df2dd703..27df2dd703 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/paddlegame.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/paddlegame.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/readme.md
index c6da7f5f47..c6da7f5f47 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/readme.md
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/readme.md
diff --git a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/rgb_matrix_map.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/rgb_matrix_map.h
index 06d34ba6cb..06d34ba6cb 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/rgb_matrix_map.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/rgb_matrix_map.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/rules.mk
index a3f5bfd35c..a3f5bfd35c 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/paddlegame/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/paddlegame/rules.mk
diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/config.h
index 78ff96f8b7..78ff96f8b7 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/config.h
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/config.h
diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
index 762fe00df2..762fe00df2 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/readme.md
index c4e2225433..c4e2225433 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/readme.md
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/readme.md
diff --git a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/rules.mk
index 6440dc6d41..6440dc6d41 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/stickandgum/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/stickandgum/rules.mk
diff --git a/keyboards/gmmk/pro/ansi/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c
index d50bbfbf56..1f59b52999 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/via/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
 
 
-    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the RESET key (to put the board into bootloader mode). Without
+    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without
     // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
     // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
     // if that's your preference.
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [1] = LAYOUT(
         _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          _______,
         _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,            _______,
         _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______,
         _______,          _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
         _______, _______, _______,                            _______,                            _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI
diff --git a/keyboards/gmmk/pro/ansi/keymaps/via/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/via/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/via/rules.mk
diff --git a/keyboards/gmmk/pro/ansi/keymaps/wholesomeducky/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c
index fded532562..fded532562 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/wholesomeducky/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/wholesomeducky/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/willwm/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.c
index a32fef1041..a32fef1041 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/willwm/keymap.c
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.c
diff --git a/keyboards/gmmk/pro/ansi/keymaps/willwm/keymap.json b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.json
index d2325d2c13..d2325d2c13 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/willwm/keymap.json
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/keymap.json
diff --git a/keyboards/gmmk/pro/ansi/keymaps/willwm/readme.md b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/readme.md
index 1c169faac6..1c169faac6 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/willwm/readme.md
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/readme.md
diff --git a/keyboards/gmmk/pro/ansi/keymaps/willwm/rules.mk b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/rules.mk
index 511b50e19c..511b50e19c 100644
--- a/keyboards/gmmk/pro/ansi/keymaps/willwm/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/willwm/rules.mk
diff --git a/keyboards/gmmk/pro/ansi/readme.md b/keyboards/gmmk/pro/rev1/ansi/readme.md
index 9800aef88e..c6721b026a 100644
--- a/keyboards/gmmk/pro/ansi/readme.md
+++ b/keyboards/gmmk/pro/rev1/ansi/readme.md
@@ -8,11 +8,11 @@ A tenkeyless 75% keyboard made and sold by Glorious LLC. Equipped with the STM32
 
 Make example for this keyboard (after setting up your build environment):
 
-    make gmmk/pro/ansi:default
+    make gmmk/pro/rev1/ansi:default
 
 Flashing example for this keyboard:
 
-    make gmmk/pro/ansi:default:flash
+    make gmmk/pro/rev1/ansi:default:flash
 
 To reset the board into bootloader mode, do one of the following:
 
diff --git a/keyboards/gmmk/pro/ansi/rules.mk b/keyboards/gmmk/pro/rev1/ansi/rules.mk
index d3afa4d432..d3afa4d432 100644
--- a/keyboards/gmmk/pro/ansi/rules.mk
+++ b/keyboards/gmmk/pro/rev1/ansi/rules.mk
diff --git a/keyboards/gmmk/pro/rev1/config.h b/keyboards/gmmk/pro/rev1/config.h
new file mode 100644
index 0000000000..9ece2e2c6c
--- /dev/null
+++ b/keyboards/gmmk/pro/rev1/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* SPI Config for LED Driver */
+#define SPI_DRIVER SPID1
diff --git a/keyboards/gmmk/pro/rev1/halconf.h b/keyboards/gmmk/pro/rev1/halconf.h
new file mode 100644
index 0000000000..8d9b60c234
--- /dev/null
+++ b/keyboards/gmmk/pro/rev1/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/gmmk/pro/iso/config.h b/keyboards/gmmk/pro/rev1/iso/config.h
index 26626ccfc1..26626ccfc1 100644
--- a/keyboards/gmmk/pro/iso/config.h
+++ b/keyboards/gmmk/pro/rev1/iso/config.h
diff --git a/keyboards/gmmk/pro/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json
index 32fac89336..32fac89336 100644
--- a/keyboards/gmmk/pro/iso/info.json
+++ b/keyboards/gmmk/pro/rev1/iso/info.json
diff --git a/keyboards/gmmk/pro/iso/iso.c b/keyboards/gmmk/pro/rev1/iso/iso.c
index fa57f1ca92..fa57f1ca92 100644
--- a/keyboards/gmmk/pro/iso/iso.c
+++ b/keyboards/gmmk/pro/rev1/iso/iso.c
diff --git a/keyboards/gmmk/pro/iso/iso.h b/keyboards/gmmk/pro/rev1/iso/iso.h
index 353bcbe875..353bcbe875 100644
--- a/keyboards/gmmk/pro/iso/iso.h
+++ b/keyboards/gmmk/pro/rev1/iso/iso.h
diff --git a/keyboards/gmmk/pro/iso/keymaps/chofstede/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c
index 84fbcf37ff..84fbcf37ff 100644
--- a/keyboards/gmmk/pro/iso/keymaps/chofstede/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/keymap.c
diff --git a/keyboards/gmmk/pro/iso/keymaps/chofstede/readme.md b/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/readme.md
index da66c447ad..da66c447ad 100644
--- a/keyboards/gmmk/pro/iso/keymaps/chofstede/readme.md
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/chofstede/readme.md
diff --git a/keyboards/gmmk/pro/iso/keymaps/default/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c
index 3bdacda6c8..0aedb78285 100644
--- a/keyboards/gmmk/pro/iso/keymaps/default/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/default/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
 
 
-    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the RESET key (to put the board into bootloader mode). Without
+    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without
     // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
     // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
     // if that's your preference.
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT(
         _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          _______,
-        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,            _______,
         _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
         _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
diff --git a/keyboards/gmmk/pro/iso/keymaps/jonavin/config.h b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/config.h
index fa7ebec7e5..fa7ebec7e5 100644
--- a/keyboards/gmmk/pro/iso/keymaps/jonavin/config.h
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/config.h
diff --git a/keyboards/gmmk/pro/iso/keymaps/jonavin/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c
index 3164ecbf68..3164ecbf68 100644
--- a/keyboards/gmmk/pro/iso/keymaps/jonavin/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/keymap.c
diff --git a/keyboards/gmmk/pro/iso/keymaps/jonavin/readme.md b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/readme.md
index f94a5eabbd..f94a5eabbd 100644
--- a/keyboards/gmmk/pro/iso/keymaps/jonavin/readme.md
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/readme.md
diff --git a/keyboards/gmmk/pro/iso/keymaps/jonavin/rgb_matrix_map.h b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/rgb_matrix_map.h
index 1aa31f2a0f..1aa31f2a0f 100644
--- a/keyboards/gmmk/pro/iso/keymaps/jonavin/rgb_matrix_map.h
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/rgb_matrix_map.h
diff --git a/keyboards/gmmk/pro/iso/keymaps/jonavin/rules.mk b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/rules.mk
index 1ffc2058a2..1ffc2058a2 100644
--- a/keyboards/gmmk/pro/iso/keymaps/jonavin/rules.mk
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/jonavin/rules.mk
diff --git a/keyboards/gmmk/pro/iso/keymaps/via/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c
index 880785ebbe..7d0693c18c 100644
--- a/keyboards/gmmk/pro/iso/keymaps/via/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/via/keymap.c
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 //      Ct_L     Win_L    Alt_L                               SPACE                               Alt_R    FN       Ct_R     Left     Down     Right
 
 
-    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the RESET key (to put the board into bootloader mode). Without
+    // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without
     // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB
     // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI
     // if that's your preference.
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT(
         _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,          _______,
-        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,            _______,
+        _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,            _______,
         _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
         _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
         _______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______,          _______, RGB_MOD, _______,
diff --git a/keyboards/gmmk/pro/iso/keymaps/via/rules.mk b/keyboards/gmmk/pro/rev1/iso/keymaps/via/rules.mk
index 1e5b99807c..1e5b99807c 100644
--- a/keyboards/gmmk/pro/iso/keymaps/via/rules.mk
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/via/rules.mk
diff --git a/keyboards/gmmk/pro/iso/keymaps/vitoni/config.h b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/config.h
index fd8f1d6859..fd8f1d6859 100644
--- a/keyboards/gmmk/pro/iso/keymaps/vitoni/config.h
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/config.h
diff --git a/keyboards/gmmk/pro/iso/keymaps/vitoni/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/keymap.c
index d5b64c153a..d5b64c153a 100644
--- a/keyboards/gmmk/pro/iso/keymaps/vitoni/keymap.c
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/keymap.c
diff --git a/keyboards/gmmk/pro/iso/keymaps/vitoni/readme.adoc b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/readme.adoc
index 38a74a568b..38a74a568b 100644
--- a/keyboards/gmmk/pro/iso/keymaps/vitoni/readme.adoc
+++ b/keyboards/gmmk/pro/rev1/iso/keymaps/vitoni/readme.adoc
diff --git a/keyboards/gmmk/pro/iso/readme.md b/keyboards/gmmk/pro/rev1/iso/readme.md
index 62dbee5d0f..50601a79ce 100644
--- a/keyboards/gmmk/pro/iso/readme.md
+++ b/keyboards/gmmk/pro/rev1/iso/readme.md
@@ -8,11 +8,11 @@ A tenkeyless 75% keyboard made and sold by Glorious LLC. Equipped with the STM32
 
 Make example for this keyboard (after setting up your build environment):
 
-    make gmmk/pro/iso:default
+    make gmmk/pro/rev1/iso:default
 
 Flashing example for this keyboard:
 
-    make gmmk/pro/iso:default:flash
+    make gmmk/pro/rev1/iso:default:flash
 
 To reset the board into bootloader mode, do one of the following:
 
diff --git a/keyboards/gmmk/pro/iso/rules.mk b/keyboards/gmmk/pro/rev1/iso/rules.mk
index d3afa4d432..d3afa4d432 100644
--- a/keyboards/gmmk/pro/iso/rules.mk
+++ b/keyboards/gmmk/pro/rev1/iso/rules.mk
diff --git a/keyboards/gmmk/pro/rev1/mcuconf.h b/keyboards/gmmk/pro/rev1/mcuconf.h
new file mode 100644
index 0000000000..48eb8be9d8
--- /dev/null
+++ b/keyboards/gmmk/pro/rev1/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2021 Glorious, LLC <salman@pcgamingrace.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE