EvyD13 MX5160 Layout Macro Additions (#20614)

* add matrix_diagram.md

* info.json: apply friendly formatting

* touch-up default keymap

- use four-space indent
- grid-align keycodes
- use enum statement for layer names

* add LAYOUT_ansi_wkl_split_bs_rshift

* add LAYOUT_ansi_wkl

* add LAYOUT_iso_wkl_split_bs_rshift

* add LAYOUT_iso_wkl

* Apply suggestions from code review

3 files changed, 572 insertions, 120 deletions

diff --git a/keyboards/evyd13/mx5160/info.json b/keyboards/evyd13/mx5160/info.json
index ec7133bbd2..38c9712196 100644
--- a/keyboards/evyd13/mx5160/info.json
+++ b/keyboards/evyd13/mx5160/info.json
@@ -29,111 +29,537 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [1, 0], "x": 1, "y": 0},
-
-                {"matrix": [0, 1], "x": 2.5, "y": 0},
-                {"matrix": [1, 1], "x": 3.5, "y": 0},
-                {"matrix": [0, 2], "x": 4.5, "y": 0},
-                {"matrix": [1, 2], "x": 5.5, "y": 0},
-                {"matrix": [0, 3], "x": 6.5, "y": 0},
-                {"matrix": [1, 3], "x": 7.5, "y": 0},
-                {"matrix": [0, 4], "x": 8.5, "y": 0},
-                {"matrix": [1, 4], "x": 9.5, "y": 0},
-                {"matrix": [0, 5], "x": 10.5, "y": 0},
-                {"matrix": [1, 5], "x": 11.5, "y": 0},
-                {"matrix": [0, 6], "x": 12.5, "y": 0},
-                {"matrix": [1, 6], "x": 13.5, "y": 0},
-                {"matrix": [0, 7], "x": 14.5, "y": 0},
-                {"matrix": [8, 7], "x": 15.5, "y": 0},
-                {"matrix": [1, 7], "x": 16.5, "y": 0},
-
-                {"matrix": [0, 8], "x": 18, "y": 0},
-                {"matrix": [1, 8], "x": 19, "y": 0},
-                {"matrix": [0, 9], "x": 20, "y": 0},
-                {"matrix": [1, 9], "x": 21, "y": 0},
-
-                {"matrix": [2, 0], "x": 0, "y": 1},
-                {"matrix": [3, 0], "x": 1, "y": 1},
-
-                {"matrix": [2, 1], "x": 2.5, "y": 1, "w": 1.5},
-                {"matrix": [3, 1], "x": 4, "y": 1},
-                {"matrix": [2, 2], "x": 5, "y": 1},
-                {"matrix": [3, 2], "x": 6, "y": 1},
-                {"matrix": [2, 3], "x": 7, "y": 1},
-                {"matrix": [3, 3], "x": 8, "y": 1},
-                {"matrix": [2, 4], "x": 9, "y": 1},
-                {"matrix": [3, 4], "x": 10, "y": 1},
-                {"matrix": [2, 5], "x": 11, "y": 1},
-                {"matrix": [3, 5], "x": 12, "y": 1},
-                {"matrix": [2, 6], "x": 13, "y": 1},
-                {"matrix": [3, 6], "x": 14, "y": 1},
-                {"matrix": [2, 7], "x": 15, "y": 1},
-                {"matrix": [3, 7], "x": 16, "y": 1, "w": 1.5},
-
-                {"matrix": [2, 8], "x": 18, "y": 1},
-                {"matrix": [3, 8], "x": 19, "y": 1},
-                {"matrix": [2, 9], "x": 20, "y": 1},
-                {"matrix": [3, 9], "x": 21, "y": 1},
-
-                {"matrix": [4, 0], "x": 0, "y": 2},
-                {"matrix": [5, 0], "x": 1, "y": 2},
-
-                {"matrix": [4, 1], "x": 2.5, "y": 2, "w": 1.75},
-                {"matrix": [5, 1], "x": 4.25, "y": 2},
-                {"matrix": [4, 2], "x": 5.25, "y": 2},
-                {"matrix": [5, 2], "x": 6.25, "y": 2},
-                {"matrix": [4, 3], "x": 7.25, "y": 2},
-                {"matrix": [5, 3], "x": 8.25, "y": 2},
-                {"matrix": [4, 4], "x": 9.25, "y": 2},
-                {"matrix": [5, 4], "x": 10.25, "y": 2},
-                {"matrix": [4, 5], "x": 11.25, "y": 2},
-                {"matrix": [5, 5], "x": 12.25, "y": 2},
-                {"matrix": [4, 6], "x": 13.25, "y": 2},
-                {"matrix": [5, 6], "x": 14.25, "y": 2},
-                {"matrix": [4, 7], "x": 15.25, "y": 2},
-                {"matrix": [5, 7], "x": 16.25, "y": 2, "w": 1.25},
-
-                {"matrix": [4, 8], "x": 18, "y": 2},
-                {"matrix": [5, 8], "x": 19, "y": 2},
-                {"matrix": [4, 9], "x": 20, "y": 2},
-                {"matrix": [5, 9], "x": 21, "y": 2},
-
-                {"matrix": [6, 0], "x": 0, "y": 3},
-                {"matrix": [7, 0], "x": 1, "y": 3},
-
-                {"matrix": [6, 1], "x": 2.5, "y": 3, "w": 1.25},
-                {"matrix": [7, 1], "x": 3.75, "y": 3},
-                {"matrix": [6, 2], "x": 4.75, "y": 3},
-                {"matrix": [7, 2], "x": 5.75, "y": 3},
-                {"matrix": [6, 3], "x": 6.75, "y": 3},
-                {"matrix": [7, 3], "x": 7.75, "y": 3},
-                {"matrix": [6, 4], "x": 8.75, "y": 3},
-                {"matrix": [7, 4], "x": 9.75, "y": 3},
-                {"matrix": [6, 5], "x": 10.75, "y": 3},
-                {"matrix": [7, 5], "x": 11.75, "y": 3},
-                {"matrix": [6, 6], "x": 12.75, "y": 3},
-                {"matrix": [7, 6], "x": 13.75, "y": 3},
-                {"matrix": [6, 7], "x": 14.75, "y": 3, "w": 1.75},
-                {"matrix": [7, 7], "x": 16.5, "y": 3},
-
-                {"matrix": [6, 8], "x": 18, "y": 3},
-                {"matrix": [7, 8], "x": 19, "y": 3},
-                {"matrix": [6, 9], "x": 20, "y": 3},
-
-                {"matrix": [8, 0], "x": 0, "y": 4},
-                {"matrix": [9, 0], "x": 1, "y": 4},
-
-                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
-                {"matrix": [8, 2], "x": 5, "y": 4, "w": 1.5},
-                {"matrix": [9, 4], "x": 6.5, "y": 4, "w": 7},
-                {"matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.5},
-                {"matrix": [9, 7], "x": 16, "y": 4, "w": 1.5},
-
-                {"matrix": [8, 8], "x": 18, "y": 4},
-                {"matrix": [9, 8], "x": 19, "y": 4},
-                {"matrix": [8, 9], "x": 20, "y": 4},
-                {"matrix": [9, 9], "x": 21, "y": 3, "h": 2}
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [1, 0], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 2.5, "y": 0},
+                {"label": "1", "matrix": [1, 1], "x": 3.5, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 4.5, "y": 0},
+                {"label": "3", "matrix": [1, 2], "x": 5.5, "y": 0},
+                {"label": "4", "matrix": [0, 3], "x": 6.5, "y": 0},
+                {"label": "5", "matrix": [1, 3], "x": 7.5, "y": 0},
+                {"label": "6", "matrix": [0, 4], "x": 8.5, "y": 0},
+                {"label": "7", "matrix": [1, 4], "x": 9.5, "y": 0},
+                {"label": "8", "matrix": [0, 5], "x": 10.5, "y": 0},
+                {"label": "9", "matrix": [1, 5], "x": 11.5, "y": 0},
+                {"label": "0", "matrix": [0, 6], "x": 12.5, "y": 0},
+                {"label": "-", "matrix": [1, 6], "x": 13.5, "y": 0},
+                {"label": "=", "matrix": [0, 7], "x": 14.5, "y": 0},
+                {"label": "\u25bd", "matrix": [8, 7], "x": 15.5, "y": 0},
+                {"label": "Backspace", "matrix": [1, 7], "x": 16.5, "y": 0},
+
+                {"label": "Num Lock", "matrix": [0, 8], "x": 18, "y": 0},
+                {"label": "/", "matrix": [1, 8], "x": 19, "y": 0},
+                {"label": "*", "matrix": [0, 9], "x": 20, "y": 0},
+                {"label": "-", "matrix": [1, 9], "x": 21, "y": 0},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [3, 0], "x": 1, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 1], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 1], "x": 4, "y": 1},
+                {"label": "W", "matrix": [2, 2], "x": 5, "y": 1},
+                {"label": "E", "matrix": [3, 2], "x": 6, "y": 1},
+                {"label": "R", "matrix": [2, 3], "x": 7, "y": 1},
+                {"label": "T", "matrix": [3, 3], "x": 8, "y": 1},
+                {"label": "Y", "matrix": [2, 4], "x": 9, "y": 1},
+                {"label": "U", "matrix": [3, 4], "x": 10, "y": 1},
+                {"label": "I", "matrix": [2, 5], "x": 11, "y": 1},
+                {"label": "O", "matrix": [3, 5], "x": 12, "y": 1},
+                {"label": "P", "matrix": [2, 6], "x": 13, "y": 1},
+                {"label": "[", "matrix": [3, 6], "x": 14, "y": 1},
+                {"label": "]", "matrix": [2, 7], "x": 15, "y": 1},
+                {"label": "\\", "matrix": [3, 7], "x": 16, "y": 1, "w": 1.5},
+
+                {"label": "7", "matrix": [2, 8], "x": 18, "y": 1},
+                {"label": "8", "matrix": [3, 8], "x": 19, "y": 1},
+                {"label": "9", "matrix": [2, 9], "x": 20, "y": 1},
+                {"label": "\u25bd", "matrix": [3, 9], "x": 21, "y": 1},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [5, 0], "x": 1, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [4, 1], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 1], "x": 4.25, "y": 2},
+                {"label": "S", "matrix": [4, 2], "x": 5.25, "y": 2},
+                {"label": "D", "matrix": [5, 2], "x": 6.25, "y": 2},
+                {"label": "F", "matrix": [4, 3], "x": 7.25, "y": 2},
+                {"label": "G", "matrix": [5, 3], "x": 8.25, "y": 2},
+                {"label": "H", "matrix": [4, 4], "x": 9.25, "y": 2},
+                {"label": "J", "matrix": [5, 4], "x": 10.25, "y": 2},
+                {"label": "K", "matrix": [4, 5], "x": 11.25, "y": 2},
+                {"label": "L", "matrix": [5, 5], "x": 12.25, "y": 2},
+                {"label": ";", "matrix": [4, 6], "x": 13.25, "y": 2},
+                {"label": "'", "matrix": [5, 6], "x": 14.25, "y": 2},
+                {"label": "\u25bd", "matrix": [4, 7], "x": 15.25, "y": 2},
+                {"label": "Enter", "matrix": [5, 7], "x": 16.25, "y": 2, "w": 1.25},
+
+                {"label": "4", "matrix": [4, 8], "x": 18, "y": 2},
+                {"label": "5", "matrix": [5, 8], "x": 19, "y": 2},
+                {"label": "6", "matrix": [4, 9], "x": 20, "y": 2},
+                {"label": "+", "matrix": [5, 9], "x": 21, "y": 2},
+
+                {"label": "F7", "matrix": [6, 0], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [7, 0], "x": 1, "y": 3},
+
+                {"label": "Shift", "matrix": [6, 1], "x": 2.5, "y": 3, "w": 1.25},
+                {"label": "\u25bd", "matrix": [7, 1], "x": 3.75, "y": 3},
+                {"label": "Z", "matrix": [6, 2], "x": 4.75, "y": 3},
+                {"label": "X", "matrix": [7, 2], "x": 5.75, "y": 3},
+                {"label": "C", "matrix": [6, 3], "x": 6.75, "y": 3},
+                {"label": "V", "matrix": [7, 3], "x": 7.75, "y": 3},
+                {"label": "B", "matrix": [6, 4], "x": 8.75, "y": 3},
+                {"label": "N", "matrix": [7, 4], "x": 9.75, "y": 3},
+                {"label": "M", "matrix": [6, 5], "x": 10.75, "y": 3},
+                {"label": ",", "matrix": [7, 5], "x": 11.75, "y": 3},
+                {"label": ".", "matrix": [6, 6], "x": 12.75, "y": 3},
+                {"label": "/", "matrix": [7, 6], "x": 13.75, "y": 3},
+                {"label": "Shift", "matrix": [6, 7], "x": 14.75, "y": 3, "w": 1.75},
+                {"label": "\u25bd", "matrix": [7, 7], "x": 16.5, "y": 3},
+
+                {"label": "1", "matrix": [6, 8], "x": 18, "y": 3},
+                {"label": "2", "matrix": [7, 8], "x": 19, "y": 3},
+                {"label": "3", "matrix": [6, 9], "x": 20, "y": 3},
+
+                {"label": "F9", "matrix": [8, 0], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [9, 0], "x": 1, "y": 4},
+
+                {"label": "Ctrl", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [8, 2], "x": 5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 4], "x": 6.5, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.5},
+                {"label": "Fn", "matrix": [9, 7], "x": 16, "y": 4, "w": 1.5},
+
+                {"label": "0", "matrix": [8, 8], "x": 18, "y": 4},
+                {"label": "\u25bd", "matrix": [9, 8], "x": 19, "y": 4},
+                {"label": ".", "matrix": [8, 9], "x": 20, "y": 4},
+                {"label": "Enter", "matrix": [9, 9], "x": 21, "y": 3, "h": 2}
+            ]
+        },
+        "LAYOUT_ansi_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [1, 0], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 2.5, "y": 0},
+                {"label": "1", "matrix": [1, 1], "x": 3.5, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 4.5, "y": 0},
+                {"label": "3", "matrix": [1, 2], "x": 5.5, "y": 0},
+                {"label": "4", "matrix": [0, 3], "x": 6.5, "y": 0},
+                {"label": "5", "matrix": [1, 3], "x": 7.5, "y": 0},
+                {"label": "6", "matrix": [0, 4], "x": 8.5, "y": 0},
+                {"label": "7", "matrix": [1, 4], "x": 9.5, "y": 0},
+                {"label": "8", "matrix": [0, 5], "x": 10.5, "y": 0},
+                {"label": "9", "matrix": [1, 5], "x": 11.5, "y": 0},
+                {"label": "0", "matrix": [0, 6], "x": 12.5, "y": 0},
+                {"label": "-", "matrix": [1, 6], "x": 13.5, "y": 0},
+                {"label": "=", "matrix": [0, 7], "x": 14.5, "y": 0},
+                {"label": "\u25bd", "matrix": [8, 7], "x": 15.5, "y": 0},
+                {"label": "Backspace", "matrix": [1, 7], "x": 16.5, "y": 0},
+
+                {"label": "Num Lock", "matrix": [0, 8], "x": 18, "y": 0},
+                {"label": "/", "matrix": [1, 8], "x": 19, "y": 0},
+                {"label": "*", "matrix": [0, 9], "x": 20, "y": 0},
+                {"label": "-", "matrix": [1, 9], "x": 21, "y": 0},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [3, 0], "x": 1, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 1], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 1], "x": 4, "y": 1},
+                {"label": "W", "matrix": [2, 2], "x": 5, "y": 1},
+                {"label": "E", "matrix": [3, 2], "x": 6, "y": 1},
+                {"label": "R", "matrix": [2, 3], "x": 7, "y": 1},
+                {"label": "T", "matrix": [3, 3], "x": 8, "y": 1},
+                {"label": "Y", "matrix": [2, 4], "x": 9, "y": 1},
+                {"label": "U", "matrix": [3, 4], "x": 10, "y": 1},
+                {"label": "I", "matrix": [2, 5], "x": 11, "y": 1},
+                {"label": "O", "matrix": [3, 5], "x": 12, "y": 1},
+                {"label": "P", "matrix": [2, 6], "x": 13, "y": 1},
+                {"label": "[", "matrix": [3, 6], "x": 14, "y": 1},
+                {"label": "]", "matrix": [2, 7], "x": 15, "y": 1},
+                {"label": "\\", "matrix": [3, 7], "x": 16, "y": 1, "w": 1.5},
+
+                {"label": "7", "matrix": [2, 8], "x": 18, "y": 1},
+                {"label": "8", "matrix": [3, 8], "x": 19, "y": 1},
+                {"label": "9", "matrix": [2, 9], "x": 20, "y": 1},
+                {"label": "\u25bd", "matrix": [3, 9], "x": 21, "y": 1},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [5, 0], "x": 1, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [4, 1], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 1], "x": 4.25, "y": 2},
+                {"label": "S", "matrix": [4, 2], "x": 5.25, "y": 2},
+                {"label": "D", "matrix": [5, 2], "x": 6.25, "y": 2},
+                {"label": "F", "matrix": [4, 3], "x": 7.25, "y": 2},
+                {"label": "G", "matrix": [5, 3], "x": 8.25, "y": 2},
+                {"label": "H", "matrix": [4, 4], "x": 9.25, "y": 2},
+                {"label": "J", "matrix": [5, 4], "x": 10.25, "y": 2},
+                {"label": "K", "matrix": [4, 5], "x": 11.25, "y": 2},
+                {"label": "L", "matrix": [5, 5], "x": 12.25, "y": 2},
+                {"label": ";", "matrix": [4, 6], "x": 13.25, "y": 2},
+                {"label": "'", "matrix": [5, 6], "x": 14.25, "y": 2},
+                {"label": "Enter", "matrix": [5, 7], "x": 15.25, "y": 2, "w": 2.25},
+
+                {"label": "4", "matrix": [4, 8], "x": 18, "y": 2},
+                {"label": "5", "matrix": [5, 8], "x": 19, "y": 2},
+                {"label": "6", "matrix": [4, 9], "x": 20, "y": 2},
+                {"label": "+", "matrix": [5, 9], "x": 21, "y": 2},
+
+                {"label": "F7", "matrix": [6, 0], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [7, 0], "x": 1, "y": 3},
+
+                {"label": "Shift", "matrix": [6, 1], "x": 2.5, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 2], "x": 4.75, "y": 3},
+                {"label": "X", "matrix": [7, 2], "x": 5.75, "y": 3},
+                {"label": "C", "matrix": [6, 3], "x": 6.75, "y": 3},
+                {"label": "V", "matrix": [7, 3], "x": 7.75, "y": 3},
+                {"label": "B", "matrix": [6, 4], "x": 8.75, "y": 3},
+                {"label": "N", "matrix": [7, 4], "x": 9.75, "y": 3},
+                {"label": "M", "matrix": [6, 5], "x": 10.75, "y": 3},
+                {"label": ",", "matrix": [7, 5], "x": 11.75, "y": 3},
+                {"label": ".", "matrix": [6, 6], "x": 12.75, "y": 3},
+                {"label": "/", "matrix": [7, 6], "x": 13.75, "y": 3},
+                {"label": "Shift", "matrix": [6, 7], "x": 14.75, "y": 3, "w": 1.75},
+                {"label": "\u25bd", "matrix": [7, 7], "x": 16.5, "y": 3},
+
+                {"label": "1", "matrix": [6, 8], "x": 18, "y": 3},
+                {"label": "2", "matrix": [7, 8], "x": 19, "y": 3},
+                {"label": "3", "matrix": [6, 9], "x": 20, "y": 3},
+
+                {"label": "F9", "matrix": [8, 0], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [9, 0], "x": 1, "y": 4},
+
+                {"label": "Ctrl", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [8, 2], "x": 5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 4], "x": 6.5, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.5},
+                {"label": "Fn", "matrix": [9, 7], "x": 16, "y": 4, "w": 1.5},
+
+                {"label": "0", "matrix": [8, 8], "x": 18, "y": 4},
+                {"label": "\u25bd", "matrix": [9, 8], "x": 19, "y": 4},
+                {"label": ".", "matrix": [8, 9], "x": 20, "y": 4},
+                {"label": "Enter", "matrix": [9, 9], "x": 21, "y": 3, "h": 2}
+            ]
+        },
+        "LAYOUT_ansi_wkl": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [1, 0], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 2.5, "y": 0},
+                {"label": "1", "matrix": [1, 1], "x": 3.5, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 4.5, "y": 0},
+                {"label": "3", "matrix": [1, 2], "x": 5.5, "y": 0},
+                {"label": "4", "matrix": [0, 3], "x": 6.5, "y": 0},
+                {"label": "5", "matrix": [1, 3], "x": 7.5, "y": 0},
+                {"label": "6", "matrix": [0, 4], "x": 8.5, "y": 0},
+                {"label": "7", "matrix": [1, 4], "x": 9.5, "y": 0},
+                {"label": "8", "matrix": [0, 5], "x": 10.5, "y": 0},
+                {"label": "9", "matrix": [1, 5], "x": 11.5, "y": 0},
+                {"label": "0", "matrix": [0, 6], "x": 12.5, "y": 0},
+                {"label": "-", "matrix": [1, 6], "x": 13.5, "y": 0},
+                {"label": "=", "matrix": [0, 7], "x": 14.5, "y": 0},
+                {"label": "Backspace", "matrix": [1, 7], "x": 15.5, "y": 0, "w": 2},
+
+                {"label": "Num Lock", "matrix": [0, 8], "x": 18, "y": 0},
+                {"label": "/", "matrix": [1, 8], "x": 19, "y": 0},
+                {"label": "*", "matrix": [0, 9], "x": 20, "y": 0},
+                {"label": "-", "matrix": [1, 9], "x": 21, "y": 0},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [3, 0], "x": 1, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 1], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 1], "x": 4, "y": 1},
+                {"label": "W", "matrix": [2, 2], "x": 5, "y": 1},
+                {"label": "E", "matrix": [3, 2], "x": 6, "y": 1},
+                {"label": "R", "matrix": [2, 3], "x": 7, "y": 1},
+                {"label": "T", "matrix": [3, 3], "x": 8, "y": 1},
+                {"label": "Y", "matrix": [2, 4], "x": 9, "y": 1},
+                {"label": "U", "matrix": [3, 4], "x": 10, "y": 1},
+                {"label": "I", "matrix": [2, 5], "x": 11, "y": 1},
+                {"label": "O", "matrix": [3, 5], "x": 12, "y": 1},
+                {"label": "P", "matrix": [2, 6], "x": 13, "y": 1},
+                {"label": "[", "matrix": [3, 6], "x": 14, "y": 1},
+                {"label": "]", "matrix": [2, 7], "x": 15, "y": 1},
+                {"label": "\\", "matrix": [3, 7], "x": 16, "y": 1, "w": 1.5},
+
+                {"label": "7", "matrix": [2, 8], "x": 18, "y": 1},
+                {"label": "8", "matrix": [3, 8], "x": 19, "y": 1},
+                {"label": "9", "matrix": [2, 9], "x": 20, "y": 1},
+                {"label": "\u25bd", "matrix": [3, 9], "x": 21, "y": 1},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [5, 0], "x": 1, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [4, 1], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 1], "x": 4.25, "y": 2},
+                {"label": "S", "matrix": [4, 2], "x": 5.25, "y": 2},
+                {"label": "D", "matrix": [5, 2], "x": 6.25, "y": 2},
+                {"label": "F", "matrix": [4, 3], "x": 7.25, "y": 2},
+                {"label": "G", "matrix": [5, 3], "x": 8.25, "y": 2},
+                {"label": "H", "matrix": [4, 4], "x": 9.25, "y": 2},
+                {"label": "J", "matrix": [5, 4], "x": 10.25, "y": 2},
+                {"label": "K", "matrix": [4, 5], "x": 11.25, "y": 2},
+                {"label": "L", "matrix": [5, 5], "x": 12.25, "y": 2},
+                {"label": ";", "matrix": [4, 6], "x": 13.25, "y": 2},
+                {"label": "'", "matrix": [5, 6], "x": 14.25, "y": 2},
+                {"label": "Enter", "matrix": [5, 7], "x": 15.25, "y": 2, "w": 2.25},
+
+                {"label": "4", "matrix": [4, 8], "x": 18, "y": 2},
+                {"label": "5", "matrix": [5, 8], "x": 19, "y": 2},
+                {"label": "6", "matrix": [4, 9], "x": 20, "y": 2},
+                {"label": "+", "matrix": [5, 9], "x": 21, "y": 2},
+
+                {"label": "F7", "matrix": [6, 0], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [7, 0], "x": 1, "y": 3},
+
+                {"label": "Shift", "matrix": [6, 1], "x": 2.5, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [6, 2], "x": 4.75, "y": 3},
+                {"label": "X", "matrix": [7, 2], "x": 5.75, "y": 3},
+                {"label": "C", "matrix": [6, 3], "x": 6.75, "y": 3},
+                {"label": "V", "matrix": [7, 3], "x": 7.75, "y": 3},
+                {"label": "B", "matrix": [6, 4], "x": 8.75, "y": 3},
+                {"label": "N", "matrix": [7, 4], "x": 9.75, "y": 3},
+                {"label": "M", "matrix": [6, 5], "x": 10.75, "y": 3},
+                {"label": ",", "matrix": [7, 5], "x": 11.75, "y": 3},
+                {"label": ".", "matrix": [6, 6], "x": 12.75, "y": 3},
+                {"label": "/", "matrix": [7, 6], "x": 13.75, "y": 3},
+                {"label": "Shift", "matrix": [6, 7], "x": 14.75, "y": 3, "w": 2.75},
+
+                {"label": "1", "matrix": [6, 8], "x": 18, "y": 3},
+                {"label": "2", "matrix": [7, 8], "x": 19, "y": 3},
+                {"label": "3", "matrix": [6, 9], "x": 20, "y": 3},
+
+                {"label": "F9", "matrix": [8, 0], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [9, 0], "x": 1, "y": 4},
+
+                {"label": "Ctrl", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [8, 2], "x": 5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 4], "x": 6.5, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.5},
+                {"label": "Fn", "matrix": [9, 7], "x": 16, "y": 4, "w": 1.5},
+
+                {"label": "0", "matrix": [8, 8], "x": 18, "y": 4},
+                {"label": "\u25bd", "matrix": [9, 8], "x": 19, "y": 4},
+                {"label": ".", "matrix": [8, 9], "x": 20, "y": 4},
+                {"label": "Enter", "matrix": [9, 9], "x": 21, "y": 3, "h": 2}
+            ]
+        },
+        "LAYOUT_iso_wkl": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [1, 0], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 2.5, "y": 0},
+                {"label": "1", "matrix": [1, 1], "x": 3.5, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 4.5, "y": 0},
+                {"label": "3", "matrix": [1, 2], "x": 5.5, "y": 0},
+                {"label": "4", "matrix": [0, 3], "x": 6.5, "y": 0},
+                {"label": "5", "matrix": [1, 3], "x": 7.5, "y": 0},
+                {"label": "6", "matrix": [0, 4], "x": 8.5, "y": 0},
+                {"label": "7", "matrix": [1, 4], "x": 9.5, "y": 0},
+                {"label": "8", "matrix": [0, 5], "x": 10.5, "y": 0},
+                {"label": "9", "matrix": [1, 5], "x": 11.5, "y": 0},
+                {"label": "0", "matrix": [0, 6], "x": 12.5, "y": 0},
+                {"label": "-", "matrix": [1, 6], "x": 13.5, "y": 0},
+                {"label": "=", "matrix": [0, 7], "x": 14.5, "y": 0},
+                {"label": "Backspace", "matrix": [1, 7], "x": 15.5, "y": 0, "w": 2},
+
+                {"label": "Num Lock", "matrix": [0, 8], "x": 18, "y": 0},
+                {"label": "/", "matrix": [1, 8], "x": 19, "y": 0},
+                {"label": "*", "matrix": [0, 9], "x": 20, "y": 0},
+                {"label": "-", "matrix": [1, 9], "x": 21, "y": 0},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [3, 0], "x": 1, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 1], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 1], "x": 4, "y": 1},
+                {"label": "W", "matrix": [2, 2], "x": 5, "y": 1},
+                {"label": "E", "matrix": [3, 2], "x": 6, "y": 1},
+                {"label": "R", "matrix": [2, 3], "x": 7, "y": 1},
+                {"label": "T", "matrix": [3, 3], "x": 8, "y": 1},
+                {"label": "Y", "matrix": [2, 4], "x": 9, "y": 1},
+                {"label": "U", "matrix": [3, 4], "x": 10, "y": 1},
+                {"label": "I", "matrix": [2, 5], "x": 11, "y": 1},
+                {"label": "O", "matrix": [3, 5], "x": 12, "y": 1},
+                {"label": "P", "matrix": [2, 6], "x": 13, "y": 1},
+                {"label": "[", "matrix": [3, 6], "x": 14, "y": 1},
+                {"label": "]", "matrix": [2, 7], "x": 15, "y": 1},
+
+                {"label": "7", "matrix": [2, 8], "x": 18, "y": 1},
+                {"label": "8", "matrix": [3, 8], "x": 19, "y": 1},
+                {"label": "9", "matrix": [2, 9], "x": 20, "y": 1},
+                {"label": "\u25bd", "matrix": [3, 9], "x": 21, "y": 1},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [5, 0], "x": 1, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [4, 1], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 1], "x": 4.25, "y": 2},
+                {"label": "S", "matrix": [4, 2], "x": 5.25, "y": 2},
+                {"label": "D", "matrix": [5, 2], "x": 6.25, "y": 2},
+                {"label": "F", "matrix": [4, 3], "x": 7.25, "y": 2},
+                {"label": "G", "matrix": [5, 3], "x": 8.25, "y": 2},
+                {"label": "H", "matrix": [4, 4], "x": 9.25, "y": 2},
+                {"label": "J", "matrix": [5, 4], "x": 10.25, "y": 2},
+                {"label": "K", "matrix": [4, 5], "x": 11.25, "y": 2},
+                {"label": "L", "matrix": [5, 5], "x": 12.25, "y": 2},
+                {"label": ";", "matrix": [4, 6], "x": 13.25, "y": 2},
+                {"label": "'", "matrix": [5, 6], "x": 14.25, "y": 2},
+                {"label": "#", "matrix": [4, 7], "x": 15.25, "y": 2},
+                {"label": "Enter", "matrix": [5, 7], "x": 16.25, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "4", "matrix": [4, 8], "x": 18, "y": 2},
+                {"label": "5", "matrix": [5, 8], "x": 19, "y": 2},
+                {"label": "6", "matrix": [4, 9], "x": 20, "y": 2},
+                {"label": "+", "matrix": [5, 9], "x": 21, "y": 2},
+
+                {"label": "F7", "matrix": [6, 0], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [7, 0], "x": 1, "y": 3},
+
+                {"label": "Shift", "matrix": [6, 1], "x": 2.5, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [7, 1], "x": 3.75, "y": 3},
+                {"label": "Z", "matrix": [6, 2], "x": 4.75, "y": 3},
+                {"label": "X", "matrix": [7, 2], "x": 5.75, "y": 3},
+                {"label": "C", "matrix": [6, 3], "x": 6.75, "y": 3},
+                {"label": "V", "matrix": [7, 3], "x": 7.75, "y": 3},
+                {"label": "B", "matrix": [6, 4], "x": 8.75, "y": 3},
+                {"label": "N", "matrix": [7, 4], "x": 9.75, "y": 3},
+                {"label": "M", "matrix": [6, 5], "x": 10.75, "y": 3},
+                {"label": ",", "matrix": [7, 5], "x": 11.75, "y": 3},
+                {"label": ".", "matrix": [6, 6], "x": 12.75, "y": 3},
+                {"label": "/", "matrix": [7, 6], "x": 13.75, "y": 3},
+                {"label": "Shift", "matrix": [6, 7], "x": 14.75, "y": 3, "w": 2.75},
+
+                {"label": "1", "matrix": [6, 8], "x": 18, "y": 3},
+                {"label": "2", "matrix": [7, 8], "x": 19, "y": 3},
+                {"label": "3", "matrix": [6, 9], "x": 20, "y": 3},
+
+                {"label": "F9", "matrix": [8, 0], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [9, 0], "x": 1, "y": 4},
+
+                {"label": "Ctrl", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [8, 2], "x": 5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 4], "x": 6.5, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.5},
+                {"label": "Fn", "matrix": [9, 7], "x": 16, "y": 4, "w": 1.5},
+
+                {"label": "0", "matrix": [8, 8], "x": 18, "y": 4},
+                {"label": "\u25bd", "matrix": [9, 8], "x": 19, "y": 4},
+                {"label": ".", "matrix": [8, 9], "x": 20, "y": 4},
+                {"label": "Enter", "matrix": [9, 9], "x": 21, "y": 3, "h": 2}
+            ]
+        },
+        "LAYOUT_iso_wkl_split_bs_rshift": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [1, 0], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 1], "x": 2.5, "y": 0},
+                {"label": "1", "matrix": [1, 1], "x": 3.5, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 4.5, "y": 0},
+                {"label": "3", "matrix": [1, 2], "x": 5.5, "y": 0},
+                {"label": "4", "matrix": [0, 3], "x": 6.5, "y": 0},
+                {"label": "5", "matrix": [1, 3], "x": 7.5, "y": 0},
+                {"label": "6", "matrix": [0, 4], "x": 8.5, "y": 0},
+                {"label": "7", "matrix": [1, 4], "x": 9.5, "y": 0},
+                {"label": "8", "matrix": [0, 5], "x": 10.5, "y": 0},
+                {"label": "9", "matrix": [1, 5], "x": 11.5, "y": 0},
+                {"label": "0", "matrix": [0, 6], "x": 12.5, "y": 0},
+                {"label": "-", "matrix": [1, 6], "x": 13.5, "y": 0},
+                {"label": "=", "matrix": [0, 7], "x": 14.5, "y": 0},
+                {"label": "\u25bd", "matrix": [8, 7], "x": 15.5, "y": 0},
+                {"label": "Backspace", "matrix": [1, 7], "x": 16.5, "y": 0},
+
+                {"label": "Num Lock", "matrix": [0, 8], "x": 18, "y": 0},
+                {"label": "/", "matrix": [1, 8], "x": 19, "y": 0},
+                {"label": "*", "matrix": [0, 9], "x": 20, "y": 0},
+                {"label": "-", "matrix": [1, 9], "x": 21, "y": 0},
+
+                {"label": "F3", "matrix": [2, 0], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [3, 0], "x": 1, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 1], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [3, 1], "x": 4, "y": 1},
+                {"label": "W", "matrix": [2, 2], "x": 5, "y": 1},
+                {"label": "E", "matrix": [3, 2], "x": 6, "y": 1},
+                {"label": "R", "matrix": [2, 3], "x": 7, "y": 1},
+                {"label": "T", "matrix": [3, 3], "x": 8, "y": 1},
+                {"label": "Y", "matrix": [2, 4], "x": 9, "y": 1},
+                {"label": "U", "matrix": [3, 4], "x": 10, "y": 1},
+                {"label": "I", "matrix": [2, 5], "x": 11, "y": 1},
+                {"label": "O", "matrix": [3, 5], "x": 12, "y": 1},
+                {"label": "P", "matrix": [2, 6], "x": 13, "y": 1},
+                {"label": "[", "matrix": [3, 6], "x": 14, "y": 1},
+                {"label": "]", "matrix": [2, 7], "x": 15, "y": 1},
+
+                {"label": "7", "matrix": [2, 8], "x": 18, "y": 1},
+                {"label": "8", "matrix": [3, 8], "x": 19, "y": 1},
+                {"label": "9", "matrix": [2, 9], "x": 20, "y": 1},
+                {"label": "\u25bd", "matrix": [3, 9], "x": 21, "y": 1},
+
+                {"label": "F5", "matrix": [4, 0], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [5, 0], "x": 1, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [4, 1], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [5, 1], "x": 4.25, "y": 2},
+                {"label": "S", "matrix": [4, 2], "x": 5.25, "y": 2},
+                {"label": "D", "matrix": [5, 2], "x": 6.25, "y": 2},
+                {"label": "F", "matrix": [4, 3], "x": 7.25, "y": 2},
+                {"label": "G", "matrix": [5, 3], "x": 8.25, "y": 2},
+                {"label": "H", "matrix": [4, 4], "x": 9.25, "y": 2},
+                {"label": "J", "matrix": [5, 4], "x": 10.25, "y": 2},
+                {"label": "K", "matrix": [4, 5], "x": 11.25, "y": 2},
+                {"label": "L", "matrix": [5, 5], "x": 12.25, "y": 2},
+                {"label": ";", "matrix": [4, 6], "x": 13.25, "y": 2},
+                {"label": "'", "matrix": [5, 6], "x": 14.25, "y": 2},
+                {"label": "#", "matrix": [4, 7], "x": 15.25, "y": 2},
+                {"label": "Enter", "matrix": [5, 7], "x": 16.25, "y": 1, "w": 1.25, "h": 2},
+
+                {"label": "4", "matrix": [4, 8], "x": 18, "y": 2},
+                {"label": "5", "matrix": [5, 8], "x": 19, "y": 2},
+                {"label": "6", "matrix": [4, 9], "x": 20, "y": 2},
+                {"label": "+", "matrix": [5, 9], "x": 21, "y": 2},
+
+                {"label": "F7", "matrix": [6, 0], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [7, 0], "x": 1, "y": 3},
+
+                {"label": "Shift", "matrix": [6, 1], "x": 2.5, "y": 3, "w": 1.25},
+                {"label": "\\", "matrix": [7, 1], "x": 3.75, "y": 3},
+                {"label": "Z", "matrix": [6, 2], "x": 4.75, "y": 3},
+                {"label": "X", "matrix": [7, 2], "x": 5.75, "y": 3},
+                {"label": "C", "matrix": [6, 3], "x": 6.75, "y": 3},
+                {"label": "V", "matrix": [7, 3], "x": 7.75, "y": 3},
+                {"label": "B", "matrix": [6, 4], "x": 8.75, "y": 3},
+                {"label": "N", "matrix": [7, 4], "x": 9.75, "y": 3},
+                {"label": "M", "matrix": [6, 5], "x": 10.75, "y": 3},
+                {"label": ",", "matrix": [7, 5], "x": 11.75, "y": 3},
+                {"label": ".", "matrix": [6, 6], "x": 12.75, "y": 3},
+                {"label": "/", "matrix": [7, 6], "x": 13.75, "y": 3},
+                {"label": "Shift", "matrix": [6, 7], "x": 14.75, "y": 3, "w": 1.75},
+                {"label": "\u25bd", "matrix": [7, 7], "x": 16.5, "y": 3},
+
+                {"label": "1", "matrix": [6, 8], "x": 18, "y": 3},
+                {"label": "2", "matrix": [7, 8], "x": 19, "y": 3},
+                {"label": "3", "matrix": [6, 9], "x": 20, "y": 3},
+
+                {"label": "F9", "matrix": [8, 0], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [9, 0], "x": 1, "y": 4},
+
+                {"label": "Ctrl", "matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "Alt", "matrix": [8, 2], "x": 5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [9, 4], "x": 6.5, "y": 4, "w": 7},
+                {"label": "Alt", "matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.5},
+                {"label": "Fn", "matrix": [9, 7], "x": 16, "y": 4, "w": 1.5},
+
+                {"label": "0", "matrix": [8, 8], "x": 18, "y": 4},
+                {"label": "\u25bd", "matrix": [9, 8], "x": 19, "y": 4},
+                {"label": ".", "matrix": [8, 9], "x": 20, "y": 4},
+                {"label": "Enter", "matrix": [9, 9], "x": 21, "y": 3, "h": 2}
             ]
         }
     }
