Merge branch 'master' of https://github.com/qmk/qmk_firmware

17 files changed, 664 insertions, 9 deletions

diff --git a/keyboards/dz60/keymaps/LEdiodes/config.h b/keyboards/dz60/keymaps/LEdiodes/config.h
index 6cdc4a91e3..196d05c533 100644
--- a/keyboards/dz60/keymaps/LEdiodes/config.h
+++ b/keyboards/dz60/keymaps/LEdiodes/config.h
@@ -28,7 +28,7 @@
 #define BACKLIGHT_LEVELS 5
 
 /* Set 0 if debouncing isn't needed */
-#define DEBOUNCING_DELAY 5
+#define DEBOUNCE 5
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/dz60/keymaps/billiams/keymap.c b/keyboards/dz60/keymaps/billiams/keymap.c
index 9de51fbfb3..b1c75d9036 100644
--- a/keyboards/dz60/keymaps/billiams/keymap.c
+++ b/keyboards/dz60/keymaps/billiams/keymap.c
@@ -28,9 +28,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * ,-----------------------------------------------------------------------------------------.
    * |     |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |    DEL    |
    * |-----------------------------------------------------------------------------------------+
-   * |        |RBB T|RGB M| Hue-| Hue+| Sat-| Sat+| Val-| Val+|     |     | Mute | Prev | Next |
+   * |        |RBB T|RGB M| Hue-| Hue+| Sat-| Sat+| Val-| Val+| Mute | Vol-| Vol+| Prev | Next |
    * |-----------------------------------------------------------------------------------------+
-   * |         |     |     |     |     |     |     |     |    |     | Vol- | Vol+ | Play/Pause |
+   * |         |     |     |     |     |     | Left| Down| Up |Right|      |      | Play/Pause |
    * |-----------------------------------------------------------------------------------------+
    * |           |     |     |     |     |     |     |     |Scr- |Scr+ |           |PG_UP|RESET|
    * |-----------------------------------------------------------------------------------------+
@@ -40,8 +40,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   LAYOUT_directional(
       _______, 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_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, _______, _______, _______, KC_MRWD, KC_MFFD,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC__VOLDOWN, KC__VOLUP,
+      _______, RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI, KC_MUTE, KC__VOLDOWN, KC__VOLUP, KC_MRWD, KC_MFFD,
+      _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______,
       KC_MPLY, _______, _______, _______, _______, _______, _______, _______, _______, KC_BRID, KC_BRIU, _______, _______, KC_PGUP, RESET,
       _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDOWN, KC_END
       ),
diff --git a/keyboards/dz60/keymaps/billiams/readme.md b/keyboards/dz60/keymaps/billiams/readme.md
index 60096473a9..5c0431e238 100644
--- a/keyboards/dz60/keymaps/billiams/readme.md
+++ b/keyboards/dz60/keymaps/billiams/readme.md
@@ -11,6 +11,7 @@ Settings:
 * `/ ?` are available when you tap the right shift. Otherwise RShift is shift when held down
 * RESET is available as `Fn`+ ` ESC`
 * Underglow toggle is available as `Fn` + `Q`. Yes your keyboard has lights even if you didn't get the LEDs. Bonus!
+* vim-style arrow key bindings H J K L in layer 1
 
 ### Initial Installation
 
