merge upstream 713427c

1 files changed, 332 insertions, 237 deletions

diff --git a/quantum/keycodes.h b/quantum/keycodes.h
index c013858e78..34b13c29af 100644
--- a/quantum/keycodes.h
+++ b/quantum/keycodes.h
@@ -1,4 +1,4 @@
-// Copyright 2022 QMK
+// Copyright 2023 QMK
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 /*******************************************************************************
@@ -77,11 +77,15 @@ enum qk_keycode_ranges {
     QK_QUANTUM                     = 0x7C00,
     QK_QUANTUM_MAX                 = 0x7DFF,
     QK_KB                          = 0x7E00,
-    QK_KB_MAX                      = 0x7EFF,
-    QK_USER                        = 0x7F00,
+    QK_KB_MAX                      = 0x7E3F,
+    QK_USER                        = 0x7E40,
     QK_USER_MAX                    = 0x7FFF,
+    QK_UNICODEMAP                  = 0x8000,
+    QK_UNICODEMAP_MAX              = 0xBFFF,
     QK_UNICODE                     = 0x8000,
     QK_UNICODE_MAX                 = 0xFFFF,
+    QK_UNICODEMAP_PAIR             = 0xC000,
+    QK_UNICODEMAP_PAIR_MAX         = 0xFFFF,
 };
 
 enum qk_keycode_defines {
@@ -277,6 +281,8 @@ enum qk_keycode_defines {
     KC_BRIGHTNESS_DOWN = 0x00BE,
     KC_CONTROL_PANEL = 0x00BF,
     KC_ASSISTANT = 0x00C0,
+    KC_MISSION_CONTROL = 0x00C1,
+    KC_LAUNCHPAD = 0x00C2,
     KC_MS_UP = 0x00CD,
     KC_MS_DOWN = 0x00CE,
     KC_MS_LEFT = 0x00CF,
@@ -304,201 +310,201 @@ enum qk_keycode_defines {
     KC_RIGHT_SHIFT = 0x00E5,
     KC_RIGHT_ALT = 0x00E6,
     KC_RIGHT_GUI = 0x00E7,
-    SH_TG = 0x56F0,
-    SH_TT = 0x56F1,
-    SH_MON = 0x56F2,
-    SH_MOFF = 0x56F3,
-    SH_OFF = 0x56F4,
-    SH_ON = 0x56F5,
-    SH_OS = 0x56F6,
-    MAGIC_SWAP_CONTROL_CAPSLOCK = 0x7000,
-    MAGIC_UNSWAP_CONTROL_CAPSLOCK = 0x7001,
-    MAGIC_TOGGLE_CONTROL_CAPSLOCK = 0x7002,
-    MAGIC_UNCAPSLOCK_TO_CONTROL = 0x7003,
-    MAGIC_CAPSLOCK_TO_CONTROL = 0x7004,
-    MAGIC_SWAP_LALT_LGUI = 0x7005,
-    MAGIC_UNSWAP_LALT_LGUI = 0x7006,
-    MAGIC_SWAP_RALT_RGUI = 0x7007,
-    MAGIC_UNSWAP_RALT_RGUI = 0x7008,
-    MAGIC_UNNO_GUI = 0x7009,
-    MAGIC_NO_GUI = 0x700A,
-    MAGIC_TOGGLE_GUI = 0x700B,
-    MAGIC_SWAP_GRAVE_ESC = 0x700C,
-    MAGIC_UNSWAP_GRAVE_ESC = 0x700D,
-    MAGIC_SWAP_BACKSLASH_BACKSPACE = 0x700E,
-    MAGIC_UNSWAP_BACKSLASH_BACKSPACE = 0x700F,
-    MAGIC_TOGGLE_BACKSLASH_BACKSPACE = 0x7010,
-    MAGIC_HOST_NKRO = 0x7011,
-    MAGIC_UNHOST_NKRO = 0x7012,
-    MAGIC_TOGGLE_NKRO = 0x7013,
-    MAGIC_SWAP_ALT_GUI = 0x7014,
-    MAGIC_UNSWAP_ALT_GUI = 0x7015,
-    MAGIC_TOGGLE_ALT_GUI = 0x7016,
-    MAGIC_SWAP_LCTL_LGUI = 0x7017,
-    MAGIC_UNSWAP_LCTL_LGUI = 0x7018,
-    MAGIC_SWAP_RCTL_RGUI = 0x7019,
-    MAGIC_UNSWAP_RCTL_RGUI = 0x701A,
-    MAGIC_SWAP_CTL_GUI = 0x701B,
-    MAGIC_UNSWAP_CTL_GUI = 0x701C,
-    MAGIC_TOGGLE_CTL_GUI = 0x701D,
-    MAGIC_EE_HANDS_LEFT = 0x701E,
-    MAGIC_EE_HANDS_RIGHT = 0x701F,
-    MAGIC_SWAP_ESCAPE_CAPSLOCK = 0x7020,
-    MAGIC_UNSWAP_ESCAPE_CAPSLOCK = 0x7021,
-    MAGIC_TOGGLE_ESCAPE_CAPSLOCK = 0x7022,
+    QK_SWAP_HANDS_TOGGLE = 0x56F0,
+    QK_SWAP_HANDS_TAP_TOGGLE = 0x56F1,
+    QK_SWAP_HANDS_MOMENTARY_ON = 0x56F2,
+    QK_SWAP_HANDS_MOMENTARY_OFF = 0x56F3,
+    QK_SWAP_HANDS_OFF = 0x56F4,
+    QK_SWAP_HANDS_ON = 0x56F5,
+    QK_SWAP_HANDS_ONE_SHOT = 0x56F6,
+    QK_MAGIC_SWAP_CONTROL_CAPS_LOCK = 0x7000,
+    QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK = 0x7001,
+    QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK = 0x7002,
+    QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF = 0x7003,
+    QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON = 0x7004,
+    QK_MAGIC_SWAP_LALT_LGUI = 0x7005,
+    QK_MAGIC_UNSWAP_LALT_LGUI = 0x7006,
+    QK_MAGIC_SWAP_RALT_RGUI = 0x7007,
+    QK_MAGIC_UNSWAP_RALT_RGUI = 0x7008,
+    QK_MAGIC_GUI_ON = 0x7009,
+    QK_MAGIC_GUI_OFF = 0x700A,
+    QK_MAGIC_TOGGLE_GUI = 0x700B,
+    QK_MAGIC_SWAP_GRAVE_ESC = 0x700C,
+    QK_MAGIC_UNSWAP_GRAVE_ESC = 0x700D,
+    QK_MAGIC_SWAP_BACKSLASH_BACKSPACE = 0x700E,
+    QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE = 0x700F,
+    QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE = 0x7010,
+    QK_MAGIC_NKRO_ON = 0x7011,
+    QK_MAGIC_NKRO_OFF = 0x7012,
+    QK_MAGIC_TOGGLE_NKRO = 0x7013,
+    QK_MAGIC_SWAP_ALT_GUI = 0x7014,
+    QK_MAGIC_UNSWAP_ALT_GUI = 0x7015,
+    QK_MAGIC_TOGGLE_ALT_GUI = 0x7016,
+    QK_MAGIC_SWAP_LCTL_LGUI = 0x7017,
+    QK_MAGIC_UNSWAP_LCTL_LGUI = 0x7018,
+    QK_MAGIC_SWAP_RCTL_RGUI = 0x7019,
+    QK_MAGIC_UNSWAP_RCTL_RGUI = 0x701A,
+    QK_MAGIC_SWAP_CTL_GUI = 0x701B,
+    QK_MAGIC_UNSWAP_CTL_GUI = 0x701C,
+    QK_MAGIC_TOGGLE_CTL_GUI = 0x701D,
+    QK_MAGIC_EE_HANDS_LEFT = 0x701E,
+    QK_MAGIC_EE_HANDS_RIGHT = 0x701F,
+    QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK = 0x7020,
+    QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK = 0x7021,
+    QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK = 0x7022,
     QK_MIDI_ON = 0x7100,
     QK_MIDI_OFF = 0x7101,
     QK_MIDI_TOGGLE = 0x7102,
-    QK_MIDI_NOTE_C_0 = 0x7110,
-    QK_MIDI_NOTE_C_SHARP_0 = 0x7111,
-    QK_MIDI_NOTE_D_0 = 0x7112,
-    QK_MIDI_NOTE_D_SHARP_0 = 0x7113,
-    QK_MIDI_NOTE_E_0 = 0x7114,
-    QK_MIDI_NOTE_F_0 = 0x7115,
-    QK_MIDI_NOTE_F_SHARP_0 = 0x7116,
-    QK_MIDI_NOTE_G_0 = 0x7117,
-    QK_MIDI_NOTE_G_SHARP_0 = 0x7118,
-    QK_MIDI_NOTE_A_0 = 0x7119,
-    QK_MIDI_NOTE_A_SHARP_0 = 0x711A,
-    QK_MIDI_NOTE_B_0 = 0x711B,
-    QK_MIDI_NOTE_C_1 = 0x7120,
-    QK_MIDI_NOTE_C_SHARP_1 = 0x7121,
-    QK_MIDI_NOTE_D_1 = 0x7122,
-    QK_MIDI_NOTE_D_SHARP_1 = 0x7123,
-    QK_MIDI_NOTE_E_1 = 0x7124,
-    QK_MIDI_NOTE_F_1 = 0x7125,
-    QK_MIDI_NOTE_F_SHARP_1 = 0x7126,
-    QK_MIDI_NOTE_G_1 = 0x7127,
-    QK_MIDI_NOTE_G_SHARP_1 = 0x7128,
-    QK_MIDI_NOTE_A_1 = 0x7129,
-    QK_MIDI_NOTE_A_SHARP_1 = 0x712A,
-    QK_MIDI_NOTE_B_1 = 0x712B,
-    QK_MIDI_NOTE_C_2 = 0x7130,
-    QK_MIDI_NOTE_C_SHARP_2 = 0x7131,
-    QK_MIDI_NOTE_D_2 = 0x7132,
-    QK_MIDI_NOTE_D_SHARP_2 = 0x7133,
-    QK_MIDI_NOTE_E_2 = 0x7134,
-    QK_MIDI_NOTE_F_2 = 0x7135,
-    QK_MIDI_NOTE_F_SHARP_2 = 0x7136,
-    QK_MIDI_NOTE_G_2 = 0x7137,
-    QK_MIDI_NOTE_G_SHARP_2 = 0x7138,
-    QK_MIDI_NOTE_A_2 = 0x7139,
-    QK_MIDI_NOTE_A_SHARP_2 = 0x713A,
-    QK_MIDI_NOTE_B_2 = 0x713B,
-    QK_MIDI_NOTE_C_3 = 0x7140,
-    QK_MIDI_NOTE_C_SHARP_3 = 0x7141,
-    QK_MIDI_NOTE_D_3 = 0x7142,
-    QK_MIDI_NOTE_D_SHARP_3 = 0x7143,
-    QK_MIDI_NOTE_E_3 = 0x7144,
-    QK_MIDI_NOTE_F_3 = 0x7145,
-    QK_MIDI_NOTE_F_SHARP_3 = 0x7146,
-    QK_MIDI_NOTE_G_3 = 0x7147,
-    QK_MIDI_NOTE_G_SHARP_3 = 0x7148,
-    QK_MIDI_NOTE_A_3 = 0x7149,
-    QK_MIDI_NOTE_A_SHARP_3 = 0x714A,
-    QK_MIDI_NOTE_B_3 = 0x714B,
-    QK_MIDI_NOTE_C_4 = 0x7150,
-    QK_MIDI_NOTE_C_SHARP_4 = 0x7151,
-    QK_MIDI_NOTE_D_4 = 0x7152,
-    QK_MIDI_NOTE_D_SHARP_4 = 0x7153,
-    QK_MIDI_NOTE_E_4 = 0x7154,
-    QK_MIDI_NOTE_F_4 = 0x7155,
-    QK_MIDI_NOTE_F_SHARP_4 = 0x7156,
-    QK_MIDI_NOTE_G_4 = 0x7157,
-    QK_MIDI_NOTE_G_SHARP_4 = 0x7158,
-    QK_MIDI_NOTE_A_4 = 0x7159,
-    QK_MIDI_NOTE_A_SHARP_4 = 0x715A,
-    QK_MIDI_NOTE_B_4 = 0x715B,
-    QK_MIDI_NOTE_C_5 = 0x7160,
-    QK_MIDI_NOTE_C_SHARP_5 = 0x7161,
-    QK_MIDI_NOTE_D_5 = 0x7162,
-    QK_MIDI_NOTE_D_SHARP_5 = 0x7163,
-    QK_MIDI_NOTE_E_5 = 0x7164,
-    QK_MIDI_NOTE_F_5 = 0x7165,
-    QK_MIDI_NOTE_F_SHARP_5 = 0x7166,
-    QK_MIDI_NOTE_G_5 = 0x7167,
-    QK_MIDI_NOTE_G_SHARP_5 = 0x7168,
-    QK_MIDI_NOTE_A_5 = 0x7169,
-    QK_MIDI_NOTE_A_SHARP_5 = 0x716A,
-    QK_MIDI_NOTE_B_5 = 0x716B,
-    QK_MIDI_OCTAVE_N2 = 0x7170,
-    QK_MIDI_OCTAVE_N1 = 0x7171,
-    QK_MIDI_OCTAVE_0 = 0x7172,
-    QK_MIDI_OCTAVE_1 = 0x7173,
-    QK_MIDI_OCTAVE_2 = 0x7174,
-    QK_MIDI_OCTAVE_3 = 0x7175,
-    QK_MIDI_OCTAVE_4 = 0x7176,
-    QK_MIDI_OCTAVE_5 = 0x7177,
-    QK_MIDI_OCTAVE_6 = 0x7178,
-    QK_MIDI_OCTAVE_7 = 0x7179,
-    QK_MIDI_OCTAVE_DOWN = 0x717A,
-    QK_MIDI_OCTAVE_UP = 0x717B,
-    QK_MIDI_TRANSPOSE_N6 = 0x7180,
-    QK_MIDI_TRANSPOSE_N5 = 0x7181,
-    QK_MIDI_TRANSPOSE_N4 = 0x7182,
-    QK_MIDI_TRANSPOSE_N3 = 0x7183,
-    QK_MIDI_TRANSPOSE_N2 = 0x7184,
-    QK_MIDI_TRANSPOSE_N1 = 0x7185,
-    QK_MIDI_TRANSPOSE_0 = 0x7186,
-    QK_MIDI_TRANSPOSE_1 = 0x7187,
-    QK_MIDI_TRANSPOSE_2 = 0x7188,
-    QK_MIDI_TRANSPOSE_3 = 0x7189,
-    QK_MIDI_TRANSPOSE_4 = 0x718A,
-    QK_MIDI_TRANSPOSE_5 = 0x718B,
-    QK_MIDI_TRANSPOSE_6 = 0x718C,
-    QK_MIDI_TRANSPOSE_DOWN = 0x718D,
-    QK_MIDI_TRANSPOSE_UP = 0x718E,
-    QK_MIDI_VELOCITY_0 = 0x7190,
-    QK_MIDI_VELOCITY_1 = 0x7191,
-    QK_MIDI_VELOCITY_2 = 0x7192,
-    QK_MIDI_VELOCITY_3 = 0x7193,
-    QK_MIDI_VELOCITY_4 = 0x7194,
-    QK_MIDI_VELOCITY_5 = 0x7195,
-    QK_MIDI_VELOCITY_6 = 0x7196,
-    QK_MIDI_VELOCITY_7 = 0x7197,
-    QK_MIDI_VELOCITY_8 = 0x7198,
-    QK_MIDI_VELOCITY_9 = 0x7199,
-    QK_MIDI_VELOCITY_10 = 0x719A,
-    QK_MIDI_VELOCITY_DOWN = 0x719B,
-    QK_MIDI_VELOCITY_UP = 0x719C,
-    QK_MIDI_CHANNEL_1 = 0x71A0,
-    QK_MIDI_CHANNEL_2 = 0x71A1,
-    QK_MIDI_CHANNEL_3 = 0x71A2,
-    QK_MIDI_CHANNEL_4 = 0x71A3,
-    QK_MIDI_CHANNEL_5 = 0x71A4,
-    QK_MIDI_CHANNEL_6 = 0x71A5,
-    QK_MIDI_CHANNEL_7 = 0x71A6,
-    QK_MIDI_CHANNEL_8 = 0x71A7,
-    QK_MIDI_CHANNEL_9 = 0x71A8,
-    QK_MIDI_CHANNEL_10 = 0x71A9,
-    QK_MIDI_CHANNEL_11 = 0x71AA,
-    QK_MIDI_CHANNEL_12 = 0x71AB,
-    QK_MIDI_CHANNEL_13 = 0x71AC,
-    QK_MIDI_CHANNEL_14 = 0x71AD,
-    QK_MIDI_CHANNEL_15 = 0x71AE,
-    QK_MIDI_CHANNEL_16 = 0x71AF,
-    QK_MIDI_CHANNEL_DOWN = 0x71B0,
-    QK_MIDI_CHANNEL_UP = 0x71B1,
-    QK_MIDI_ALL_NOTES_OFF = 0x71C0,
-    QK_MIDI_SUSTAIN = 0x71C1,
-    QK_MIDI_PORTAMENTO = 0x71C2,
-    QK_MIDI_SOSTENUTO = 0x71C3,
-    QK_MIDI_SOFT = 0x71C4,
-    QK_MIDI_LEGATO = 0x71C5,
-    QK_MIDI_MODULATION = 0x71C6,
-    QK_MIDI_MODULATION_SPEED_DOWN = 0x71C7,
-    QK_MIDI_MODULATION_SPEED_UP = 0x71C8,
-    QK_MIDI_PITCH_BEND_DOWN = 0x71C9,
-    QK_MIDI_PITCH_BEND_UP = 0x71CA,
-    SQ_ON = 0x7200,
-    SQ_OFF = 0x7201,
-    SQ_TOG = 0x7202,
-    SQ_TMPD = 0x7203,
-    SQ_TMPU = 0x7204,
-    SQ_RESD = 0x7205,
-    SQ_RESU = 0x7206,
-    SQ_SALL = 0x7207,
-    SQ_SCLR = 0x7208,
+    QK_MIDI_NOTE_C_0 = 0x7103,
+    QK_MIDI_NOTE_C_SHARP_0 = 0x7104,
+    QK_MIDI_NOTE_D_0 = 0x7105,
+    QK_MIDI_NOTE_D_SHARP_0 = 0x7106,
+    QK_MIDI_NOTE_E_0 = 0x7107,
+    QK_MIDI_NOTE_F_0 = 0x7108,
+    QK_MIDI_NOTE_F_SHARP_0 = 0x7109,
+    QK_MIDI_NOTE_G_0 = 0x710A,
+    QK_MIDI_NOTE_G_SHARP_0 = 0x710B,
+    QK_MIDI_NOTE_A_0 = 0x710C,
+    QK_MIDI_NOTE_A_SHARP_0 = 0x710D,
+    QK_MIDI_NOTE_B_0 = 0x710E,
+    QK_MIDI_NOTE_C_1 = 0x710F,
+    QK_MIDI_NOTE_C_SHARP_1 = 0x7110,
+    QK_MIDI_NOTE_D_1 = 0x7111,
+    QK_MIDI_NOTE_D_SHARP_1 = 0x7112,
+    QK_MIDI_NOTE_E_1 = 0x7113,
+    QK_MIDI_NOTE_F_1 = 0x7114,
+    QK_MIDI_NOTE_F_SHARP_1 = 0x7115,
+    QK_MIDI_NOTE_G_1 = 0x7116,
+    QK_MIDI_NOTE_G_SHARP_1 = 0x7117,
+    QK_MIDI_NOTE_A_1 = 0x7118,
+    QK_MIDI_NOTE_A_SHARP_1 = 0x7119,
+    QK_MIDI_NOTE_B_1 = 0x711A,
+    QK_MIDI_NOTE_C_2 = 0x711B,
+    QK_MIDI_NOTE_C_SHARP_2 = 0x711C,
+    QK_MIDI_NOTE_D_2 = 0x711D,
+    QK_MIDI_NOTE_D_SHARP_2 = 0x711E,
+    QK_MIDI_NOTE_E_2 = 0x711F,
+    QK_MIDI_NOTE_F_2 = 0x7120,
+    QK_MIDI_NOTE_F_SHARP_2 = 0x7121,
+    QK_MIDI_NOTE_G_2 = 0x7122,
+    QK_MIDI_NOTE_G_SHARP_2 = 0x7123,
+    QK_MIDI_NOTE_A_2 = 0x7124,
+    QK_MIDI_NOTE_A_SHARP_2 = 0x7125,
+    QK_MIDI_NOTE_B_2 = 0x7126,
+    QK_MIDI_NOTE_C_3 = 0x7127,
+    QK_MIDI_NOTE_C_SHARP_3 = 0x7128,
+    QK_MIDI_NOTE_D_3 = 0x7129,
+    QK_MIDI_NOTE_D_SHARP_3 = 0x712A,
+    QK_MIDI_NOTE_E_3 = 0x712B,
+    QK_MIDI_NOTE_F_3 = 0x712C,
+    QK_MIDI_NOTE_F_SHARP_3 = 0x712D,
+    QK_MIDI_NOTE_G_3 = 0x712E,
+    QK_MIDI_NOTE_G_SHARP_3 = 0x712F,
+    QK_MIDI_NOTE_A_3 = 0x7130,
+    QK_MIDI_NOTE_A_SHARP_3 = 0x7131,
+    QK_MIDI_NOTE_B_3 = 0x7132,
+    QK_MIDI_NOTE_C_4 = 0x7133,
+    QK_MIDI_NOTE_C_SHARP_4 = 0x7134,
+    QK_MIDI_NOTE_D_4 = 0x7135,
+    QK_MIDI_NOTE_D_SHARP_4 = 0x7136,
+    QK_MIDI_NOTE_E_4 = 0x7137,
+    QK_MIDI_NOTE_F_4 = 0x7138,
+    QK_MIDI_NOTE_F_SHARP_4 = 0x7139,
+    QK_MIDI_NOTE_G_4 = 0x713A,
+    QK_MIDI_NOTE_G_SHARP_4 = 0x713B,
+    QK_MIDI_NOTE_A_4 = 0x713C,
+    QK_MIDI_NOTE_A_SHARP_4 = 0x713D,
+    QK_MIDI_NOTE_B_4 = 0x713E,
+    QK_MIDI_NOTE_C_5 = 0x713F,
+    QK_MIDI_NOTE_C_SHARP_5 = 0x7140,
+    QK_MIDI_NOTE_D_5 = 0x7141,
+    QK_MIDI_NOTE_D_SHARP_5 = 0x7142,
+    QK_MIDI_NOTE_E_5 = 0x7143,
+    QK_MIDI_NOTE_F_5 = 0x7144,
+    QK_MIDI_NOTE_F_SHARP_5 = 0x7145,
+    QK_MIDI_NOTE_G_5 = 0x7146,
+    QK_MIDI_NOTE_G_SHARP_5 = 0x7147,
+    QK_MIDI_NOTE_A_5 = 0x7148,
+    QK_MIDI_NOTE_A_SHARP_5 = 0x7149,
+    QK_MIDI_NOTE_B_5 = 0x714A,
+    QK_MIDI_OCTAVE_N2 = 0x714B,
+    QK_MIDI_OCTAVE_N1 = 0x714C,
+    QK_MIDI_OCTAVE_0 = 0x714D,
+    QK_MIDI_OCTAVE_1 = 0x714E,
+    QK_MIDI_OCTAVE_2 = 0x714F,
+    QK_MIDI_OCTAVE_3 = 0x7150,
+    QK_MIDI_OCTAVE_4 = 0x7151,
+    QK_MIDI_OCTAVE_5 = 0x7152,
+    QK_MIDI_OCTAVE_6 = 0x7153,
+    QK_MIDI_OCTAVE_7 = 0x7154,
+    QK_MIDI_OCTAVE_DOWN = 0x7155,
+    QK_MIDI_OCTAVE_UP = 0x7156,
+    QK_MIDI_TRANSPOSE_N6 = 0x7157,
+    QK_MIDI_TRANSPOSE_N5 = 0x7158,
+    QK_MIDI_TRANSPOSE_N4 = 0x7159,
+    QK_MIDI_TRANSPOSE_N3 = 0x715A,
+    QK_MIDI_TRANSPOSE_N2 = 0x715B,
+    QK_MIDI_TRANSPOSE_N1 = 0x715C,
+    QK_MIDI_TRANSPOSE_0 = 0x715D,
+    QK_MIDI_TRANSPOSE_1 = 0x715E,
+    QK_MIDI_TRANSPOSE_2 = 0x715F,
+    QK_MIDI_TRANSPOSE_3 = 0x7160,
+    QK_MIDI_TRANSPOSE_4 = 0x7161,
+    QK_MIDI_TRANSPOSE_5 = 0x7162,
+    QK_MIDI_TRANSPOSE_6 = 0x7163,
+    QK_MIDI_TRANSPOSE_DOWN = 0x7164,
+    QK_MIDI_TRANSPOSE_UP = 0x7165,
+    QK_MIDI_VELOCITY_0 = 0x7166,
+    QK_MIDI_VELOCITY_1 = 0x7167,
+    QK_MIDI_VELOCITY_2 = 0x7168,
+    QK_MIDI_VELOCITY_3 = 0x7169,
+    QK_MIDI_VELOCITY_4 = 0x716A,
+    QK_MIDI_VELOCITY_5 = 0x716B,
+    QK_MIDI_VELOCITY_6 = 0x716C,
+    QK_MIDI_VELOCITY_7 = 0x716D,
+    QK_MIDI_VELOCITY_8 = 0x716E,
+    QK_MIDI_VELOCITY_9 = 0x716F,
+    QK_MIDI_VELOCITY_10 = 0x7170,
+    QK_MIDI_VELOCITY_DOWN = 0x7171,
+    QK_MIDI_VELOCITY_UP = 0x7172,
+    QK_MIDI_CHANNEL_1 = 0x7173,
+    QK_MIDI_CHANNEL_2 = 0x7174,
+    QK_MIDI_CHANNEL_3 = 0x7175,
+    QK_MIDI_CHANNEL_4 = 0x7176,
+    QK_MIDI_CHANNEL_5 = 0x7177,
+    QK_MIDI_CHANNEL_6 = 0x7178,
+    QK_MIDI_CHANNEL_7 = 0x7179,
+    QK_MIDI_CHANNEL_8 = 0x717A,
+    QK_MIDI_CHANNEL_9 = 0x717B,
+    QK_MIDI_CHANNEL_10 = 0x717C,
+    QK_MIDI_CHANNEL_11 = 0x717D,
+    QK_MIDI_CHANNEL_12 = 0x717E,
+    QK_MIDI_CHANNEL_13 = 0x717F,
+    QK_MIDI_CHANNEL_14 = 0x7180,
+    QK_MIDI_CHANNEL_15 = 0x7181,
+    QK_MIDI_CHANNEL_16 = 0x7182,
+    QK_MIDI_CHANNEL_DOWN = 0x7183,
+    QK_MIDI_CHANNEL_UP = 0x7184,
+    QK_MIDI_ALL_NOTES_OFF = 0x7185,
+    QK_MIDI_SUSTAIN = 0x7186,
+    QK_MIDI_PORTAMENTO = 0x7187,
+    QK_MIDI_SOSTENUTO = 0x7188,
+    QK_MIDI_SOFT = 0x7189,
+    QK_MIDI_LEGATO = 0x718A,
+    QK_MIDI_MODULATION = 0x718B,
+    QK_MIDI_MODULATION_SPEED_DOWN = 0x718C,
+    QK_MIDI_MODULATION_SPEED_UP = 0x718D,
+    QK_MIDI_PITCH_BEND_DOWN = 0x718E,
+    QK_MIDI_PITCH_BEND_UP = 0x718F,
+    QK_SEQUENCER_ON = 0x7200,
+    QK_SEQUENCER_OFF = 0x7201,
+    QK_SEQUENCER_TOGGLE = 0x7202,
+    QK_SEQUENCER_TEMPO_DOWN = 0x7203,
+    QK_SEQUENCER_TEMPO_UP = 0x7204,
+    QK_SEQUENCER_RESOLUTION_DOWN = 0x7205,
+    QK_SEQUENCER_RESOLUTION_UP = 0x7206,
+    QK_SEQUENCER_STEPS_ALL = 0x7207,
+    QK_SEQUENCER_STEPS_CLEAR = 0x7208,
     QK_JOYSTICK_BUTTON_0 = 0x7400,
     QK_JOYSTICK_BUTTON_1 = 0x7401,
     QK_JOYSTICK_BUTTON_2 = 0x7402,
@@ -713,7 +719,72 @@ enum qk_keycode_defines {
     QK_AUTOCORRECT_ON = 0x7C74,
     QK_AUTOCORRECT_OFF = 0x7C75,
     QK_AUTOCORRECT_TOGGLE = 0x7C76,
-    SAFE_RANGE = 0x7E00,
+    QK_TRI_LAYER_LOWER = 0x7C77,
+    QK_TRI_LAYER_UPPER = 0x7C78,
+    QK_KB_0 = 0x7E00,
+    QK_KB_1 = 0x7E01,
+    QK_KB_2 = 0x7E02,
+    QK_KB_3 = 0x7E03,
+    QK_KB_4 = 0x7E04,
+    QK_KB_5 = 0x7E05,
+    QK_KB_6 = 0x7E06,
+    QK_KB_7 = 0x7E07,
+    QK_KB_8 = 0x7E08,
+    QK_KB_9 = 0x7E09,
+    QK_KB_10 = 0x7E0A,
+    QK_KB_11 = 0x7E0B,
+    QK_KB_12 = 0x7E0C,
+    QK_KB_13 = 0x7E0D,
+    QK_KB_14 = 0x7E0E,
+    QK_KB_15 = 0x7E0F,
+    QK_KB_16 = 0x7E10,
+    QK_KB_17 = 0x7E11,
+    QK_KB_18 = 0x7E12,
+    QK_KB_19 = 0x7E13,
+    QK_KB_20 = 0x7E14,
+    QK_KB_21 = 0x7E15,
+    QK_KB_22 = 0x7E16,
+    QK_KB_23 = 0x7E17,
+    QK_KB_24 = 0x7E18,
+    QK_KB_25 = 0x7E19,
+    QK_KB_26 = 0x7E1A,
+    QK_KB_27 = 0x7E1B,
+    QK_KB_28 = 0x7E1C,
+    QK_KB_29 = 0x7E1D,
+    QK_KB_30 = 0x7E1E,
+    QK_KB_31 = 0x7E1F,
+    QK_USER_0 = 0x7E40,
+    QK_USER_1 = 0x7E41,
+    QK_USER_2 = 0x7E42,
+    QK_USER_3 = 0x7E43,
+    QK_USER_4 = 0x7E44,
+    QK_USER_5 = 0x7E45,
+    QK_USER_6 = 0x7E46,
+    QK_USER_7 = 0x7E47,
+    QK_USER_8 = 0x7E48,
+    QK_USER_9 = 0x7E49,
+    QK_USER_10 = 0x7E4A,
+    QK_USER_11 = 0x7E4B,
+    QK_USER_12 = 0x7E4C,
+    QK_USER_13 = 0x7E4D,
+    QK_USER_14 = 0x7E4E,
+    QK_USER_15 = 0x7E4F,
+    QK_USER_16 = 0x7E50,
+    QK_USER_17 = 0x7E51,
+    QK_USER_18 = 0x7E52,
+    QK_USER_19 = 0x7E53,
+    QK_USER_20 = 0x7E54,
+    QK_USER_21 = 0x7E55,
+    QK_USER_22 = 0x7E56,
+    QK_USER_23 = 0x7E57,
+    QK_USER_24 = 0x7E58,
+    QK_USER_25 = 0x7E59,
+    QK_USER_26 = 0x7E5A,
+    QK_USER_27 = 0x7E5B,
+    QK_USER_28 = 0x7E5C,
+    QK_USER_29 = 0x7E5D,
+    QK_USER_30 = 0x7E5E,
+    QK_USER_31 = 0x7E5F,
 
 // Alias
     XXXXXXX    = KC_NO,
@@ -829,6 +900,8 @@ enum qk_keycode_defines {
     KC_BRID    = KC_BRIGHTNESS_DOWN,
     KC_CPNL    = KC_CONTROL_PANEL,
     KC_ASST    = KC_ASSISTANT,
+    KC_MCTL    = KC_MISSION_CONTROL,
+    KC_LPAD    = KC_LAUNCHPAD,
     KC_MS_U    = KC_MS_UP,
     KC_MS_D    = KC_MS_DOWN,
     KC_MS_L    = KC_MS_LEFT,
@@ -863,41 +936,48 @@ enum qk_keycode_defines {
     KC_RGUI    = KC_RIGHT_GUI,
     KC_RCMD    = KC_RIGHT_GUI,
     KC_RWIN    = KC_RIGHT_GUI,
-    CL_SWAP    = MAGIC_SWAP_CONTROL_CAPSLOCK,
-    CL_NORM    = MAGIC_UNSWAP_CONTROL_CAPSLOCK,
-    CL_TOGG    = MAGIC_TOGGLE_CONTROL_CAPSLOCK,
-    CL_CAPS    = MAGIC_UNCAPSLOCK_TO_CONTROL,
-    CL_CTRL    = MAGIC_CAPSLOCK_TO_CONTROL,
-    LAG_SWP    = MAGIC_SWAP_LALT_LGUI,
-    LAG_NRM    = MAGIC_UNSWAP_LALT_LGUI,
-    RAG_SWP    = MAGIC_SWAP_RALT_RGUI,
-    RAG_NRM    = MAGIC_UNSWAP_RALT_RGUI,
-    GUI_ON     = MAGIC_UNNO_GUI,
-    GUI_OFF    = MAGIC_NO_GUI,
-    GUI_TOG    = MAGIC_TOGGLE_GUI,
-    GE_SWAP    = MAGIC_SWAP_GRAVE_ESC,
-    GE_NORM    = MAGIC_UNSWAP_GRAVE_ESC,
-    BS_SWAP    = MAGIC_SWAP_BACKSLASH_BACKSPACE,
-    BS_NORM    = MAGIC_UNSWAP_BACKSLASH_BACKSPACE,
-    BS_TOGG    = MAGIC_TOGGLE_BACKSLASH_BACKSPACE,
-    NK_ON      = MAGIC_HOST_NKRO,
-    NK_OFF     = MAGIC_UNHOST_NKRO,
-    NK_TOGG    = MAGIC_TOGGLE_NKRO,
-    AG_SWAP    = MAGIC_SWAP_ALT_GUI,
-    AG_NORM    = MAGIC_UNSWAP_ALT_GUI,
-    AG_TOGG    = MAGIC_TOGGLE_ALT_GUI,
-    LCG_SWP    = MAGIC_SWAP_LCTL_LGUI,
-    LCG_NRM    = MAGIC_UNSWAP_LCTL_LGUI,
-    RCG_SWP    = MAGIC_SWAP_RCTL_RGUI,
-    RCG_NRM    = MAGIC_UNSWAP_RCTL_RGUI,
-    CG_SWAP    = MAGIC_SWAP_CTL_GUI,
-    CG_NORM    = MAGIC_UNSWAP_CTL_GUI,
-    CG_TOGG    = MAGIC_TOGGLE_CTL_GUI,
-    EH_LEFT    = MAGIC_EE_HANDS_LEFT,
-    EH_RGHT    = MAGIC_EE_HANDS_RIGHT,
-    EC_SWAP    = MAGIC_SWAP_ESCAPE_CAPSLOCK,
-    EC_NORM    = MAGIC_UNSWAP_ESCAPE_CAPSLOCK,
-    EC_TOGG    = MAGIC_TOGGLE_ESCAPE_CAPSLOCK,
+    SH_TOGG    = QK_SWAP_HANDS_TOGGLE,
+    SH_TT      = QK_SWAP_HANDS_TAP_TOGGLE,
+    SH_MON     = QK_SWAP_HANDS_MOMENTARY_ON,
+    SH_MOFF    = QK_SWAP_HANDS_MOMENTARY_OFF,
+    SH_OFF     = QK_SWAP_HANDS_OFF,
+    SH_ON      = QK_SWAP_HANDS_ON,
+    SH_OS      = QK_SWAP_HANDS_ONE_SHOT,
+    CL_SWAP    = QK_MAGIC_SWAP_CONTROL_CAPS_LOCK,
+    CL_NORM    = QK_MAGIC_UNSWAP_CONTROL_CAPS_LOCK,
+    CL_TOGG    = QK_MAGIC_TOGGLE_CONTROL_CAPS_LOCK,
+    CL_CAPS    = QK_MAGIC_CAPS_LOCK_AS_CONTROL_OFF,
+    CL_CTRL    = QK_MAGIC_CAPS_LOCK_AS_CONTROL_ON,
+    AG_LSWP    = QK_MAGIC_SWAP_LALT_LGUI,
+    AG_LNRM    = QK_MAGIC_UNSWAP_LALT_LGUI,
+    AG_RSWP    = QK_MAGIC_SWAP_RALT_RGUI,
+    AG_RNRM    = QK_MAGIC_UNSWAP_RALT_RGUI,
+    GU_ON      = QK_MAGIC_GUI_ON,
+    GU_OFF     = QK_MAGIC_GUI_OFF,
+    GU_TOGG    = QK_MAGIC_TOGGLE_GUI,
+    GE_SWAP    = QK_MAGIC_SWAP_GRAVE_ESC,
+    GE_NORM    = QK_MAGIC_UNSWAP_GRAVE_ESC,
+    BS_SWAP    = QK_MAGIC_SWAP_BACKSLASH_BACKSPACE,
+    BS_NORM    = QK_MAGIC_UNSWAP_BACKSLASH_BACKSPACE,
+    BS_TOGG    = QK_MAGIC_TOGGLE_BACKSLASH_BACKSPACE,
+    NK_ON      = QK_MAGIC_NKRO_ON,
+    NK_OFF     = QK_MAGIC_NKRO_OFF,
+    NK_TOGG    = QK_MAGIC_TOGGLE_NKRO,
+    AG_SWAP    = QK_MAGIC_SWAP_ALT_GUI,
+    AG_NORM    = QK_MAGIC_UNSWAP_ALT_GUI,
+    AG_TOGG    = QK_MAGIC_TOGGLE_ALT_GUI,
+    CG_LSWP    = QK_MAGIC_SWAP_LCTL_LGUI,
+    CG_LNRM    = QK_MAGIC_UNSWAP_LCTL_LGUI,
+    CG_RSWP    = QK_MAGIC_SWAP_RCTL_RGUI,
+    CG_RNRM    = QK_MAGIC_UNSWAP_RCTL_RGUI,
+    CG_SWAP    = QK_MAGIC_SWAP_CTL_GUI,
+    CG_NORM    = QK_MAGIC_UNSWAP_CTL_GUI,
+    CG_TOGG    = QK_MAGIC_TOGGLE_CTL_GUI,
+    EH_LEFT    = QK_MAGIC_EE_HANDS_LEFT,
+    EH_RGHT    = QK_MAGIC_EE_HANDS_RIGHT,
+    EC_SWAP    = QK_MAGIC_SWAP_ESCAPE_CAPS_LOCK,
+    EC_NORM    = QK_MAGIC_UNSWAP_ESCAPE_CAPS_LOCK,
+    EC_TOGG    = QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK,
     MI_ON      = QK_MIDI_ON,
     MI_OFF     = QK_MIDI_OFF,
     MI_TOGG    = QK_MIDI_TOGGLE,
@@ -1072,6 +1152,15 @@ enum qk_keycode_defines {
     MI_MODU    = QK_MIDI_MODULATION_SPEED_UP,
     MI_BNDD    = QK_MIDI_PITCH_BEND_DOWN,
     MI_BNDU    = QK_MIDI_PITCH_BEND_UP,
+    SQ_ON      = QK_SEQUENCER_ON,
+    SQ_OFF     = QK_SEQUENCER_OFF,
+    SQ_TOGG    = QK_SEQUENCER_TOGGLE,
+    SQ_TMPD    = QK_SEQUENCER_TEMPO_DOWN,
+    SQ_TMPU    = QK_SEQUENCER_TEMPO_UP,
+    SQ_RESD    = QK_SEQUENCER_RESOLUTION_DOWN,
+    SQ_RESU    = QK_SEQUENCER_RESOLUTION_UP,
+    SQ_SALL    = QK_SEQUENCER_STEPS_ALL,
+    SQ_SCLR    = QK_SEQUENCER_STEPS_CLEAR,
     JS_0       = QK_JOYSTICK_BUTTON_0,
     JS_1       = QK_JOYSTICK_BUTTON_1,
     JS_2       = QK_JOYSTICK_BUTTON_2,
@@ -1271,6 +1360,8 @@ enum qk_keycode_defines {
     AC_ON      = QK_AUTOCORRECT_ON,
     AC_OFF     = QK_AUTOCORRECT_OFF,
     AC_TOGG    = QK_AUTOCORRECT_TOGGLE,
+    TL_LOWR    = QK_TRI_LAYER_LOWER,
+    TL_UPPR    = QK_TRI_LAYER_UPPER,
 };
 
 // Range Helpers
@@ -1300,19 +1391,21 @@ enum qk_keycode_defines {
 #define IS_QK_QUANTUM(code) ((code) >= QK_QUANTUM && (code) <= QK_QUANTUM_MAX)
 #define IS_QK_KB(code) ((code) >= QK_KB && (code) <= QK_KB_MAX)
 #define IS_QK_USER(code) ((code) >= QK_USER && (code) <= QK_USER_MAX)
+#define IS_QK_UNICODEMAP(code) ((code) >= QK_UNICODEMAP && (code) <= QK_UNICODEMAP_MAX)
 #define IS_QK_UNICODE(code) ((code) >= QK_UNICODE && (code) <= QK_UNICODE_MAX)
+#define IS_QK_UNICODEMAP_PAIR(code) ((code) >= QK_UNICODEMAP_PAIR && (code) <= QK_UNICODEMAP_PAIR_MAX)
 
 // Group Helpers
 #define IS_INTERNAL_KEYCODE(code) ((code) >= KC_NO && (code) <= KC_TRANSPARENT)
 #define IS_BASIC_KEYCODE(code) ((code) >= KC_A && (code) <= KC_EXSEL)
 #define IS_SYSTEM_KEYCODE(code) ((code) >= KC_SYSTEM_POWER && (code) <= KC_SYSTEM_WAKE)
-#define IS_MEDIA_KEYCODE(code) ((code) >= KC_AUDIO_MUTE && (code) <= KC_ASSISTANT)
+#define IS_CONSUMER_KEYCODE(code) ((code) >= KC_AUDIO_MUTE && (code) <= KC_LAUNCHPAD)
 #define IS_MOUSE_KEYCODE(code) ((code) >= KC_MS_UP && (code) <= KC_MS_ACCEL2)
-#define IS_MODIFIERS_KEYCODE(code) ((code) >= KC_LEFT_CTRL && (code) <= KC_RIGHT_GUI)
-#define IS_SWAP_HANDS_KEYCODE(code) ((code) >= SH_TG && (code) <= SH_OS)
-#define IS_MAGIC_KEYCODE(code) ((code) >= MAGIC_SWAP_CONTROL_CAPSLOCK && (code) <= MAGIC_TOGGLE_ESCAPE_CAPSLOCK)
+#define IS_MODIFIER_KEYCODE(code) ((code) >= KC_LEFT_CTRL && (code) <= KC_RIGHT_GUI)
+#define IS_SWAP_HANDS_KEYCODE(code) ((code) >= QK_SWAP_HANDS_TOGGLE && (code) <= QK_SWAP_HANDS_ONE_SHOT)
+#define IS_MAGIC_KEYCODE(code) ((code) >= QK_MAGIC_SWAP_CONTROL_CAPS_LOCK && (code) <= QK_MAGIC_TOGGLE_ESCAPE_CAPS_LOCK)
 #define IS_MIDI_KEYCODE(code) ((code) >= QK_MIDI_ON && (code) <= QK_MIDI_PITCH_BEND_UP)
-#define IS_SEQUENCER_KEYCODE(code) ((code) >= SQ_ON && (code) <= SQ_SCLR)
+#define IS_SEQUENCER_KEYCODE(code) ((code) >= QK_SEQUENCER_ON && (code) <= QK_SEQUENCER_STEPS_CLEAR)
 #define IS_JOYSTICK_KEYCODE(code) ((code) >= QK_JOYSTICK_BUTTON_0 && (code) <= QK_JOYSTICK_BUTTON_31)
 #define IS_PROGRAMMABLE_BUTTON_KEYCODE(code) ((code) >= QK_PROGRAMMABLE_BUTTON_1 && (code) <= QK_PROGRAMMABLE_BUTTON_32)
 #define IS_AUDIO_KEYCODE(code) ((code) >= QK_AUDIO_ON && (code) <= QK_AUDIO_VOICE_PREVIOUS)
@@ -1320,4 +1413,6 @@ enum qk_keycode_defines {
 #define IS_MACRO_KEYCODE(code) ((code) >= QK_MACRO_0 && (code) <= QK_MACRO_31)
 #define IS_BACKLIGHT_KEYCODE(code) ((code) >= QK_BACKLIGHT_ON && (code) <= QK_BACKLIGHT_TOGGLE_BREATHING)
 #define IS_RGB_KEYCODE(code) ((code) >= RGB_TOG && (code) <= RGB_MODE_TWINKLE)
-#define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_AUTOCORRECT_TOGGLE)
+#define IS_QUANTUM_KEYCODE(code) ((code) >= QK_BOOTLOADER && (code) <= QK_TRI_LAYER_UPPER)
+#define IS_KB_KEYCODE(code) ((code) >= QK_KB_0 && (code) <= QK_KB_31)
+#define IS_USER_KEYCODE(code) ((code) >= QK_USER_0 && (code) <= QK_USER_31)