Updated k1 pro

34 files changed, 1815 insertions, 239 deletions

diff --git a/keyboards/keychron/k1_pro/ansi/rgb/config.h b/keyboards/keychron/k1_pro/ansi/rgb/config.h
index 5a97419722..fa9adfcea6 100644
--- a/keyboards/keychron/k1_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k1_pro/ansi/rgb/config.h
@@ -21,6 +21,8 @@
 #    define DRIVER_COUNT 2
 #    define DRIVER_ADDR_1 0b1110111
 #    define DRIVER_ADDR_2 0b1110100
+
+/* RGB Matrix Configuration */
 #    define DRIVER_1_LED_TOTAL 47
 #    define DRIVER_2_LED_TOTAL 40
 #    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
@@ -39,7 +41,6 @@
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
-
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECT
 
diff --git a/keyboards/keychron/k1_pro/ansi/rgb/info.json b/keyboards/keychron/k1_pro/ansi/rgb/info.json
index 9b11965651..1a0b3287a6 100644
--- a/keyboards/keychron/k1_pro/ansi/rgb/info.json
+++ b/keyboards/keychron/k1_pro/ansi/rgb/info.json
@@ -30,6 +30,100 @@
             "solid_reactive_multinexus": true,
             "splash": true,
             "solid_splash": true