@@ -59,9 +60,9 @@ FN Layer
 ,-----------------------------------------------------------------------------------------.
 |  `  |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 |    DEL    |
 |-----------------------------------------------------------------------------------------+
-|        |RBB T|RGB M| Hue-| Hue+| Sat-| Sat+| Val-| Val+|     |     | MUTE | Prev | Next |
+|        |RBB T|RGB M| Hue-| Hue+| Sat-| Sat+| Val-| Val+| Mute | Vol-| Vol+| Prev | Next |
 |-----------------------------------------------------------------------------------------+
-|         |     |     |     |     |     |     |     |     |    | Vol- | Vol+ | Play/Pause |
+|         |     |     |     |     |     | Left| Down| Up |Right|      |      | Play/Pause |
 |-----------------------------------------------------------------------------------------+
 |           |     |     |     |     |     |     |     |Scr- |Scr+ |         | PG_UP |RESET|
 |-----------------------------------------------------------------------------------------+
diff --git a/keyboards/dz60/keymaps/bingocaller/config.h b/keyboards/dz60/keymaps/bingocaller/config.h
new file mode 100644
index 0000000000..b04b47a30b
--- /dev/null
+++ b/keyboards/dz60/keymaps/bingocaller/config.h
@@ -0,0 +1,3 @@
+#define MOUSEKEY_DELAY 0
+#define MOUSEKEY_INTERVAL 20
+#define MOUSEKEY_TIME_TO_MAX 15
diff --git a/keyboards/dz60/keymaps/bingocaller/keymap.c b/keyboards/dz60/keymaps/bingocaller/keymap.c
new file mode 100644
index 0000000000..6b33174978
--- /dev/null
+++ b/keyboards/dz60/keymaps/bingocaller/keymap.c
@@ -0,0 +1,93 @@
+#include QMK_KEYBOARD_H
+
+#define WORD_BACK A(KC_LEFT)
+#define WORD_FORWARD A(KC_RIGHT)
+#define DELETE_WORD_BACK A(KC_BSPACE)
+#define DELETE_WORD_FORWARD A(KC_DELETE)
+#define FINE_VOLUP S(A(KC__VOLUP))
+#define FINE_VOLDOWN S(A(KC__VOLDOWN))
+
+enum layers {
+  _BASE,
+  _ARROWS,
+  _HDUE, // Home, PgDown, PgUp, End
+  _MOUSE,
+  _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
+        * Hold D to activate layer 1
+        * Hold Space to activate layer 3 (Mouse keys)
+        * Hold FN to activate layer 4
+    */
+    [_BASE] = LAYOUT(
+        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_NO, 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,
+        LCTL_T(KC_ESC), KC_A, KC_S, LT(_ARROWS, KC_D), KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+        KC_LSPO, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, KC_NO,
+        ALL_T(KC_CAPS), KC_LALT, KC_LGUI, KC_NO, LT(_MOUSE, KC_SPC), KC_NO, KC_RGUI, KC_RALT, KC_NO, MO(_FN), ALL_T(KC_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
+    */
+    [_ARROWS] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, WORD_FORWARD, _______, _______, _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, KC__MUTE, FINE_VOLDOWN, FINE_VOLUP, _______,
+        _______, _______, _______, _______, LT(_HDUE, _______), _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, WORD_BACK, KC_BSPC, KC_DEL, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+    /*  Layer 2:
+        * Home, End, Page Up, Page Down
+        * Delete word forward/back on W/B
+    */
+    [_HDUE] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, DELETE_WORD_FORWARD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDOWN, KC_PGUP, KC_END, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, DELETE_WORD_BACK, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+    /*  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)
+    */
+    [_MOUSE] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, KC_WH_D, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, 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
+        * RGB (underglow) controls
+        * RESET firmware on backslash
+        * Screen brightness: Z (decrease), X (increase)
+    */
+    [_FN] = LAYOUT(
+        _______, 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_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, RESET,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, KC_BRMD, KC_BRMU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+    // TEMPLATE
+    // LAYOUT(
+        // _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        // _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        // _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        // _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        // _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
diff --git a/keyboards/dz60/keymaps/bingocaller/readme.md b/keyboards/dz60/keymaps/bingocaller/readme.md
new file mode 100644
index 0000000000..d32dc62674
--- /dev/null
+++ b/keyboards/dz60/keymaps/bingocaller/readme.md
@@ -0,0 +1,114 @@
+# MacOS standard 60% keymap with Vim-like arrows
+
+This is a MacOS-specific keymap for DZ60 configured in a standard 60% ANSI layout, with a stepped Caps Lock:
+
+[![](https://i.imgur.com/lFP2O41.png)](http://www.keyboard-layout-editor.com/#/gists/4b156fdf2c1426bffc82fadd2b1c5634)
+
+**[Fully assembled 60% keyboard from KBDfans](https://kbdfans.cn/collections/fully-assembled-keyboard/products/fully-assembled-plastic-case-mechanical-keyboard)**
+
+## Base Layer
+
+```
+,-----------------------------------------------------------------------------------------.
+|  `  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  | Backspace |
+|-----------------------------------------------------------------------------------------+
+|   Tab  |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |   \    |
+|-----------------------------------------------------------------------------------------+
+| Ctrl/Esc |  A  |  S  | D/L1 |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |   Enter   |
+|-----------------------------------------------------------------------------------------+
+|   Shift/(   |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  |    Shift/)    |
+|-----------------------------------------------------------------------------------------+
+| Hyper |  Alt  |  Cmd  |             Space/L3             |  Cmd  |  Alt  |  L4  | Hyper |
+`-----------------------------------------------------------------------------------------'
+```
+
+* Space Cadet shifts (parentheses on tap)
+* Caps Lock is Control on hold, Esc on tap
+* Hyper/Caps Lock on Control
+* Hold D to activate layer 1
+* Hold Space to activate layer 3 (Mouse keys)
+* Hold FN to activate layer 4
+
+## `L1`
+
+```
+,-----------------------------------------------------------------------------------------.
+|     |     |     |     |     |     |     |     |     |     |     |     |     |           |
+|-----------------------------------------------------------------------------------------+
+|        |     |  W→  |     |     |     |     | ⏮ | ⏯ | ⏭ |  🔇 |  🔉 |  🔊 |         |
+|-----------------------------------------------------------------------------------------+
+|          |     |     |     |  L2  |     |  ←  |  ↓  |  ↑  |  →  |     |     |           |
+|-----------------------------------------------------------------------------------------+
+|             |     |     |     |     |  W←  |  ⌫  |  ⌦  |     |     |     |              |
+|-----------------------------------------------------------------------------------------+
+|       |       |       |                                 |       |       |       |       |
+`-----------------------------------------------------------------------------------------'
+```
+
+* 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
+
+## `L2`
+
+```
+,-----------------------------------------------------------------------------------------.
+|     |     |     |     |     |     |     |     |     |     |     |     |     |           |
+|-----------------------------------------------------------------------------------------+
+|        |     |  W⌦  |     |     |     |     |     |     |     |     |     |     |       |
+|-----------------------------------------------------------------------------------------+
+|          |     |      |     |     |     |  ↖  |  ⇞  |  ⇟  |  ↘︎  |     |     |           |
+|-----------------------------------------------------------------------------------------+
+|             |     |     |     |     |  W⌫  |     |     |     |     |     |              |
+|-----------------------------------------------------------------------------------------+
+|       |       |       |                                 |       |       |       |       |
+`-----------------------------------------------------------------------------------------'
+```
+
+* Home, End, Page Up, Page Down
+* Delete word forward/back on W/B
+
+## `L3`
+
+```
+,-----------------------------------------------------------------------------------------.
+|     |     |     |     |     |     |     |     |     |     |     |     |     |           |
+|-----------------------------------------------------------------------------------------+
+|        |     |     |     | MWU |     |     |     |     |     |     |     |     |        |
+|-----------------------------------------------------------------------------------------+
+|           |     | M3  | M2  | M1  |     | M←  | M↓  | M↑  | M→  |     |     |           |
+|-----------------------------------------------------------------------------------------+
+|             |     |     |     | MWD |     |     |     |     |     |     |               |
+|-----------------------------------------------------------------------------------------+
+|       |       |       |                                 |       |       |       |       |
+`-----------------------------------------------------------------------------------------'
+```
+
+* 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)
+
+## `L4`
+
+```
+,-----------------------------------------------------------------------------------------.
+|     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |     ⌦     |
+|-----------------------------------------------------------------------------------------+
+|       |RGB_T|RGB_M|RGB_H+|RGB_H-|RGB_S+|RGB_S-|RGB_V+|RGB_V-|   |   |   |   |   RESET   |
+|-----------------------------------------------------------------------------------------+
+|           |     |     |     |     |     |     |     |     |     |     |     |           |
+|-----------------------------------------------------------------------------------------+
+|             | 🔅 | 🔆 |     |     |     |     |     |     |     |      |                |
+|-----------------------------------------------------------------------------------------+
+|       |       |       |                                 |       |       |       |       |
+`-----------------------------------------------------------------------------------------'
+```
+
+* F1-12
+* Del on backspace
+* RGB (underglow) controls
+* RESET firmware on backspace
+* Screen brightness: Z (decrease), X (increase)
diff --git a/keyboards/dz60/keymaps/calbatr0ss/keymap.c b/keyboards/dz60/keymaps/calbatr0ss/keymap.c
new file mode 100644
index 0000000000..2852b4a207
--- /dev/null
+++ b/keyboards/dz60/keymaps/calbatr0ss/keymap.c
@@ -0,0 +1,84 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/*  LAYER 0
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ESC│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ` │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │ TAB │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ BKSP│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │ CTRL │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ ENTER  │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │ SHIFT  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ SHIFT│LYR│
+ * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───┤
+ * │CAPS│ OS │ ALT│ SPACE  │ FN │  SPACE   │ ALT│ OS │MENU│CTRL│
+ * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘
+ */
+  LAYOUT_60_calbatr0ss(
+      KC_ESC,  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_BSLS, KC_GRV,
+      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_BSPC,
+      KC_LCTL,          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(3),
+      KC_CAPS, KC_LGUI,          KC_LALT, KC_SPC,        MO(2),            KC_SPC, KC_RALT,         KC_RGUI, KC_APP,  KC_RCTL),
+
+/*  LAYER 1
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ESC│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ \ │ ` │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │ TAB │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │ BKSP│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │ CTRL │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ ENTER  │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │ SHIFT  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ SHIFT│LYR│
+ * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───┤
+ * │CAPS│ ALT│ OS │ SPACE  │ FN │  SPACE   │ OS │ ALT│MENU│CTRL│
+ * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘
+ */
+  LAYOUT_60_calbatr0ss(
+      KC_ESC,  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_BSLS, KC_GRV,
+      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_BSPC,
+      KC_LCTL,          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(3),
+      KC_CAPS, KC_LALT,          KC_LGUI, KC_SPC,        MO(2),            KC_SPC, KC_RGUI,         KC_RALT, KC_APP,  KC_RCTL),
+
+/*  LAYER 2
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│   │   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │     │   │   │   │   │   │   │PDN│ UP│PUP│   │   │   │ DEL │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │      │   │   │   │   │   │HOM│LFT│DWN│RHT│END│   │        │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │        │   │   │   │   │VDN│VUP│MUT│PRV│NXT│PLY│      │   │
+ * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───┤
+ * │RSET│    │    │        │    │          │    │    │    │    │
+ * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘
+ */
+  LAYOUT_60_calbatr0ss(
+      KC_TRNS, 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_TRNS, KC_TRNS,
+      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_UP,   KC_PGUP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_DEL,
+      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT,  KC_END,  KC_TRNS, KC_TRNS,
+      KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT,  KC_MPLY,          KC_TRNS, KC_TRNS,
+      RESET,   KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,          KC_TRNS),
+
+/*  LAYER 3
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │WIN│MAC│   │   │   │   │   │   │   │   │   │   │   │   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │      │   │   │   │   │   │   │   │   │   │   │   │        │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │        │   │   │   │   │   │   │   │   │   │   │      │   │
+ * ├────┬───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴───┼───┴┬────┬┴───┤
+ * │    │    │    │        │    │          │    │    │    │    │
+ * └────┴────┴────┴────────┴────┴──────────┴────┴────┴────┴────┘
+ */
+  LAYOUT_60_calbatr0ss(
+      KC_TRNS, DF(0),   DF(1),   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/dz60/keymaps/kifinnsson/keymap.c b/keyboards/dz60/keymaps/kifinnsson/keymap.c
new file mode 100644
index 0000000000..7d88b6dbb4
--- /dev/null
+++ b/keyboards/dz60/keymaps/kifinnsson/keymap.c
@@ -0,0 +1,210 @@
+#include QMK_KEYBOARD_H
+
+bool is_lgui_active = false;
+uint16_t lgui_timer = 0;
+
+
+//Macro Declarations
+enum my_keycodes {
+  KI_NO = SAFE_RANGE,
+    KI_1,
+    KI_2,
+    KI_3,
+    KI_4,
+    KI_5,
+    KI_6,
+    KI_7,
+    KI_8,
+    KI_9,
+    KI_10,
+    KI_11,
+    KI_12,
+    KI_ESC,
+    KI_BKSP,
+    KI_BSLS,
+    KI_WLFT,
+    KI_WRGT,
+    };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	LAYOUT_all(
+		KC_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,  XXXXXXX, KC_BSPC,
+		KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,   KC_U,     KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS,
+		MO(1),   KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,   KC_E,     KC_I,    KC_O,    KC_QUOT, KC_ENT,
+		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    MO(2),   KC_K,   KC_M,     KC_COMM, KC_DOT,  KC_SLSH, XXXXXXX, KC_RSFT, XXXXXXX,
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, MO(1),  XXXXXXX,  MO(3),   KC_RCTL),
+
+	LAYOUT_all(
+		KC_GRV,  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,
+		_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PGUP, KC_HOME, KC_UP,   KC_END,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+		_______, XXXXXXX, KC_TAB,  KC_LSFT, KC_LCTL, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL,  KC_CAPS, XXXXXXX,
+		_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, KC_BSPC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,,
+		_______, _______, XXXXXXX, KC_ENT,  KC_ENT,  KC_ENT,  _______, _______, _______, _______, RESET),
+
+	LAYOUT_all(
+		KI_ESC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, KI_BKSP,
+		_______, KI_1,    KI_2,    KI_3,    KI_4,    KI_5,    KI_6,    KI_7,    KI_8,    KI_9,    KI_10,   KI_11,   KI_12,   KI_BSLS,
+		_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+		_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, KI_WLFT, KI_WRGT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+		_______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, XXXXXXX),
+
+	LAYOUT_all(
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    // Keycodes Starting with KI_ are place holders for my personal macros. They are set below. Most are simple SEND_STRINGS().
+    case KI_ESC:
+      if (record->event.pressed) {
+        SEND_STRING("");
+      } else {
+        
+      }
+      return false; // Skip all further processing of this key
+    case KI_1:
+      if (record->event.pressed) {
+        SEND_STRING("");
+      } else {
+        
+      }
+      return false; // Skip all further processing of this key
+    case KI_2:
+      if (record->event.pressed) {
+        SEND_STRING("");
+      } else {
+        
+      }
+      return false; // Skip all further processing of this key
+    case KI_3:
+      if (record->event.pressed) {
+        SEND_STRING("");
+      } else {
+        
+      }
+      return false; // Skip all further processing of this key
+    case KI_4:
+      if (record->event.pressed) {
+        SEND_STRING("");
+      } else {
+        
+      }
+      return false; // Skip all further processing of this key
+    case KI_5:
+      if (record->event.pressed) {
+        SEND_STRING("");
+      } else {
+        
+      }
+      return false; // Skip all further processing of this key
+    case KI_6:
+      if (record->event.pressed) {
+        SEND_STRING("");
+      } else {
+        
+      }
+      return false; // Skip all further processing of this key
+    case KI_7:
+      if (record->event.pressed) {
+        SEND_STRING("");
+      } else {
+        
+      }
+      return false; // Skip all further processing of this key
+    case KI_8:
+      if (record->event.pressed) {
+        SEND_STRING("");
+      } else {
+        
+      }
+      return false; // Skip all further processing of this key
+    case KI_9:
+      if (record->event.pressed) {
+        SEND_STRING("");
+      } else {
+        
+      }
+      return false; // Skip all further processing of this key
+    case KI_10:
+      if (record->event.pressed) {
+        SEND_STRING("");
+      } else {
+        
+      }
+      return false; // Skip all further processing of this key
+    case KI_11:
+      if (record->event.pressed) {
+        SEND_STRING("");
+      } else {
+        
+      }
+      return false; // Skip all further processing of this key
+    case KI_12:
+      if (record->event.pressed) {
+        SEND_STRING("");
+      } else {
+        
+      }
+      return false; // Skip all further processing of this key
+    case KI_BKSP:
+      if (record->event.pressed) {
+        SEND_STRING("");
+      } else {
+        
+      }
+      return false; // Skip all further processing of this key
+    case KI_BSLS:
+      if (record->event.pressed) {
+        SEND_STRING("");
+      } else {
+        
+      }
+      return false; // Skip all further processing of this key
+
+    //Windows Win+Left tap to move window without resetting KC_LGUI
+    //Additional code is in matrix_scan_user()
+    case KI_WLFT:
+      if (record->event.pressed) {
+        if (!is_lgui_active) {
+          is_lgui_active = true;
+          register_code(KC_LGUI);
+        } 
+        lgui_timer = timer_read();
+        tap_code(KC_LEFT);
+      } else {
+        
+      }
+      return false; // Skip all further processing of this key
+    //Windows Win+Right tap to move window without resetting KC_LGUI
+    //Additional code is in matrix_scan_user()
+    case KI_WRGT:
+      if (record->event.pressed) {
+        if (!is_lgui_active) {
+          is_lgui_active = true;
+          register_code(KC_LGUI);
+        } 
+        lgui_timer = timer_read();
+        tap_code(KC_RIGHT);
+      } else {
+        
+      }
+      return false; // Skip all further processing of this key
+    default:
+      return true; // Process all other keycodes normally
+  }
+}
+
+//Check if KC_LGUI is active in KI_WLFT and KI_WRGT
+void matrix_scan_user(void) { 
+  if (is_lgui_active) {
+    if (timer_elapsed(lgui_timer) > 1000) {
+      unregister_code(KC_LGUI);
+      is_lgui_active = false;
+    }
+  }
+}
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/kifinnsson/readme.md b/keyboards/dz60/keymaps/kifinnsson/readme.md
new file mode 100644
index 0000000000..49f5595030
--- /dev/null
+++ b/keyboards/dz60/keymaps/kifinnsson/readme.md
@@ -0,0 +1,5 @@
+# kifinnsson's Colemak angle mod ansi-ish layout
+-----------------
+
+Keymap for my non-standard DZ60 layout. It is an ansi layout on the right and iso on the left (ie 1.25x left shift). This is to implement the angle mod on for Colemak which is the base layer. A side effect of this is that I have an extra key on row 4, which sits between the "b" and "k" keys in Colemak. I use this key as a switch to layer 2 which is my macro layer.
+
diff --git a/keyboards/dz60/keymaps/kifinnsson/rules.mk b/keyboards/dz60/keymaps/kifinnsson/rules.mk
new file mode 100644
index 0000000000..5fb201c88a
--- /dev/null
+++ b/keyboards/dz60/keymaps/kifinnsson/rules.mk
@@ -0,0 +1,6 @@
+# Build Options
+#   comment out to disable the options.
+#
+BOOTMAGIC_ENABLE = no	# Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no	# Mouse keys(+4700)
+EXTRAKEY_ENABLE = no	# Audio control and System control(+450)
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/kream/keymap.c b/keyboards/dz60/keymaps/kream/keymap.c
new file mode 100644
index 0000000000..2c74de482c
--- /dev/null
+++ b/keyboards/dz60/keymaps/kream/keymap.c
@@ -0,0 +1,17 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_60_ansi_split_space_rshift(
+        KC_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,
+        MO(1),   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_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_NO, KC_SPC, KC_CAPS, KC_NO, KC_NO,   KC_ENT),
+
+	[1] = LAYOUT_60_ansi_split_space_rshift(
+        KC_GRV,  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_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_PSCR, KC_GRV,  KC_TILD, _______,
+        _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, _______,
+        _______, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
+};
diff --git a/keyboards/dz60/keymaps/kream/rules.mk b/keyboards/dz60/keymaps/kream/rules.mk
new file mode 100644
index 0000000000..6a82f21b35
--- /dev/null
+++ b/keyboards/dz60/keymaps/kream/rules.mk
@@ -0,0 +1,3 @@
+MOUSEKEY_ENABLE=no
+BACKLIGHT_ENABLE=no
+RGBLIGHT_ENABLE=no
diff --git a/keyboards/dz60/keymaps/mpaarating/keymap.c b/keyboards/dz60/keymaps/mpaarating/keymap.c
new file mode 100644
index 0000000000..3ad32aae0a
--- /dev/null
+++ b/keyboards/dz60/keymaps/mpaarating/keymap.c
@@ -0,0 +1,24 @@
+#include QMK_KEYBOARD_H
+
+// Layer definition
+#define L0 0
+#define L1 1
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[L0] = LAYOUT_60_2_function(
+		KC_ESC, 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_BSLASH, KC_GRAVE,
+		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_BSPACE,
+		KC_LCTL,          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(L1),
+		KC_LCTL, KC_LGUI,          KC_LALT,                   KC_SPC,                             KC_RALT, KC_RCTL, KC_RGUI, MO(L1)
+    ),
+
+	[L1] = LAYOUT_60_2_function(
+		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_TRNS, KC_TRNS,
+		KC_TRNS,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_UP, KC_TRNS, KC_DELETE,
+		KC_CAPS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_LEFT, KC_RIGHT, KC_TRNS,
+		KC_TRNS,          KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_TRNS,  KC_END,  KC_DOWN, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/dz60/keymaps/mpaarating/readme.md b/keyboards/dz60/keymaps/mpaarating/readme.md
new file mode 100644
index 0000000000..d21d26c757
--- /dev/null
+++ b/keyboards/dz60/keymaps/mpaarating/readme.md
@@ -0,0 +1,12 @@
+# DZ60
+
+![dz60](https://i.imgur.com/nVOX9Gb.jpg)
+
+### Layout
+**Note:** Layer 2 does not exist currently
+![layer 0](https://i.imgur.com/uXFTNBs.png)
+![layer 1](https://i.imgur.com/f7uTkDU.png)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make dz60:mpaarating
diff --git a/keyboards/dz60/keymaps/olligranlund_iso/keymap.c b/keyboards/dz60/keymaps/olligranlund_iso/keymap.c
index 5b80470133..74953764fd 100644
--- a/keyboards/dz60/keymaps/olligranlund_iso/keymap.c
+++ b/keyboards/dz60/keymaps/olligranlund_iso/keymap.c
@@ -26,13 +26,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		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,
 		MO(1),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,     KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
 		KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,     KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_PSCR,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, MO(1),    KC_NO,   KC_APP,   KC_RCTL),
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, MO(1),    KC_APP,  KC_RCTL),
 
 	LAYOUT_60_iso_split_space_bs_rshift(
 		KC_GRV,  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_DEL,
 		KC_NO,   KC_MPRV, KC_MPLY, KC_MNXT, KC_NO,   KC_NO,   KC_NO,   KC_PGDOWN,KC_UP,   KC_PGUP, KC_NO,   KC_NO,   KC_NO,
 		KC_NO,   KC_VOLD, KC_MUTE, KC_VOLU, KC_NO,   KC_NO,   KC_HOME,  KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,   KC_NO,   KC_NO,   KC_NO,
 		KC_LSFT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_END,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_RSFT, KC_CAPS,
-		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, MO(1),    KC_NO,   KC_APP,  KC_RCTL),
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC,  KC_SPC,  KC_SPC,  KC_RALT, MO(1),    KC_APP,  KC_RCTL),
 
 };