diff --git a/keyboards/evyd13/mx5160/keymaps/default/keymap.c b/keyboards/evyd13/mx5160/keymaps/default/keymap.c
index e7a2895008..07f9291620 100644
--- a/keyboards/evyd13/mx5160/keymaps/default/keymap.c
+++ b/keyboards/evyd13/mx5160/keymaps/default/keymap.c
@@ -20,22 +20,27 @@
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
 
-#define _MA 0 //Main layer
-#define _FN 1 //Main layer
+enum layer_names {
+    _MA, //Main layer
+    _FN, //Main layer
+};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[_MA] = LAYOUT_all(
-    KC_F1,   KC_F2,   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_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
-    KC_F3,   KC_F4,   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_P7,   KC_P8,   KC_P9,   _______,
-    KC_F5,   KC_F6,   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_P4,   KC_P5,   KC_P6,   KC_PPLS,
-    KC_F7,   KC_F8,   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_P1,   KC_P2,   KC_P3,
-    KC_F9,   KC_F10,  KC_LCTL,          KC_LALT,                            KC_SPC,                                            KC_RALT,                    MO(_FN),   KC_P0,   _______, KC_PDOT, KC_PENT),
-	
-[_FN] = LAYOUT_all(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,   _______,   _______, _______, _______, QK_BOOT,      KC_PSCR, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,   _______,   _______, _______,          _______,    _______, KC_UP,   _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,   _______,   _______, _______,          _______,    KC_LEFT, KC_DOWN, KC_RGHT, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  KC_VOLD,   KC_VOLU,   KC_MPLY, _______,          _______,    _______, _______, _______,
-    _______, _______, _______,          _______,                            _______,                                           _______,                   _______,    _______, _______, _______, _______),
+
+    [_MA] = LAYOUT_all(
+        KC_F1,   KC_F2,      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_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
+        KC_F3,   KC_F4,      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_P7,   KC_P8,   KC_P9,   _______,
+        KC_F5,   KC_F6,      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_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_F7,   KC_F8,      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_P1,   KC_P2,   KC_P3,
+        KC_F9,   KC_F10,     KC_LCTL,          KC_LALT,                            KC_SPC,                                      KC_RALT,          MO(_FN),             KC_P0,   _______, KC_PDOT, KC_PENT
+    ),
+
+    [_FN] = LAYOUT_all(
+        _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,    KC_PSCR, _______, _______, _______,
+        _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______, KC_UP,   _______, _______,
+        _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             KC_LEFT, KC_DOWN, KC_RGHT, _______,
+        _______, _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MPLY, _______, _______,             _______, _______, _______,
+        _______, _______,    _______,          _______,                            _______,                                     _______,          _______,             _______, _______, _______, _______
+    ),
 
 };
