Merge remote-tracking branch 'origin/master' into develop

14 files changed, 473 insertions, 133 deletions

diff --git a/keyboards/xbows/knight/config.h b/keyboards/xbows/knight/config.h
index fbe1504398..540e29d4df 100644
--- a/keyboards/xbows/knight/config.h
+++ b/keyboards/xbows/knight/config.h
@@ -1,44 +1,51 @@
+/* Copyright 2021 Shulin Huang <mumu@x-bows.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"
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x1225
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    X-BOWS
-#define PRODUCT         KNIGHT
 
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 12
-#define MATRIX_COLS 15
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x1225
+#define DEVICE_VER   0x0001
+#define MANUFACTURER X-BOWS
+#define PRODUCT      KNIGHT
 
-// wiring of each half
-#define MATRIX_ROW_PINS { D2, E6, E2, F7, F6, F5 }
-#define MATRIX_COL_PINS { B0, B1, B2, B3, F4, F1, C6, B6, B5, B4, D7, D6, D4, D5, D3}
-/* COL2ROW or ROW2COL */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }
+#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6 }
 #define DIODE_DIRECTION COL2ROW
 
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
+#define DEBOUNCE 3
 
-#define LED_NUM_LOCK_PIN D1
-#define LED_CAPS_LOCK_PIN C7
-#define LED_PIN_ON_STATE 0
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_LED_PROCESS_LIMIT 18
+#    define RGB_MATRIX_LED_FLUSH_LIMIT 16
+#    define RGB_DISABLE_AFTER_TIMEOUT 0          // number of ticks to wait until disabling effects
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED true  // turn off effects when suspended
+#    define RGB_MATRIX_KEYPRESSES
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+#    define RGB_MATRIX_CENTER { 92, 43 }
 