-        }
+        },
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":1, "x":26,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":39,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":52,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":65,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":85,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":98,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":111, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":124, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":144, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":157, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":170, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":183, "y":0},
+            {"matrix":[0, 14], "flags":1, "x":197, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":210, "y":0},
+            {"matrix":[0, 16], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":0,   "y":13},
+            {"matrix":[1, 1],  "flags":8, "x":13,  "y":13},
+            {"matrix":[1, 2],  "flags":8, "x":26,  "y":13},
+            {"matrix":[1, 3],  "flags":8, "x":39,  "y":13},
+            {"matrix":[1, 4],  "flags":4, "x":52,  "y":13},
+            {"matrix":[1, 5],  "flags":4, "x":65,  "y":13},
+            {"matrix":[1, 6],  "flags":4, "x":78,  "y":13},
+            {"matrix":[1, 7],  "flags":4, "x":91,  "y":13},
+            {"matrix":[1, 8],  "flags":4, "x":104, "y":13},
+            {"matrix":[1, 9],  "flags":4, "x":117, "y":13},
+            {"matrix":[1, 10], "flags":4, "x":130, "y":13},
+            {"matrix":[1, 11], "flags":4, "x":144, "y":13},
+            {"matrix":[1, 12], "flags":4, "x":157, "y":13},
+            {"matrix":[1, 13], "flags":1, "x":176, "y":13},
+            {"matrix":[1, 14], "flags":1, "x":197, "y":13},
+            {"matrix":[1, 15], "flags":1, "x":210, "y":13},
+            {"matrix":[1, 16], "flags":1, "x":224, "y":13},
+
+            {"matrix":[2, 0],  "flags":1, "x":3,   "y":26},
+            {"matrix":[2, 1],  "flags":4, "x":19,  "y":26},
+            {"matrix":[2, 2],  "flags":4, "x":32,  "y":26},
+            {"matrix":[2, 3],  "flags":4, "x":45,  "y":26},
+            {"matrix":[2, 4],  "flags":4, "x":58,  "y":26},
+            {"matrix":[2, 5],  "flags":4, "x":72,  "y":26},
+            {"matrix":[2, 6],  "flags":4, "x":85,  "y":26},
+            {"matrix":[2, 7],  "flags":4, "x":98,  "y":26},
+            {"matrix":[2, 8],  "flags":4, "x":111, "y":26},
+            {"matrix":[2, 9],  "flags":4, "x":124, "y":26},
+            {"matrix":[2, 10], "flags":4, "x":137, "y":26},
+            {"matrix":[2, 11], "flags":4, "x":150, "y":26},
+            {"matrix":[2, 12], "flags":4, "x":163, "y":26},
+            {"matrix":[2, 13], "flags":1, "x":180, "y":33},
+            {"matrix":[2, 14], "flags":1, "x":197, "y":26},
+            {"matrix":[2, 15], "flags":1, "x":210, "y":26},
+            {"matrix":[2, 16], "flags":1, "x":224, "y":26},
+
+            {"matrix":[3, 0],  "flags":8, "x":4,   "y":38},
+            {"matrix":[3, 1],  "flags":4, "x":22,  "y":38},
+            {"matrix":[3, 2],  "flags":4, "x":36,  "y":38},
+            {"matrix":[3, 3],  "flags":4, "x":49,  "y":38},
+            {"matrix":[3, 4],  "flags":4, "x":62,  "y":38},
+            {"matrix":[3, 5],  "flags":4, "x":75,  "y":38},
+            {"matrix":[3, 6],  "flags":4, "x":88,  "y":38},
+            {"matrix":[3, 7],  "flags":4, "x":101, "y":38},
+            {"matrix":[3, 8],  "flags":4, "x":114, "y":38},
+            {"matrix":[3, 9],  "flags":4, "x":127, "y":38},
+            {"matrix":[3, 10], "flags":4, "x":140, "y":38},
+            {"matrix":[3, 11], "flags":4, "x":153, "y":38},
+            {"matrix":[3, 13], "flags":1, "x":175, "y":38},
+
+            {"matrix":[4, 0],  "flags":1, "x":8,   "y":51},
+            {"matrix":[4, 2],  "flags":4, "x":29,  "y":51},
+            {"matrix":[4, 3],  "flags":4, "x":42,  "y":51},
+            {"matrix":[4, 4],  "flags":4, "x":55,  "y":51},
+            {"matrix":[4, 5],  "flags":4, "x":68,  "y":51},
+            {"matrix":[4, 6],  "flags":4, "x":81,  "y":51},
+            {"matrix":[4, 7],  "flags":4, "x":94,  "y":51},
+            {"matrix":[4, 8],  "flags":4, "x":108, "y":51},
+            {"matrix":[4, 9],  "flags":4, "x":121, "y":51},
+            {"matrix":[4, 10], "flags":4, "x":134, "y":51},
+            {"matrix":[4, 11], "flags":4, "x":147, "y":51},
+            {"matrix":[4, 13], "flags":1, "x":171, "y":51},
+            {"matrix":[4, 15], "flags":1, "x":210, "y":51},
+
+            {"matrix":[5, 0],  "flags":1, "x":1,   "y":64},
+            {"matrix":[5, 1],  "flags":1, "x":18,  "y":64},
+            {"matrix":[5, 2],  "flags":1, "x":34,  "y":64},
+            {"matrix":[5, 6],  "flags":4, "x":83,  "y":64},
+            {"matrix":[5, 10], "flags":1, "x":132, "y":64},
+            {"matrix":[5, 11], "flags":1, "x":148, "y":64},
+            {"matrix":[5, 12], "flags":1, "x":165, "y":64},
+            {"matrix":[5, 13], "flags":1, "x":181, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":197, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":210, "y":64},
+            {"matrix":[5, 16], "flags":1, "x":224, "y":64}
+        ]
     }
 }
diff --git a/keyboards/keychron/k1_pro/ansi/rgb/keymaps/default/keymap.c b/keyboards/keychron/k1_pro/ansi/rgb/keymaps/default/keymap.c
index d0cd37cffb..dd6718e04b 100644
--- a/keyboards/keychron/k1_pro/ansi/rgb/keymaps/default/keymap.c
+++ b/keyboards/keychron/k1_pro/ansi/rgb/keymaps/default/keymap.c
@@ -16,14 +16,14 @@
 
 #include QMK_KEYBOARD_H
 
