From 3c139b15077363a358559a3a0fab05a4f9e21ded Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Fri, 28 Apr 2023 21:48:35 -0700
Subject: [PATCH] dyz Synthesis60 Layout Macro Addition (#20610)

* add matrix_diagram.md

* info.json: apply friendly formatting

* refactor keymaps

- use four-space indent
- grid-align keycodes
- use QMK-native keycodes alias for `KC_RIGHT`

* add key positions for arrow keys to LAYOUT_all

* add LAYOUT_arrow with reference keymap

* info.json: unify key legends
---
 keyboards/dyz/synthesis60/info.json           | 212 ++++++++++++------
 .../dyz/synthesis60/keymaps/default/keymap.c  |  42 ++--
 .../keymaps/default_arrow/keymap.c            |  56 +++++
 .../dyz/synthesis60/keymaps/via/keymap.c      |  42 ++--
 keyboards/dyz/synthesis60/matrix_diagram.md   |  20 ++
 5 files changed, 263 insertions(+), 109 deletions(-)
 create mode 100644 keyboards/dyz/synthesis60/keymaps/default_arrow/keymap.c
 create mode 100644 keyboards/dyz/synthesis60/matrix_diagram.md

diff --git a/keyboards/dyz/synthesis60/info.json b/keyboards/dyz/synthesis60/info.json
index d82de523a7..8a09eeea34 100644
--- a/keyboards/dyz/synthesis60/info.json
+++ b/keyboards/dyz/synthesis60/info.json
@@ -59,85 +59,163 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"matrix": [4, 0], "x": 0, "y": 0},
+                {"label": "Home", "matrix": [4, 0], "x": 0, "y": 0},
 
-                {"matrix": [0, 0], "x": 1.25, "y": 0},
-                {"matrix": [0, 1], "x": 2.25, "y": 0},
-                {"matrix": [0, 2], "x": 3.25, "y": 0},
-                {"matrix": [0, 3], "x": 4.25, "y": 0},
-                {"matrix": [0, 4], "x": 5.25, "y": 0},
-                {"matrix": [0, 5], "x": 6.25, "y": 0},
-                {"matrix": [0, 6], "x": 7.25, "y": 0},
+                {"label": "Esc", "matrix": [0, 0], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 7.25, "y": 0},
 
-                {"matrix": [0, 7], "x": 10.25, "y": 0},
-                {"matrix": [0, 8], "x": 11.25, "y": 0},
-                {"matrix": [0, 9], "x": 12.25, "y": 0},
-                {"matrix": [0, 10], "x": 13.25, "y": 0},
-                {"matrix": [0, 11], "x": 14.25, "y": 0},
-                {"matrix": [0, 12], "x": 15.25, "y": 0},
-                {"matrix": [0, 13], "x": 16.25, "y": 0},
-                {"matrix": [4, 13], "x": 17.25, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 10.25, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 11.25, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 12.25, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 13.25, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 14.25, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 15.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 16.25, "y": 0},
+                {"label": "Delete", "matrix": [4, 13], "x": 17.25, "y": 0},
 
-                {"matrix": [4, 1], "x": 0, "y": 1},
+                {"label": "Page Up", "matrix": [4, 1], "x": 0, "y": 1},
 
