Tidy up dztech keyboard.c/h and readmes (#7664)

* Tidy up dztech keyboard.c/h and readmes

* Use new lock LED function

* Undo changes to led flags

* Fix make examples

* Update readmes some more

* Clarify filetypes

* Format as list

12 files changed, 443 insertions, 441 deletions

diff --git a/keyboards/dztech/dz60rgb/dz60rgb.c b/keyboards/dztech/dz60rgb/dz60rgb.c
index a8217480d0..747b8854d4 100644
--- a/keyboards/dztech/dz60rgb/dz60rgb.c
+++ b/keyboards/dztech/dz60rgb/dz60rgb.c
@@ -1,120 +1,112 @@
 #include "dz60rgb.h"
+
 #ifdef RGB_MATRIX_ENABLE
 const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
-    {0, K_14,   J_14,   L_14},
-    {0, K_13,   J_13,   L_13},
-    {0, K_12,   J_12,   L_12},
-    {0, K_11,   J_11,   L_11},
-    {0, K_10,   J_10,   L_10},
-    {0, K_9,    J_9,    L_9},
-    {0, K_8,    J_8,    L_8},
-    {0, K_7,    J_7,    L_7},
-    {0, K_6,    J_6,    L_6},
-    {0, K_5,    J_5,    L_5},
-    {0, K_4,    J_4,    L_4},
-    {0, K_3,    J_3,    L_3},
-    {0, K_2,    J_2,    L_2},
-    {0, K_1,    J_1,    L_1},
-    {0, H_14,   G_14,   I_14},
-    {0, H_13,   G_13,   I_13},
-    {0, H_12,   G_12,   I_12},
-    {0, H_11,   G_11,   I_11},
-    {0, H_10,   G_10,   I_10},
-    {0, H_9,    G_9,    I_9},
-    {0, H_8,    G_8,    I_8},
-    {0, H_7,    G_7,    I_7},
-    {0, H_6,    G_6,    I_6},
-    {0, H_5,    G_5,    I_5},
-    {0, H_4,    G_4,    I_4},
-    {0, H_3,    G_3,    I_3},
-    {0, H_2,    G_2,    I_2},
-    {0, H_1,    G_1,    I_1},
-    {0, E_14,   D_14,   F_14},
-    {0, E_12,   D_12,   F_12},
-    {0, E_11,   D_11,   F_11},
-    {0, E_10,   D_10,   F_10},
-    {0, E_9,    D_9,    F_9},
-    {0, E_8,    D_8,    F_8},
-    {0, E_7,    D_7,    F_7},
-    {0, E_6,    D_6,    F_6},
-    {0, E_5,    D_5,    F_5},
-    {0, E_4,    D_4,    F_4},
-    {0, E_3,    D_3,    F_3},
-    {0, E_2,    D_2,    F_2},
-    {0, E_1,    D_1,    F_1},
-    {0, B_14,   A_14,   C_14},
-    {0, B_13,   A_13,   C_13},
-    {0, B_11,   A_11,   C_11},
-    {0, B_10,   A_10,   C_10},
-    {0, B_9,    A_9,    C_9},
-    {0, B_8,    A_8,    C_8},
-    {0, B_7,    A_7,    C_7},
-    {0, B_6,    A_6,    C_6},
-    {0, B_5,    A_5,    C_5},
-    {0, B_4,    A_4,    C_4},
-    {0, B_3,    A_3,    C_3},
-    {0, B_2,    A_2,    C_2},
-    {0, B_1,    A_1,    C_1},
-    {0, B_15,   A_15,   C_15},
-    {0, E_13,   D_13,   F_13},
-    {0, B_12,   A_12,   C_12},
-    {0, E_15,   D_15,   F_15},
-    {0, H_15,   G_15,   I_15},
-    {0, B_16,   A_16,   C_16},
-    {0, E_16,   D_16,   F_16},
-    {0, H_16,   G_16,   I_16},
-    {0, K_16,   J_16,   L_16},
-};
+    { 0, K_14, J_14, L_14 },
+    { 0, K_13, J_13, L_13 },
+    { 0, K_12, J_12, L_12 },
+    { 0, K_11, J_11, L_11 },
+    { 0, K_10, J_10, L_10 },
+    { 0, K_9,  J_9,  L_9 },
+    { 0, K_8,  J_8,  L_8 },
+    { 0, K_7,  J_7,  L_7 },
+    { 0, K_6,  J_6,  L_6 },
+    { 0, K_5,  J_5,  L_5 },
+    { 0, K_4,  J_4,  L_4 },
+    { 0, K_3,  J_3,  L_3 },
+    { 0, K_2,  J_2,  L_2 },
+    { 0, K_1,  J_1,  L_1 },
 
-led_config_t g_led_config = { {
-    {  13,  12,  11,  10,   9,   8,   7,   6,   5,   4,   3,   2,   1,   0 },
-    {  27,  26,  25,  24,  23,  22,  21,  20,  19,  18,  17,  16,  15,  14 },
-    {  40,  39,  38,  37,  36,  35,  34,  33,  32,  31,  30,  29, NO_LED,  28 },
-    {  53,  52,  51,  50,  49,  48,  47,  46,  45,  44,  43,  42, NO_LED,  41 },
-    {  62,  61,  60, NO_LED, NO_LED,  59, NO_LED, NO_LED,  58,  57,  56,  55, NO_LED,  54 }
-}, {
-    { 216,   0 }, { 192,   0 }, { 176,   0 }, { 160,   0 }, { 144,   0 }, { 128,   0 }, { 112,   0 }, {  96,   0 }, {  80,   0 }, {  64,   0 }, {  48,   0 }, {  32,   0 }, {  16,   0 }, {   0,   0 },
-    { 220,  16 }, { 200,  16 }, { 184,  16 }, { 168,  16 }, { 152,  16 }, { 136,  16 }, { 120,  16 }, { 104,  16 }, {  88,  16 }, {  72,  16 }, {  56,  16 }, {  40,  16 }, {  24,  16 }, {   4,  16 },
-    { 214,  32 }, { 188,  32 }, { 172,  32 }, { 156,  32 }, { 140,  32 }, { 124,  32 }, { 108,  32 }, {  92,  32 }, {  76,  32 }, {  60,  32 }, {  44,  32 }, {  28,  32 }, {   6,  32 }, { 224,  48 },
-    { 208,  48 }, { 186,  48 }, { 164,  48 }, { 148,  48 }, { 132,  48 }, { 116,  48 }, { 100,  48 }, {  84,  48 }, {  68,  48 }, {  52,  48 }, {  36,  48 }, {   9,  48 }, { 224,  64 }, { 208,  64 },
-    { 192,  64 }, { 176,  64 }, { 160,  64 }, { 102,  64 }, {  42,  64 }, {  22,  64 }, {   2,  64 }
-}, {
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
-    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
-    1, 1, 1, 4, 1, 1, 1
-} };
+    { 0, H_14, G_14, I_14 },
+    { 0, H_13, G_13, I_13 },
+    { 0, H_12, G_12, I_12 },
+    { 0, H_11, G_11, I_11 },
+    { 0, H_10, G_10, I_10 },
+    { 0, H_9,  G_9,  I_9 },
+    { 0, H_8,  G_8,  I_8 },
+    { 0, H_7,  G_7,  I_7 },
+    { 0, H_6,  G_6,  I_6 },
+    { 0, H_5,  G_5,  I_5 },
+    { 0, H_4,  G_4,  I_4 },
+    { 0, H_3,  G_3,  I_3 },
+    { 0, H_2,  G_2,  I_2 },
+    { 0, H_1,  G_1,  I_1 },
 