-// clang-format off
 enum layers{
   MAC_BASE,
   MAC_FN,
   WIN_BASE,
-  WIN_FN
+  WIN_FN,
 };
 
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_tkl_ansi(
         KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_SNAP,  KC_SIRI,  RGB_MOD,
diff --git a/keyboards/keychron/k1_pro/ansi/rgb/keymaps/via/keymap.c b/keyboards/keychron/k1_pro/ansi/rgb/keymaps/via/keymap.c
index d0cd37cffb..dd6718e04b 100644
--- a/keyboards/keychron/k1_pro/ansi/rgb/keymaps/via/keymap.c
+++ b/keyboards/keychron/k1_pro/ansi/rgb/keymaps/via/keymap.c
@@ -16,14 +16,14 @@
 
 #include QMK_KEYBOARD_H
 
-// clang-format off
 enum layers{
   MAC_BASE,
   MAC_FN,
   WIN_BASE,
-  WIN_FN
+  WIN_FN,
 };
 
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_tkl_ansi(
         KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_SNAP,  KC_SIRI,  RGB_MOD,
diff --git a/keyboards/keychron/k1_pro/ansi/rgb/rgb.c b/keyboards/keychron/k1_pro/ansi/rgb/rgb.c
index 33fb65b997..3f782bb328 100644
--- a/keyboards/keychron/k1_pro/ansi/rgb/rgb.c
+++ b/keyboards/keychron/k1_pro/ansi/rgb/rgb.c
@@ -118,37 +118,4 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
     {1, F_16,   D_16,   E_16},
     {1, C_15,   A_15,   B_15}
 };
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, __, 13, 14, 15 },
-        { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 },
-        { 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49 },
-        { 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, __, 62, __, __, __ },
-        { 63, __, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, __, 74, __, 75, __ },
-        { 76, 77, 78, __, __, __, 79, __, __, __, 80, 81, 82, 83, 84, 85, 86 }
-    },
-    {
-        // LED Index to Physical Position
-        {0, 0},          {26, 0}, {39, 0}, {52, 0}, {65, 0}, {85, 0}, {98, 0},   {111,  0}, {124,  0}, {144,  0}, {157,  0}, {170,  0}, {183,  0}, {197,  0}, {210,  0}, {224,  0},
-        {0,13}, {13,13}, {26,13}, {39,13}, {52,13}, {65,13}, {78,13}, { 91, 13}, {104, 13}, {117, 13}, {130, 13}, {144, 13}, {157, 13}, {176, 13}, {197, 13}, {210, 13}, {224, 13},
-        {3,26}, {19,26}, {32,26}, {45,26}, {58,26}, {72,26}, {85,26}, { 98, 26}, {111, 26}, {124, 26}, {137, 26}, {150, 26}, {163, 26}, {180, 26}, {197, 26}, {210, 26}, {224, 26},
-        {4,38}, {22,38}, {36,38}, {49,38}, {62,38}, {75,38}, {88,38}, {101, 38}, {114, 38}, {127, 38}, {140, 38}, {153, 38},            {175, 38},
-        {8,51},          {29,51}, {42,51}, {55,51}, {68,51}, {81,51}, { 94, 51}, {108, 51}, {121, 51}, {134, 51}, {147, 51},            {171, 51},            {210, 51},
-        {1,64}, {18,64}, {34,64},                            {83,64},                                  {132, 64}, {148, 64}, {165, 64}, {181, 64}, {197, 64}, {210, 64}, {224, 64}
-
-    },
-    {
-        // RGB LED Index to Flag
-        1,    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-        4, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
-        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 1
-    }
-};
 #endif
diff --git a/keyboards/keychron/k1_pro/ansi/white/config.h b/keyboards/keychron/k1_pro/ansi/white/config.h
index bfd714a2c1..c5b171ca6d 100644
--- a/keyboards/keychron/k1_pro/ansi/white/config.h
+++ b/keyboards/keychron/k1_pro/ansi/white/config.h
@@ -20,8 +20,9 @@
 /* LED Matrix Driver Configuration */
 #    define DRIVER_COUNT 1
 #    define DRIVER_ADDR_1 0b1110100