-/* number of backlight levels */
-// #define BACKLIGHT_LEVELS 3
-#define BACKLIGHT_PIN B7
-#ifdef BACKLIGHT_PIN
-#define BACKLIGHT_BREATHING
-#define BACKLIGHT_LEVELS 3
+#    define DRIVER_ADDR_1 0b1110100
+#    define DRIVER_ADDR_2 0b1110110
+#    define DRIVER_ADDR_3 0b1110101
+#    define DRIVER_COUNT 3
+#    define DRIVER_1_LED_TOTAL 36
+#    define DRIVER_2_LED_TOTAL 35
+#    define DRIVER_3_LED_TOTAL 15
+#    define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + DRIVER_3_LED_TOTAL)
 #endif
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE 5
-
-/* serial.c configuration for split keyboard */
-#define SOFT_SERIAL_PIN D0
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define SPLIT_HAND_PIN F0
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
diff --git a/keyboards/xbows/knight/info.json b/keyboards/xbows/knight/info.json
index 63ff8d293e..439b1741ca 100644
--- a/keyboards/xbows/knight/info.json
+++ b/keyboards/xbows/knight/info.json
@@ -1,8 +1,8 @@
 {
-    "keyboard_name": "knight",
+    "keyboard_name": "KNIGHT",
     "url": "",
-    "maintainer": "xbows",
-    "width": 23,
+    "maintainer": "xbows-qmk",
+    "width": 18,
     "height": 6.5,
     "layouts": {
         "LAYOUT": {
@@ -22,10 +22,7 @@
                 {"label":"F12", "x":12.75, "y":0},
                 {"label":"Delete", "x":14, "y":0, "w":2},
                 {"label":"Print Screen", "x":16, "y":0, "w":2},
-                {"label":"Esc", "x":19, "y":0},
-                {"label":"Tab", "x":20, "y":0},
-                {"label":"Backspace", "x":21, "y":0},
-                {"label":"Fn", "x":22, "y":0},
+
                 {"label":"~", "x":0, "y":1.5},
                 {"label":"!", "x":1, "y":1.5},
                 {"label":"@", "x":2, "y":1.5},
@@ -40,10 +37,7 @@
                 {"label":"_", "x":14, "y":1.5},
                 {"label":"+", "x":15, "y":1.5},
                 {"label":"Backspace", "x":16, "y":1.5, "w":2},
-                {"label":"Num Lock", "x":19, "y":1.5},
-                {"label":"/", "x":20, "y":1.5},
-                {"label":"*", "x":21, "y":1.5},
-                {"label":"-", "x":22, "y":1.5},
+
                 {"label":"Tab", "x":0, "y":2.5},
                 {"label":"Q", "x":1, "y":2.5},
                 {"label":"W", "x":2, "y":2.5},
@@ -59,17 +53,14 @@
                 {"label":"}", "x":15, "y":2.5},
                 {"label":"|", "x":16, "y":2.5},
                 {"label":"Page Up", "x":17, "y":2.5},
-                {"label":"7", "x":19, "y":2.5},
-                {"label":"8", "x":20, "y":2.5},
-                {"label":"9", "x":21, "y":2.5},
-                {"label":"+", "x":22, "y":2.5},
+
                 {"label":"Caps Lock", "x":0, "y":3.5},
                 {"label":"A", "x":1, "y":3.5},
                 {"label":"S", "x":2, "y":3.5},
                 {"label":"D", "x":3, "y":3.5},
                 {"label":"F", "x":4, "y":3.5},
                 {"label":"G", "x":5, "y":3.5},
-                {"label":"Backspace", "x":6, "y":3.5, "w":3},
+                {"label":"Backspace", "x":6.75, "y":3.5, "w":1.5},
                 {"label":"H", "x":9, "y":3.5},
                 {"label":"J", "x":10, "y":3.5},
                 {"label":"K", "x":11, "y":3.5},
@@ -78,17 +69,14 @@
                 {"label":"\"", "x":14, "y":3.5},
                 {"label":"Enter", "x":15, "y":3.5, "w":2},
                 {"label":"Page Down", "x":17, "y":3.5},
-                {"label":"4", "x":19, "y":3.5},
-                {"label":"5", "x":20, "y":3.5},
-                {"label":"6", "x":21, "y":3.5},
-                {"label":"+", "x":22, "y":3.5},
+
                 {"label":"Shift", "x":0, "y":4.5},
                 {"label":"Z", "x":1, "y":4.5},
                 {"label":"X", "x":2, "y":4.5},
                 {"label":"C", "x":3, "y":4.5},
                 {"label":"V", "x":4, "y":4.5},
                 {"label":"B", "x":5, "y":4.5},
-                {"label":"Enter", "x":6, "y":4.5, "w":3},
+                {"label":"Enter", "x":6.5, "y":4.5, "w":2},
                 {"label":"N", "x":9, "y":4.5},
                 {"label":"M", "x":10, "y":4.5},
                 {"label":"<", "x":11, "y":4.5},
@@ -96,10 +84,7 @@
                 {"label":"?", "x":13, "y":4.5},
                 {"label":"Shift", "x":14, "y":4.5},
                 {"label":"Up", "x":16, "y":4.5},
-                {"label":"1", "x":19, "y":4.5},
-                {"label":"2", "x":20, "y":4.5},
-                {"label":"3", "x":21, "y":4.5},
-                {"label":"Enter", "x":22, "y":4.5, "h":2},
+
                 {"label":"Ctrl", "x":0, "y":5.5},
                 {"label":"Win", "x":1, "y":5.5},
                 {"label":"Alt", "x":2, "y":5.5, "w":2},
@@ -112,9 +97,8 @@
                 {"label":"Ctrl", "x":14, "y":5.5},
                 {"label":"Left", "x":15, "y":5.5},
                 {"label":"Down", "x":16, "y":5.5},
-                {"label":"Right", "x":17, "y":5.5},
-                {"label":"0", "x":19, "y":5.5, "w":2},
-                {"label":".", "x":21, "y":5.5}
+                {"label":"Right", "x":17, "y":5.5}
+
             ]
         }
     }
