Merge remote-tracking branch 'upstream/develop'

15 files changed, 43 insertions, 44 deletions

diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h
index 87b5b66375..9ee1c3e3cb 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/333fred/config.h
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#define USE_SERIAL
 #define EE_HANDS
 
 #undef TAPPING_TERM
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h
index 5a20f9473f..4d83c191f3 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
-
 #define MASTER_LEFT
 //#define MASTER_RIGHT
 
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/keymap.c
index 5bb5836fbc..9c220be47f 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
         KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
         KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
-        KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLASH,
+        KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
                          KC_LBRC,KC_RBRC,                                                       KC_PLUS, KC_EQL,
                                          RAISE,KC_SPC,                        KC_ENT, LOWER,
                                          KC_TAB,KC_HOME,                         KC_END,  KC_DEL,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_RAISE] = LAYOUT_5x6(
           KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                        KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-          _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NLCK,KC_INS ,KC_SLCK,KC_MUTE,
+          _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NUM,KC_INS ,KC_SCRL,KC_MUTE,
           _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
           _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,KC_VOLD,
                                                   _______,_______,            KC_EQL ,_______,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/config.h
index d046806eaa..68900af390 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/config.h
@@ -17,8 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define USE_SERIAL
-
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 //#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/keymap.c
index 179b448664..3f3ae25848 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
      KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
      KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
-     KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLASH,
+     KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
                       KC_LBRC,KC_RBRC,                                                       KC_PLUS, KC_EQL,
                                       RAISE,KC_SPC,                           KC_ENT, LOWER,
                                       KC_TAB,KC_HOME,                         KC_END,  KC_DEL,
@@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_RAISE] = LAYOUT_5x6(
      KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                         KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
-     _______,_______,_______,_______,_______,KC_LBRC,                         KC_RBRC,_______,KC_NLCK,KC_INS ,KC_SLCK,KC_MUTE,
+     _______,_______,_______,_______,_______,KC_LBRC,                         KC_RBRC,_______,KC_NUM,KC_INS ,KC_SCRL,KC_MUTE,
      _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                         KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
      _______,_______,_______,_______,_______,_______,                         _______,_______,_______,_______,_______,KC_VOLD,
                                      _______,_______,                         KC_EQL ,_______,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c
index 4a83a5e73a..d118eec92a 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/nabos/keymap.c
@@ -29,7 +29,7 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_5x6(
-     KC_GESC, KC_1 , KC_2  ,  KC_3  , KC_4  , KC_5  ,         KC_6     , KC_7  , KC_8  , KC_9 , KC_0  ,KC_RBRC,
+     QK_GESC, KC_1 , KC_2  ,  KC_3  , KC_4  , KC_5  ,         KC_6     , KC_7  , KC_8  , KC_9 , KC_0  ,KC_RBRC,
      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_PGUP, KC_A , KC_S  ,  KC_D  , KC_F  , KC_G  ,         KC_H     , KC_J  , KC_K  , KC_L ,KC_SCLN,KC_QUOT,
      KC_PGDN, KC_Z , KC_X  ,  KC_C  , KC_V  , KC_B  ,         KC_N     , KC_M  ,KC_COMM,KC_DOT,KC_SLSH,_______,
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_NUMPAD] = LAYOUT_5x6(
-     _______,_______,_______,_______,_______,_______,         _______,KC_NLCK,_______,_______,KC_MINS,KC_EQL ,
+     _______,_______,_______,_______,_______,_______,         _______,KC_NUM ,_______,_______,KC_MINS,KC_EQL ,
      _______,_______,_______,_______,_______,_______,         _______,KC_KP_7,KC_KP_8,KC_KP_9,_______,_______,
      _______,_______,_______,_______,_______,_______,         _______,KC_KP_4,KC_KP_5,KC_KP_6,_______,_______,
      _______,_______,_______,_______,_______,_______,         _______,KC_KP_1,KC_KP_2,KC_KP_3,_______,KC_PSCR,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h
index 98dc760031..fb01f969d3 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-// #define USE_SERIAL
 #define USE_I2C
 // #define MASTER_LEFT
 // #define MASTER_RIGHT
@@ -36,6 +34,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #define RGBLED_NUM 54
 #define RGBLIGHT_LIMIT_VAL 200
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 // #define RGBLIGHT_LED_MAP { 11,10,9,8,7,6,5,4,3,2,1,0,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26 }
 #define RGBLIGHT_SPLIT 27
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/keymap.c
index 54ecf8101d..83b47f3ca9 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [SYMB] = LAYOUT_5x6_wrapper(
        KC_F12 , ______________________F_L__________________,                      ______________________F_R__________________, KC_F11,
-       _______, _________________SYMBOL_L1_________________,                      _________________SYMBOL_R1_________________, KC_NLCK,
+       _______, _________________SYMBOL_L1_________________,                      _________________SYMBOL_R1_________________, KC_NUM,
        _______, _________________SYMBOL_L2_________________,                      _________________SYMBOL_R2_________________, _______,
        _______, _________________SYMBOL_L3_________________,                      _________________SYMBOL_R3_________________, _______,
                                                _______, _______,            KC_P0 , KC_PDOT,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
index e8899a3689..44c4234c9b 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define USE_SERIAL
-
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 //#define EE_HANDS
@@ -38,6 +35,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN D3
 #undef RGBLED_NUM
 #define RGBLED_NUM 30
-#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_LIMIT_VAL 95
 #define RGBLIGHT_SPLIT
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
index a4bd37c27b..c4887a3dbb 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/keymap.c
@@ -21,8 +21,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_GRAVE,
      KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
      KC_BSPC, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
-     KC_LSFT, CTL_T(KC_Z)  , KC_X  , KC_C  , KC_V  , KC_B  ,                  KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLASH,
-                      KC_LALT,KC_LCTRL,                                                       KC_DEL, KC_PMNS,
+     KC_LSFT, CTL_T(KC_Z)  , KC_X  , KC_C  , KC_V  , KC_B  ,                  KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLS,
+                      KC_LALT,KC_LCTL,                                                        KC_DEL, KC_PMNS,
                                       KC_SPC, MO(_ARROWS),                          MO(_MOUSE), KC_ENT,
                                       KC_LCMD, MO(_SYMBOLS),                        KC_EQL, KC_RALT,
                                       KC_LALT, MO(_NUMBERS),                        MO(_MEDIA), KC_EJCT
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      _______,_______,_______,_______,_______,_______,                        _______, _______ , _______ , _______ ,_______ ,_______,
                           KC_LCMD,KC_LALT,                                                       _______, _______,
                                              _______,_______,            _______,_______,
-                                             KC_LCTRL,_______,            _______,_______,
+                                             KC_LCTL,_______,            _______,_______,
                                              _______,_______,            _______,_______
 
   ),
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                    QK_BOOT,_______, _______ ,_______,_______ ,TG(_WINDOWS),                        _______,_______,_______,_______,_______,_______,
                    _______,_______,_______,_______,_______,_______,                        _______, KC_HOME , KC_UP , KC_END ,_______,_______,
                    _______,_______,_______,_______,_______ ,_______,                        KC_HOME, KC_LEFT , KC_DOWN , KC_RIGHT ,KC_END,_______,
-                   _______,_______,_______,_______,_______,_______,                        _______, KC_PGDOWN , _______ , KC_PGUP ,_______ ,_______,
+                   _______,_______,_______,_______,_______,_______,                        _______, KC_PGDN ,   _______ , KC_PGUP ,_______ ,_______,
                                         QK_BOOT,_______,                                                       _______, _______,
                                                            _______,_______,            _______,_______,
                                                            _______,_______,            _______,_______,
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/config.h
index 29ab59ad66..b63c5788d1 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/swedish/config.h
@@ -18,9 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define USE_SERIAL
-
 #define MASTER_LEFT
 // #define MASTER_RIGHT
 //#define EE_HANDS
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
index 2caa5b5bd1..5d740986fb 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h
@@ -18,10 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-#define USE_SERIAL
-// #define USE_I2C
-
 // #define MASTER_LEFT
 // #define MASTER_RIGHT
 #define EE_HANDS
@@ -32,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #undef SOFT_SERIAL_PIN
 #define SOFT_SERIAL_PIN D0
-// #define DRIVER_LED_TOTAL 32
+// #define RGB_MATRIX_LED_COUNT 32
 
 #define RGB_MATRIX_KEYPRESSES
 
@@ -40,12 +36,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 80
 #undef RGBLED_NUM
 #define RGBLED_NUM       64 // Number of LEDs
-#define DRIVER_LED_TOTAL RGBLED_NUM
+#define RGB_MATRIX_LED_COUNT RGBLED_NUM
 #define RGB_MATRIX_SPLIT \
         { 32, 32  }
 #define SPLIT_TRANSPORT_MIRROR
 
-// #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_TYPING_HEATMAP // Sets the default mode, if none has been set
+// #define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_TYPING_HEATMAP // Sets the default mode, if none has been set
 #define ENABLE_RGB_MATRIX_TYPING_HEATMAP
 #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
 
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/keymap.c
index 055df1b87d..05920d16e8 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/keymap.c
@@ -65,7 +65,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //├────────┼────────┼────────┼────────┼────────┼────────┤                          ┌────────┼────────┼────────┼────────┼────────┼────────┤
      _______, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD,XXXXXXX,                            XXXXXXX, KC_P1,   KC_P2,   KC_P3,   KC_PDOT, _______,
   //└────────┴────────┼────────┼────────┼────────┼────────┘                          └────────┴────────┼────────┼────────┼────────┼────────┘
-                       KC_PGUP, KC_PGDN,                                                                KC_P0,   DEBUG,
+                       KC_PGUP, KC_PGDN,                                                                KC_P0,   Debug,
   //                  └────────┴────────┘        ┌────────┬────────┐        ┌────────┬────────┐        └────────┴────────┘
                                                   _______, _______,          _______,  _______,
   //                                             ├────────┼────────┤        ├────────┼────────┤
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h
index 4eca68c542..af5842e602 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/config.h
@@ -2,8 +2,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#define USE_SERIAL
-
 #define RGBLED_NUM 12
 #define RGBLED_SPLIT {6,6}
 #define RGBLIGHT_LIMIT_VAL 127
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
index 211cd91e12..620994fc37 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/uqs/keymap.c
@@ -38,20 +38,20 @@ LAYOUT_5x6(                       \
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [L_QWER] = LAYOUT_uqs(
-     KC_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,
+     QK_GESC,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,
      KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,
      KC_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,
      KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,
                          KC_LBRC,  KC_RBRC,
      /*thumb*/ LT_EXTD_ESC, KC_SPC, LT_MOUSE_ALT_SHIFT_INS,
-      /*aux*/  KC_LEAD,  OSM_GUI,  KC_LALT,
+      /*aux*/  QK_LEAD,  OSM_GUI,  KC_LALT,
      KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINUS,
      KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSLS,
      KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
      KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  RSFT_T(KC_GRV),
                          KC_MINS,  KC_EQL,
      /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
-      /*aux*/  KC_RALT,  KC_APP,   KC_LEAD
+      /*aux*/  KC_RALT,  KC_APP,   QK_LEAD
   ),
 
   [L_WASD] = LAYOUT_uqs(
@@ -78,21 +78,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      KC_BTN3,  KC_Z,     KC_X,     KC_C,     KC_D,     KC_V,
                          MS_WHUP,  MS_WHDN,
      /*thumb*/ LT_EXTD_ESC, SFT_T(KC_SPC), LT(L_MOUSE, KC_TAB),
-      /*aux*/  KC_LEAD,  OSM_GUI,  KC_LALT,
+      /*aux*/  QK_LEAD,  OSM_GUI,  KC_LALT,
      KC_NO,    KC_BTN1,  KC_BTN2,  KC_BTN3,  KC_NO,    KC_NO,
      KC_J,     KC_L,     KC_U,     KC_Y,     KC_QUOT,  KC_NO,
      KC_M,     KC_C_N,   KC_S_E,   KC_A_I,   KC_G_O,   KC_NO,
      KC_K,     KC_H,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_NO,
                          KC_NO,    KC_NO,
      /*thumb*/ LT_FUNC_SHIFT_INS, KC_ENT, LT_NUM_BSPC,
-      /*aux*/  KC_LEAD,  KC_RALT,  KC_APP
+      /*aux*/  QK_LEAD,  KC_RALT,  KC_APP
   ),
 
   // Updated with inspiration from https://forum.colemak.com/topic/2014-extend-extra-extreme/
   // I like the AltGr trick from https://stevep99.github.io/seniply/ and should probably incorporate some stuff from it.
   [L_EXTD] = LAYOUT_uqs(
      _______,  _______,  _______,  _______,  _______,  _______,
-     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  KC_LEAD,
+     _______,  KC_BTN1,  KC_SCTAB, KC_PGUP,  KC_CTAB,  QK_LEAD,
      _______,  OSM_GUI,  OSM_ALT,  OSM_SFT,  OSM_CTL,  KC_RALT,
      _______,  ALT_TAB,  MS_WHUP,  MS_WHDN,  KC_PGDN,  INS_HARD,
                          _______,  _______,
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      /*thumb*/ KC_ESC,   KC_SPC,   KC_0,
       /*aux*/  _______,  _______,  _______,
                /* ^^^^ use these */
-     KC_NUMLOCK,KC_NO,   KC_NO,    KC_NO,    KC_NO,    KC_NO,
+     KC_NUM,   KC_NO,   KC_NO,    KC_NO,    KC_NO,    KC_NO,
      KC_EQUAL, KC_7,     KC_8,     KC_9,     KC_KP_PLUS,_______,
      KC_KP_ASTERISK,KC_4,KC_5,     KC_6,     MINS_UNDSCR,_______,
      KC_COMM,  KC_1,     KC_2,     KC_3,     KC_KP_SLASH,KC_KP_ENTER,  // Enter here, because thumb is occupied
@@ -141,7 +141,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                /* ^^^^ use these */
      KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,    KC_NO,
      KC_PSCR,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_NO,
-     KC_SLCK,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
+     KC_SCRL,  KC_F4,    KC_F5,    KC_F6,    KC_F11,   KC_NO,
      KC_PAUS,  KC_F1,    KC_F2,    KC_F3,    KC_F12,   KC_NO,
                          KC_NO,    KC_NO,
      /*thumb*/ _______,  _______,  _______,