-#    define DRIVER_1_LED_TOTAL 87
-#    define LED_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
+
+/* LED Matrix Configuration */
+#    define LED_MATRIX_LED_COUNT 87
 
 /* Set to infinit, which is use in USB mode by default */
 #    define LED_MATRIX_TIMEOUT LED_MATRIX_TIMEOUT_INFINITE
@@ -37,7 +38,6 @@
 // LED Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
 // https://docs.qmk.fm/#/feature_led_matrix?id=led-matrix-effects
-
 #    define LED_MATRIX_KEYPRESSES
 
 /* Use first 6 channels of LED driver */
diff --git a/keyboards/keychron/k1_pro/ansi/white/info.json b/keyboards/keychron/k1_pro/ansi/white/info.json
index 1509ceb749..00fcf925a6 100644
--- a/keyboards/keychron/k1_pro/ansi/white/info.json
+++ b/keyboards/keychron/k1_pro/ansi/white/info.json
@@ -25,6 +25,100 @@
             "wave_left_right": true,
             "wave_up_down": true,
             "effect_max": true
-        }
+        },
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":1, "x":26,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":39,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":52,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":65,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":85,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":98,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":111, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":124, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":144, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":157, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":170, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":183, "y":0},
+            {"matrix":[0, 14], "flags":1, "x":197, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":210, "y":0},
+            {"matrix":[0, 16], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":0,   "y":13},
+            {"matrix":[1, 1],  "flags":8, "x":13,  "y":13},
+            {"matrix":[1, 2],  "flags":8, "x":26,  "y":13},
+            {"matrix":[1, 3],  "flags":8, "x":39,  "y":13},
+            {"matrix":[1, 4],  "flags":4, "x":52,  "y":13},
+            {"matrix":[1, 5],  "flags":4, "x":65,  "y":13},
+            {"matrix":[1, 6],  "flags":4, "x":78,  "y":13},
+            {"matrix":[1, 7],  "flags":4, "x":91,  "y":13},
+            {"matrix":[1, 8],  "flags":4, "x":104, "y":13},
+            {"matrix":[1, 9],  "flags":4, "x":117, "y":13},
+            {"matrix":[1, 10], "flags":4, "x":130, "y":13},
+            {"matrix":[1, 11], "flags":4, "x":144, "y":13},
+            {"matrix":[1, 12], "flags":4, "x":157, "y":13},
+            {"matrix":[1, 13], "flags":1, "x":176, "y":13},
+            {"matrix":[1, 14], "flags":1, "x":197, "y":13},
+            {"matrix":[1, 15], "flags":1, "x":210, "y":13},
+            {"matrix":[1, 16], "flags":1, "x":224, "y":13},
+
+            {"matrix":[2, 0],  "flags":1, "x":3,   "y":26},
+            {"matrix":[2, 1],  "flags":4, "x":19,  "y":26},
+            {"matrix":[2, 2],  "flags":4, "x":32,  "y":26},
+            {"matrix":[2, 3],  "flags":4, "x":45,  "y":26},
+            {"matrix":[2, 4],  "flags":4, "x":58,  "y":26},
+            {"matrix":[2, 5],  "flags":4, "x":72,  "y":26},
+            {"matrix":[2, 6],  "flags":4, "x":85,  "y":26},
+            {"matrix":[2, 7],  "flags":4, "x":98,  "y":26},
+            {"matrix":[2, 8],  "flags":4, "x":111, "y":26},
+            {"matrix":[2, 9],  "flags":4, "x":124, "y":26},
+            {"matrix":[2, 10], "flags":4, "x":137, "y":26},
+            {"matrix":[2, 11], "flags":4, "x":150, "y":26},
+            {"matrix":[2, 12], "flags":4, "x":163, "y":26},
+            {"matrix":[2, 13], "flags":1, "x":180, "y":33},
+            {"matrix":[2, 14], "flags":1, "x":197, "y":26},
+            {"matrix":[2, 15], "flags":1, "x":210, "y":26},
+            {"matrix":[2, 16], "flags":1, "x":224, "y":26},
+
+            {"matrix":[3, 0],  "flags":8, "x":4,   "y":38},
+            {"matrix":[3, 1],  "flags":4, "x":22,  "y":38},
+            {"matrix":[3, 2],  "flags":4, "x":36,  "y":38},
+            {"matrix":[3, 3],  "flags":4, "x":49,  "y":38},
+            {"matrix":[3, 4],  "flags":4, "x":62,  "y":38},
+            {"matrix":[3, 5],  "flags":4, "x":75,  "y":38},
+            {"matrix":[3, 6],  "flags":4, "x":88,  "y":38},
+            {"matrix":[3, 7],  "flags":4, "x":101, "y":38},
+            {"matrix":[3, 8],  "flags":4, "x":114, "y":38},
+            {"matrix":[3, 9],  "flags":4, "x":127, "y":38},
+            {"matrix":[3, 10], "flags":4, "x":140, "y":38},
+            {"matrix":[3, 11], "flags":4, "x":153, "y":38},
+            {"matrix":[3, 13], "flags":1, "x":175, "y":38},
+
+            {"matrix":[4, 0],  "flags":1, "x":8,   "y":51},
+            {"matrix":[4, 2],  "flags":4, "x":29,  "y":51},
+            {"matrix":[4, 3],  "flags":4, "x":42,  "y":51},
+            {"matrix":[4, 4],  "flags":4, "x":55,  "y":51},
+            {"matrix":[4, 5],  "flags":4, "x":68,  "y":51},
+            {"matrix":[4, 6],  "flags":4, "x":81,  "y":51},
+            {"matrix":[4, 7],  "flags":4, "x":94,  "y":51},
+            {"matrix":[4, 8],  "flags":4, "x":108, "y":51},
+            {"matrix":[4, 9],  "flags":4, "x":121, "y":51},
+            {"matrix":[4, 10], "flags":4, "x":134, "y":51},
+            {"matrix":[4, 11], "flags":4, "x":147, "y":51},
+            {"matrix":[4, 13], "flags":1, "x":171, "y":51},
+            {"matrix":[4, 15], "flags":1, "x":210, "y":51},
+
+            {"matrix":[5, 0],  "flags":1, "x":1,   "y":64},
+            {"matrix":[5, 1],  "flags":1, "x":18,  "y":64},
+            {"matrix":[5, 2],  "flags":1, "x":34,  "y":64},
+            {"matrix":[5, 6],  "flags":4, "x":83,  "y":64},
+            {"matrix":[5, 10], "flags":1, "x":132, "y":64},
+            {"matrix":[5, 11], "flags":1, "x":148, "y":64},
+            {"matrix":[5, 12], "flags":1, "x":165, "y":64},
+            {"matrix":[5, 13], "flags":1, "x":181, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":197, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":210, "y":64},
+            {"matrix":[5, 16], "flags":1, "x":224, "y":64}
+        ]
     }
 }
