Merge upstream master

14 files changed, 981 insertions, 0 deletions

diff --git a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
new file mode 100644
index 0000000000..475c9cc4b5
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
@@ -0,0 +1,103 @@
+#include "dz60rgb_ansi.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = {
+    { 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
+    }
+};
+
+bool rgb_matrix_indicators_kb(void) {
+    if (!rgb_matrix_indicators_user()) {
+        return false;
+    }
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
+    }
+    return true;
+}
+#endif
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c
new file mode 100644
index 0000000000..0791f9e665
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/badger/keymap.c
@@ -0,0 +1,60 @@
+/*
+Copyright 2020 Dan White <opensource@bluetufa.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 "badger.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY_MAC] = LAYOUT_60_ansi(\
+     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, \
+     MOVE_MAC,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,   KC_ENT,   \
+     KC_LSFT,    KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,   \
+     KC_LCTL,    KC_LALT,  KC_LGUI,  KC_SPC,   ADJUST,   KC_RGUI,  KC_RALT,  MAC_POP),
+
+  [_MOVE_MAC]   = LAYOUT_60_ansi(\
+     MAC_FRC,    MM_LEFT,  MM_RGHT,  KC_HASH,  KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_0,     IJ_TOP,    IJ_BOTT,  KC_DEL, \
+     KC_BACK,    IJ_STEP,  IJ_INTO,  IJ_OUT,   IJ_RUN,   IJ_STOP,  _______,  WD_BACK,  KC_HOME,  KC_END,   WD_FRWD,  IJ_BACK,   IJ_FWD,   KC_NEXT, \
+     _______,    MM_LH,    MM_MAX,   MM_RH,    IJ_FIND,  IJ_IMPS,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CM_RIGHT, CM_DOWN,   _______,  \
+     _______,    MM_UH,    MM_BH,    MAC_CPY,  MAC_PST,  IJ_IMPH,  _______,  IJ_REN,   IJ_IMPL,  IJ_DECL,  IJ_USAG,  _______,   \
+     _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+     
+  [_QWERTY_LINUX] = LAYOUT_60_ansi(\
+     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, \
+     MOVE,       KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,   KC_ENT,   \
+     KC_LSFT,    KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,   \
+     KC_LCTL,    KC_LGUI,  KC_LALT,  KC_SPC,   ADJUST,   KC_LALT,  KC_RGUI,  KC_RCTL),
+
+  [_MOVE_LINUX] = LAYOUT_60_ansi(\
+     KC_GRV,     VD_1,     VD_2,     VD_3,     KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL, \
+     KC_BACK,    WM_VD1,   WM_UH,    WM_VD2,   QK_BOOT,  KC_MSTP,  KC_MPLY,  KC_PGUP,  KC_HOME,  KC_END,   KC_PGDN,  _______,   _______,  KC_NEXT, \
+     _______,    WM_LH,    WM_MAX,   WM_RH,    WD_FRWD,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  CS_RIGHT, CS_DOWN,   _______, \
+     _______,    WM_VD3,   WM_BH,    OS_COPY,  OS_PAST,  WD_BACK,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  _______,  _______,   \
+     _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______),
+
+  [_ADJUST]     = LAYOUT_60_ansi(\
+     KC_ESC,    KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL, \
+     _______,   _______,  _______,  _______,  KC_WREF,   KC_MSTP,  KC_MPLY,  KC_PGUP,  _______,  _______,  KC_PGDN,  KC_VOLD,   KC_VOLU,  KC_INS, \
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  \
+     _______,   DF_1,     DF_2,     KC_CAPS,  _______,   KC_MPRV,  KC_MNXT,  KC_MUTE,  KC_WBAK,  KC_WFWD,  KC_WSCH,  _______,   \
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  MO(_CONFIG)),
+
+  [_CONFIG]     = LAYOUT_60_ansi(\
+     _______,   KC_F1,    KC_F2,    KC_F3,    KC_F4,     KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,    KC_F12,   KC_DEL, \
+     _______,   NK_ON,    NK_OFF,   EE_CLR,   QK_BOOT,   _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  KC_INS, \
+     _______,   GE_SWAP,  GE_NORM,  DB_TOGG,  RGB_MOD,   RGB_HUI,  RGB_SAI,  RGB_SPI,  RGB_M_B,  _______,  _______,  RGB_TOG,   _______,  \
+     _______,   LAG_SWP,  LAG_NRM,  _______,  RGB_RMOD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  RGB_M_K,  _______,  _______,  _______,   \
+     _______,   _______,  _______,  _______,  _______,   _______,  _______,  _______)
+};
+
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c
new file mode 100644
index 0000000000..6ed31b62bc
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/bingocaller/keymap.c
@@ -0,0 +1,128 @@
+ /* Copyright 2021 Jesper Nellemann Jakobsen
+  * 
+  * 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
+
+enum layers {
+    _BASE,
+    _ARROWS,
+    _HDUE, /* Home, pgDown, pgUp, End */
+    _MOUSE,
+    _FN
+};
+
+/* Custom keys */
+
+/* Word movement/deletetion */
+#define WORD_BK A(KC_LEFT)
+#define WORD_FW A(KC_RIGHT)
+#define D_WORD_BK A(KC_BACKSPACE)
+#define D_WORD_FW A(KC_DELETE)
+/* Fine volume control */
+#define FVOLU S(A(KC_VOLU))
+#define F_VOLD S(A(KC_VOLD))
+/* Multi-purpose keys */
+#define HYPR_CAPS ALL_T(KC_CAPS)
+#define CTL_ESC LCTL_T(KC_ESC)
+/* Layer keys */
+#define ARROWS LT(_ARROWS, KC_D)
+#define HDUE MO(_HDUE)
+#define MOUSP LT(_MOUSE, KC_SPC)
+#define FN MO(_FN)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*  Default layer:
+     * Space Cadet shifts (parentheses on tap)
+     * Caps Lock is Control on hold, Esc on tap
+     * Hyper/Caps Lock on Control keys
+     * Hold D to activate layer 1 (Arrows)
+     * Hold Space to activate layer 3 (Mouse keys)
+     * Hold FN to activate layer 4 (FN layer)
+     */
+    [_BASE] = LAYOUT_60_ansi(
+        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,
+        CTL_ESC,   KC_A,    KC_S,    ARROWS,  KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        SC_LSPO,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          SC_RSPC,
+        HYPR_CAPS, KC_LALT, KC_LGUI,                            MOUSP,                              KC_RGUI, KC_RALT, FN,      HYPR_CAPS
+    ),
+
+    /*  Layer 1:
+     * Vim arrows (HJKL)
+     * Vim-like move across words with W(ord), and B(eginning)
+     * Media controls (fine volume controls using Option+Shift)
+     * Backspace/Del on N/M
+     * Hold F to activate layer 2 (HDUE: Home, Down, Up, End)
+     */
+    [_ARROWS] = LAYOUT_60_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, WORD_FW, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, F_VOLD,  FVOLU,   _______,
+        _______, _______, _______, _______, HDUE,    _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, WORD_BK, KC_BSPC, KC_DEL,  _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+
+    /*  Layer 2:
+     * Home, Page Down, Page Up, End
+     * Delete word forward/back on W/B
+     */
+    [_HDUE] = LAYOUT_60_ansi(
+        _______, _______, _______,   _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, D_WORD_FW, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,   _______, _______, _______, KC_HOME,   KC_PGDN, KC_PGUP, KC_END,  _______, _______,          _______,
+        _______,          _______,   _______, _______, _______, D_WORD_BK, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                              _______,                              _______, _______, _______, _______
+    ),
+
+    /*  Layer 3:
+     * Mouse keys
+     * Cursor movement: HJKL
+     * MB 1, 2, and 3 on F, D, and S, respectively
+     * Mouse wheel: up (V), down (R) (reversed because of Natural Scrolling)
+     * Change mouse acceleration on U, I, O (0, 1, 2)
+     */
+    [_MOUSE] = LAYOUT_60_ansi(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, KC_WH_D, _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______,
+        _______, _______, KC_BTN3, KC_BTN2, KC_BTN1, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,          _______,
+        _______,          _______, _______, _______, KC_WH_U, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+
+    /*  Layer 4:
+     * F1-12
+     * Del on backspace
+     * Lots of RGB controls
+     * QK_BOOT firmware on backslash
+     * Screen brightness: Z (decrease), X (increase)
+     */
+    [_FN] = LAYOUT_60_ansi(
+        _______, KC_F1,   KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,    KC_F8,    KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, RGB_M_P,  RGB_M_B,  RGB_M_R, _______, _______, _______, QK_BOOT,
+        _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, RGB_M_SW, RGB_M_SN, RGB_M_K, _______, _______,          _______,
+        _______,          KC_BRID,  KC_BRIU, _______, _______, _______, _______,  RGB_M_X,  RGB_M_G, RGB_M_T, _______,          _______,
+        _______, _______, _______,                             _______,                              _______, _______, _______, _______
+    )
+
+    // TEMPLATE
+    // LAYOUT_60_ansi(
+    //    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    //    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    //    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    //    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    //    _______, _______, _______,                            _______,                            _______, _______, _______, _______,
+    // ),
+};
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/default/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/default/keymap.c
new file mode 100644
index 0000000000..339d2fa428
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/default/keymap.c
@@ -0,0 +1,25 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_60_ansi(
+        QK_GESC,        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,
+        CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+        KC_LCTL,        KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   MO(2),   KC_RCTL
+    ),
+    [1] = LAYOUT_60_ansi(
+        QK_GESC, 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_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______,
+        KC_MPRV,          KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN,          KC_MNXT,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+    [2] = LAYOUT_60_ansi(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    )
+};
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
new file mode 100644
index 0000000000..7f3b24de74
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/kuru/keymap.c
@@ -0,0 +1,101 @@
+/* Copyright 2022 Murali Suresh
+ *
+ * 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] = {
+    [0] = LAYOUT_60_ansi(
+        KC_GRAVE,       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, LT(2,KC_BSLS),
+        CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_UP,
+        KC_LCTL,        KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_60_ansi(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, _______, KC_UP,   _______, _______, _______, KC_CALC, _______, KC_INS,  _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP,          _______,
+        KC_MPRV,          KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, NK_TOGG, _______, _______, KC_END,  KC_PGDN,          KC_MNXT,
+        _______, _______, _______,                            TO(3)  ,                            _______, _______, _______, _______
+    ),
+    [2] = LAYOUT_60_ansi(
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_60_ansi(
+        KC_GRAVE,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  LT(4,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,
+        CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+        MO(4)  ,        KC_LGUI, KC_RALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(2),   KC_RCTL
+    ),
+    [4] = LAYOUT_60_ansi(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, _______, _______, KC_END,  _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        _______, KC_HOME, _______, _______, KC_PGDN, _______, KC_LEFT, KC_DOWN, KC_UP ,  KC_RGHT, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, KC_PGUP, NK_TOGG, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            TO(0)  ,                            _______, _______, _______, _______
+    ),
+};
+
+void highlight_layer3(void){
+    // F9-F12
+    rgb_matrix_set_color(4, 0xFF, 0xFF, 0xFF);
+    rgb_matrix_set_color(3, 0xFF, 0xFF, 0xFF);
+    rgb_matrix_set_color(2, 0xFF, 0xFF, 0xFF);
+    rgb_matrix_set_color(1, 0xFF, 0xFF, 0xFF);
+    // F1-F4
+    rgb_matrix_set_color(9, 0xFF, 0xFF, 0xFF);
+    rgb_matrix_set_color(10, 0xFF, 0xFF, 0xFF);
+    rgb_matrix_set_color(11, 0xFF, 0xFF, 0xFF);
+    rgb_matrix_set_color(12, 0xFF, 0xFF, 0xFF);
+    // Reset
+    rgb_matrix_set_color(14, 0x99, 0x99, 0xFF);
+    // Pause + Slck + PrScr
+    rgb_matrix_set_color(15, 0xFF, 0x99, 0x00);
+    rgb_matrix_set_color(16, 0xFF, 0x99, 0x00);
+    rgb_matrix_set_color(17, 0xFF, 0x99, 0x00);
+    // Pgup, Home
+    rgb_matrix_set_color(39, 0x00, 0x99, 0x00);
+    rgb_matrix_set_color(24, 0x00, 0x99, 0x00);
+    // hjkl
+    rgb_matrix_set_color(31, 0x00, 0x00, 0xFF);
+    rgb_matrix_set_color(32, 0x00, 0x00, 0xFF);
+    rgb_matrix_set_color(33, 0x00, 0x00, 0xFF);
+    rgb_matrix_set_color(34, 0x00, 0x00, 0xFF);
+    // PgDwn, End
+    rgb_matrix_set_color(36, 0x00, 0x99, 0x00);
+    rgb_matrix_set_color(46, 0x00, 0x99, 0x00);
+}
+
+bool rgb_matrix_indicators_user(void) {
+	  uint8_t this_led = host_keyboard_leds();
+      if (!g_suspend_state) {
+        switch (get_highest_layer(layer_state)) {
+          case 3:
+            highlight_layer3(); break;
+          default:
+            break;
+        }
+      }
+	  if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
+	        rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
+	  }
+    return false;
+}
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
new file mode 100644
index 0000000000..af2d9fa3dc
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/keymap.c
@@ -0,0 +1,168 @@
+/* Copyright 2022 Murali Suresh
+ *
+ * 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] = {
+  /* Qwerty
+   * ,------------------------------------------------------------------------------------------.
+   * | ` ~  |  1! |  2@ |  3# |  4$ |  5% |  6^ |  7& |  8* |  9( |  0) |  -  |  =  |   Bkspc   |
+   * |------------------------------------------------------------------------------------------+
+   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |     \   |
+   * |------------------------------------------------------------------------------------------+
+   * | Ctl_T(C) |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
+   * |------------------------------------------------------------------------------------------+
+   * | Shift      |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |    RShift       |
+   * |------------------------------------------------------------------------------------------+
+   * |  MO1  |  Cmd  |  Alt  |              Space                | RAlt | Cmd  |  MO2  |  RCTL  |
+   * `------------------------------------------------------------------------------------------'
+   */
+    [0] = LAYOUT_60_ansi(
+        KC_GRAVE,       KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  LT(1,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,
+        CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+        MO(1)  ,        KC_LGUI, KC_RALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(2),   KC_RCTL
+    ),
+  /* Layer1
+   * ,------------------------------------------------------------------------------------------.
+   * | ` ~  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   Del     |
+   * |------------------------------------------------------------------------------------------+
+   * |        |     |     |     |     |     |  Y  |     |  I  |     | PScr| Slck| Paus|  Reset  |
+   * |------------------------------------------------------------------------------------------+
+   * |          |     |     |     |     |     | Left| Down| Up  | Rght| Home| Pgup|             |
+   * |------------------------------------------------------------------------------------------+
+   * | Shift      | V-  | V+  |  C  |     |     |     |     |     | End | PgDn|                 |
+   * |------------------------------------------------------------------------------------------+
+   * |       |       |       |              TO3                  |      |      |       |        |
+   * `------------------------------------------------------------------------------------------'
+   */
+    [1] = LAYOUT_60_ansi(
+        KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        _______, _______, _______, KC_END,  _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SCRL, KC_PAUS, QK_BOOT,
+        _______, KC_HOME, _______, _______, KC_PGDN, _______, KC_LEFT, KC_DOWN, KC_UP ,  KC_RGHT, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, KC_PGUP, NK_TOGG, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            TO(3)  ,                            _______, _______, _______, _______
+    ),
+    [2] = LAYOUT_60_ansi(
+        _______, 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,
+        _______, RGB_TOG, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, _______, _______, _______, QK_BOOT,
+        _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPI, RGB_SPD, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______
+    ),
+    [3] = LAYOUT_60_ansi(
+        _______, 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_PSCR, KC_SCRL, KC_PAUS, _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______, _______, TO(0),
+        _______, _______, KC_INS,  KC_HOME, KC_PGUP, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, _______,          _______,
+        _______,          _______, KC_DEL,  KC_END,  KC_PGDN, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______,          KC_UP,
+        _______, _______, _______,                            _______,                            _______, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+};
+
+void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue) {
+  for (int i = 0; i < RGB_MATRIX_LED_COUNT; i++) {
+    if (HAS_FLAGS(g_led_config.flags[i], LED_FLAG_MODIFIER)) {
+        rgb_matrix_set_color( i, red, green, blue );
+    }
+  }
+}
+
+void highlight_layer1(void){
+    // F9-F12
+    rgb_matrix_set_color(4, 0xFF, 0xFF, 0xFF);
+    rgb_matrix_set_color(3, 0xFF, 0xFF, 0xFF);
+    rgb_matrix_set_color(2, 0xFF, 0xFF, 0xFF);
+    rgb_matrix_set_color(1, 0xFF, 0xFF, 0xFF);
+    // F1-F4
+    rgb_matrix_set_color(9, 0xFF, 0xFF, 0xFF);
+    rgb_matrix_set_color(10, 0xFF, 0xFF, 0xFF);
+    rgb_matrix_set_color(11, 0xFF, 0xFF, 0xFF);
+    rgb_matrix_set_color(12, 0xFF, 0xFF, 0xFF);
+    // Reset
+    rgb_matrix_set_color(14, 0x99, 0x99, 0xFF);
+    // Pause + Slck + PrScr
+    rgb_matrix_set_color(15, 0xFF, 0x99, 0x00);
+    rgb_matrix_set_color(16, 0xFF, 0x99, 0x00);
+    rgb_matrix_set_color(17, 0xFF, 0x99, 0x00);
+    // Pgup, Home
+    rgb_matrix_set_color(39, 0x00, 0x99, 0x00);
+    rgb_matrix_set_color(24, 0x00, 0x99, 0x00);
+    // hjkl
+    rgb_matrix_set_color(31, 0x00, 0x00, 0xFF);
+    rgb_matrix_set_color(32, 0x00, 0x00, 0xFF);
+    rgb_matrix_set_color(33, 0x00, 0x00, 0xFF);
+    rgb_matrix_set_color(34, 0x00, 0x00, 0xFF);
+    // PgDwn, End
+    rgb_matrix_set_color(36, 0x00, 0x99, 0x00);
+    rgb_matrix_set_color(46, 0x00, 0x99, 0x00);
+}
+
+void highlight_layer2(void){
+    // Mode
+    rgb_matrix_set_color(18, 0xFF, 0xFF, 0xFF);
+    // Value
+    rgb_matrix_set_color(19, 0x4C, 0x00, 0x99);
+    rgb_matrix_set_color(20, 0x4C, 0x00, 0x99);
+    // Sat
+    rgb_matrix_set_color(21, 0xFF, 0xFF, 0xFF);
+    rgb_matrix_set_color(22, 0xFF, 0xFF, 0xFF);
+    // Hue
+    rgb_matrix_set_color(23, 0x99, 0x99, 0x00);
+    rgb_matrix_set_color(24, 0x99, 0x99, 0x00);
+    // Toggle
+    rgb_matrix_set_color(26, 0xFF, 0xFF, 0xFF);
+    // Speed
+    rgb_matrix_set_color(31, 0xFF, 0x99, 0x00);
+    rgb_matrix_set_color(32, 0xFF, 0x99, 0x00);
+}
+
+void highlight_layer3(void) {
+    int ins_key_block[9] = {25, 24, 23, 38, 37, 36, 50, 49, 48};
+    for(int i  = 0; i < 9; i++) {
+      rgb_matrix_set_color(ins_key_block[i], 0x00, 0x99, 0x00);
+    }
+    int num_key_block[9] = {20, 19, 18, 33, 32, 31, 45, 44, 43};
+    for(int i  = 0; i < 9; i++) {
+      rgb_matrix_set_color(num_key_block[i], 0x00, 0x09, 0x09);
+    }
+    int easy_arrow_keys[4] = {41, 55, 54, 53};
+    for(int i  = 0; i < 4; i++) {
+      rgb_matrix_set_color(easy_arrow_keys[i], 0x09, 0x00, 0x09);
+    }
+}
+
+bool rgb_matrix_indicators_user(void) {
+	  uint8_t this_led = host_keyboard_leds();
+      if (!g_suspend_state) {
+        switch (get_highest_layer(layer_state)) {
+          case 1:
+            highlight_layer1(); break;
+          case 2:
+            highlight_layer2(); break;
+          case 3:
+            /* rgb_matrix_layer_helper(0x03, 0x03, 0x00); */
+            highlight_layer3();
+            break;
+          default:
+            break;
+        }
+      }
+	  if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
+	        rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
+	  }
+    return false;
+}
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/readme.md b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/readme.md
new file mode 100644
index 0000000000..b9dbdfeb90
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/muralisc/readme.md
@@ -0,0 +1,26 @@
+### ansi vim
+
+Keymap for dz60rgb terminal users
+
+### Philosophy
+
+Touch typing largely relies on muscle memory and hence
+maintaining a uniform position of keys across devices helps a lot.
+
+The below keymap attempts to maintain a uniform keymap across Linux and Mac.
+
+Avoiding the use of `QK_GESC` as the intention is to use the same layer for mac and linux.
+`QK_GESC` causes `` CMD+` `` to be send which has a default mapping
+
+Layer: 1
+
+Using `A` for `Home`
+Using `E` for `End`
+Using `F` for `PgDN`
+Using `B` for `PgUP`
+
+Layer 3:
+
+Dedicated Num keys block and `Ins, Home, PgUp` block.
+
+Dedicated Layer for arrow keys and Num keys and `Ins`, `Home` and `PgUp`.
diff --git a/keyboards/dztech/dz60rgb_ansi/keymaps/via/keymap.c b/keyboards/dztech/dz60rgb_ansi/keymaps/via/keymap.c
new file mode 100644
index 0000000000..a15e986d2d
--- /dev/null
+++ b/keyboards/dztech/dz60rgb_ansi/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_60_ansi(
+        QK_GESC,        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,
+        CTL_T(KC_CAPS), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+        KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT,
+        KC_LCTL,        KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   MO(2),   KC_RCTL
+    ),
+    [1] = LAYOUT_60_ansi(
+        QK_GESC, KC_F1,   KC_F2,