+    { 0, E_14, D_14, F_14 },
+    { 0, E_12, D_12, F_12 },
+    { 0, E_11, D_11, F_11 },
+    { 0, E_10, D_10, F_10 },
+    { 0, E_9,  D_9,  F_9 },
+    { 0, E_8,  D_8,  F_8 },
+    { 0, E_7,  D_7,  F_7 },
+    { 0, E_6,  D_6,  F_6 },
+    { 0, E_5,  D_5,  F_5 },
+    { 0, E_4,  D_4,  F_4 },
+    { 0, E_3,  D_3,  F_3 },
+    { 0, E_2,  D_2,  F_2 },
+    { 0, E_1,  D_1,  F_1 },
 
+    { 0, B_14, A_14, C_14 },
+    { 0, B_13, A_13, C_13 },
+    { 0, B_11, A_11, C_11 },
+    { 0, B_10, A_10, C_10 },
+    { 0, B_9,  A_9,  C_9 },
+    { 0, B_8,  A_8,  C_8 },
+    { 0, B_7,  A_7,  C_7 },
+    { 0, B_6,  A_6,  C_6 },
+    { 0, B_5,  A_5,  C_5 },
+    { 0, B_4,  A_4,  C_4 },
+    { 0, B_3,  A_3,  C_3 },
+    { 0, B_2,  A_2,  C_2 },
+    { 0, B_1,  A_1,  C_1 },
+
+    { 0, B_15, A_15, C_15 },
+    { 0, E_13, D_13, F_13 },
+    { 0, B_12, A_12, C_12 },
+    { 0, E_15, D_15, F_15 },
+    { 0, H_15, G_15, I_15 },
+    { 0, B_16, A_16, C_16 },
+    { 0, E_16, D_16, F_16 },
+    { 0, H_16, G_16, I_16 },
+    { 0, K_16, J_16, L_16 }
+};
+
+led_config_t g_led_config = {
+    {
+        { 13, 12, 11,     10,      9,  8,      7,      6,  5,  4,  3,  2,      1,  0 },
+        { 27, 26, 25,     24,     23, 22,     21,     20, 19, 18, 17, 16,     15, 14 },
+        { 40, 39, 38,     37,     36, 35,     34,     33, 32, 31, 30, 29, NO_LED, 28 },
+        { 53, 52, 51,     50,     49, 48,     47,     46, 45, 44, 43, 42, NO_LED, 41 },
+        { 62, 61, 60, NO_LED, NO_LED, 59, NO_LED, NO_LED, 58, 57, 56, 55, NO_LED, 54 }
+    }, {
+        { 216,   0 }, { 192,   0 }, { 176,   0 }, { 160,   0 }, { 144,   0 }, { 128,   0 }, { 112,   0 }, {  96,   0 }, {  80,   0 }, {  64,   0 }, {  48,   0 }, {  32,   0 }, {  16,   0 }, {   0,   0 },
+        { 220,  16 }, { 200,  16 }, { 184,  16 }, { 168,  16 }, { 152,  16 }, { 136,  16 }, { 120,  16 }, { 104,  16 }, {  88,  16 }, {  72,  16 }, {  56,  16 }, {  40,  16 }, {  24,  16 }, {   4,  16 },
+        { 214,  32 }, { 188,  32 }, { 172,  32 }, { 156,  32 }, { 140,  32 }, { 124,  32 }, { 108,  32 }, {  92,  32 }, {  76,  32 }, {  60,  32 }, {  44,  32 }, {  28,  32 },               {   6,  32 },
+        { 224,  48 },               { 208,  48 }, { 186,  48 }, { 164,  48 }, { 148,  48 }, { 132,  48 }, { 116,  48 }, { 100,  48 }, {  84,  48 }, {  68,  48 }, {  52,  48 }, {  36,  48 }, {   9,  48 },
+        { 224,  64 }, { 208,  64 }, { 192,  64 },                                           { 176,  64 },                             { 160,  64 }, { 102,  64 }, {  42,  64 }, {  22,  64 }, {   2,  64 }
+    }, {
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
+        1,    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 1, 1,          1,       1, 4, 1, 1, 1
+    }
+};
 #endif
 
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    return process_record_user(keycode, record);
-}
-void suspend_power_down_kb(void)
-{
+void suspend_power_down_kb(void) {
     rgb_matrix_set_suspend_state(true);
     suspend_power_down_user();
 }
 
-void suspend_wakeup_init_kb(void)
-{
+void suspend_wakeup_init_kb(void) {
     rgb_matrix_set_suspend_state(false);
     suspend_wakeup_init_user();
 }
+
 __attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
-    if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
-    {
+void rgb_matrix_indicators_user(void) {
+    if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
     }
 }
-
diff --git a/keyboards/dztech/dz60rgb/dz60rgb.h b/keyboards/dztech/dz60rgb/dz60rgb.h
index a029933f1f..872be7e1b3 100644
--- a/keyboards/dztech/dz60rgb/dz60rgb.h
+++ b/keyboards/dztech/dz60rgb/dz60rgb.h
@@ -1,12 +1,15 @@
 #pragma once
-#define XXX KC_NO
+
 #include "quantum.h"
+
+#define XXX KC_NO
+
 #define LAYOUT( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
-    K40, K41, K42,           K45,           K48, K49, K4A, K4B,      K4D  \
+    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
+    K40, K41, K42,                K45,           K48, K49, K4A, K4B, K4D  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
diff --git a/keyboards/dztech/dz60rgb/readme.md b/keyboards/dztech/dz60rgb/readme.md
index 2fffa413b6..1b2eb6f85f 100644
--- a/keyboards/dztech/dz60rgb/readme.md
+++ b/keyboards/dztech/dz60rgb/readme.md
@@ -4,12 +4,18 @@
 
 A hotswap 60% RGB keyboard.
 
-Keyboard Maintainer: DZtech  
-Hardware Supported: DZtech dz60rgb, dz60rgb-ansi  
-Hardware Availability: [kbdfans](https://kbdfans.myshopify.com/)
+* Keyboard Maintainer: [moyi4681](https://github.com/moyi4681)
+* Hardware Supported: DZtech DZ60RGB V1 and V2
+* Hardware Availability: [KBDfans](https://kbdfans.com/)
+
+There are two versions of the DZ60RGB. Please use the appropriate firmware for your board.
+
+* V1: STM32F303 (Arm), takes .bin files
+* V2: ATmega32U4 (AVR), takes .hex files
 
 Make example for this keyboard (after setting up your build environment):
 
-    make dztech/dz60rgb:default
+    make dztech/dz60rgb/v1:default # Arm (STM32F303)
+    make dztech/dz60rgb/v2:default # AVR (ATmega32U4)
 
 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/dztech/dz60rgb_ansi/dz60rgb_ansi.c b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
index 6cb82dd542..910797120b 100644
--- a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
+++ b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
@@ -1,118 +1,110 @@
 #include "dz60rgb_ansi.h"
+
 #ifdef RGB_MATRIX_ENABLE
 const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
-    {0, K_14,   J_14,   L_14},
-    {0, K_13,   J_13,   L_13},
-    {0, K_12,   J_12,   L_12},
-    {0, K_11,   J_11,   L_11},
-    {0, K_10,   J_10,   L_10},
-    {0, K_9,    J_9,    L_9},
-    {0, K_8,    J_8,    L_8},
-    {0, K_7,    J_7,    L_7},
-    {0, K_6,    J_6,    L_6},
-    {0, K_5,    J_5,    L_5},
-    {0, K_4,    J_4,    L_4},
-    {0, K_3,    J_3,    L_3},
-    {0, K_2,    J_2,    L_2},
-    {0, K_1,    J_1,    L_1},
-    {0, H_14,   G_14,   I_14},
-    {0, H_13,   G_13,   I_13},
-    {0, H_12,   G_12,   I_12},
-    {0, H_11,   G_11,   I_11},
-    {0, H_10,   G_10,   I_10},
-    {0, H_9,    G_9,    I_9},
-    {0, H_8,    G_8,    I_8},
-    {0, H_7,    G_7,    I_7},
-    {0, H_6,    G_6,    I_6},
-    {0, H_5,    G_5,    I_5},
-    {0, H_4,    G_4,    I_4},
-    {0, H_3,    G_3,    I_3},
-    {0, H_2,    G_2,    I_2},
-    {0, H_1,    G_1,    I_1},
-    {0, E_14,   D_14,   F_14},
-    {0, E_12,   D_12,   F_12},
-    {0, E_11,   D_11,   F_11},
-    {0, E_10,   D_10,   F_10},
-    {0, E_9,    D_9,    F_9},
-    {0, E_8,    D_8,    F_8},
-    {0, E_7,    D_7,    F_7},
-    {0, E_6,    D_6,    F_6},
-    {0, E_5,    D_5,    F_5},
-    {0, E_4,    D_4,    F_4},
-    {0, E_3,    D_3,    F_3},
-    {0, E_2,    D_2,    F_2},
-    {0, E_1,    D_1,    F_1},
-    {0, B_13,   A_13,   C_13},
-    {0, B_11,   A_11,   C_11},
-    {0, B_10,   A_10,   C_10},
-    {0, B_9,    A_9,    C_9},
-    {0, B_8,    A_8,    C_8},
-    {0, B_7,    A_7,    C_7},
-    {0, B_6,    A_6,    C_6},
-    {0, B_5,    A_5,    C_5},
-    {0, B_4,    A_4,    C_4},
-    {0, B_3,    A_3,    C_3},
-    {0, B_2,    A_2,    C_2},
-    {0, B_1,    A_1,    C_1},
-    {0, B_15,   A_15,   C_15},
-    {0, E_13,   D_13,   F_13},
-    {0, B_12,   A_12,   C_12},
-    {0, E_15,   D_15,   F_15},
-    {0, B_16,   A_16,   C_16},
-    {0, E_16,   D_16,   F_16},
-    {0, H_16,   G_16,   I_16},
-    {0, K_16,   J_16,   L_16},
+    { 0, K_14, J_14, L_14 },
+    { 0, K_13, J_13, L_13 },
+    { 0, K_12, J_12, L_12 },
+    { 0, K_11, J_11, L_11 },
+    { 0, K_10, J_10, L_10 },
+    { 0, K_9,  J_9,  L_9 },
+    { 0, K_8,  J_8,  L_8 },
+    { 0, K_7,  J_7,  L_7 },
+    { 0, K_6,  J_6,  L_6 },
+    { 0, K_5,  J_5,  L_5 },
+    { 0, K_4,  J_4,  L_4 },
+    { 0, K_3,  J_3,  L_3 },
+    { 0, K_2,  J_2,  L_2 },
+    { 0, K_1,  J_1,  L_1 },
+
+    { 0, H_14, G_14, I_14 },
+    { 0, H_13, G_13, I_13 },
+    { 0, H_12, G_12, I_12 },
+    { 0, H_11, G_11, I_11 },
+    { 0, H_10, G_10, I_10 },
+    { 0, H_9,  G_9,  I_9 },
+    { 0, H_8,  G_8,  I_8 },
+    { 0, H_7,  G_7,  I_7 },
+    { 0, H_6,  G_6,  I_6 },
+    { 0, H_5,  G_5,  I_5 },
+    { 0, H_4,  G_4,  I_4 },
+    { 0, H_3,  G_3,  I_3 },
+    { 0, H_2,  G_2,  I_2 },
+    { 0, H_1,  G_1,  I_1 },
+
+    { 0, E_14, D_14, F_14 },
+    { 0, E_12, D_12, F_12 },
+    { 0, E_11, D_11, F_11 },
+    { 0, E_10, D_10, F_10 },
+    { 0, E_9,  D_9,  F_9 },
+    { 0, E_8,  D_8,  F_8 },
+    { 0, E_7,  D_7,  F_7 },
+    { 0, E_6,  D_6,  F_6 },
+    { 0, E_5,  D_5,  F_5 },
+    { 0, E_4,  D_4,  F_4 },
+    { 0, E_3,  D_3,  F_3 },
+    { 0, E_2,  D_2,  F_2 },
+    { 0, E_1,  D_1,  F_1 },
+
+    { 0, B_13, A_13, C_13 },
+    { 0, B_11, A_11, C_11 },
+    { 0, B_10, A_10, C_10 },
+    { 0, B_9,  A_9,  C_9 },
+    { 0, B_8,  A_8,  C_8 },
+    { 0, B_7,  A_7,  C_7 },
+    { 0, B_6,  A_6,  C_6 },
+    { 0, B_5,  A_5,  C_5 },
+    { 0, B_4,  A_4,  C_4 },
+    { 0, B_3,  A_3,  C_3 },
+    { 0, B_2,  A_2,  C_2 },
+    { 0, B_1,  A_1,  C_1 },
+
+    { 0, B_15, A_15, C_15 },
+    { 0, E_13, D_13, F_13 },
+    { 0, B_12, A_12, C_12 },
+    { 0, E_15, D_15, F_15 },
+    { 0, B_16, A_16, C_16 },
+    { 0, E_16, D_16, F_16 },
+    { 0, H_16, G_16, I_16 },
+    { 0, K_16, J_16, L_16 }
 };
 
-led_config_t g_led_config = { {
-    {  13,  12,  11,  10,   9,   8,   7,   6,   5,   4,   3,   2,   1,   0 },
-    {  27,  26,  25,  24,  23,  22,  21,  20,  19,  18,  17,  16,  15,  14 },
-    {  40,  39,  38,  37,  36,  35,  34,  33,  32,  31,  30,  29, NO_LED,  28 },
-    {  52,  51,  50,  49,  48,  47,  46,  45,  44,  43,  42,  41, NO_LED, NO_LED },
-    {  60,  59,  58, NO_LED, NO_LED,  57, NO_LED, NO_LED, NO_LED,  56,  55,  54, NO_LED,  53 }
-}, {
-    { 216,   0 }, { 192,   0 }, { 176,   0 }, { 160,   0 }, { 144,   0 }, { 128,   0 }, { 112,   0 }, {  96,   0 }, {  80,   0 }, {  64,   0 }, {  48,   0 }, {  32,   0 }, {  16,   0 }, {   0,   0 },
-    { 220,  16 }, { 200,  16 }, { 184,  16 }, { 168,  16 }, { 152,  16 }, { 136,  16 }, { 120,  16 }, { 104,  16 }, {  88,  16 }, {  72,  16 }, {  56,  16 }, {  40,  16 }, {  24,  16 }, {   4,  16 },
-    { 214,  24 }, { 188,  32 }, { 172,  32 }, { 156,  32 }, { 140,  32 }, { 124,  32 }, { 108,  32 }, {  92,  32 }, {  76,  32 }, {  60,  32 }, {  44,  32 }, {  28,  32 }, {   6,  32 }, { 210,  48 },
-    { 180,  48 }, { 164,  48 }, { 148,  48 }, { 132,  48 }, { 116,  48 }, { 100,  48 }, {  84,  48 }, {  68,  48 }, {  52,  48 }, {  20,  48 }, {  10,  48 }, { 222,  64 }, { 202,  64 }, { 182,  64 },
-    { 162,  64 }, { 102,  64 }, {  42,  64 }, {  22,  64 }, {   2,  64 }
-}, {
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 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
-} };
+led_config_t g_led_config = {
+    {
+        { 13, 12, 11,     10,      9,  8,      7,      6,      5,  4,  3,  2,      1,      0 },
+        { 27, 26, 25,     24,     23, 22,     21,     20,     19, 18, 17, 16,     15,     14 },
+        { 40, 39, 38,     37,     36, 35,     34,     33,     32, 31, 30, 29, NO_LED,     28 },
+        { 52, 51, 50,     49,     48, 47,     46,     45,     44, 43, 42, 41, NO_LED, NO_LED },
+        { 60, 59, 58, NO_LED, NO_LED, 57, NO_LED, NO_LED, NO_LED, 56, 55, 54, NO_LED,     53 }
+    }, {
+        { 216,   0 }, { 192,   0 }, { 176,   0 }, { 160,   0 }, { 144,   0 }, { 128,   0 }, { 112,   0 }, {  96,   0 }, {  80,   0 }, {  64,   0 }, {  48,   0 }, {  32,   0 }, {  16,   0 }, {   0,   0 },
+        { 220,  16 }, { 200,  16 }, { 184,  16 }, { 168,  16 }, { 152,  16 }, { 136,  16 }, { 120,  16 }, { 104,  16 }, {  88,  16 }, {  72,  16 }, {  56,  16 }, {  40,  16 }, {  24,  16 }, {   4,  16 },
+        { 214,  24 }, { 188,  32 }, { 172,  32 }, { 156,  32 }, { 140,  32 }, { 124,  32 }, { 108,  32 }, {  92,  32 }, {  76,  32 }, {  60,  32 }, {  44,  32 }, {  28,  32 },               {   6,  32 },
+        { 210,  48 },               { 180,  48 }, { 164,  48 }, { 148,  48 }, { 132,  48 }, { 116,  48 }, { 100,  48 }, {  84,  48 }, {  68,  48 }, {  52,  48 }, {  20,  48 },               {  10,  48 },
+        { 222,  64 }, { 202,  64 }, { 182,  64 },                                           { 162,  64 },                                           { 102,  64 }, {  42,  64 }, {  22,  64 }, {   2,  64 }
+    }, {
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 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
+    }
+};
 #endif
 
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    return process_record_user(keycode, record);
-}
-void suspend_power_down_kb(void)
-{
+void suspend_power_down_kb(void) {
     rgb_matrix_set_suspend_state(true);
     suspend_power_down_user();
 }
 
-void suspend_wakeup_init_kb(void)
-{
+void suspend_wakeup_init_kb(void) {
     rgb_matrix_set_suspend_state(false);
     suspend_wakeup_init_user();
 }
 
-
 __attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
-    if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
-    {
+void rgb_matrix_indicators_user(void) {
+    if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
     }
 }
-
diff --git a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.h b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.h
index de30c58a73..e522c482c2 100644
--- a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.h
+++ b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.h
@@ -1,12 +1,15 @@
 #pragma once
-#define XXX KC_NO
+
 #include "quantum.h"
+
+#define XXX KC_NO
+
 #define LAYOUT_60_ansi( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,           \
-    K40, K41, K42,           K45,                K49, K4A, K4B,      K4D  \
+    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3B, \
+    K40, K41, K42,                K45,                K49, K4A, K4B, K4D  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
diff --git a/keyboards/dztech/dz60rgb_ansi/readme.md b/keyboards/dztech/dz60rgb_ansi/readme.md
index 2fffa413b6..aa15dda890 100644
--- a/keyboards/dztech/dz60rgb_ansi/readme.md
+++ b/keyboards/dztech/dz60rgb_ansi/readme.md
@@ -1,15 +1,21 @@
-# DZ60RGB
+# DZ60RGB-ANSI
 
 ![dz60rgb](https://cdn.shopify.com/s/files/1/0043/9140/3591/products/TIM_20190130170231_grande.jpg?v=1548839053)
 
 A hotswap 60% RGB keyboard.
 
-Keyboard Maintainer: DZtech  
-Hardware Supported: DZtech dz60rgb, dz60rgb-ansi  
-Hardware Availability: [kbdfans](https://kbdfans.myshopify.com/)
+* Keyboard Maintainer: [moyi4681](https://github.com/moyi4681)
+* Hardware Supported: DZtech DZ60RGB-ANSI V1 and V2
+* Hardware Availability: [KBDfans](https://kbdfans.com/)
+
+There are two versions of the DZ60RGB-ANSI. Please use the appropriate firmware for your board.
+
+* V1: STM32F303 (Arm), takes .bin files
+* V2: ATmega32U4 (AVR), takes .hex files
 
 Make example for this keyboard (after setting up your build environment):
 
-    make dztech/dz60rgb:default
+    make dztech/dz60rgb_ansi/v1:default # Arm (STM32F303)
+    make dztech/dz60rgb_ansi/v2:default # AVR (ATmega32U4)
 
 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/dztech/dz60rgb_wkl/dz60rgb_wkl.c b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
index 1c0edb7227..482e98fa43 100644
--- a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
+++ b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
@@ -1,116 +1,111 @@
 #include "dz60rgb_wkl.h"
+
 #ifdef RGB_MATRIX_ENABLE
 const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
-	{0, H_15,   G_15,   I_15},
-    {0, K_14,   J_14,   L_14},
-    {0, K_13,   J_13,   L_13},
-    {0, K_12,   J_12,   L_12},
-    {0, K_11,   J_11,   L_11},
-    {0, K_10,   J_10,   L_10},
-    {0, K_9,    J_9,    L_9},
-    {0, K_8,    J_8,    L_8},
-    {0, K_7,    J_7,    L_7},
-    {0, K_6,    J_6,    L_6},
-    {0, K_5,    J_5,    L_5},
-    {0, K_4,    J_4,    L_4},
-    {0, K_3,    J_3,    L_3},
-    {0, K_2,    J_2,    L_2},
-    {0, K_1,    J_1,    L_1},
-    {0, H_14,   G_14,   I_14},
-    {0, H_13,   G_13,   I_13},
-    {0, H_12,   G_12,   I_12},
-    {0, H_11,   G_11,   I_11},
-    {0, H_10,   G_10,   I_10},
-    {0, H_9,    G_9,    I_9},
-    {0, H_8,    G_8,    I_8},
-    {0, H_7,    G_7,    I_7},
-    {0, H_6,    G_6,    I_6},
-    {0, H_5,    G_5,    I_5},
-    {0, H_4,    G_4,    I_4},
-    {0, H_3,    G_3,    I_3},
-    {0, H_2,    G_2,    I_2},
-    {0, H_1,    G_1,    I_1},
-    {0, E_14,   D_14,   F_14},
-    {0, E_12,   D_12,   F_12},
-    {0, E_11,   D_11,   F_11},
-    {0, E_10,   D_10,   F_10},
-    {0, E_9,    D_9,    F_9},
-    {0, E_8,    D_8,    F_8},
-    {0, E_7,    D_7,    F_7},
-    {0, E_6,    D_6,    F_6},
-    {0, E_5,    D_5,    F_5},
-    {0, E_4,    D_4,    F_4},
-    {0, E_3,    D_3,    F_3},
-    {0, E_2,    D_2,    F_2},
-    {0, E_1,    D_1,    F_1},
-    {0, B_14,   A_14,   C_14},
-    {0, B_13,   A_13,   C_13},
-    {0, B_11,   A_11,   C_11},
-    {0, B_10,   A_10,   C_10},
-    {0, B_9,    A_9,    C_9},
-    {0, B_8,    A_8,    C_8},
-    {0, B_7,    A_7,    C_7},
-    {0, B_6,    A_6,    C_6},
-    {0, B_5,    A_5,    C_5},
-    {0, B_4,    A_4,    C_4},
-    {0, B_3,    A_3,    C_3},
-    {0, B_2,    A_2,    C_2},
-    {0, B_1,    A_1,    C_1},
-    {0, B_15,   A_15,   C_15},
-    {0, E_13,   D_13,   F_13},
-    {0, B_12,   A_12,   C_12},
-    {0, B_16,   A_16,   C_16},
-    {0, E_16,   D_16,   F_16},
-    {0, H_16,   G_16,   I_16},
-    {0, K_16,   J_16,   L_16},
+    { 0, H_15, G_15, I_15 },
+    { 0, K_14, J_14, L_14 },
+    { 0, K_13, J_13, L_13 },
+    { 0, K_12, J_12, L_12 },
+    { 0, K_11, J_11, L_11 },
+    { 0, K_10, J_10, L_10 },
+    { 0, K_9,  J_9,  L_9 },
+    { 0, K_8,  J_8,  L_8 },
+    { 0, K_7,  J_7,  L_7 },
+    { 0, K_6,  J_6,  L_6 },
+    { 0, K_5,  J_5,  L_5 },
+    { 0, K_4,  J_4,  L_4 },
+    { 0, K_3,  J_3,  L_3 },
+    { 0, K_2,  J_2,  L_2 },
+    { 0, K_1,  J_1,  L_1 },
+
+    { 0, H_14, G_14, I_14 },
+    { 0, H_13, G_13, I_13 },
+    { 0, H_12, G_12, I_12 },
+    { 0, H_11, G_11, I_11 },
+    { 0, H_10, G_10, I_10 },
+    { 0, H_9,  G_9,  I_9 },
+    { 0, H_8,  G_8,  I_8 },
+    { 0, H_7,  G_7,  I_7 },
+    { 0, H_6,  G_6,  I_6 },
+    { 0, H_5,  G_5,  I_5 },
+    { 0, H_4,  G_4,  I_4 },
+    { 0, H_3,  G_3,  I_3 },
+    { 0, H_2,  G_2,  I_2 },
+    { 0, H_1,  G_1,  I_1 },
+
+    { 0, E_14, D_14, F_14 },
+    { 0, E_12, D_12, F_12 },
+    { 0, E_11, D_11, F_11 },
+    { 0, E_10, D_10, F_10 },
+    { 0, E_9,  D_9,  F_9 },
+    { 0, E_8,  D_8,  F_8 },
+    { 0, E_7,  D_7,  F_7 },
+    { 0, E_6,  D_6,  F_6 },
+    { 0, E_5,  D_5,  F_5 },
+    { 0, E_4,  D_4,  F_4 },
+    { 0, E_3,  D_3,  F_3 },
+    { 0, E_2,  D_2,  F_2 },
+    { 0, E_1,  D_1,  F_1 },
+
+    { 0, B_14, A_14, C_14 },
+    { 0, B_13, A_13, C_13 },
+    { 0, B_11, A_11, C_11 },
+    { 0, B_10, A_10, C_10 },
+    { 0, B_9,  A_9,  C_9 },
+    { 0, B_8,  A_8,  C_8 },
+    { 0, B_7,  A_7,  C_7 },
+    { 0, B_6,  A_6,  C_6 },
+    { 0, B_5,  A_5,  C_5 },
+    { 0, B_4,  A_4,  C_4 },
+    { 0, B_3,  A_3,  C_3 },
+    { 0, B_2,  A_2,  C_2 },
+    { 0, B_1,  A_1,  C_1 },
+
+    { 0, B_15, A_15, C_15 },
+    { 0, E_13, D_13, F_13 },
+    { 0, B_12, A_12, C_12 },
+    { 0, B_16, A_16, C_16 },
+    { 0, E_16, D_16, F_16 },
+    { 0, H_16, G_16, I_16 },
+    { 0, K_16, J_16, L_16 }
 };
 
-led_config_t g_led_config = { {
-    {  14,  13,  12,  11,  10,   9,   8,   7,   6,   5,   4,   3,   2,   1 },
-    {  28,  27,  26,  25,  24,  23,  22,  21,  20,  19,  18,  17,  16,  15 },
-    {  41,  40,  39,  38,  37,  36,  35,  34,  33,  32,  31,  30,   0,  29 },
-    {  54,  53,  52,  51,  50,  49,  48,  47,  46,  45,  44,  43, NO_LED,  42 },
-    {  61,  60,  59, NO_LED, NO_LED,  58, NO_LED, NO_LED, NO_LED, NO_LED,  57,  56, NO_LED,  55 }
-}, {
-    { 224,   0 }, { 208,   0 }, { 192,   0 }, { 176,   0 }, { 160,   0 }, { 144,   0 }, { 128,   0 }, { 112,   0 }, {  96,   0 }, {  80,   0 }, {  64,   0 }, {  48,   0 }, {  32,   0 }, {  16,   0 },
-    {   0,   0 }, { 220,  16 }, { 200,  16 }, { 184,  16 }, { 168,  16 }, { 152,  16 }, { 136,  16 }, { 120,  16 }, { 104,  16 }, {  88,  16 }, {  72,  16 }, {  56,  16 }, {  40,  16 }, {  24,  16 },
-    {   4,  16 }, { 204,  32 }, { 188,  32 }, { 172,  32 }, { 156,  32 }, { 140,  32 }, { 124,  32 }, { 108,  32 }, {  92,  32 }, {  76,  32 }, {  60,  32 }, {  44,  32 }, {  28,  32 }, {   6,  32 },
-    { 224,  48 }, { 202,  48 }, { 180,  48 }, { 164,  48 }, { 148,  48 }, { 132,  48 }, { 116,  48 }, { 100,  48 }, {  84,  48 }, {  68,  48 }, {  52,  48 }, {  20,  48 }, {  10,  48 }, { 218,  64 },
-    { 198,  64 }, { 178,  64 }, { 112,  64 }, {  46,  64 }, {  26,  64 }, {   6,  64 }
-}, {
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
-    1, 1, 4, 1, 1, 1
-} };
+led_config_t g_led_config = {
+    {
+        { 14, 13, 12,     11,     10,  9,      8,      7,      6,      5,  4,  3,      2,  1 },
+        { 28, 27, 26,     25,     24, 23,     22,     21,     20,     19, 18, 17,     16, 15 },
+        { 41, 40, 39,     38,     37, 36,     35,     34,     33,     32, 31, 30,      0, 29 },
+        { 54, 53, 52,     51,     50, 49,     48,     47,     46,     45, 44, 43, NO_LED, 42 },
+        { 61, 60, 59, NO_LED, NO_LED, 58, NO_LED, NO_LED, NO_LED, NO_LED, 57, 56, NO_LED, 55 }
+    }, {
+        { 224,   0 }, { 208,   0 }, { 192,   0 }, { 176,   0 }, { 160,   0 }, { 144,   0 }, { 128,   0 }, { 112,   0 }, {  96,   0 }, {  80,   0 }, {  64,   0 }, {  48,   0 }, {  32,   0 }, {  16,   0 }, {   0,   0 },
+        { 220,  16 }, { 200,  16 }, { 184,  16 }, { 168,  16 }, { 152,  16 }, { 136,  16 }, { 120,  16 }, { 104,  16 }, {  88,  16 }, {  72,  16 }, {  56,  16 }, {  40,  16 }, {  24,  16 }, {   4,  16 },
+        { 204,  32 }, { 188,  32 }, { 172,  32 }, { 156,  32 }, { 140,  32 }, { 124,  32 }, { 108,  32 }, {  92,  32 }, {  76,  32 }, {  60,  32 }, {  44,  32 }, {  28,  32 },               {   6,  32 },
+        { 224,  48 },               { 202,  48 }, { 180,  48 }, { 164,  48 }, { 148,  48 }, { 132,  48 }, { 116,  48 }, { 100,  48 }, {  84,  48 }, {  68,  48 }, {  52,  48 }, {  20,  48 }, {  10,  48 },
+        { 218,  64 }, { 198,  64 }, { 178,  64 },                                           { 112,  64 },                                                         {  46,  64 }, {  26,  64 }, {   6,  64 }
+    }, {
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
+        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 1, 1,          4,             1, 1, 1
+    }
+};
 #endif
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    return process_record_user(keycode, record);
-}
-void suspend_power_down_kb(void)
-{
+
+void suspend_power_down_kb(void) {
     rgb_matrix_set_suspend_state(true);
     suspend_power_down_user();
 }
 
-void suspend_wakeup_init_kb(void)
-{
+void suspend_wakeup_init_kb(void) {
     rgb_matrix_set_suspend_state(false);
     suspend_wakeup_init_user();
 }
 
 __attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
-    if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
-    {
+void rgb_matrix_indicators_user(void) {
+    if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(41, 0xFF, 0xFF, 0xFF);
     }
 }
diff --git a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.h b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.h
index 0c448994f9..5f47903fc8 100644
--- a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.h
+++ b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.h
@@ -1,18 +1,21 @@
 #pragma once
-#define XXX KC_NO
+
 #include "quantum.h"
+
+#define XXX KC_NO
+
 #define LAYOUT_60_tsangan_hhkb( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C,\
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,\
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D,\
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,\
-    K40, K41, K42,           K45,                     K4A, K4B,      K4D \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \
+    K40, K41, K42,                K45,                     K4A, K4B, K4D  \
 ) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D}, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D },     \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D },     \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D },     \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, XXX, K4A, K4B, XXX, K4D }      \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \
+    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, XXX, K4A, K4B, XXX, K4D }  \
 }
 
 #define LAYOUT_HHKB LAYOUT_60_tsangan_hhkb
diff --git a/keyboards/dztech/dz60rgb_wkl/readme.md b/keyboards/dztech/dz60rgb_wkl/readme.md
index 2fffa413b6..a80236437a 100644
--- a/keyboards/dztech/dz60rgb_wkl/readme.md
+++ b/keyboards/dztech/dz60rgb_wkl/readme.md
@@ -4,12 +4,18 @@
 
 A hotswap 60% RGB keyboard.
 
-Keyboard Maintainer: DZtech  
-Hardware Supported: DZtech dz60rgb, dz60rgb-ansi  
-Hardware Availability: [kbdfans](https://kbdfans.myshopify.com/)
+* Keyboard Maintainer: [moyi4681](https://github.com/moyi4681)
+* Hardware Supported: DZtech DZ60RGB-WKL V1 and V2
+* Hardware Availability: [KBDfans](https://kbdfans.com/)
+
+There are two versions of the DZ60RGB-WKL. Please use the appropriate firmware for your board.
+
+* V1: STM32F303 (Arm), takes .bin files
+* V2: ATmega32U4 (AVR), takes .hex files
 
 Make example for this keyboard (after setting up your build environment):
 
-    make dztech/dz60rgb:default
+    make dztech/dz60rgb_wkl/v1:default # Arm (STM32F303)
+    make dztech/dz60rgb_wkl/v2:default # AVR (ATmega32U4)
 
 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/dztech/dz65rgb/dz65rgb.c b/keyboards/dztech/dz65rgb/dz65rgb.c
index 8f095960d4..5d35bc8982 100644
--- a/keyboards/dztech/dz65rgb/dz65rgb.c
+++ b/keyboards/dztech/dz65rgb/dz65rgb.c
@@ -1,129 +1,117 @@
 #include "dz65rgb.h"
+
 #ifdef RGB_MATRIX_ENABLE
 const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+    { 0, C8_8,  C7_8,  C6_8 },
+    { 0, C9_8,  C7_7,  C6_7 },
+    { 0, C9_7,  C8_7,  C6_6 },
+    { 0, C9_6,  C8_6,  C7_6 },
+    { 0, C9_5,  C8_5,  C7_5 },
+    { 0, C9_4,  C8_4,  C7_4 },
+    { 0, C9_3,  C8_3,  C7_3 },
+    { 0, C9_2,  C8_2,  C7_2 },
+    { 0, C9_1,  C8_1,  C7_1 },
+    { 0, C2_9,  C3_9,  C4_9 },
+    { 0, C1_9,  C3_10, C4_10 },
+    { 0, C1_10, C2_10, C4_11 },
+    { 0, C1_11, C2_11, C3_11 },
+    { 0, C1_13, C2_13, C3_13 },
+    { 0, C1_14, C2_14, C3_14 },
 
-	{0, C8_8,  C7_8, C6_8},   // LA17
-	{0, C9_8,  C7_7, C6_7},   // LA16
-	{0, C9_7,  C8_7, C6_6},   // LA15
-	{0, C9_6,  C8_6, C7_6},   // LA14
-	{0, C9_5,  C8_5, C7_5},   // LA13
-	{0, C9_4,  C8_4, C7_4},   // LA12
-	{0, C9_3,  C8_3, C7_3},   // LA11
-	{0, C9_2,  C8_2, C7_2},   // LA10
-	{0, C9_1,  C8_1,  C7_1},  // LA9
-	{0, C2_9,  C3_9,  C4_9},  // LB0
-	{0, C1_9,  C3_10, C4_10}, // LB1
-	{0, C1_10, C2_10, C4_11}, // LB2
-	{0, C1_11, C2_11, C3_11}, // LB3
-	{0, C1_13, C2_13, C3_13}, // LB5
-	{0, C1_14, C2_14, C3_14}, // LB6
-
-	{0, C1_7,  C2_7, C3_7},   // LA7
-	{0, C1_6,  C2_6, C3_6},   // LA6
-	{0, C1_5,  C2_5, C3_5},   // LA5
-	{0, C1_4,  C2_4, C3_4},   // LA4
-	{0, C1_3,  C2_3, C3_3},   // LA3
-	{0, C1_2,  C2_2, C4_3},   // LA2
-	{0, C1_1,  C3_2, C4_2},   // LA1
-	{0, C2_1,  C3_1,  C4_1},  // LA0
-	{0, C9_9,  C8_9,  C7_9},  // LB9
-	{0, C9_10, C8_10, C7_10}, // LB10
-	{0, C9_11, C8_11, C7_11}, // LB11
-	{0, C9_12, C8_12, C7_12}, // LB12
-	{0, C9_13, C8_13, C7_13}, // LB13
-	{0, C9_14, C8_14, C7_14}, // LB14
-	{0, C1_15, C2_15, C3_15}, // LB7
-
-    {0, C1_8,  C2_8, C3_8},   // LA8
-	{1, C9_6,  C8_6, C7_6},   // LC14
-	{1, C9_5,  C8_5, C7_5},   // LC13
-	{1, C9_4,  C8_4, C7_4},   // LC12
-	{1, C9_3,  C8_3, C7_3},   // LC11
-	{1, C9_2,  C8_2, C7_2},   // LC10
-	{1, C9_1,  C8_1,  C7_1},  // LC9
-	{1, C2_9,  C3_9,  C4_9},  // LD0
-	{1, C1_9,  C3_10, C4_10}, // LD1
-	{1, C1_10, C2_10, C4_11}, // LD2
-	{1, C1_11, C2_11, C3_11}, // LD3
-	{1, C1_12, C2_12, C3_12}, // LD4
-	{1, C1_13, C2_13, C3_13}, // LD5
-	{0, C1_16, C2_16, C3_16}, // LB8
+    { 0, C1_7,  C2_7,  C3_7 },
+    { 0, C1_6,  C2_6,  C3_6 },
+    { 0, C1_5,  C2_5,  C3_5 },
+    { 0, C1_4,  C2_4,  C3_4 },
+    { 0, C1_3,  C2_3,  C3_3 },
+    { 0, C1_2,  C2_2,  C4_3 },
+    { 0, C1_1,  C3_2,  C4_2 },
+    { 0, C2_1,  C3_1,  C4_1 },
+    { 0, C9_9,  C8_9,  C7_9 },
+    { 0, C9_10, C8_10, C7_10 },
+    { 0, C9_11, C8_11, C7_11 },
+    { 0, C9_12, C8_12, C7_12 },
+    { 0, C9_13, C8_13, C7_13 },
+    { 0, C9_14, C8_14, C7_14 },
+    { 0, C1_15, C2_15, C3_15 },
 
-	{1, C9_8,  C7_7, C6_7},   // LC16
-	{1, C1_5,  C2_5, C3_5},   // LC5
-	{1, C1_4,  C2_4, C3_4},   // LC4
-	{1, C1_3,  C2_3, C3_3},   // LC3
-	{1, C1_2,  C2_2, C4_3},   // LC2
-	{1, C1_1,  C3_2, C4_2},   // LC1
-	{1, C9_9,  C8_9,  C7_9},  // LD9
-	{1, C9_10, C8_10, C7_10}, // LD10
-	{1, C9_11, C8_11, C7_11}, // LD11
-	{1, C9_12, C8_12, C7_12}, // LD12
-	{1, C1_14, C2_14, C3_14}, // LD6
-	{1, C1_15, C2_15, C3_15}, // LD7
-	{1, C1_16, C2_16, C3_16}, // LD8
-	{0, C9_15, C8_15, C6_14}, // LB15
+    { 0, C1_8,  C2_8,  C3_8 },
+    { 1, C9_6,  C8_6,  C7_6 },
+    { 1, C9_5,  C8_5,  C7_5 },
+    { 1, C9_4,  C8_4,  C7_4 },
+    { 1, C9_3,  C8_3,  C7_3 },
+    { 1, C9_2,  C8_2,  C7_2 },
+    { 1, C9_1,  C8_1,  C7_1 },
+    { 1, C2_9,  C3_9,  C4_9 },
+    { 1, C1_9,  C3_10, C4_10 },
+    { 1, C1_10, C2_10, C4_11 },
+    { 1, C1_11, C2_11, C3_11 },
+    { 1, C1_12, C2_12, C3_12 },
+    { 1, C1_13, C2_13, C3_13 },
+    { 0, C1_16, C2_16, C3_16 },
 
-	{1, C8_8,  C7_8, C6_8},   // LC17
-	{1, C1_8,  C2_8, C3_8},   // LC8
-	{1, C1_7,  C2_7, C3_7},   // LC7
-	{1, C2_1,  C3_1,  C4_1},  // LC0
-	{1, C9_14, C8_14, C7_14}, // LD14
-	{1, C9_15, C8_15, C6_14}, // LD15
-	{1, C9_16, C7_15, C6_15}, // LD16
-	{1, C8_16, C7_16, C6_16}, // LD17
-	{0, C8_16, C7_16, C6_16}, // LB17
-	{0, C9_16, C7_15, C6_15}, // LB16
+    { 1, C9_8,  C7_7,  C6_7 },
+    { 1, C1_5,  C2_5,  C3_5 },
+    { 1, C1_4,  C2_4,  C3_4 },
+    { 1, C1_3,  C2_3,  C3_3 },
+    { 1, C1_2,  C2_2,  C4_3 },
+    { 1, C1_1,  C3_2,  C4_2 },
+    { 1, C9_9,  C8_9,  C7_9 },
+    { 1, C9_10, C8_10, C7_10 },
+    { 1, C9_11, C8_11, C7_11 },
+    { 1, C9_12, C8_12, C7_12 },
+    { 1, C1_14, C2_14, C3_14 },
+    { 1, C1_15, C2_15, C3_15 },
+    { 1, C1_16, C2_16, C3_16 },
+    { 0, C9_15, C8_15, C6_14 },
 
+    { 1, C8_8,  C7_8,  C6_8 },
+    { 1, C1_8,  C2_8,  C3_8 },
+    { 1, C1_7,  C2_7,  C3_7 },
+    { 1, C2_1,  C3_1,  C4_1 },
+    { 1, C9_14, C8_14, C7_14 },
+    { 1, C9_15, C8_15, C6_14 },
+    { 1, C9_16, C7_15, C6_15 },
+    { 1, C8_16, C7_16, C6_16 },
+    { 0, C8_16, C7_16, C6_16 },
+    { 0, C9_16, C7_15, C6_15 }
 };
 
-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, 21,    22,    23,  24,  25,  26, 27,    28,  29 },
-    {  30, 31, 32, 33,    34,    35, 36,    37,    38,  39,  40,  41, NO_LED,42,  43 },
-    {  44, 45, 46, 47,    48,    49, 59,    51,    52,  53,  54,  55, NO_LED,56,  57 },
-    {  58, 59, 60, NO_LED,NO_LED,61, NO_LED,NO_LED,62,  63,  64,  65, NO_LED,66,  67 }
-}, {
-    {0,0}, {15,0}, {30,0}, {45,0}, {60,0},  {75,0},  {90,0},  {105,0}, {120,0}, {135,0}, {150,0}, {165,0}, {180,0}, {203,0},{224,0},
-	{4,16},{23,16},{38,16},{53,16},{68,16}, {83,16}, {98,16}, {113,16},{128,16},{143,16},{158,16},{173,16},{188,16},{206,16},{224,16},
-	{6,32},{26,32},{41,32},{56,32},{71,32}, {86,32}, {101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32},
-	{9,48},{34,48},{49,48},{64,48},{79,48}, {94,48}, {109,48},{124,48},{139,48},{154,48},{169,48},{189,48},{210,48},{224,48},
-	{2,64},{21,64},{39,64},{96,64},{150,64},{165,64},{180,64},{195,64},{210,64},{224,64}
-}, {
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
-    1, 1, 1, 4, 1, 1, 1, 1, 1, 1
-} };
+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,     21,     22, 23, 24, 25, 26,     27, 28, 29 },
+        { 30, 31, 32,     33,     34, 35,     36,     37, 38, 39, 40, 41, NO_LED, 42, 43 },
+        { 44, 45, 46,     47,     48, 49,     59,     51, 52, 53, 54, 55, NO_LED, 56, 57 },
+        { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, 63, 64, 65, NO_LED, 66, 67 }
+    }, {
+        {   0,   0 }, {  15,   0 }, {  30,   0 }, {  45,   0 }, {  60,   0 }, {  75,   0 }, {  90,   0 }, { 105,   0 }, { 120,   0 }, { 135,   0 }, { 150,   0 }, { 165,   0 }, { 180,   0 }, { 203,   0 }, { 224,   0 },
+        {   4,  16 }, {  23,  16 }, {  38,  16 }, {  53,  16 }, {  68,  16 }, {  83,  16 }, {  98,  16 }, { 113,  16 }, { 128,  16 }, { 143,  16 }, { 158,  16 }, { 173,  16 }, { 188,  16 }, { 206,  16 }, { 224,  16 },
+        {   6,  32 }, {  26,  32 }, {  41,  32 }, {  56,  32 }, {  71,  32 }, {  86,  32 }, { 101,  32 }, { 116,  32 }, { 131,  32 }, { 146,  32 }, { 161,  32 }, { 176,  32 },               { 201,  32 }, { 224,  32 },
+        {   9,  48 },               {  34,  48 }, {  49,  48 }, {  64,  48 }, {  79,  48 }, {  94,  48 }, { 109,  48 }, { 124,  48 }, { 139,  48 }, { 154,  48 }, { 169,  48 }, { 189,  48 }, { 210,  48 }, { 224,  48 },
+        {   2,  64 }, {  21,  64 }, {  39,  64 },                                           {  96,  64 },                             { 150,  64 }, { 165,  64 }, { 180,  64 }, { 195,  64 }, { 210,  64 }, { 224,  64 }
+    }, {
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    4, 1,
+        1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 1, 1,          4,       1, 1, 1, 1, 1, 1
+    }
+};
 #endif
 