diff --git a/keyboards/keychron/k1_pro/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/k1_pro/ansi/white/keymaps/default/keymap.c
index d23e72e2e6..dec4f3ad53 100644
--- a/keyboards/keychron/k1_pro/ansi/white/keymaps/default/keymap.c
+++ b/keyboards/keychron/k1_pro/ansi/white/keymaps/default/keymap.c
@@ -16,44 +16,44 @@
 
 #include QMK_KEYBOARD_H
 
-// clang-format off
 enum layers{
   MAC_BASE,
   MAC_FN,
   WIN_BASE,
-  WIN_FN
+  WIN_FN,
 };
 
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[MAC_BASE] = LAYOUT_tkl_ansi(
-    KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_SNAP,  KC_SIRI,  BL_STEP,
-    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_INS,   KC_HOME,  KC_PGUP,
-    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_DEL,   KC_END,   KC_PGDN,
-    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_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_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN),KC_RCTL, KC_LEFT,  KC_DOWN,  KC_RGHT),
+    [MAC_BASE] = LAYOUT_tkl_ansi(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_SNAP,  KC_SIRI,  BL_STEP,
+        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_INS,   KC_HOME,  KC_PGUP,
+        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_DEL,   KC_END,   KC_PGDN,
+        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_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_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN),KC_RCTL, KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-[MAC_FN] = LAYOUT_tkl_ansi(
-    _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,  _______,  BL_TOGG,
-    _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-    _______,            _______,  _______,  _______,  _______,  BAT_LVL,  NK_TOGG,  _______,  _______,  _______,  _______,            _______,            _______,
-    _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______),
+    [MAC_FN] = LAYOUT_tkl_ansi(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,  _______,  BL_TOGG,
+        _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  BAT_LVL,  NK_TOGG,  _______,  _______,  _______,  _______,            _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______),
 