diff --git a/keyboards/xbows/knight/keymaps/default/config.h b/keyboards/xbows/knight/keymaps/default/config.h
new file mode 100644
index 0000000000..8e1b68f97f
--- /dev/null
+++ b/keyboards/xbows/knight/keymaps/default/config.h
@@ -0,0 +1,43 @@
+/* Copyright 2021 Shulin Huang <mumu@x-bows.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
+
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
+#    define DISABLE_RGB_MATRIX_SOLID_COLOR               // Static single hue, no speed support
+#    define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes
+#    define DISABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right
+#    define DISABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right
+#    define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation
+#    define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAT           // Single hue spinning spiral fades saturation
+#    define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in
+#    define DISABLE_RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard
+
+#    define DISABLE_RGB_MATRIX_DIGITAL_RAIN              // That famous computer simulation
+#    define DISABLE_RGB_MATRIX_TYPING_HEATMAP            // How hot is your WPM!
+
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out
+//#    define DISABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out
+#    define DISABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out
+#    define DISABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out
+//#    define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out
+
+#endif
diff --git a/keyboards/xbows/knight/keymaps/default/keymap.c b/keyboards/xbows/knight/keymaps/default/keymap.c
index c7db8f3ca9..bde212f105 100644
--- a/keyboards/xbows/knight/keymaps/default/keymap.c
+++ b/keyboards/xbows/knight/keymaps/default/keymap.c
@@ -1,18 +1,49 @@
+/* Copyright 2021 Shulin Huang <mumu@x-bows.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/>.
+ */
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap VANILLA: (Base Layer) Default Layer
+   *
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * | Esc |  F1  |  F2  |  F3  |  F4  |      F5  |  F6  |  F7  |  F8  |      F9  |  F10 |  F11 |  F12 |   Delete   |    Prtsc    |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * |  ~  |     1   |   2   |   3   |   4   |    5      |       6    |    7    |    8   |   9  |   0  |   -  |  =  |  Backspace  |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * | Tab |   Q    |    W   |   E  |   R  |   T  |            |    Y   |    U   |    I  |   O  |   P  |   [  |  ]  |   \  | PgUp |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * | Ctl |   A   |   S   |   D  |   F  |   G  |      Bksp      |    H  |    J   |   K  |   L  |   ;  |  '"  |    Enter   | PgDn |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * |Shift|   Z  |   X  |   C  |   V  |   B  |       Enter       |    N  |    M   |  ,  |   .  |  /?  | Shift|      |  Up |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * |Ctrl | GUI |     Alter   |    Space   |   Ctrl   |   Shift   |     Space     |    Alter   |  FN  | Ctrl | Lft  |  Dn |  Rig |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   */
   [0] = 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_DEL,  KC_PSCR, KC_ESC ,  KC_TAB,  KC_BSPC, MO(1),
-		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_NLCK, KC_PSLS, KC_PAST, KC_EQL,  
-		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_P7,   KC_P8,   KC_P9,   KC_PMNS,      
-		KC_CAPS, KC_A,    KC_S,  KC_D,   KC_F,   KC_G,    KC_BSPC,KC_H,  KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,  KC_PGDN, KC_P4,   KC_P5,   KC_P6,   KC_PPLS,   
-		KC_LSFT, KC_Z,    KC_X,  KC_C,   KC_V,   KC_B,    KC_ENT, KC_N,  KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,            KC_P1,   KC_P2,   KC_P3,   KC_ENT,    
-		KC_LCTL, KC_LGUI, KC_LALT,KC_SPC,        KC_LCTL, KC_LSFT,KC_SPC,        KC_RALT, MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT,          KC_P0,   KC_PDOT),
+		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_DEL,  KC_PSCR,
+		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_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_BSPC, 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_ENT,  KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+		KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC, KC_LCTL, KC_LSFT, KC_SPC,        KC_RALT, MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
   [1] = 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_DEL,  KC_PSCR,  RESET,  KC_TAB, KC_BSPC,KC_TRNS,   
-		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_NLCK,KC_PSLS,KC_PAST,KC_EQL,
-		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_P7,  KC_P8,  KC_P9,  KC_PMNS, 
-		KC_CAPS, KC_A,    KC_S,  KC_D,   KC_F,   KC_G,    BL_STEP,KC_H,  KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,  KC_PGDN,  KC_P4,  KC_P5,  KC_P6,  KC_PPLS, 
-		KC_LSFT, KC_Z,    KC_X,  KC_C,   KC_V,   KC_B,    RESET,  KC_N,  KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,             KC_P1,  KC_P2,  KC_P3,  KC_ENT, 
-		KC_LCTL, KC_LGUI, KC_SPC,KC_LALT,        KC_LCTL, KC_LSFT,KC_SPC,        KC_RALT, KC_TRNS,KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT,          KC_0,   KC_PDOT)
+    RESET,     KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EEP_RST,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NLCK,
+    RGB_TOG,   RGB_MOD, RGB_VAI, RGB_HUI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME,
+    KC_TRNS,   RGB_SPD, RGB_VAD, RGB_SPI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_END,
+    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_MUTE,   KC_VOLU,
+    KC_TRNS,   KC_TRNS, KC_TRNS,           KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,   KC_TRNS,  KC_MPLY,   KC_MPRV,   KC_VOLD,   KC_MNXT)
 };