-                {"matrix": [1, 0], "x": 1.25, "y": 1, "w": 1.5},
-                {"matrix": [1, 1], "x": 2.75, "y": 1},
-                {"matrix": [1, 2], "x": 3.75, "y": 1},
-                {"matrix": [1, 3], "x": 4.75, "y": 1},
-                {"matrix": [1, 4], "x": 5.75, "y": 1},
-                {"matrix": [1, 5], "x": 6.75, "y": 1},
+                {"label": "Tab", "matrix": [1, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 6.75, "y": 1},
 
-                {"matrix": [1, 6], "x": 9.75, "y": 1},
-                {"matrix": [1, 7], "x": 10.75, "y": 1},
-                {"matrix": [1, 8], "x": 11.75, "y": 1},
-                {"matrix": [1, 9], "x": 12.75, "y": 1},
-                {"matrix": [1, 10], "x": 13.75, "y": 1},
-                {"matrix": [1, 11], "x": 14.75, "y": 1},
-                {"matrix": [1, 12], "x": 15.75, "y": 1},
-                {"matrix": [1, 13], "x": 16.75, "y": 1, "w": 1.5},
+                {"label": "Y", "matrix": [1, 6], "x": 9.75, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 10.75, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 11.75, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 12.75, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 13.75, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 14.75, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 15.75, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 16.75, "y": 1, "w": 1.5},
 
-                {"matrix": [4, 2], "x": 0, "y": 2},
+                {"label": "Page Down", "matrix": [4, 2], "x": 0, "y": 2},
 
-                {"matrix": [2, 0], "x": 1.25, "y": 2, "w": 1.75},
-                {"matrix": [2, 1], "x": 3, "y": 2},
-                {"matrix": [2, 2], "x": 4, "y": 2},
-                {"matrix": [2, 3], "x": 5, "y": 2},
-                {"matrix": [2, 4], "x": 6, "y": 2},
-                {"matrix": [2, 5], "x": 7, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 7, "y": 2},
 
-                {"matrix": [2, 6], "x": 10, "y": 2},
-                {"matrix": [2, 7], "x": 11, "y": 2},
-                {"matrix": [2, 8], "x": 12, "y": 2},
-                {"matrix": [2, 9], "x": 13, "y": 2},
-                {"matrix": [2, 10], "x": 14, "y": 2},
-                {"matrix": [2, 11], "x": 15, "y": 2},
-                {"matrix": [2, 12], "x": 16, "y": 2, "w": 2.25},
+                {"label": "H", "matrix": [2, 6], "x": 10, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 11, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 12, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 13, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 14, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 15, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 16, "y": 2, "w": 2.25},
 
-                {"matrix": [3, 0], "x": 1.25, "y": 3, "w": 2.25},
-                {"matrix": [3, 1], "x": 3.5, "y": 3},
-                {"matrix": [3, 2], "x": 4.5, "y": 3},
-                {"matrix": [3, 3], "x": 5.5, "y": 3},
-                {"matrix": [3, 4], "x": 6.5, "y": 3},
-                {"matrix": [3, 5], "x": 7.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 0], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 7.5, "y": 3},
 
-                {"matrix": [3, 6], "x": 9.5, "y": 3},
-                {"matrix": [3, 7], "x": 10.5, "y": 3},
-                {"matrix": [3, 8], "x": 11.5, "y": 3},
-                {"matrix": [3, 9], "x": 12.5, "y": 3},
-                {"matrix": [3, 10], "x": 13.5, "y": 3},
-                {"matrix": [3, 11], "x": 14.5, "y": 3},
-                {"matrix": [3, 12], "x": 15.5, "y": 3, "w": 1.75},
-                {"matrix": [3, 13], "x": 17.25, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 9.5, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 10.5, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 11.5, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 12.5, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 13.5, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 14.5, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 15.5, "y": 3, "w": 1.75},
+                {"label": "Delete", "matrix": [3, 13], "x": 17.25, "y": 3},
 