-[WIN_BASE] = LAYOUT_tkl_ansi(
-    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_CTANA, BL_STEP,
-    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_INS,   KC_HOME,  KC_PGUP,
-    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_DEL,   KC_END,   KC_PGDN,
-    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_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_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RGUI, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+    [WIN_BASE] = LAYOUT_tkl_ansi(
+        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_CTANA, BL_STEP,
+        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_INS,   KC_HOME,  KC_PGUP,
+        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_DEL,   KC_END,   KC_PGDN,
+        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_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_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RGUI, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-[WIN_FN] = LAYOUT_tkl_ansi(
-    _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FILE,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  BL_TOGG,
-    _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-    _______,            _______,  _______,  _______,  _______,  BAT_LVL,  NK_TOGG,  _______,  _______,  _______,  _______,            _______,            _______,
-    _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______)
+    [WIN_FN] = LAYOUT_tkl_ansi(
+        _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FILE,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,  _______,  BL_TOGG,
+        _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  BAT_LVL,  NK_TOGG,  _______,  _______,  _______,  _______,            _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______)
 };
diff --git a/keyboards/keychron/k1_pro/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/k1_pro/ansi/white/keymaps/via/keymap.c
index d23e72e2e6..dec4f3ad53 100644
--- a/keyboards/keychron/k1_pro/ansi/white/keymaps/via/keymap.c
+++ b/keyboards/keychron/k1_pro/ansi/white/keymaps/via/keymap.c
@@ -16,44 +16,44 @@
 
 #include QMK_KEYBOARD_H
 
-// clang-format off
 enum layers{
   MAC_BASE,
   MAC_FN,
   WIN_BASE,
-  WIN_FN
+  WIN_FN,
 };
 
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[MAC_BASE] = LAYOUT_tkl_ansi(
-    KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_SNAP,  KC_SIRI,  BL_STEP,
-    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_INS,   KC_HOME,  KC_PGUP,
-    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_DEL,   KC_END,   KC_PGDN,
-    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_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_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN),KC_RCTL, KC_LEFT,  KC_DOWN,  KC_RGHT),
+    [MAC_BASE] = LAYOUT_tkl_ansi(
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_SNAP,  KC_SIRI,  BL_STEP,
+        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_INS,   KC_HOME,  KC_PGUP,
+        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_DEL,   KC_END,   KC_PGDN,
+        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_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_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN),KC_RCTL, KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-[MAC_FN] = LAYOUT_tkl_ansi(
-    _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,  _______,  BL_TOGG,
-    _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
-    _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
-    _______,            _______,  _______,  _______,  _______,  BAT_LVL,  NK_TOGG,  _______,  _______,  _______,  _______,            _______,            _______,
-    _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______),
+    [MAC_FN] = LAYOUT_tkl_ansi(
+        _______,            KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,  _______,  BL_TOGG,
+        _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,            _______,  _______,  _______,  _______,  BAT_LVL,  NK_TOGG,  _______,  _______,  _______,  _______,            _______,            _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______,  _______),
 
-[WIN_BASE] = LAYOUT_tkl_ansi(
-    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_CTANA, BL_STEP,
-    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_INS,   KC_HOME,  KC_PGUP,
-    KC_TAB,   KC_Q