Merge remote-tracking branch 'origin/master' into develop

4 files changed, 322 insertions, 25 deletions

diff --git a/keyboards/neson_design/nico/info.json b/keyboards/neson_design/nico/info.json
index f21b644f56..477ac3ba7c 100644
--- a/keyboards/neson_design/nico/info.json
+++ b/keyboards/neson_design/nico/info.json
@@ -34,8 +34,11 @@
         "pid": "0x6E65",
         "vid": "0x4E65"
     },
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_65_xt_ansi_blocker_split_bs"
+    },
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_65_xt_ansi_blocker_split_bs": {
             "layout": [
                 { "label": "K017", "matrix": [0, 15], "x": 0, "y": 0 },
                 { "label": "K018", "matrix": [0, 16], "x": 1, "y": 0 },
@@ -116,6 +119,275 @@
                 { "label": "K4C", "matrix": [4, 12], "x": 16.5, "y": 4 },
                 { "label": "K4D", "matrix": [4, 13], "x": 17.5, "y": 4 }
             ]
+        },
+        "LAYOUT_65_xt_ansi_blocker": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 15], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 16], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 2.5, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 3.5, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 4.5, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 6.5, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 7.5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 8.5, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 9.5, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 10.5, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 11.5, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 12.5, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 13.5, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 14.5, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 15.5, "y": 0, "w": 2},
+                {"label": "Print Screen", "matrix": [4, 14], "x": 17.5, "y": 0},
+
+                {"label": "F3", "matrix": [1, 15], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [1, 16], "x": 1, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 4, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 6, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 7, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 8, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 9, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 10, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 11, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 12, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 13, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 14, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 15, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 16, "y": 1, "w": 1.5},
+                {"label": "Home", "matrix": [1, 14], "x": 17.5, "y": 1},
+
+                {"label": "F5", "matrix": [2, 15], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [2, 16], "x": 1, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 4.25, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 5.25, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 6.25, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 7.25, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 8.25, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 9.25, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 10.25, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 11.25, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 12.25, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 13.25, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 14.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 15.25, "y": 2, "w": 2.25},
+                {"label": "End", "matrix": [2, 14], "x": 17.5, "y": 2},
+
+                {"label": "F7", "matrix": [3, 15], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [3, 16], "x": 1, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 4.75, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 5.75, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 6.75, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 7.75, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 8.75, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 9.75, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 10.75, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 11.75, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 12.75, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 13.75, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 14.75, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 16.5, "y": 3},
+                {"label": "Fn", "matrix": [3, 14], "x": 17.5, "y": 3},
+
+                {"label": "F9", "matrix": [4, 15], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [4, 16], "x": 1, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 1], "x": 3.75, "y": 4, "w": 1.25},
+                {"label": "Alt", "matrix": [4, 2], "x": 5, "y": 4, "w": 1.25},
+                {"label": "Space", "matrix": [4, 8], "x": 6.25, "y": 4, "w": 6.25},
+                {"label": "Alt", "matrix": [4, 9], "x": 12.5, "y": 4, "w": 1.25},
+                {"label": "GUI", "matrix": [4, 10], "x": 13.75, "y": 4, "w": 1.25},
+                {"label": "\u2190", "matrix": [4, 11], "x": 15.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 16.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 17.5, "y": 4}
+            ]
+        },
+        "LAYOUT_65_xt_ansi_blocker_tsangan_split_bs": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 15], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 16], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 2.5, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 3.5, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 4.5, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 6.5, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 7.5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 8.5, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 9.5, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 10.5, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 11.5, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 12.5, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 13.5, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 14.5, "y": 0},
+                {"label": "Delete", "matrix": [0, 13], "x": 15.5, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 16.5, "y": 0},
+                {"label": "Print Screen", "matrix": [4, 14], "x": 17.5, "y": 0},
+
+                {"label": "F3", "matrix": [1, 15], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [1, 16], "x": 1, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 4, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 6, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 7, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 8, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 9, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 10, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 11, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 12, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 13, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 14, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 15, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 16, "y": 1, "w": 1.5},
+                {"label": "Home", "matrix": [1, 14], "x": 17.5, "y": 1},
+
+                {"label": "F5", "matrix": [2, 15], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [2, 16], "x": 1, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 4.25, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 5.25, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 6.25, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 7.25, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 8.25, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 9.25, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 10.25, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 11.25, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 12.25, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 13.25, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 14.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 15.25, "y": 2, "w": 2.25},
+                {"label": "End", "matrix": [2, 14], "x": 17.5, "y": 2},
+
+                {"label": "F7", "matrix": [3, 15], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [3, 16], "x": 1, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 4.75, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 5.75, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 6.75, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 7.75, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 8.75, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 9.75, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 10.75, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 11.75, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 12.75, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 13.75, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 14.75, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 16.5, "y": 3},
+                {"label": "Fn", "matrix": [3, 14], "x": 17.5, "y": 3},
+
+                {"label": "F9", "matrix": [4, 15], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [4, 16], "x": 1, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.5, "y": 4, "w": 7},
+                {"label": "GUI", "matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 11], "x": 15.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 16.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 17.5, "y": 4}
+            ]
+        },
+        "LAYOUT_65_xt_ansi_blocker_tsangan": {
+            "layout": [
+                {"label": "F1", "matrix": [0, 15], "x": 0, "y": 0},
+                {"label": "F2", "matrix": [0, 16], "x": 1, "y": 0},
+
+                {"label": "Esc", "matrix": [0, 0], "x": 2.5, "y": 0},
+                {"label": "1", "matrix": [0, 1], "x": 3.5, "y": 0},
+                {"label": "2", "matrix": [0, 2], "x": 4.5, "y": 0},
+                {"label": "3", "matrix": [0, 3], "x": 5.5, "y": 0},
+                {"label": "4", "matrix": [0, 4], "x": 6.5, "y": 0},
+                {"label": "5", "matrix": [0, 5], "x": 7.5, "y": 0},
+                {"label": "6", "matrix": [0, 6], "x": 8.5, "y": 0},
+                {"label": "7", "matrix": [0, 7], "x": 9.5, "y": 0},
+                {"label": "8", "matrix": [0, 8], "x": 10.5, "y": 0},
+                {"label": "9", "matrix": [0, 9], "x": 11.5, "y": 0},
+                {"label": "0", "matrix": [0, 10], "x": 12.5, "y": 0},
+                {"label": "-", "matrix": [0, 11], "x": 13.5, "y": 0},
+                {"label": "=", "matrix": [0, 12], "x": 14.5, "y": 0},
+                {"label": "Backspace", "matrix": [0, 14], "x": 15.5, "y": 0, "w": 2},
+                {"label": "Print Screen", "matrix": [4, 14], "x": 17.5, "y": 0},
+
+                {"label": "F3", "matrix": [1, 15], "x": 0, "y": 1},
+                {"label": "F4", "matrix": [1, 16], "x": 1, "y": 1},
+
+                {"label": "Tab", "matrix": [1, 0], "x": 2.5, "y": 1, "w": 1.5},
+                {"label": "Q", "matrix": [1, 1], "x": 4, "y": 1},
+                {"label": "W", "matrix": [1, 2], "x": 5, "y": 1},
+                {"label": "E", "matrix": [1, 3], "x": 6, "y": 1},
+                {"label": "R", "matrix": [1, 4], "x": 7, "y": 1},
+                {"label": "T", "matrix": [1, 5], "x": 8, "y": 1},
+                {"label": "Y", "matrix": [1, 6], "x": 9, "y": 1},
+                {"label": "U", "matrix": [1, 7], "x": 10, "y": 1},
+                {"label": "I", "matrix": [1, 8], "x": 11, "y": 1},
+                {"label": "O", "matrix": [1, 9], "x": 12, "y": 1},
+                {"label": "P", "matrix": [1, 10], "x": 13, "y": 1},
+                {"label": "[", "matrix": [1, 11], "x": 14, "y": 1},
+                {"label": "]", "matrix": [1, 12], "x": 15, "y": 1},
+                {"label": "\\", "matrix": [1, 13], "x": 16, "y": 1, "w": 1.5},
+                {"label": "Home", "matrix": [1, 14], "x": 17.5, "y": 1},
+
+                {"label": "F5", "matrix": [2, 15], "x": 0, "y": 2},
+                {"label": "F6", "matrix": [2, 16], "x": 1, "y": 2},
+
+                {"label": "Caps Lock", "matrix": [2, 0], "x": 2.5, "y": 2, "w": 1.75},
+                {"label": "A", "matrix": [2, 1], "x": 4.25, "y": 2},
+                {"label": "S", "matrix": [2, 2], "x": 5.25, "y": 2},
+                {"label": "D", "matrix": [2, 3], "x": 6.25, "y": 2},
+                {"label": "F", "matrix": [2, 4], "x": 7.25, "y": 2},
+                {"label": "G", "matrix": [2, 5], "x": 8.25, "y": 2},
+                {"label": "H", "matrix": [2, 6], "x": 9.25, "y": 2},
+                {"label": "J", "matrix": [2, 7], "x": 10.25, "y": 2},
+                {"label": "K", "matrix": [2, 8], "x": 11.25, "y": 2},
+                {"label": "L", "matrix": [2, 9], "x": 12.25, "y": 2},
+                {"label": ";", "matrix": [2, 10], "x": 13.25, "y": 2},
+                {"label": "'", "matrix": [2, 11], "x": 14.25, "y": 2},
+                {"label": "Enter", "matrix": [2, 13], "x": 15.25, "y": 2, "w": 2.25},
+                {"label": "End", "matrix": [2, 14], "x": 17.5, "y": 2},
+
+                {"label": "F7", "matrix": [3, 15], "x": 0, "y": 3},
+                {"label": "F8", "matrix": [3, 16], "x": 1, "y": 3},
+
+                {"label": "Shift", "matrix": [3, 0], "x": 2.5, "y": 3, "w": 2.25},
+                {"label": "Z", "matrix": [3, 2], "x": 4.75, "y": 3},
+                {"label": "X", "matrix": [3, 3], "x": 5.75, "y": 3},
+                {"label": "C", "matrix": [3, 4], "x": 6.75, "y": 3},
+                {"label": "V", "matrix": [3, 5], "x": 7.75, "y": 3},
+                {"label": "B", "matrix": [3, 6], "x": 8.75, "y": 3},
+                {"label": "N", "matrix": [3, 7], "x": 9.75, "y": 3},
+                {"label": "M", "matrix": [3, 8], "x": 10.75, "y": 3},
+                {"label": ",", "matrix": [3, 9], "x": 11.75, "y": 3},
+                {"label": ".", "matrix": [3, 10], "x": 12.75, "y": 3},
+                {"label": "/", "matrix": [3, 11], "x": 13.75, "y": 3},
+                {"label": "Shift", "matrix": [3, 12], "x": 14.75, "y": 3, "w": 1.75},
+                {"label": "\u2191", "matrix": [3, 13], "x": 16.5, "y": 3},
+                {"label": "Fn", "matrix": [3, 14], "x": 17.5, "y": 3},
+
+                {"label": "F9", "matrix": [4, 15], "x": 0, "y": 4},
+                {"label": "F10", "matrix": [4, 16], "x": 1, "y": 4},
+
+                {"label": "Ctrl", "matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.5},
+                {"label": "GUI", "matrix": [4, 1], "x": 4, "y": 4},
+                {"label": "Alt", "matrix": [4, 2], "x": 5, "y": 4, "w": 1.5},
+                {"label": "Space", "matrix": [4, 8], "x": 6.5, "y": 4, "w": 7},
+                {"label": "GUI", "matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.5},
+                {"label": "\u2190", "matrix": [4, 11], "x": 15.5, "y": 4},
+                {"label": "\u2193", "matrix": [4, 12], "x": 16.5, "y": 4},
+                {"label": "\u2192", "matrix": [4, 13], "x": 17.5, "y": 4}
+            ]
         }
     }
 }