-                {"matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.5},
-                {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
-                {"matrix": [4, 6], "x": 7.75, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 4], "x": 4, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
+                {"label": "Fn", "matrix": [4, 6], "x": 7.75, "y": 4},
 
-                {"matrix": [4, 7], "x": 9.5, "y": 4, "w": 1.5},
-                {"matrix": [4, 8], "x": 11, "y": 4, "w": 1.25},
-                {"matrix": [4, 9], "x": 12.25, "y": 4, "w": 1.5},
-                {"matrix": [4, 12], "x": 16.75, "y": 4, "w": 1.5}
+                {"label": "Space", "matrix": [4, 7], "x": 9.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 11, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 12.25, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 10], "x": 14.5, "y": 4},
+                {"label": "Menu", "matrix": [4, 11], "x": 15.5, "y": 4},
+                {"label": "Ctrl", "matrix": [4, 12], "x": 16.5, "y": 4, "w": 1.5}
+            ]
+        },
+        "LAYOUT_arrow": {
+            "layout": [
+                {"label": "Home", "matrix": [4, 0], "x": 0, "y": 0},
+                {"label": "Esc", "matrix": [0, 0], "x": 1.25, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 2.25, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 3.25, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 4.25, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 5.25, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 6.25, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 7.25, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 10.25, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 11.25, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 12.25, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 13.25, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 14.25, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 15.25, "y": 0},
+                {"label": "Backspace", "matrix": [0, 13], "x": 16.25, "y": 0, "w": 2},
+
+                {"label": "PgUp", "matrix": [4, 1], "x": 0, "y": 1},
+                {"label": "Tab", "matrix": [1, 0], "x": 1.25, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 2.75, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 3.75, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 4.75, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 5.75, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 6.75, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 9.75, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 10.75, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 11.75, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 12.75, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 13.75, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 14.75, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 15.75, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 16.75, "y": 1, "w": 1.5},
+
+                {"label": "PgDn", "matrix": [4, 2], "x": 0, "y": 2},
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 1.25, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 3, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 4, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 5, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 6, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 7, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 10, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 11, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 12, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 13, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 14, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 15, "y": 2},
+                {"label": "Enter", "matrix": [2, 12], "x": 16, "y": 2, "w": 2.25},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 1.25, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 1], "x": 3.5, "y": 3},
+                {"label": "X", "matrix": [3, 2], "x": 4.5, "y": 3},
+                {"label": "C", "matrix": [3, 3], "x": 5.5, "y": 3},
+                {"label": "V", "matrix": [3, 4], "x": 6.5, "y": 3},
+                {"label": "B", "matrix": [3, 5], "x": 7.5, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 9.5, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 10.5, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 11.5, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 12.5, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 13.5, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 14.5, "y": 3},
+                {"label": "\u2191", "matrix": [3, 12], "x": 15.5, "y": 3},
+                {"label": "Fn", "matrix": [3, 13], "x": 16.5, "y": 3, "w": 1.75},
+
+                {"label": "Ctrl", "matrix": [4, 3], "x": 1.25, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [4, 4], "x": 4, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 5], "x": 5.5, "y": 4, "w": 2.25},
+                {"label": "Space", "matrix": [4, 6], "x": 7.75, "y": 4},
+                {"label": "Space", "matrix": [4, 7], "x": 9.5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 11, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 12.25, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 10], "x": 14.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 11], "x": 15.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 12], "x": 16.5, "y": 4}
             ]
         }
     }