-void matrix_init_kb(void) {
-    matrix_init_user();
-}
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    return process_record_user(keycode, record);
-}
-void suspend_power_down_kb(void)
-{
+void suspend_power_down_kb(void) {
     rgb_matrix_set_suspend_state(true);
     suspend_power_down_user();
 }
 
-void suspend_wakeup_init_kb(void)
-{
+void suspend_wakeup_init_kb(void) {
     rgb_matrix_set_suspend_state(false);
     suspend_wakeup_init_user();
 }
 
 __attribute__ ((weak))
-void rgb_matrix_indicators_user(void)
-{
-    if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
-    {
+void rgb_matrix_indicators_user(void) {
+    if (host_keyboard_led_state().caps_lock) {
         rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
     }
 }
diff --git a/keyboards/dztech/dz65rgb/dz65rgb.h b/keyboards/dztech/dz65rgb/dz65rgb.h
index b251a339f9..371facc89e 100644
--- a/keyboards/dztech/dz65rgb/dz65rgb.h
+++ b/keyboards/dztech/dz65rgb/dz65rgb.h
@@ -1,12 +1,15 @@
 #pragma once
-#define XXX KC_NO
+
 #include "quantum.h"
+
+#define XXX KC_NO
+
 #define LAYOUT_65_ansi( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, \
-    K40, K41, K42,           K45,           K48, K49, K4A, K4B,      K4D, K4E  \
+    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \
+    K40, K41, K42,                K45,           K48, K49, K4A, K4B, K4D, K4E  \
 ) { \
     { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
     { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
diff --git a/keyboards/dztech/dz65rgb/readme.md b/keyboards/dztech/dz65rgb/readme.md
index 7f8aad95f8..8d7b95b3d6 100644
--- a/keyboards/dztech/dz65rgb/readme.md
+++ b/keyboards/dztech/dz65rgb/readme.md
@@ -2,13 +2,18 @@
 
 A customizable 65% RGB keyboard.
 
-Keyboard Maintainer: [DZtech](http://keyboarddiy.taobao.com)  
-Hardware Supported: [DZtech](http://keyboarddiy.taobao.com)  
-Hardware Availability: [kbdfans](https://kbdfans.myshopify.com/)
+* Keyboard Maintainer: [moyi4681](https://github.com/moyi4681)
+* Hardware Supported: DZ65RGB V1 and V2
+* Hardware Availability: [KBDfans](https://kbdfans.com/)
 
+There are two versions of the DZ65RGB. Please use the appropriate firmware for your board.
+
+* V1: STM32F303 (Arm), takes .bin files
+* V2: ATmega32U4 (AVR), takes .hex files
 
 Make example for this keyboard (after setting up your build environment):
 
-    make dztech/dz65rgb:default
+    make dztech/dz65rgb/v1:default # Arm (STM32F303)
+    make dztech/dz65rgb/v2:default # AVR (ATmega32U4)
 
 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).