diff --git a/keyboards/evyd13/mx5160/matrix_diagram.md b/keyboards/evyd13/mx5160/matrix_diagram.md
new file mode 100644
index 0000000000..8215cda2e6
--- /dev/null
+++ b/keyboards/evyd13/mx5160/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for MX-5160
+
+```
+                                                              ┌───────┐
+                                                 2u Backspace │17     │
+                                                              └───────┘
+┌───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┐
+│00 │10 │ │01 │11 │02 │12 │03 │13 │04 │14 │05 │15 │06 │16 │07 │87 │17 │ │08 │18 │09 │19 │
+├───┼───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┼───┤      ┌─────┐             ┌───┐
+│20 │30 │ │21   │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │27 │37   │ │28 │38 │29 │39 │      │     │             │   │ 2u
+├───┼───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┼───┼───┤   ┌──┴┐57  │ ISO Enter   │59 │ Numpad
+│40 │50 │ │41    │51 │42 │52 │43 │53 │44 │54 │45 │55 │46 │56 │57      │ │48 │58 │49 │59 │   │47 │    │             │   │ Plus
+├───┼───┤ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ├───┼───┼───┼───┤   └───┴────┘             └───┘
+│60 │70 │ │61  │71 │62 │72 │63 │73 │64 │74 │65 │75 │66 │76 │67    │77 │ │68 │78 │69 │99 │
+├───┼───┤ ├────┴┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤ ├───┼───┼───┤   │
+│80 │90 │ │81   │   │82   │94                         │96   │   │97   │ │88 │98 │89 │   │
+└───┴───┘ └─────┘   └─────┴───────────────────────────┴─────┘   └─────┘ └───┴───┴───┴───┘
+          ┌────────┐                                       ┌──────────┐ ┌───────┐
+          │61      │ 2.25u LShift             2.75u RShift │67        │ │88     │ 2u Numpad Zero
+          └────────┘                                       └──────────┘ └───────┘
+```