diff --git a/keyboards/dyz/synthesis60/keymaps/default/keymap.c b/keyboards/dyz/synthesis60/keymaps/default/keymap.c
index 5cf1b94cf3..bdc705f90b 100644
--- a/keyboards/dyz/synthesis60/keymaps/default/keymap.c
+++ b/keyboards/dyz/synthesis60/keymaps/default/keymap.c
@@ -22,27 +22,27 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_all( /* Base */
-    KC_HOME, 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_BSPC, KC_DEL,
-    KC_PGUP, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,         KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,
-    KC_PGDN, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,         KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,
-             KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                  KC_B, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_DEL,
-             KC_LCTL,                    KC_LALT, KC_SPC, MO(1),                 KC_SPC, KC_SPC, KC_RALT, KC_RCTL
-  ),
-  [_FN] = LAYOUT_all(
-    RGB_TOG, _______,  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_VOLU, _______,  _______,    KC_HOME,    KC_UP,    KC_END,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,          _______,
-    KC_VOLD, _______, _______,    KC_LEFT,    KC_DOWN,    KC_RIGHT,    _______,    _______,    _______,    _______,    _______,    _______, _______,                   _______,
-             _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______,          _______, _______,
-             _______,          _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-  [_FN2] = LAYOUT_all(
-    _______, _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______, _______,
-    _______, _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,          _______,
-    _______, _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,                   _______,
-             _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______,          _______, _______,
-             _______,          _______, _______, _______, _______, _______, _______, _______, _______
-  )
+    [_BASE] = LAYOUT_all( /* Base */
+        KC_HOME,    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_BSPC, KC_DEL,
+        KC_PGUP,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_PGDN,    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+                    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_DEL,
+                    KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),               KC_SPC,  KC_SPC,  KC_RALT,                   KC_RGUI, KC_APP,  KC_RCTL
+    ),
+    [_FN] = LAYOUT_all(
+        RGB_TOG,    _______, 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_VOLU,    _______, _______, KC_HOME, KC_UP,   KC_END,  _______,             _______, _______, _______, _______, _______, _______, _______, _______,
+        KC_VOLD,    _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,             _______, _______, _______, _______, _______, _______,          _______,
+                    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______, _______, _______,
+                    _______,          _______,          _______, _______,             _______, _______, _______,                   _______, _______, _______
+    ),
+    [_FN2] = LAYOUT_all(
+        _______,    _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______,          _______,
+                    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______, _______, _______,
+                    _______,          _______,          _______, _______,             _______, _______, _______,                   _______, _______, _______
+    )
 };
 
 
diff --git a/keyboards/dyz/synthesis60/keymaps/default_arrow/keymap.c b/keyboards/dyz/synthesis60/keymaps/default_arrow/keymap.c
new file mode 100644
index 0000000000..5ef6db4675
--- /dev/null
+++ b/keyboards/dyz/synthesis60/keymaps/default_arrow/keymap.c
@@ -0,0 +1,56 @@
+/* Copyright 2019 Ryota Goto
+ *
+ * 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 layer_names {
+    _BASE,
+    _FN,
+    _FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_arrow( /* Base */
+        KC_HOME,    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_BSPC,
+        KC_PGUP,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_PGDN,    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+                    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_DEL,
+                    KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),               KC_SPC,  KC_SPC,  KC_RALT,                   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_arrow(
+        RGB_TOG,    _______, 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_VOLU,    _______, _______, KC_HOME, KC_UP,   KC_END,  _______,             _______, _______, _______, _______, _______, _______, _______, _______,
+        KC_VOLD,    _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,             _______, _______, _______, _______, _______, _______,          _______,
+                    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______, _______, _______,
+                    _______,          _______,          _______, _______,             _______, _______, _______,                   _______, _______, _______
+    ),
+    [_FN2] = LAYOUT_arrow(
+        _______,    _______, _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______,          _______,
+                    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______, _______, _______,
+                    _______,          _______,          _______, _______,             _______, _______, _______,                   _______, _______, _______
+    )
+};
+
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    if (get_highest_layer(state) != 0) {
+        writePinLow(C6);
+    } else {
+        writePinHigh(C6);
+    }
+    return state;
+}
diff --git a/keyboards/dyz/synthesis60/keymaps/via/keymap.c b/keyboards/dyz/synthesis60/keymaps/via/keymap.c
index 5cf1b94cf3..bdc705f90b 100644
--- a/keyboards/dyz/synthesis60/keymaps/via/keymap.c
+++ b/keyboards/dyz/synthesis60/keymaps/via/keymap.c
@@ -22,27 +22,27 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_all( /* Base */
-    KC_HOME, 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_BSPC, KC_DEL,
-    KC_PGUP, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,         KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,
-    KC_PGDN, KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,         KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,                   KC_ENT,
-             KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                  KC_B, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RSFT, KC_DEL,
-             KC_LCTL,                    KC_LALT, KC_SPC, MO(1),                 KC_SPC, KC_SPC, KC_RALT, KC_RCTL
-  ),
-  [_FN] = LAYOUT_all(
-    RGB_TOG, _______,  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_VOLU, _______,  _______,    KC_HOME,    KC_UP,    KC_END,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,          _______,
-    KC_VOLD, _______, _______,    KC_LEFT,    KC_DOWN,    KC_RIGHT,    _______,    _______,    _______,    _______,    _______,    _______, _______,                   _______,
-             _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______,          _______, _______,
-             _______,          _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-  [_FN2] = LAYOUT_all(
-    _______, _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______, _______,
-    _______, _______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,          _______,
-    _______, _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,                   _______,
-             _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______,          _______, _______,
-             _______,          _______, _______, _______, _______, _______, _______, _______, _______
-  )
+    [_BASE] = LAYOUT_all( /* Base */
+        KC_HOME,    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_BSPC, KC_DEL,
+        KC_PGUP,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        KC_PGDN,    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,
+                    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_DEL,
+                    KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),               KC_SPC,  KC_SPC,  KC_RALT,                   KC_RGUI, KC_APP,  KC_RCTL
+    ),
+    [_FN] = LAYOUT_all(
+        RGB_TOG,    _______, 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_VOLU,    _______, _______, KC_HOME, KC_UP,   KC_END,  _______,             _______, _______, _______, _______, _______, _______, _______, _______,
+        KC_VOLD,    _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,             _______, _______, _______, _______, _______, _______,          _______,
+                    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______, _______, _______,
+                    _______,          _______,          _______, _______,             _______, _______, _______,                   _______, _______, _______
+    ),
+    [_FN2] = LAYOUT_all(
+        _______,    _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______,          _______,
+                    _______, _______, _______, _______, _______, _______,             _______, _______, _______, _______, _______, _______, _______, _______,
+                    _______,          _______,          _______, _______,             _______, _______, _______,                   _______, _______, _______
+    )
 };
 
 