diff --git a/keyboards/neson_design/nico/keymaps/default/keymap.c b/keyboards/neson_design/nico/keymaps/default/keymap.c
index d481379e21..845d7fdc4f 100644
--- a/keyboards/neson_design/nico/keymaps/default/keymap.c
+++ b/keyboards/neson_design/nico/keymaps/default/keymap.c
@@ -18,17 +18,19 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-      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_DEL, KC_BSPC, KC_PSCR,
-      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_HOME,
-      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_END,
-      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_UP,   MO(1),
-      KC_F9,KC_F10,     KC_LCTL,  KC_LGUI,  KC_LALT,                        KC_SPC,                  KC_RALT,KC_RGUI,                KC_LEFT,KC_DOWN, KC_RIGHT),
+    [0] = LAYOUT_65_xt_ansi_blocker_split_bs(
+        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_DEL,  KC_BSPC, KC_PSCR,
+        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_HOME,
+        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_END,
+        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_UP,   MO(1),
+        KC_F9,   KC_F10,     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-    [1] = 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_PSCR,_______,
-      _______, _______, QK_BOOT,          RGB_TOG,RGB_MOD,_______, KC_F16, KC_F17,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,_______,
-      _______, _______, _______,        _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME, KC_END,        _______,_______,
-      _______, _______, _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,
-      _______, _______, _______,_______,_______,                        _______,                        _______,_______,        _______,_______,_______),
+    [1] = LAYOUT_65_xt_ansi_blocker_split_bs(
+        _______, _______,    _______, 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_PSCR, _______,
+        _______, _______,    QK_BOOT, RGB_TOG, RGB_MOD, _______, KC_F16,  KC_F17,  _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,          _______,
+        _______, _______,    _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_HOME, KC_END,           _______,          _______,
+        _______, _______,    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______,    _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+    ),
 };