diff --git a/keyboards/dz60/keymaps/weeheavy_2.25_lshift/README.md b/keyboards/dz60/keymaps/weeheavy_2.25_lshift/README.md
new file mode 100644
index 0000000000..6ff8d9e67c
--- /dev/null
+++ b/keyboards/dz60/keymaps/weeheavy_2.25_lshift/README.md
@@ -0,0 +1,53 @@
+![DZ60 ANSI with arrow cluster](https://i.imgur.com/hX6rMcm.png)
+
+# weeheavy's DZ60 layout
+
+* Default 2.25 left shift
+* arrow cluster
+
+## Layouts
+
+The base layout is ANSI QWERTY.
+
+Key sizes (ASCII keyboards below match this scale):
+
+    1u    = 4 chars  = |  |
+    1.25u = 5 chars  = |   |
+    1.5u  = 6 chars  = |    |
+    1.75u = 7 chars  = |     |
+    2u    = 8 chars  = |      |
+    2.25u = 9 chars  = |       |
+    2.75u = 11 chars = |         |
+    6.25u = 25 chars = |                       |
+
+### Layer 0: Base layout
+
+Specialities:
+
+* Arrow cluster
+* FN: access to layer 1
+
+```
+,----------------------------------------------------------.
+|Es||1 ||2 ||3 ||4 ||5 ||6 ||7 ||8 ||9 ||0 ||- ||= || Bksp |
+|----------------------------------------------------------+
+|Tab ||Q ||W ||E ||R ||T ||Y ||U ||I ||O ||P ||[ ||] || \  |
+|----------------------------------------------------------+
+|Caps ||A ||S ||D ||F ||G ||H ||J ||K ||L ||; ||' || Enter |
+|----------------------------------------------------------+
+| Shift ||Z ||X ||C ||V ||B ||N ||M ||, ||. ||/ ||  Shift  |
+|----------------------------------------------------------+
+|Ctl||Win||Alt||          Space         |FN||← ||↑ ||↓ ||→ |
+`----------------------------------------------------------'
+```
+
+### Layer 1: Utility
+
+Specialities:
+
+* F1-F12 keys when holding FN
+* Multimedia cluster on the bottom right
+* RGB config on the left hand side
+* Reset key on ESC and backslash location
+* Brightness control top right
+* Additional "B" key (a learning from my mistakes)
diff --git a/keyboards/dz60/keymaps/weeheavy_2.25_lshift/keymap.c b/keyboards/dz60/keymaps/weeheavy_2.25_lshift/keymap.c
new file mode 100644
index 0000000000..38e4519b33
--- /dev/null
+++ b/keyboards/dz60/keymaps/weeheavy_2.25_lshift/keymap.c
@@ -0,0 +1,30 @@
+#include QMK_KEYBOARD_H
+
+// Make special keycodes more visible
+#define ____ KC_TRNS
+#define XXXX KC_NO
+
+// Layer definition
+#define L0 0
+#define L1 1
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+// Base layer - ANSI QWERTY
+[L0] = LAYOUT_all(
+	KC_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, XXXX, 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_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, XXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_RSFT,
+	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, MO(L1), KC_LEFT, KC_UP, KC_DOWN, KC_RIGHT),
+
+// Utility layer - RGB and multimedia control, reset and additional "b" button
+[L1] = LAYOUT_all(
+	RESET, 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_B, RGB_TOG, RGB_MOD, RGB_M_K, RGB_M_R, ____, ____, KC_PSCR, ____, KC_PAUS, KC_BRID, KC_BRIU, ____, RESET,
+	____, RGB_HUI, RGB_HUD, KC_DEL, ____, ____, ____, KC_INS, KC_HOME, KC_PGUP, ____, ____, ____,
+	____, ____, RGB_SAI, RGB_SAD, ____, ____, ____, ____, ____, KC_END, KC_PGDN, KC_MPLY, ____, KC_MUTE, KC_MUTE,
+	____, RGB_VAI, RGB_VAD, ____, ____, ____, ____, KC_MPRV, KC_VOLU, KC_VOLD, KC_MNXT),
+
+};
+