diff --git a/keyboards/dyz/synthesis60/matrix_diagram.md b/keyboards/dyz/synthesis60/matrix_diagram.md
new file mode 100644
index 0000000000..d5dd7c8a3f
--- /dev/null
+++ b/keyboards/dyz/synthesis60/matrix_diagram.md
@@ -0,0 +1,20 @@
+# Matrix Diagram for dyz Synthesis60 v2.1
+
+```
+┌───┐┌───┬───┬───┬───┬───┬───┬───┐        ┌───┬───┬───┬───┬───┬───┬───┬───┐   ┌───────┐
+│40 ││00 │01 │02 │03 │04 │05 │06 │        │07 │08 │09 │0A │0B │0C │0D │4D │   │0D     │ 2u Backspace
+├───┤├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘      ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤   └───────┘
+│41 ││10   │11 │12 │13 │14 │15 │        │16 │17 │18 │19 │1A │1B │1C │1D   │
+├───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐       └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+│42 ││20    │21 │22 │23 │24 │25 │        │26 │27 │28 │29 │2A │2B │2C      │
+└───┘├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐    ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   ┌───┬──────┐   ┌──────────┐
+     │30      │31 │32 │33 │34 │35 │    │36 │37 │38 │39 │3A │3B │3C    │3D │   │3C │3D    │   │3C        │
+     ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐  ├───┴─┬─┴──┬┴───┴┬──┼───┼───┬──┴┬──┘   └───┴──────┘   └──────────┘
+     │43   │     │44   │45     │46  │  │47   │48  │49   │  │4A │4B │4C │       1u/1.75u       2.75u
+     └─────┘     └─────┴───────┴────┘  └─────┴────┴─────┘  └───┴───┴───┘       RShift         RShift
+                                       ┌──────────┐        ──────┬─────┐
+                                       │47        │              │4C   │
+                                       └──────────┘              └─────┘
+                                        2.75u                     1.5u
+                                        RSpace                    RCtrl
+```