diff --git a/keyboards/neson_design/nico/keymaps/via/keymap.c b/keyboards/neson_design/nico/keymaps/via/keymap.c
index 9de688505e..845d7fdc4f 100644
--- a/keyboards/neson_design/nico/keymaps/via/keymap.c
+++ b/keyboards/neson_design/nico/keymaps/via/keymap.c
@@ -18,17 +18,19 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
-      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_DEL, KC_BSPC, KC_PSCR,
-      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_HOME,
-      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_END,
-      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_UP,   MO(1),
-      KC_F9,KC_F10,     KC_LCTL,  KC_LGUI,  KC_LALT,                        KC_SPC,                  KC_RALT,KC_RGUI,                KC_LEFT,KC_DOWN, KC_RIGHT),
+    [0] = LAYOUT_65_xt_ansi_blocker_split_bs(
+        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_DEL,  KC_BSPC, KC_PSCR,
+        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_HOME,
+        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_END,
+        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_UP,   MO(1),
+        KC_F9,   KC_F10,     KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI,          KC_LEFT, KC_DOWN, KC_RGHT
+    ),
 
-    [1] = LAYOUT(
-      _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-      _______, _______, QK_BOOT,        RGB_TOG,RGB_MOD,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
-      _______, _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,
-      _______, _______, _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,_______,
-      _______, _______, _______,_______,_______,                        _______,                        _______,_______,        _______,_______,_______)
+    [1] = LAYOUT_65_xt_ansi_blocker_split_bs(
+        _______, _______,    _______, 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_PSCR, _______,
+        _______, _______,    QK_BOOT, RGB_TOG, RGB_MOD, _______, KC_F16,  KC_F17,  _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______,          _______,
+        _______, _______,    _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_HOME, KC_END,           _______,          _______,
+        _______, _______,    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______,    _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+    ),
 };
diff --git a/keyboards/neson_design/nico/matrix_diagram.md b/keyboards/neson_design/nico/matrix_diagram.md
new file mode 100644
index 0000000000..b761512be7
--- /dev/null
+++ b/keyboards/neson_design/nico/matrix_diagram.md
@@ -0,0 +1,21 @@
+# Matrix Diagram for Neson Design Nico
+
+```
+                                                              ┌───────┐
+                                                 2u Backspace │0E     │
+                                                              └───────┘
+┌───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│0F │0G │ │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │4E │
+├───┼───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+│1F │1G │ │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D   │1E │
+├───┼───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+│2F │2G │ │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D      │2E │
+├───┼───┤ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+│3F │3G │ │30      │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C    │3D │3E │
+├───┼───┤ ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+│4F │4G │ │40  │41  │42  │48                      │49  │4A  │ │4B │4C │4D │
+└───┴───┘ └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+          ┌─────┬───┬─────┬───────────────────────────┬─────┐
+          │40   │41 │42   │48                         │4A   │ Blocker Tsangan
+          └─────┴───┴─────┴───────────────────────────┴─────┘
+```