diff --git a/keyboards/xbows/knight/keymaps/via/config.h b/keyboards/xbows/knight/keymaps/via/config.h
new file mode 100644
index 0000000000..4fafee0a94
--- /dev/null
+++ b/keyboards/xbows/knight/keymaps/via/config.h
@@ -0,0 +1,64 @@
+/* Copyright 2021 Shulin Huang <mumu@x-bows.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

+

+#ifdef RGB_MATRIX_ENABLE

+#    define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set

+#    define DISABLE_RGB_MATRIX_ALPHAS_MODS               // Static dual hue, speed is hue for secondary hue

+#    define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN          // Static gradient top to bottom, speed controls how much gradient changes

+#    define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT       // Static gradient left to right, speed controls how much gradient changes

+//#    define DISABLE_RGB_MATRIX_BREATHING                 // Single hue brightness cycling animation

+#    define DISABLE_RGB_MATRIX_BAND_SAT                  // Single hue band fading saturation scrolling left to right

+#    define DISABLE_RGB_MATRIX_BAND_VAL                  // Single hue band fading brightness scrolling left to right

+#    define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT         // Single hue 3 blade spinning pinwheel fades saturation

+#    define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL         // Single hue 3 blade spinning pinwheel fades brightness

+#    define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT           // Single hue spinning spiral fades saturation

+#    define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL           // Single hue spinning spiral fades brightness

+//#    define DISABLE_RGB_MATRIX_CYCLE_ALL                 // Full keyboard solid hue cycling through full gradient

+//#    define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT          // Full gradient scrolling left to right

+#    define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN             // Full gradient scrolling top to bottom

+//#    define DISABLE_RGB_MATRIX_CYCLE_OUT_IN              // Full gradient scrolling out to in

+#    define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL         // Full dual gradients scrolling out to in

+#    define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON    // Full gradent Chevron shapped scrolling left to right

+#    define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL            // Full gradient spinning pinwheel around center of keyboard

+#    define DISABLE_RGB_MATRIX_CYCLE_SPIRAL              // Full gradient spinning spiral around center of keyboard

+#    define DISABLE_RGB_MATRIX_DUAL_BEACON               // Full gradient spinning around center of keyboard

+//#    define DISABLE_RGB_MATRIX_RAINBOW_BEACON            // Full tighter gradient spinning around center of keyboard

+#    define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS         // Full dual gradients spinning two halfs of keyboard

+#    define DISABLE_RGB_MATRIX_RAINDROPS                 // Randomly changes a single key's hue

+#    define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS       // Randomly changes a single key's hue and saturation

+//#    define DISABLE_RGB_MATRIX_HUE_BREATHING             // Hue shifts up a slight ammount at the same time, then shifts back

+#    define DISABLE_RGB_MATRIX_HUE_PENDULUM              // Hue shifts up a slight ammount in a wave to the right, then back to the left

+//#    define DISABLE_RGB_MATRIX_HUE_WAVE                  // Hue shifts up a slight ammount and then back down in a wave to the right

+

+#    define DISABLE_RGB_MATRIX_DIGITAL_RAIN              // That famous computer simulation

+#    define DISABLE_RGB_MATRIX_TYPING_HEATMAP            // How hot is your WPM!

+

+//#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE     // Pulses keys hit to hue & value then fades value out

+//#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE            // Static single hue, pulses keys hit to shifted hue then fades to current hue

+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE       // Hue & value pulse near a single key hit then fades value out

+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE  // Hue & value pulse near multiple key hits then fades value out

+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS      // Hue & value pulse the same column and row of a single key hit then fades value out

+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS // Hue & value pulse the same column and row of multiple key hits then fades value out

+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS      // Hue & value pulse away on the same column and row of a single key hit then fades value out

+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS // Hue & value pulse away on the same column and row of multiple key hits then fades value out

+//#    define DISABLE_RGB_MATRIX_SPLASH                    // Full gradient & value pulse away from a single key hit then fades value out

+#    define DISABLE_RGB_MATRIX_MULTISPLASH               // Full gradient & value pulse away from multiple key hits then fades value out

+#    define DISABLE_RGB_MATRIX_SOLID_SPLASH              // Hue & value pulse away from a single key hit then fades value out

+//#    define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH         // Hue & value pulse away from multiple key hits then fades value out

+

+

+#endif

diff --git a/keyboards/xbows/knight/keymaps/via/keymap.c b/keyboards/xbows/knight/keymaps/via/keymap.c
new file mode 100644
index 0000000000..dabbc6c9b3
--- /dev/null
+++ b/keyboards/xbows/knight/keymaps/via/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2021 Shulin Huang <mumu@x-bows.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/>.
+ */
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap VANILLA: (Base Layer) Default Layer
+   *
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * | Esc |  F1  |  F2  |  F3  |  F4  |      F5  |  F6  |  F7  |  F8  |      F9  |  F10 |  F11 |  F12 |   Delete   |    Prtsc    |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * |  ~  |     1   |   2   |   3   |   4   |    5      |       6    |    7    |    8   |   9  |   0  |   -  |  =  |  Backspace  |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * | Tab |   Q    |    W   |   E  |   R  |   T  |            |    Y   |    U   |    I  |   O  |   P  |   [  |  ]  |   \  | PgUp |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * | Ctl |   A   |   S   |   D  |   F  |   G  |      Bksp      |    H  |    J   |   K  |   L  |   ;  |  '"  |    Enter   | PgDn |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * |Shift|   Z  |   X  |   C  |   V  |   B  |       Enter       |    N  |    M   |  ,  |   .  |  /?  | Shift|      |  Up |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * |Ctrl | GUI |     Alter   |    Space   |   Ctrl   |   Shift   |     Space     |    Alter   |  FN  | Ctrl | Lft  |  Dn |  Rig |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   */
+  [0] = 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_DEL,  KC_PSCR,
+		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_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_BSPC, 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_ENT,  KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+		KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC, KC_LCTL, KC_LSFT, KC_SPC,        KC_RALT, MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+  [1] = LAYOUT(
+    RESET,     KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_CALC,   KC_MYCM,  KC_MSEL,   KC_MAIL,   NK_TOGG,   EEP_RST,
+    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_NLCK,
+    RGB_TOG,   RGB_MOD,  RGB_VAI,  RGB_HUI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_HOME,
+    KC_TRNS,   RGB_SPD,  RGB_VAD,  RGB_SPI,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_END,
+    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_MUTE,   KC_VOLU,
+    KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,   KC_TRNS,  KC_MPLY,   KC_MPRV,   KC_VOLD,   KC_MNXT),
+  [2] = LAYOUT(
+    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS),
+  [3] = LAYOUT(
+    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,             KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,
+    KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS)
+};
diff --git a/keyboards/xbows/knight/keymaps/via/rules.mk b/keyboards/xbows/knight/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/xbows/knight/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/xbows/knight/knight.c b/keyboards/xbows/knight/knight.c
index cb79d9d584..1a1aebf18f 100644
--- a/keyboards/xbows/knight/knight.c
+++ b/keyboards/xbows/knight/knight.c
@@ -1 +1,145 @@
-#include "knight.h"
+/* Copyright 2021 Shulin Huang <mumu@x-bows.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/>.
+ */
+ #include "knight.h"
+ #ifdef RGB_MATRIX_ENABLE
+ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+
+   {0, C1_3, C2_3, C3_3},   // L01
+   {0, C1_4, C2_4, C3_4},   // L02
+   {0, C1_5, C2_5, C3_5},   // L03
+   {0, C1_6, C2_6, C3_6},   // L04
+   {0, C1_7, C2_7, C3_7},   // L05
+   {0, C1_8, C2_8, C3_8},   // L06
+   {1, C1_3, C2_3, C3_3},   // L07
+   {1, C1_4, C2_4, C3_4},   // L08
+   {1, C1_5, C2_5, C3_5},   // L09
+   {1, C1_6, C2_6, C3_6},   // L10
+   {1, C1_7, C2_7, C3_7},   // L11
+   {1, C1_8, C2_8, C3_8},   // L12
+   {2, C1_3, C2_3, C3_3},   // L13
+   {2, C1_4, C2_4, C3_4},   // L14
+   {2, C1_5, C2_5, C3_5},   // L15
+
+   {0, C6_1, C5_1, C4_1},   // L16
+   {0, C6_2, C5_2, C4_2},   // L17
+   {0, C6_3, C5_3, C4_3},   // L18
+   {0, C6_6, C5_6, C4_6},   // L19
+   {0, C6_7, C5_7, C4_7},   // L20
+   {0, C6_8, C5_8, C4_8},   // L21
+   {1, C6_2, C5_2, C4_2},   // L22
+   {1, C6_3, C5_3, C4_3},   // L23
+   {1, C6_6, C5_6, C4_6},   // L24
+   {1, C6_7, C5_7, C4_7},   // L25
+   {1, C6_8, C5_8, C4_8},   // L26
+   {2, C6_1, C5_1, C4_1},   // L27
+   {2, C6_2, C5_2, C4_2},   // L28
+   {2, C6_3, C5_3, C4_3},   // L29
+
+   {0, C9_1, C8_1, C7_1},   // L30
+   {0, C9_2, C8_2, C7_2},   // L31
+   {0, C9_3, C8_3, C7_3},   // L32
+   {0, C9_4, C8_4, C7_4},   // L33
+   {0, C9_5, C8_5, C7_5},   // L34
+   {0, C9_6, C8_6, C7_6},   // L35
+   {2, C6_8, C5_8, C4_8},   // L44
+   {1, C9_1, C8_1, C7_1},   // L36
+   {1, C9_2, C8_2, C7_2},   // L37
+   {1, C9_3, C8_3, C7_3},   // L38
+   {1, C9_4, C8_4, C7_4},   // L39
+   {1, C9_5, C8_5, C7_5},   // L40
+   {1, C9_6, C8_6, C7_6},   // L41
+   {2, C6_6, C5_6, C4_6},   // L42
+   {2, C6_7, C5_7, C4_7},   // L43
+
+
+   {0, C1_11, C2_11, C3_11},   // L45
+   {0, C1_12, C2_12, C3_12},   // L46
+   {0, C1_13, C2_13, C3_13},   // L47
+   {0, C1_14, C2_14, C3_14},   // L48
+   {0, C1_15, C2_15, C3_15},   // L49
+   {0, C1_16, C2_16, C3_16},   // L50
+   {1, C9_9, C8_9, C7_9},      // L51
+   {1, C1_11, C2_11, C3_11},   // L52
+   {1, C1_12, C2_12, C3_12},   // L53
+   {1, C1_13, C2_13, C3_13},   // L54
+   {1, C1_14, C2_14, C3_14},   // L55
+   {1, C1_15, C2_15, C3_15},   // L56
+   {1, C1_16, C2_16, C3_16},   // L57
+   {2, C9_4, C8_4, C7_4},      // L58
+   {2, C9_5, C8_5, C7_5},      // L59
+
+   {0, C6_9, C5_9, C4_9},      // L60
+   {0, C6_10, C5_10, C4_10},   // L61
+   {0, C6_11, C5_11, C4_11},   // L62
+   {0, C6_14, C5_14, C4_14},   // L63
+   {0, C6_15, C5_15, C4_15},   // L64
+   {0, C6_16, C5_16, C4_16},   // L65
+   {1, C9_10, C8_10, C7_10},   // L66
+   {1, C6_9, C5_9, C4_9},      // L67
+   {1, C6_10, C5_10, C4_10},   // L68
+   {1, C6_11, C5_11, C4_11},   // L69
+   {1, C6_14, C5_14, C4_14},   // L70
+   {1, C6_15, C5_15, C4_15},   // L71
+   {1, C6_16, C5_16, C4_16},   // L72
+   {2, C9_6, C8_6, C7_6},      // L73
+
+   {0, C9_9, C8_9, C7_9},      // L74
+   {0, C9_10, C8_10, C7_10},   // L75
+   {0, C9_11, C8_11, C7_11},   // L76
+   {0, C9_12, C8_12, C7_12},   // L77
+   {0, C9_13, C8_13, C7_13},   // L78
+   {0, C9_14, C8_14, C7_14},   // L79
+   {1, C9_11, C8_11, C7_11},   // L80
+   {1, C9_12, C8_12, C7_12},   // L81
+   {1, C9_13, C8_13, C7_13},   // L82
+   {1, C9_14, C8_14, C7_14},   // L83
+   {2, C1_6, C2_6, C3_6},      // L84
+   {2, C1_7, C2_7, C3_7},      // L85
+   {2, C1_8, C2_8, C3_8},      // L86
+ };
+
+ led_config_t g_led_config = { {
+     {  0,      1,      2,      3,      4,      5,      6,      7,      8,      9,      10,     11,     12,     13,     14     },
+     {  15,     16,     17,     18,     19,     20,     NO_LED, 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,     NO_LED },
+     {  73,     74,     75,     NO_LED, 76,     77,     78,     79,     NO_LED, 80,     81,     82,     83,     84,     85     }
+ }, {
+ 		{0,0},  {16,0},  {30,0},  {43,0},  {56,0},  {72,0},  {85,0},   {99,0},   {112,0},  {128,0},  {141,0},  {154,0},  {167,0},  {190,0},  {216,0},
+ 		{0,13}, {16,13}, {32,12}, {49,14}, {66,16}, {82,20},           {102,20}, {118,16}, {134,14}, {150,12}, {167,13}, {184,13}, {197,13}, {216,13},
+ 		{0,26}, {15,26}, {31,23}, {47,24}, {63,28}, {78,30}, {224,26}, {105,30}, {120,28}, {136,24}, {152,23}, {168,26}, {184,26}, {197,26}, {210,26},
+ 		{0,37}, {15,37}, {30,33}, {45,35}, {60,37}, {75,40}, {92,43},  {108,40}, {124,37}, {138,35}, {153,33}, {168,37}, {184,37}, {203,37}, {224,37},
+ 		{0,48}, {14,48}, {29,44}, {43,46}, {57,48}, {72,50}, {92,53},  {112,50}, {126,48}, {141,46}, {155,44}, {169,48}, {184,48}, {210,48},
+ 		{0,58}, {14,58}, {34,58},          {61,61}, {83,64}, {100,64}, {122,61},           {149,58}, {170,58}, {184,58}, {197,58}, {210,58}, {224,58}
+ }, {
+     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+     4, 4, 4, 4, 4, 4,    4, 4, 4, 4, 4, 4, 4, 4,
+     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+     4, 4, 4,    4, 4, 4, 4,    4, 4, 4, 1, 1, 1
+ } };
+
+
+
+ __attribute__ ((weak)) void rgb_matrix_indicators_user(void) {
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(44, 0xFF, 0xFF, 0xFF);
+    }
+}
+
+#endif
diff --git a/keyboards/xbows/knight/knight.h b/keyboards/xbows/knight/knight.h
index 952d5a3114..a6497119ba 100644
--- a/keyboards/xbows/knight/knight.h
+++ b/keyboards/xbows/knight/knight.h
@@ -1,35 +1,33 @@
+/* Copyright 2021 Shulin Huang <mumu@x-bows.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 "quantum.h"
-
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-  #include <avr/io.h>
-  #include <avr/interrupt.h>
-#endif
-#endif
-
 #define LAYOUT( \
-	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018,  \
-	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109,       K111, K112, K113, K114, K115, K116, K117, K118,  \
-	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218,  \
-	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318,  \
-	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,       K415, K416, K417, K518,  \
-	K500, K501, K502, K503,       K505, K506, K507,       K509, K510, K511, K512, K513, K514,       K516, K517     \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,  \
+	K100, K101, K102, K103, K104, K105,       K107, K108, K109, K110, K111, K112, K113, K114,  \
+	K200, K201, K202, K203, K204, K205, K207, K208, K209, K210, K211, K212, K213, K214, K206,  \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,  \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,        \
+	K500, K501, K502,       K504, K505, K506, K507,       K509, K510, K511, K512, K513, K514   \
 ) \
 	{ \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010,  K011, K012, K013, K014 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, KC_NO, K111, K112, K113, K114 }, \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+    { K100, K101, K102, K103, K104, K105, KC_NO,K107, K108, K109, K110, K111, K112, K113, K114 }, \
     { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
     { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
-    { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO }, \
-    { K500, K501, K502, K503, KC_NO,K505, K506, K507, KC_NO,K509, K510, K511, K512, K513, K514 }, \
-    { K015, K016, K017, K018 }, \
-    { K115, K116, K117, K118 }, \
-    { K215, K216, K217, K218 }, \
-    { K315, K316, K317, K318 }, \
-    { K415, K416, K417, KC_NO }, \
-    { KC_NO,K516, K517, K518 }  \
+    { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO}, \
+    { K500, K501, K502, KC_NO,K504, K505, K506, K507, KC_NO,K509, K510, K511, K512, K513, K514 }  \
 }
diff --git a/keyboards/xbows/knight/readme.md b/keyboards/xbows/knight/readme.md
index 063ff7a2e6..c66538594a 100644
--- a/keyboards/xbows/knight/readme.md
+++ b/keyboards/xbows/knight/readme.md
@@ -1,15 +1,29 @@
 # KNIGHT
-![KNIGHT](https://ftp.bmp.ovh/imgs/2019/10/5f357cd665dd4b04.png)
+![KNIGHT](https://cdn.shopify.com/s/files/1/0014/7623/1237/products/BestSeller_2_1024x1024@2x.png?v=1615697870)
 
-KNIGHT, a split87 and pad Mechanical Keyboard.
-X-BOWS Knight, the first ergonomic mechanical keyboard with magnetic connection of detachable numeric keypad on both sides. Revolutionary seamless integrated aluminum alloy body. Original spherical OEM keycaps.  
+KNIGHT, A 86 Keys Ergonomic Mechanical Keyboard with RGB backlight.
 
-Keyboard Maintainer: X-BOWS  
-Hardware Supported: X-BOWS Knight  
-Hardware Availability: [X-BOWS](https://x-bows.com/)
+If you spend your work days in front of a computer, you have likely felt some discomfort after a long day of typing. While spending less time on our computers would be the ideal remedy for this problem, that is not a realistic solution for most people. X-Bows was designed to limit the stress on your hands and wrists while also providing a productive and stylish typing experience.
+
+
+X-Bows was designed with three criteria in mind:
+* Enhancing the comfort and ergonomics of the keyboard
+* Limiting the learning curve for our new layout
+* Creating an attractive design
+
+
+* Keyboard Maintainer: X-BOWS
+* Hardware Supported: X-BOWS KNIGHT
+* Hardware Availability: [X-BOWS](https://x-bows.com/)
 
 Make example for this keyboard (after setting up your build environment):
 
     make xbows/knight:default
+    make xbows/knight:via
+
+Flashing example for this keyboard:
+
+    make xbows/knight:default:flash
+    make xbows/knight:via:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/xbows/knight/rules.mk b/keyboards/xbows/knight/rules.mk
index 4c60801297..71883128e9 100644
--- a/keyboards/xbows/knight/rules.mk
+++ b/keyboards/xbows/knight/rules.mk
@@ -2,13 +2,6 @@
 MCU = atmega32u4
 
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 
 # Build Options
@@ -18,15 +11,14 @@ BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
+COMMAND_ENABLE = no         # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+SLEEP_LED_ENABLE = yes       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-NKRO_ENABLE = no            # USB Nkey Rollover
-BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI support
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-AUDIO_ENABLE = no           # Audio output on port C6
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/keyboards/xbows/knight_plus/info.json b/keyboards/xbows/knight_plus/info.json
index b03bb3b56b..22d1a1ac38 100644
--- a/keyboards/xbows/knight_plus/info.json
+++ b/keyboards/xbows/knight_plus/info.json
@@ -60,7 +60,7 @@
                 {"label":"D", "x":3, "y":3.5},
                 {"label":"F", "x":4, "y":3.5},
                 {"label":"G", "x":5, "y":3.5},
-                {"label":"Backspace", "x":6, "y":3.5, "w":1.5},
+                {"label":"Backspace", "x":6.75, "y":3.5, "w":1.5},
                 {"label":"H", "x":9, "y":3.5},
                 {"label":"J", "x":10, "y":3.5},
                 {"label":"K", "x":11, "y":3.5},
@@ -76,7 +76,7 @@
                 {"label":"C", "x":3, "y":4.5},
                 {"label":"V", "x":4, "y":4.5},
                 {"label":"B", "x":5, "y":4.5},
-                {"label":"Enter", "x":6, "y":4.5, "w":2},
+                {"label":"Enter", "x":6.5, "y":4.5, "w":2},
                 {"label":"N", "x":9, "y":4.5},
                 {"label":"M", "x":10, "y":4.5},
                 {"label":"<", "x":11, "y":4.5},
diff --git a/keyboards/xbows/knight_plus/rules.mk b/keyboards/xbows/knight_plus/rules.mk
index b056361414..71883128e9 100644
--- a/keyboards/xbows/knight_plus/rules.mk
+++ b/keyboards/xbows/knight_plus/rules.mk
@@ -13,8 +13,7 @@ EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-NO_USB_STARTUP_CHECK = yes  # Disables usb supend check after keyboard startup
+SLEEP_LED_ENABLE = yes       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
diff --git a/keyboards/xbows/numpad/info.json b/keyboards/xbows/numpad/info.json
index 607ab93a3a..8a4707fbcf 100644
--- a/keyboards/xbows/numpad/info.json
+++ b/keyboards/xbows/numpad/info.json
@@ -15,12 +15,12 @@
               {"label":"Num Lock", "x":0, "y":1.5},
               {"label":"/", "x":1, "y":1.5},
               {"label":"*", "x":2, "y":1.5},
-              {"label":"-", "x":3, "y":1.5},
+              {"label":"=", "x":3, "y":1.5},
 
               {"label":"7", "x":0, "y":2.5},
               {"label":"8", "x":1, "y":2.5},
               {"label":"9", "x":2, "y":2.5},
-              {"label":"+", "x":3, "y":2.5},
+              {"label":"-", "x":3, "y":2.5},
 
               {"label":"4", "x":0, "y":3.5},
               {"label":"5", "x":1, "y":3.5},
@@ -33,7 +33,7 @@
               {"label":"Enter", "x":3, "y":4.5, "h":2},
 
               {"label":"0", "x":0, "y":5.5, "w":2},
-              {"label":".", "x":3, "y":5.5}
+              {"label":".", "x":2, "y":5.5}
 
             ]
         }